1
0
forked from mirrors/0ad

Compare commits

...

635 Commits

Author SHA1 Message Date
historic_bruno 329b3e3d28 Adds notice of saved game issues to Aegis' description
This was SVN commit r13332.
2013-04-01 15:03:31 +00:00
Enrique 0535cab26f Added mauryan healer skin and head.
Added roman army camp rubble with AO
Added AO map and normal map to roman army camp

This was SVN commit r13331.
2013-04-01 00:48:18 +00:00
historic_bruno afde8b04fd Deletes "obsolete and rubbish" textureconv
This was SVN commit r13330.
2013-03-31 23:53:53 +00:00
wraitii 3b5ab7ab51 Fixes #1884 . Should Fix #1883 .
This was SVN commit r13328.
2013-03-30 07:30:54 +00:00
historic_bruno c2ca0209fa Fixes multiplayer crash when host disconnects while clients are still loading.
Improves client disconnect handling slightly.

This was SVN commit r13327.
2013-03-25 05:01:36 +00:00
wraitii 475c722327 Fix serialization issues with Aegis.
This was SVN commit r13326.
2013-03-24 09:10:32 +00:00
historic_bruno 6f78224f8d Fixes tooltip in Atlas' locked teams checkbox.
Adds scrollbar to environment panel and reorganizes controls.

This was SVN commit r13324.
2013-03-23 19:22:11 +00:00
historic_bruno 71ae5a19d8 Fixes visual actor interpolation, handling position changes more cleanly, based on patch by sbte.
Fixes rally point lines not updating, fixes #1865

This was SVN commit r13323.
2013-03-23 17:59:54 +00:00
historic_bruno 6f33003f30 Fixes serialization test failure caused by CmpFoundation's buildMultiplier property sometimes being NaN (which can assume different internal values in Spidermonkey). For now, NaN cannot be reliably serialized. Fixes #1828, refs #1879
This was SVN commit r13322.
2013-03-22 22:23:50 +00:00
Enrique 0d069954b7 waterfall textures reduced 50%
This was SVN commit r13321.
2013-03-22 00:37:33 +00:00
Enrique 3d94f3a5be Added 4 geology waterfalls variations.
Added water splash particle effect.

This was SVN commit r13320.
2013-03-22 00:24:46 +00:00
Enrique 4560bb62b0 Updated contributor Paperkat merch ship texture
This was SVN commit r13319.
2013-03-19 09:58:06 +00:00
historic_bruno 78d1548753 Fixes (un)packing siege units responding to attacks in violent stance, by ignoring attacks while (un)packing. Fixes #1751, refs #1752
This was SVN commit r13318.
2013-03-19 00:53:47 +00:00
Enrique 807985ac08 Added a base with flowers and playercolor to mauryan pillars.
Added contributor Paperkat merchant ship.

This was SVN commit r13317.
2013-03-18 12:34:55 +00:00
Enrique e031d71b78 Added chakra wheel to ashoka pillar 4 lions variation-
This was SVN commit r13316.
2013-03-18 01:46:44 +00:00
Mythos_Ruler 1bcb6140b0 Skirms bonus vs. elephants reduced from 1.5x to 1.25x.
Some new elephant templates. Elephant unit entities adjusted.

Spartan female citizen now has a bonus attack vs. siege weapons.

This was SVN commit r13315.
2013-03-18 01:33:20 +00:00
Enrique 063fa52252 removes chandragupta normal texture line from his actor
This was SVN commit r13314.
2013-03-17 23:16:40 +00:00
Ykkrosh a7343420f2 Disable fancy water rendering on all Intel devices, since it appears to be very slow.
Also recognise Haswell chipsets on Mesa.

This was SVN commit r13313.
2013-03-17 14:27:47 +00:00
Enrique cfbde115b8 Maur hero Ashoka skin tone change
This was SVN commit r13312.
2013-03-17 12:46:24 +00:00
Enrique e367cf0d7e maur barracks death variation semi-fix
This was SVN commit r13311.
2013-03-17 12:34:03 +00:00
Enrique 6a1a1c16cb maur market stalls cloth small fix
This was SVN commit r13310.
2013-03-17 12:27:15 +00:00
Pureon 49f52500de Mauryan ship icons
This was SVN commit r13309.
2013-03-17 11:53:09 +00:00
Pureon 25c800e9c4 Chanakya hero template
This was SVN commit r13308.
2013-03-17 10:10:49 +00:00
wraitii f8a7692d92 A few final fixes to some AI logic in attack and defense.
This was SVN commit r13307.
2013-03-17 08:55:46 +00:00
Enrique 3f28ade5c6 Hero ashoka added. Fixed maiden holding parasol in chariot.
Added hero turban prop
Hero Chanakya now uses elite healer template

This was SVN commit r13306.
2013-03-17 00:39:43 +00:00
Pureon 9e46759ada Mauryan actor indent cleanup
This was SVN commit r13305.
2013-03-16 16:05:53 +00:00
Pureon fc3b5637c8 Ambient occlusion for Mauryan houses
This was SVN commit r13304.
2013-03-16 15:53:20 +00:00
wraitii 03c3b1daa3 Fixes a few changes in my previous commit. Makes "Medium" the default difficulty setting.
This was SVN commit r13303.
2013-03-16 12:55:03 +00:00
Pureon 77999f6b42 Ashoka pillar variations and footprint fix
This was SVN commit r13302.
2013-03-16 11:18:33 +00:00
Pureon e78da0b3e4 Mauryan mill ambient occlusion
This was SVN commit r13301.
2013-03-16 11:00:24 +00:00
Pureon 5ba7153541 Placeholder Mauryan merchant ship
This was SVN commit r13300.
2013-03-16 10:30:29 +00:00
wraitii b0f1afa994 Change Punjab 1 water settings.
Fix a little mess-up on my last commit.

This was SVN commit r13299.
2013-03-16 10:16:41 +00:00
wraitii d709fe50ed Clean-up of Aegis scripts. Most deprecated functions have been removed, some comments updated. Also makes resource maps 8-bit to save a little memory.
Fix the placement of the "civ info" button to avoid overlapping on
1024*768.

This was SVN commit r13298.
2013-03-16 09:59:43 +00:00
Pureon d70db48173 Mauryan ship footprints
This was SVN commit r13297.
2013-03-16 09:56:22 +00:00
Enrique 0fc8dba671 Fixed mauryan market stall color.
This was SVN commit r13296.
2013-03-16 01:06:51 +00:00
Enrique fd74292f2b Added specular map for Chanakya hero.
Fixed defense tower shields when destroyed.
Added Chandragupta texture with spec.
Fixed wall tower projectile and garrisoned prop-points.

This was SVN commit r13295.
2013-03-16 00:32:04 +00:00
historic_bruno 3958c03dbc Changes default scenarios to Punjab 1
This was SVN commit r13294.
2013-03-15 23:06:16 +00:00
historic_bruno 4bcbd14f71 Resets most land scenarios to default AIs, so they'll use Aegis Bot.
Removes AIs from some demo maps.

This was SVN commit r13293.
2013-03-15 23:02:29 +00:00
historic_bruno a96869851c Replaces force attack hotkey with Ctrl+Alt (AltGr isn't available on US keyboards)
This was SVN commit r13292.
2013-03-15 21:59:36 +00:00
wraitii 4769481796 Makes sure to remove the entity from the Gatherer array of the resource it was gathering from when dying. Fixes #1867 (if all goes well).
This was SVN commit r13290.
2013-03-15 18:12:17 +00:00
wraitii 5af7544918 Bug fixes and small improvements to Aegis. Change the "C" button into a "Settings" button. Fix to -autostart-aidiff.
This was SVN commit r13289.
2013-03-15 12:35:16 +00:00
wraitii 066cfa5893 Improve workers' reactions when they find out that the resource they gathered from is full. Refs #1387
This was SVN commit r13288.
2013-03-15 10:26:46 +00:00
wraitii d40a66f310 Fix particle to correctly display in the FOW, and to adapt slightly to sunColor settings (both on ARB and GLSL).
This was SVN commit r13287.
2013-03-15 10:22:24 +00:00
Pureon 26cc813cf5 Update for release trailer recording
This was SVN commit r13286.
2013-03-14 23:24:53 +00:00
Pureon afe87f720a Mauryan Corral AO
This was SVN commit r13285.
2013-03-14 23:13:31 +00:00
quantumstate c23181a1e0 Make towers weaker by reducing range fro 80 to 70 and decreasing the arrow tech multiplier to 40% more arrows from 100%.
This was SVN commit r13284.
2013-03-14 22:57:59 +00:00
stwf 4edbd21714 elimate small memory leaks in SoundManager
This was SVN commit r13283.
2013-03-14 02:59:31 +00:00
Enrique 9dac1bf89b Fixed inverted green channel in elephants normal maps (fixed normals)
This was SVN commit r13282.
2013-03-14 00:48:31 +00:00
Enrique 1cf1707ce7 Added mauryan hero chanakya and mauryan elephants static meshes.
This was SVN commit r13281.
2013-03-14 00:05:46 +00:00
Pureon 163fc7cbfd Mauryan farmstead AO stuff
This was SVN commit r13280.
2013-03-13 23:58:38 +00:00
wraitii 25293ce0cc Many small bugfixes for AIs. Adds support for difficulty (and along with that, some behind-the-door architecture for a handicap system).
Adds -autostart-aidiff to set the difficulty from the command line from
testing.

This was SVN commit r13278.
2013-03-13 20:44:48 +00:00
wraitii 8ac9f1d8ea Limit the number of gatherer per resource, as described in #1387. Based on work by crezax. Fixes #1387
This was SVN commit r13277.
2013-03-13 20:10:46 +00:00
leper 844f71681a Add notification for missing resources when tributing. Patch by alpha123. Fixes #1839.
This was SVN commit r13276.
2013-03-13 18:37:06 +00:00
leper 637abf8167 Stop following units into FoW. Patch by crezax. Fixes #1827.
This was SVN commit r13275.
2013-03-13 18:17:58 +00:00
leper 56784aceab Fix signed/unsigned comparison warning.
This was SVN commit r13274.
2013-03-13 16:23:27 +00:00
stwf b75183eba2 remove log entries concerning sound manager distress mode
This was SVN commit r13273.
2013-03-13 03:55:36 +00:00
Enrique 60a91cb032 fixes death variation for mauryan walls, fortress, defense tower, and temple.
This was SVN commit r13272.
2013-03-12 23:06:20 +00:00
wraitii 2bcb03f049 Fix messages.js for "/team" messages when no teams were set.
Change to AI logic, makes Aegis more efficient with a better attack,
eco, and defense. Bugfixes.

This was SVN commit r13271.
2013-03-12 21:58:25 +00:00
Pureon e37012a9fd Added Omri's latest track to the Hellenic civs
This was SVN commit r13270.
2013-03-12 21:55:33 +00:00
Pureon 21f4a94242 New Mauryan emblem
This was SVN commit r13269.
2013-03-12 21:48:42 +00:00
wraitii 3f6702075b Fix my previous commit where if you had enough units buildings would never construct (rounding issue).
This was SVN commit r13268.
2013-03-12 10:07:53 +00:00
wraitii 791a901df9 Fix a bug with the foundation changes that caused buildings to be built too fast with multiple units.
This was SVN commit r13267.
2013-03-12 08:22:45 +00:00
wraitii 9b1b8cc8fd A few bugfixes, slight change in logic for smoother play. Makes Aegis gather with cavalry. Allows it to send chat messages to warn about attacks.
This was SVN commit r13266.
2013-03-11 19:58:29 +00:00
historic_bruno ca40764dc6 Fixes bug in map reader that caused actor variations to default to seed 0. Fixes #1861.
Fixes maps that were affected by this bug.

This was SVN commit r13264.
2013-03-11 16:42:41 +00:00
wraitii dab9175f30 Foundations now require 100% health for construction to be completed. Progress now linked with health. Patch by Malcom. Fixes #1853
This was SVN commit r13263.
2013-03-11 15:47:16 +00:00
OmriLahav c6eea186e8 New Hellenic track - The Hallespont, A13.
This was SVN commit r13261.
2013-03-11 12:15:02 +00:00
Mythos_Ruler 6431eb63a5 Mauryans now have a cavalry swordsman.
This was SVN commit r13260.
2013-03-11 02:29:19 +00:00
Mythos_Ruler ba38a22abe Renamed some wonder templates. Let us know if it breaks anything.
This was SVN commit r13258.
2013-03-11 01:08:48 +00:00
Pureon 0e6d764162 Mauryan long wall template edit
This was SVN commit r13257.
2013-03-11 01:06:45 +00:00
Pureon 9e511134e6 Updated sandbox with latest Mauryan units
This was SVN commit r13256.
2013-03-11 00:48:36 +00:00
Mythos_Ruler 0ec860651a This was SVN commit r13255. 2013-03-11 00:35:33 +00:00
Mythos_Ruler 7dda41f693 Mauryan walls cost wood and have roughly 25% less health than stone walls.
This was SVN commit r13254.
2013-03-11 00:10:24 +00:00
leper 0d7e6b7880 Use pimpl idiom for ThreadDebugger.
This was SVN commit r13253.
2013-03-10 23:08:01 +00:00
wraitii eda2802f6d Simplify construction of the transformation matrix in GetInterpolatedTransform. Patch by sbte. Fixes #1854
This was SVN commit r13252.
2013-03-10 20:31:53 +00:00
wraitii 1778e685ac Improve detection of when a component needs to be interpolated. Patch by sbte. Fixes #1858.
This was SVN commit r13251.
2013-03-10 20:28:01 +00:00
Pureon f3eab4127e caliper icon and Mauryan wall tweak
This was SVN commit r13250.
2013-03-10 16:12:10 +00:00
Pureon d2e5d63039 Animations for Mauryan wall gate
This was SVN commit r13249.
2013-03-10 12:04:56 +00:00
wraitii 1368aa4ae9 Fix bugs in the attack manager, fix reparations in enemy territory, change readme.txt to document the new -autostart-civ function.
This was SVN commit r13248.
2013-03-10 07:37:05 +00:00
wraitii 2c17ab70ac Add support for -autostart-civ to set civilizations when quickstarting.
Put the AI memory heap back to 32 MB to avoid OOM errors with numerous
AIs in late game.
Fix a bug that made ProductionQueue not broadcast progress.
Fix many issues with Aegis in defense, pathfinding, foundation
construction, training building choice, strength calculations, building
placement and mostly attack. Aegis should be much more aggressive.

This was SVN commit r13247.
2013-03-09 14:09:06 +00:00
leper 0572ffd3d2 Add support for mauryan walls to the rmgen wall builder. Patch by FeXoR. Fixes #1855.
This was SVN commit r13246.
2013-03-08 23:46:36 +00:00
leper 8c756b507a Fix non-pch build. Maybe use pimpl idiom instead.
This was SVN commit r13245.
2013-03-08 23:46:32 +00:00
quantumstate c6043779f6 Better fix for the angle interolation issue. Thanks sbte for spotting it. Refs #1846.
This was SVN commit r13244.
2013-03-08 20:01:12 +00:00
quantumstate 8777f68aa0 Fix rotation interpolation. Refs #1846.
This was SVN commit r13243.
2013-03-08 19:34:55 +00:00
wraitii d76f570a69 Fix the defense system (it now works as expected, that doesn't mean well). Fix a bug in dropsite placement that caused AIs to go awry. Slight changes here and there to the strategy. Optimizations when running many workers at once. Fix some pathfinding not working. Units in attack plans should be slightly less dumb.
This was SVN commit r13242.
2013-03-07 21:33:57 +00:00
Enrique 940ecd29e8 Mauryan walls added with AO. No gate animation yet.
This was SVN commit r13241.
2013-03-07 21:05:33 +00:00
Yves d892e1887a My modifications to the jsdebugger's web GUI. Adds a few features and makes it compatible with the current server-side code. Closes #410
This was SVN commit r13240.
2013-03-07 14:41:03 +00:00
Yves 28200e6a04 The original web GUI for the jsdebugger from contributor mmayfield45. I only removed the jquery demo directory and added some licensing information. This is for an older version of the debuggers server-side part, so it doesn't work anymore. The required modifications will be committed soon. Refs #410
This was SVN commit r13239.
2013-03-07 14:27:34 +00:00
Yves 73951b75fc Adds the server-side part of the javascript debugger. Refs #410
This was SVN commit r13238.
2013-03-07 13:49:49 +00:00
historic_bruno f5be596ee8 Fixes use of invalid pointer from temporary string (caused some invalid read warnings in Valgrind)
This was SVN commit r13237.
2013-03-07 03:54:41 +00:00
Pureon ff97d550b8 Added Omri's 2 other new tracks to the relevant civs
This was SVN commit r13236.
2013-03-06 22:09:10 +00:00
Mythos_Ruler ee85e942e1 Mauryan civ json changed to use new Mauryan music track.
This was SVN commit r13235.
2013-03-06 19:27:24 +00:00
Mythos_Ruler 59be67d27e Portrait for Wonders.
This was SVN commit r13234.
2013-03-06 18:16:41 +00:00
OmriLahav dfd1abeab9 A13 - first Mauryan Indian peace track
This was SVN commit r13232.
2013-03-06 15:27:05 +00:00
wraitii 081721c679 Fix the build and stops the AI from creating tons of AI dump images for no good reason.
This was SVN commit r13231.
2013-03-06 14:33:15 +00:00
wraitii a45a926aeb Fix an issue that caused a crash on serialization. Prepare the AI manager a little more for serialization.
Fix bugs with tests. Fix some other issues in the AI (attack plans deal
with walls better, choose better paths, target selection is better. Dock
building won't be tried hundreds of times if it fails.)
Changes the Oasis random map to only put a path in the middle 50% of the
time.

This was SVN commit r13230.
2013-03-06 11:52:41 +00:00
OmriLahav f0db42e34e A13 track - Gaulic early peace.
This was SVN commit r13228.
2013-03-06 10:54:03 +00:00
Pureon c3944097a7 Small nerf to bolt shooters
This was SVN commit r13227.
2013-03-06 00:21:38 +00:00
wraitii e33d4a52e9 AI API V3 along with a new version of Aegis. Support for a JS shared component that can be used or not for each AI.
This was SVN commit r13225.
2013-03-05 22:52:48 +00:00
Pureon c29a8d8ac0 Tech icons
This was SVN commit r13224.
2013-03-05 21:27:29 +00:00
quantumstate 21f13f9683 Only use interpolation for moving objects in VisualActor. Patch by sbte. Fixes #1846.
This was SVN commit r13223.
2013-03-05 20:02:16 +00:00
Pureon 121fb35f72 Bolt shooter accuracy tech
This was SVN commit r13222.
2013-03-04 23:30:50 +00:00
quantumstate 7461e4a3c1 Add technology support for ranged unit spread
This was SVN commit r13221.
2013-03-04 21:52:44 +00:00
Pureon 7df4fd6919 helmet variations and tweak to ballista template
This was SVN commit r13220.
2013-03-04 21:27:45 +00:00
ShieldBearer b8322fa6bb Zebu model
This was SVN commit r13219.
2013-03-04 14:16:08 +00:00
stwf efd42ef490 fixes windows compile error and some nuused param warnings
This was SVN commit r13217.
2013-03-03 22:28:26 +00:00
Pureon 3bce7cafba Updated Mauryan corral and some sound tweaks
This was SVN commit r13216.
2013-03-03 22:09:26 +00:00
Pureon e4e4ae9ede Mauryan maceman helmet
This was SVN commit r13215.
2013-03-03 18:19:10 +00:00
Pureon 7e2d54d2ef Gaia portraits
This was SVN commit r13214.
2013-03-03 14:31:49 +00:00
Pureon 99c0497f23 Model and texture changes to some Mauryan units
This was SVN commit r13213.
2013-03-03 11:58:55 +00:00
wraitii 9b03e0d572 Darkens icons that are unavailable to train/build/research to make it more obvious than only the grayscaling in some cases.
Improves the red overlay showing a lack of resource for technologies.
Makes tech pair show a red cross instead of a red overlay when hovering
over a pair to make it less confusing.

This was SVN commit r13212.
2013-03-03 10:27:37 +00:00
Mythos_Ruler 2c1a3ee892 Adjusting starting units for all civs.
Added "Wonder" structural template.

This was SVN commit r13211.
2013-03-03 00:57:30 +00:00
stwf ed8746e798 remove log message
This was SVN commit r13210.
2013-03-01 14:23:28 +00:00
stwf e4a9312c46 newest soundmanager patch, should give better battle sequences, and handle low resource situations correctly.
This was SVN commit r13209.
2013-03-01 14:22:28 +00:00
Deiz c16b93794a Support decrementing training batches, show batch size on icons.
This was SVN commit r13208.
2013-02-28 00:20:16 +00:00
quantumstate 3c50352134 Use attack move icon as a cursor. Refs #1847.
This was SVN commit r13207.
2013-02-27 18:18:59 +00:00
Pureon 7ff4538414 Attack move icon
This was SVN commit r13206.
2013-02-27 00:39:29 +00:00
Pureon 1bcb07af64 Improved animal attack sounds
This was SVN commit r13205.
2013-02-26 22:33:14 +00:00
historic_bruno 284e9cd230 Improves frame rate counter to give smoother results, patch by sbte. Fixes #1016
This was SVN commit r13204.
2013-02-26 21:50:38 +00:00
historic_bruno e283e75d84 Updates example component documentation
This was SVN commit r13203.
2013-02-26 19:58:51 +00:00
Enrique 6c7543c044 Added Mauryan birreme from contributor Ndragu.
Added details to Mauryan Great Stupa fence.

This was SVN commit r13202.
2013-02-26 15:32:03 +00:00
leper cb890ad876 Add shift-clicking to tribute multiples of 500. Patch by alpha123. Refs #1839.
This was SVN commit r13201.
2013-02-25 22:59:04 +00:00
quantumstate 18ee932a01 Adds attack move bound to the Ctrl hotkey. Patch from mimo. Refs #1001.
This was SVN commit r13200.
2013-02-25 21:56:24 +00:00
Pureon ac32c7266e Mauryan farmstead
This was SVN commit r13199.
2013-02-25 21:56:09 +00:00
leper 94f2c2d912 Add insufficient population count to production queue tooltip. Patch by zoot. Fixes #1659.
This was SVN commit r13198.
2013-02-25 20:30:02 +00:00
Mythos_Ruler a66ac54bbb Fix slinger tooltip.
This was SVN commit r13197.
2013-02-25 02:35:52 +00:00
Mythos_Ruler aa36718217 Balancing for slingers and elephants: Slinger attack and cost small nerf. Elephant speed slightly reduced.
Fixed range bug for Celtic faction slingers.

This was SVN commit r13196.
2013-02-25 02:33:44 +00:00
historic_bruno 10373892be Adds support for Apple command/meta hotkeys by grouping them with unified "Super" hotkey (not bothering to handle the distinction which is only relevant to Apple keyboards and SDL 1.2).
Adds Super+Q hotkey to close the game on OS X.

This was SVN commit r13195.
2013-02-24 21:42:21 +00:00
Enrique ee7e135900 Added bigger Ashoka pillar variation with 4 lions. Textures modified.
This was SVN commit r13194.
2013-02-24 15:17:38 +00:00
historic_bruno 9e163500c5 Don't use Number, parseInt, etc. per coding conventions (use the +operator instead)
This was SVN commit r13192.
2013-02-24 00:25:13 +00:00
historic_bruno ca92e50048 Adds notification tooltips for building placement, fixes #921.
Tweaks info tooltip borders and padding to improve readability.

This was SVN commit r13191.
2013-02-24 00:12:41 +00:00
Enrique 6e6a25dbce Updated Mauryan Ndragu mauryan trireme with his fix. Modified Mauryans sandbox map.
This was SVN commit r13189.
2013-02-23 16:04:43 +00:00
Pureon e5291d267d Horse sound effects by Evan Bogunia
This was SVN commit r13186.
2013-02-23 15:12:37 +00:00
Enrique 344645dbae Added mauryan wonder "Great Stupa" with AO. Mauryan market AO texture scaled down.
This was SVN commit r13185.
2013-02-23 13:19:42 +00:00
historic_bruno 92fdbb49b6 Moves particle interpolation to its own simulation component.
Fixes inconsistency between Atlas and in-game particle rendering during
pauses.
Fixes some issues related to Atlas simulation test and map loading.

This was SVN commit r13184.
2013-02-22 23:20:59 +00:00
Pureon 9e1b4a4370 Some animal sound effects
This was SVN commit r13183.
2013-02-22 23:10:16 +00:00
historic_bruno a87019ea5a Render initial game view during loading screen, to begin loading assets and eliminate ugly terrain blending artifacts. Refs #1663
This was SVN commit r13181.
2013-02-22 07:32:22 +00:00
leper 1e3bdc439b Fix MSVC warning. Refs #1838.
Remove special support for removed internal mod.

This was SVN commit r13180.
2013-02-21 19:59:39 +00:00
Enrique 5e9c408c01 Added mauryan market with ao
This was SVN commit r13179.
2013-02-21 16:08:33 +00:00
OmriLahav 3d7bf1dc54 This was SVN commit r13177. 2013-02-21 11:35:29 +00:00
leper c09d390656 Notify the player on receiving a tribute. Patch by alpha123. Refs #1839.
This was SVN commit r13176.
2013-02-20 15:56:55 +00:00
leper 67202eabc8 Only focus on idle units instead of following them. Patch by zoot. Fixes #1835.
This was SVN commit r13175.
2013-02-20 15:56:42 +00:00
danschub 3acba819b0 Fixed Parallax mapping for the Mauryan roofs.
This was SVN commit r13174.
2013-02-16 17:58:52 +00:00
danschub 708cdd9c91 Improved normal/spec maps. Added parallax support for the Mauryans.
This was SVN commit r13173.
2013-02-16 16:07:47 +00:00
historic_bruno 7cf7ae769c Suppresses noisy Boost header warnings on OS X by including them as system headers, refs #1076.
Bumps default SDK in build-osx-bundle.sh to 10.7 (newer Xcode doesn't
include 10.6).
Fixes using xml2-config from SDK when needed.
Fixes more linker warnings about symbol visibility by compiling libs
with fvisibility=hidden.
Updates some comments in the build scripts.

This was SVN commit r13172.
2013-02-15 22:43:28 +00:00
danschub ee4b2ccab4 Added normal, parallax and spec maps for all Mauryan buildings - except for those who aren't done yet.
Added normal, parallax and spec maps for the Mauryan ships.
~Gen.Kenobi

This was SVN commit r13171.
2013-02-15 01:29:32 +00:00
historic_bruno 22a5bff3a0 Adds more dependency options to NVTT CMake scripts.
Disables more unneeded NVTT libs in build-osx-libs.sh (avoids link error
with MacPorts' libtiff installed)

This was SVN commit r13170.
2013-02-14 23:37:04 +00:00
historic_bruno 6ce1e46138 Deletes internal mod (see SVN history if needed)
This was SVN commit r13169.
2013-02-14 22:32:17 +00:00
Pureon 88c10f5af1 Mauryan Corral model
This was SVN commit r13168.
2013-02-14 01:26:19 +00:00
leper 2f19cf86d3 Fix mod priority. Add user mod support. Fixes #1838.
This was SVN commit r13167.
2013-02-14 00:40:02 +00:00
historic_bruno efd6030ec7 Fixes OS X lib script to build SDL without X11 (caused error on Mountain Lion)
This was SVN commit r13165.
2013-02-12 21:52:13 +00:00
Pureon 4817fd5dbb Fixes #1781 SPQR signs
This was SVN commit r13164.
2013-02-12 01:10:30 +00:00
quantumstate cd5e5882ee Improvements to battle detection. Patch from zoot. Fixes #1425.
This was SVN commit r13163.
2013-02-11 20:38:13 +00:00
Pureon a91bbdd714 Head gear variations for Mauryan archer and swordsman units
This was SVN commit r13162.
2013-02-11 19:17:33 +00:00
Pureon a281fa5bdc Reduced placeholder texture size for the onager
This was SVN commit r13161.
2013-02-11 01:22:52 +00:00
Pureon 5748b1d72a More wild ass. Committed old onager files last time by mistake
This was SVN commit r13160.
2013-02-11 01:17:09 +00:00
Pureon 87c901f140 Update to Britons sandbox map. Added missing buildings
This was SVN commit r13159.
2013-02-11 00:07:23 +00:00
leper ab4db58e82 Fix build restrictions for neutral players.
This was SVN commit r13158.
2013-02-10 20:13:37 +00:00
Pureon 06a3bf9e99 Mauryan Farmstead wip
This was SVN commit r13157.
2013-02-10 15:08:12 +00:00
historic_bruno f9bbd97dde Adds startup warning(s) about removing fixed renderpath, fixes #1795
This was SVN commit r13156.
2013-02-09 22:55:42 +00:00
Pureon ac11cf30a5 Mauryan head gear and faces
This was SVN commit r13155.
2013-02-09 16:28:10 +00:00
Pureon 9c2e4c93a0 Siege Onager model and animations. Texture is placeholder.
This was SVN commit r13154.
2013-02-09 16:22:36 +00:00
Enrique d1dd979800 Added contributor Ndragu mauryan trireme
This was SVN commit r13153.
2013-02-09 12:10:42 +00:00
historic_bruno cac2d08353 Fixes corpse variation not matching living entity, fixes #1007
This was SVN commit r13152.
2013-02-09 07:10:50 +00:00
historic_bruno b1178d30e3 Adds missing native eol-style property
This was SVN commit r13151.
2013-02-04 00:42:53 +00:00
leper 5cbd9f0314 Add tribute stats to the summary screen. Patch by alpha123. Fixes #1831.
This was SVN commit r13149.
2013-02-03 23:49:49 +00:00
historic_bruno 14f1917a34 NOTE: Requires update-workspaces!
Adds build script for OS X dependencies, fixes #1112. OS X builds no
longer use MacPorts/Homebrew, check BuildInstructions.
Adds build script for OS X bundles. Adds OS X icon and DMG background
image.
Moves bundled libraries to libraries/source.
Moves most headers and precompiled static libs for Windows to
libraries/win32.
Updates Premake and packaging scripts to support this.

This was SVN commit r13148.
2013-02-03 23:49:29 +00:00
Spahbod b96009dafc Fixing the weird line bug in gulf variation of unknown maps.
This was SVN commit r13147.
2013-02-03 17:40:05 +00:00
wraitii abd98ad581 Re: disable foam and coastal waves in Atlas until properly optimized (this time with 100% more it-does-not-bug). Refs #1743
(sorry about the last time, should not blindly commit).

This was SVN commit r13146.
2013-02-03 15:49:41 +00:00
historic_bruno 1f7e6cb2ba Adds actor seed support to scenario XML data, optionally used in place of entity ID.
Fixes Atlas previews not matching placed entity.
Fixes in-game building previews not matching final entity (except
walls).

This was SVN commit r13144.
2013-02-03 02:16:52 +00:00
historic_bruno 31be9cd0de Adds building previews that rise during construction, fixes #1174, refs #21.
Adds scaffold support for foundations, includes two examples for 3x3 and
4x4, fixes #1581.
Extends CmpVisualActor and CUnit to support random variant seeds.
Fixes bug in actor hotloading.
Fixes serialization failure caused by destroying entities in OnDestroy
handlers.

This was SVN commit r13143.
2013-02-03 02:08:20 +00:00
leper e4fcddaf73 Some template fixes from qwertz/kosmo.
This was SVN commit r13142.
2013-02-02 22:44:51 +00:00
Mythos_Ruler 3cbb403685 Neareastern Badlands 2 scenario. 2v2.
The 'Cappadocia' region of Central-Eastern Anatolia. All players start
on one end of the map, with a vast unclaimed wilderness lying open
before them ripe for conquest and depredation.

This was SVN commit r13141.
2013-02-02 08:12:23 +00:00
historic_bruno 03cc1b3a6b Fixes minor bugs in reference checker script.
Fixes missing template in pathfinding terrain demo

This was SVN commit r13140.
2013-02-01 00:26:23 +00:00
Enrique 1761a6253f Little fix I forgot to commit for mauryan docks
This was SVN commit r13139.
2013-02-01 00:13:30 +00:00
historic_bruno f51e129628 Temporary revert of revert from 38b0c0eb72 to fix water maps in Atlas, refs #1743
This was SVN commit r13138.
2013-01-31 23:03:09 +00:00
OmriLahav 449eceb7e8 This was SVN commit r13136. 2013-01-31 20:17:59 +00:00
Enrique 60c328302b Added Mauryan fishing boat from contributor Ndragu
This was SVN commit r13135.
2013-01-31 12:56:26 +00:00
Spahbod 5bea1e7b87 New random map: Kerala
This was SVN commit r13134.
2013-01-31 09:00:44 +00:00
Mythos_Ruler 305a654ae1 AO textures added to the metal slabs and rock quarries.
This was SVN commit r13133.
2013-01-29 06:37:06 +00:00
leper 7e60f07df5 Ensure that animals that aren't visible when the order is executed are killed before being gathered from. Fixes #1826.
This was SVN commit r13132.
2013-01-28 22:19:06 +00:00
Enrique f503dd4e3e Fixed Mauryan dock selection square and obstruction size
This was SVN commit r13131.
2013-01-28 13:22:13 +00:00
Enrique 9438000616 Added UV coords for AO to geo_mineral_01, 02 and geo_stonemine_large.
Added AO textures for them.

This was SVN commit r13130.
2013-01-28 12:38:38 +00:00
Mythos_Ruler 66bc206a78 Persian Assyrian Ram +50hp.
Celt Fanatic uses round shield instead of buckler.
Neareastern Badlands map preview image.
Rubbles added for Roman market and army camp (though, Army Camp could
use its own custom rubble).
Cavalry meat gathering reduced from 10/sec to 5/sec.
War Dog -20hp.
Gathering rates adjusted for women and men.
Another texture variant for the Mauryan woman.

This was SVN commit r13129.
2013-01-28 01:25:05 +00:00
Mythos_Ruler 05695aba36 Updated Neareastern Badlands and another Oasis map, this time with Mauryans.
This was SVN commit r13128.
2013-01-27 23:36:05 +00:00
Enrique b577f07e6c Added missing .xml for water troughs in mauryan stables
This was SVN commit r13127.
2013-01-27 18:19:08 +00:00
Enrique 4e7c2807b2 Added Mauryan docks with AO map
This was SVN commit r13126.
2013-01-27 18:10:59 +00:00
historic_bruno 1fdaca5cec Attempts to fix StringifyJSON by clearing pending exceptions from JS API
This was SVN commit r13125.
2013-01-27 01:38:43 +00:00
historic_bruno 25928f1a8b Updates and organizes main LICENSE.txt.
Adds new LICENSE.txts for /libraries and /source/tools. Refs #1682

This was SVN commit r13121.
2013-01-26 21:36:18 +00:00
wraitii 38b0c0eb72 Reverts some changes: Atlas now won't recompute the water foam on terrain change, thus reducing the lag until I properly optimize it. refs #1743
This was SVN commit r13120.
2013-01-26 17:10:12 +00:00
Mythos_Ruler c1f2572006 Fauna elephants for sounds now too.
This was SVN commit r13119.
2013-01-25 07:13:33 +00:00
Mythos_Ruler 66750ad681 New "badlands" cliff textures.
This was SVN commit r13118.
2013-01-25 06:58:41 +00:00
historic_bruno 2f8fa898df This was SVN commit r13117. 2013-01-24 22:17:11 +00:00
historic_bruno a0e6283889 Deletes some duplicate textures
This was SVN commit r13116.
2013-01-24 22:03:10 +00:00
leper 26f616aba7 Save player name when hosting.
This was SVN commit r13115.
2013-01-24 20:12:12 +00:00
leper 2ceeb3231f Fix distance restrictions.
This was SVN commit r13114.
2013-01-24 18:08:35 +00:00
leper aebecd1204 Make territory build restriction tech modifiable.
This was SVN commit r13113.
2013-01-23 22:50:11 +00:00
leper fc835bdedb Only call FinishOrder on MoveCompleted if we didn't get an error. Fix #1823.
This was SVN commit r13112.
2013-01-23 16:02:37 +00:00
leper 3e8bdebc6d Add Clang detection and add BSD to the collected stats.
This was SVN commit r13111.
2013-01-23 16:01:17 +00:00
Mythos_Ruler 684f117560 Fortresses and Docks build about 25% faster.
This was SVN commit r13110.
2013-01-23 08:11:05 +00:00
Enrique b146b3666a Fixed african elephant UVs, added turret to temporary mauryan support elephant.
This was SVN commit r13108.
2013-01-22 18:52:18 +00:00
Pureon e543da5565 Activate battle music tracks
This was SVN commit r13107.
2013-01-21 23:18:53 +00:00
historic_bruno a65db5ca41 Ensures max population is integral by rounding
This was SVN commit r13106.
2013-01-21 22:03:35 +00:00
OmriLahav b9faead8eb This was SVN commit r13103. 2013-01-21 21:28:57 +00:00
OmriLahav c7123140bb This was SVN commit r13102. 2013-01-21 21:26:11 +00:00
Ykkrosh 75a23856cf Fix some static analysis warnings
This was SVN commit r13101.
2013-01-21 20:33:25 +00:00
Ykkrosh c037e3f78e Add detection of Win8 in wversion, to help stats collection
This was SVN commit r13100.
2013-01-21 20:32:07 +00:00
Enrique a9294b0491 added props for mauryan stables
This was SVN commit r13099.
2013-01-21 07:29:24 +00:00
Mythos_Ruler 484faf3bc0 Balancing.
This was SVN commit r13098.
2013-01-21 04:11:59 +00:00
Mythos_Ruler a4e9c7a223 Tweaks.
This was SVN commit r13097.
2013-01-21 01:22:45 +00:00
Mythos_Ruler fe3465cf0c Fixed indentation for Quantumstate. ;)
This was SVN commit r13096.
2013-01-21 00:07:27 +00:00
Mythos_Ruler 7947f87c97 War Dogs now have their own template.
This was SVN commit r13095.
2013-01-21 00:04:07 +00:00
quantumstate 064c687f0e Balance changes, decrease build times for houses and mills, increase train times and non food gather rates for women. Patch from TheMista.
This was SVN commit r13094.
2013-01-20 23:40:41 +00:00
quantumstate e3bc8d1c87 Actually add the battle detection code. Refs #1425.
This was SVN commit r13093.
2013-01-20 23:36:08 +00:00
Mythos_Ruler 786386f9f0 Test Ptolemaic elephant for Enrique.
This was SVN commit r13092.
2013-01-20 22:58:24 +00:00
quantumstate 3715985f1a Add battle detection support to the simulation. Refs #1425 (Patch by Zoot)
The audio code does not yet support actually playing battle music.

This was SVN commit r13091.
2013-01-20 22:47:59 +00:00
Pureon 2d6e3f8ca4 Gather capacity wheelbarrow tech icon
This was SVN commit r13090.
2013-01-20 22:34:05 +00:00
Pureon 679978310f handcart icon for tech
This was SVN commit r13089.
2013-01-20 21:20:59 +00:00
Pureon 272d6798d2 Military Engineers tech icon
This was SVN commit r13088.
2013-01-20 00:04:31 +00:00
Mythos_Ruler 1421b21f82 Added spec and normal mapping to Crannog.
This was SVN commit r13087.
2013-01-19 08:22:58 +00:00
Pureon 369050bdcb Crannog settlement for the Britons
This was SVN commit r13086.
2013-01-17 23:47:00 +00:00
Enrique 062c1aba6c Added playercolor to mauryan stables, decal changed.
This was SVN commit r13085.
2013-01-17 21:11:42 +00:00
Pureon c46d964afb metalworker tech icon
This was SVN commit r13084.
2013-01-17 20:50:30 +00:00
Enrique 24ec6b8040 Added decal to Mauryan stables
This was SVN commit r13083.
2013-01-17 19:07:52 +00:00
Enrique 36eacbfd06 Added Mauryan stables with AO map
This was SVN commit r13082.
2013-01-17 18:27:28 +00:00
Mythos_Ruler 46841bc963 New shield textures by Lion.
This was SVN commit r13081.
2013-01-16 19:07:15 +00:00
Pureon defe8f8b98 Military Engineers, Artillery Instructors, and Metalworker techs
This was SVN commit r13080.
2013-01-16 01:05:26 +00:00
leper 31fe58db82 Stop formation members from sliding. Fixes #1823. Thanks to zoot for the test case!
This was SVN commit r13079.
2013-01-15 18:53:19 +00:00
Pureon 96d389dee2 Mauryan mill model
This was SVN commit r13078.
2013-01-15 00:39:59 +00:00
leper 25de88a68b Take distance between attacker and target into account when fleeing. Patch by mimo. Fixes #1723.
This was SVN commit r13077.
2013-01-15 00:21:25 +00:00
myconid 21a70c0399 Bloom shader rewrite.
This was SVN commit r13076.
2013-01-14 16:57:09 +00:00
Enrique 9cd647a2a0 Fixed Mauryan temple selection ring size and obstruction
This was SVN commit r13075.
2013-01-14 12:41:27 +00:00
Enrique 63fa3d5ea1 Mauryan temple with AO added. Fixed mauryan fortress garrison flag
This was SVN commit r13074.
2013-01-13 23:55:52 +00:00
leper 56db7fa945 Don't use the carrying animation when a unit is ungarrisoned and it dropped of the resources while garrisoning. Patch by zoot. Fixes #1759.
This was SVN commit r13073.
2013-01-13 20:55:55 +00:00
leper 02ac06e293 Allow ungarrisoning units even if they cannot be built due to tech requirements. Patch by mimo. Fixes #1808, #1672.
Fix batch training tooltip if we have more units than the entity limit
allows for.

This was SVN commit r13072.
2013-01-13 19:39:11 +00:00
leper aec8d6ff96 Stop foundation health from jumping. Fixes #1809.
This was SVN commit r13071.
2013-01-13 17:37:26 +00:00
historic_bruno 637fb6d258 Fixes a bug in player assignment and prevents starting games with no assigned human players, fixes #1054
This was SVN commit r13070.
2013-01-12 05:39:04 +00:00
historic_bruno a074eb814a Adds blinking cursors with configurable rate, based on patch by kingadami. Fixes #876
This was SVN commit r13068.
2013-01-12 01:20:01 +00:00
historic_bruno 1f8d0cacdc Adds manual to in-game menu, based on patches by _vincent and grillaz. Fixes #1338
This was SVN commit r13067.
2013-01-12 00:09:42 +00:00
historic_bruno 5968e3cb63 Adds xcode4 workspace for OS X, from Premake 4.4-beta4
This was SVN commit r13066.
2013-01-11 21:31:38 +00:00
historic_bruno de3a28557c Fixes Boost libs being linked under compiler settings by accident, caused linker errors in Xcode
This was SVN commit r13065.
2013-01-11 20:49:33 +00:00
stwf 0be4a49c3f get my name in the contributors file in alphabetical order
This was SVN commit r13064.
2013-01-11 18:40:13 +00:00
stwf 8aa62da454 get my name in the contributors file
This was SVN commit r13063.
2013-01-11 18:38:18 +00:00
historic_bruno 17181e5a73 Fixes incorrect working directory for Windows installer shortcuts
This was SVN commit r13062.
2013-01-11 01:51:05 +00:00
leper bec33070ea Change attack animation naming to allow for multiple attacks. Patch/script by dvagennip. Fixes #1686.
This was SVN commit r13060.
2013-01-09 14:39:25 +00:00
leper fd274a6e70 Add template helper function. Fix some errors. Refs #1692.
This was SVN commit r13059.
2013-01-09 13:25:11 +00:00
Pureon ca41c22b71 New Mauryan house models
This was SVN commit r13058.
2013-01-09 00:10:45 +00:00
historic_bruno d4572e555e Fixes tests
This was SVN commit r13057.
2013-01-08 15:45:39 +00:00
quantumstate 5caddcdd20 Make technology code cleaner with helper functions. Refs #1692.
This was SVN commit r13056.
2013-01-08 00:00:21 +00:00
stwf 670deaef2a added variable sleep time depending on load an seperate mutex for deleting old items
This was SVN commit r13055.
2013-01-07 21:02:22 +00:00
leper d29f6c5c49 Fix dicrepancy in the settings dialog when using hotkeys. Patch by kingadami. Fixes #1817.
This was SVN commit r13054.
2013-01-07 15:19:10 +00:00
historic_bruno e89193d66d Fixes serialization test failure from CmpVisualActor not setting initial animation state with graphics disabled, fixes #1812
This was SVN commit r13053.
2013-01-06 07:37:22 +00:00
historic_bruno 8a2baec240 Fixes multiline text alignment, fixes #723. Patch by kingadami.
Adds text alignment to tooltips, fixes text alignment for dropdowns.

This was SVN commit r13051.
2013-01-06 01:46:44 +00:00
historic_bruno 50fcbc1fc5 Fixes some alignment issues in the match setup UI
This was SVN commit r13050.
2013-01-06 00:34:21 +00:00
Mythos_Ruler 1549e1c91c Fixed Mauryan Civ Centre footprint.
This was SVN commit r13049.
2013-01-05 22:33:13 +00:00
Mythos_Ruler 179df7e173 Elephant archer tweaks.
This was SVN commit r13048.
2013-01-05 22:05:28 +00:00
Mythos_Ruler 0cd3f74a62 New Mauryan shields by Lion.Kanzen.
New Carthage War Elephant texture.

Work in progress Mauryan elephant archer.

This was SVN commit r13047.
2013-01-05 21:38:27 +00:00
Enrique 0ef172db74 New Mauryan civic centre with ao added
This was SVN commit r13046.
2013-01-05 21:15:28 +00:00
quantumstate a2aa4b77fa Change watermark hotkey to Alt-K to prevent accidental presses.
This was SVN commit r13045.
2013-01-04 20:12:32 +00:00
quantumstate 58fa0c7c58 Fix errors when using autostart to launch a game. Use setters instead of accessing cmpPlayers properties directly.
Tidy the formatting in Player.js

This was SVN commit r13044.
2013-01-04 19:50:54 +00:00
historic_bruno dc6c0e483b Fixes unhandled enumeration warning in some compilers
This was SVN commit r13043.
2013-01-04 05:46:35 +00:00
historic_bruno 8e382d98a2 Fixes cost spacing in wall construction tooltips, refs #1675
This was SVN commit r13042.
2013-01-04 00:52:21 +00:00
quantumstate be63de5a7c Add fps counter to game setup. Fixes #1264. Patch by kingadami.
This was SVN commit r13041.
2013-01-03 23:01:54 +00:00
quantumstate 0d204037b6 Added right click selection removal. Fixes #1028. Thanks to kingadami and GerbilOfDoom for the patch.
This was SVN commit r13040.
2013-01-03 22:53:46 +00:00
quantumstate ba94247744 Added unordered map serialization
This was SVN commit r13039.
2013-01-03 22:33:04 +00:00
Enrique 8ef7e45a0a Mauryan barracks re-centered and ao maps fixed
This was SVN commit r13038.
2013-01-03 22:11:14 +00:00
historic_bruno d65c7751a5 Updates bundled libpng to v1.5.13, built with VC2008 - requires update-workspaces. Refs #864
This was SVN commit r13035.
2013-01-03 17:22:14 +00:00
leper 276f0a41a0 New Year's clean-up.
Throw a warning if a invalid (not present) AI is specified in a map.
Replace the last occurences of jubot with qbot.
Exclude the common siege templates from the Units Demo map.
Fix an error with flying units.
Replace CFG_GET_SYS_VAL with CFG_GET_USER_VAL and rename it to
CFG_GET_VAL to reflect its behaviour better.
Fix linker error with clang 3.2. Refs 1588.
Remove some useless includes.

This was SVN commit r13031.
2013-01-01 18:33:53 +00:00
Pureon 4764af695a Update to Mauryan structure texture b
This was SVN commit r13030.
2012-12-30 15:52:41 +00:00
danschub cbfffbe32f Fireworks!
This was SVN commit r13029.
2012-12-29 22:38:56 +00:00
Pureon a223b986e4 New corral and sheep icons
This was SVN commit r13028.
2012-12-29 15:26:40 +00:00
Mythos_Ruler 4c5ff9579b This was SVN commit r13027. 2012-12-27 23:39:03 +00:00
Mythos_Ruler ab9463e13f Miscellaneous Mauryan structure based on Eggbird's old Civ Centre.
This was SVN commit r13026.
2012-12-27 23:27:41 +00:00
Pureon 478de5b001 elephant stables icon update
This was SVN commit r13025.
2012-12-27 23:02:29 +00:00
Mythos_Ruler 02d95b99ff Adjusting Mauryan barracks footprint and obstruction.
This was SVN commit r13024.
2012-12-27 21:38:52 +00:00
Pureon eee68581b8 new fortress icon
This was SVN commit r13023.
2012-12-26 23:10:23 +00:00
leper adc4012944 Save last multiplayer server. Based on patch by Aurium. Fixes #1778.
Fix bug in ConfigDB: Creating a value could result in changing a value
in a different namespace.

This was SVN commit r13021.
2012-12-25 22:49:18 +00:00
Enrique b1a606eb08 Increased Mauryan barracks size
This was SVN commit r13020.
2012-12-24 11:10:27 +00:00
Mythos_Ruler 0df7a67ad1 Reordered unit roster for Mauryan barracks.
This was SVN commit r13019.
2012-12-24 01:34:46 +00:00
Mythos_Ruler a685541d52 Portraits for some Mauryan unit. Celtic Fanatic is now a spearman (more historically accurate). Fixed some other things.
This was SVN commit r13017.
2012-12-24 00:40:49 +00:00
Enrique b33ff333dd Added two Mauryan barracks variations with AO
Fixed garrison flag type in mauryan defense tower

This was SVN commit r13016.
2012-12-24 00:23:10 +00:00
Mythos_Ruler f4da84f15a Some Mauryan unit textures and spec maps.
This was SVN commit r13015.
2012-12-23 22:34:33 +00:00
leper 18b532a195 Remove current targets when changing ownership. Fixes #1794.
This was SVN commit r13014.
2012-12-23 20:03:00 +00:00
wraitii 61734c48d4 Fix a logic error that lead to reflections always being rendered. Might ref #1744
This was SVN commit r13013.
2012-12-23 10:50:30 +00:00
wraitii 9fa7273c2c Backport from API v3 to API v2 that should fix a bug happening with sheeps. fixes #1754
This was SVN commit r13012.
2012-12-23 10:31:39 +00:00
Mythos_Ruler 74cce87692 Nerfed heroes and Champion Archer.
This was SVN commit r13011.
2012-12-22 23:39:18 +00:00
historic_bruno 00c1766907 Adds and updates some hotkeys in the game manual
This was SVN commit r13009.
2012-12-22 22:00:27 +00:00
Mythos_Ruler 0322f2ea59 Hannibal is a bit slower.
This was SVN commit r13008.
2012-12-22 21:10:37 +00:00
Yves ebb2dc3a15 A quick fix for the assertion failure that happens when trying to access profiling data using profiler2.html.
This was SVN commit r13007.
2012-12-22 16:36:20 +00:00
quantumstate f19dbcdc7b Increase cavalry health (70 for melee, 30 for ranged) and pierce armour (3 for melee, 1 for ranged). Also increase melee cavalry speed by 1. Thanks to alpha123 for his stats changing script.
Fix some minor validation errors in some other templates

This was SVN commit r13006.
2012-12-22 01:28:10 +00:00
leper b27d4c26b0 Work around the sheep bug on Acropolis 7. Refs #1754, #1793.
This was SVN commit r13005.
2012-12-21 19:11:31 +00:00
Spahbod 9c34b1ffed Major random map bugfixes:
Fixes the chicken problem
There are no more unreachable trees around the map (hopefully)
Fixed the bug that caused edges of the map ruin the layout of painters
(One of the best examples to look is archipelago, before and after this
revision).
Fixed those out of memory errors caused by pathplacer (Mostly noticeable
in alpine valley and corinthian isthmus)
And some other minor tweaks.
Fixes #1577

This was SVN commit r13004.
2012-12-21 09:48:36 +00:00
leper 9a2dfa3fc0 Read default multiplayer server name/IP address from config. Patch by Aurium. Refs #1778.
This was SVN commit r13003.
2012-12-20 21:44:56 +00:00
Mythos_Ruler 6ab0ab586a Gates added for Iberian player on Acropolis 7.
This was SVN commit r13002.
2012-12-20 19:31:26 +00:00
historic_bruno c5e597d5c4 Fixes some Atlas build warnings about hidden overloaded virtual functions when using wxWidgets 2.9
This was SVN commit r13001.
2012-12-20 03:57:17 +00:00
leper 573d47d9a9 Disable diplomacy settings when player is defeated. Fixes #1764.
This was SVN commit r13000.
2012-12-19 20:19:54 +00:00
Pureon 4d6d514029 New icons for dock, mill, stoa, theatron, and monument structures.
This was SVN commit r12999.
2012-12-19 19:28:51 +00:00
historic_bruno e7ef6a57ad Fixes some build errors from the OS X 10.5 SDK, refs #1768
This was SVN commit r12998.
2012-12-18 22:58:34 +00:00
historic_bruno 5c94761c3e Fixes use of NULL for non-pointer type, fixes #1765
This was SVN commit r12997.
2012-12-18 22:52:55 +00:00
Mythos_Ruler 9665a17f7a Removes "root" attribute from the Mauryan elephant stables.
This was SVN commit r12996.
2012-12-18 18:43:51 +00:00
leper 188a60315b Update release name.
This was SVN commit r12995.
2012-12-14 19:56:58 +00:00
Mythos_Ruler 1c97d819d8 Updated some tips images.
This was SVN commit r12994.
2012-12-14 19:38:20 +00:00
historic_bruno 0da37326d6 Fixes bug that caused training icons for unavailable units to not be greyed out
This was SVN commit r12993.
2012-12-14 19:22:08 +00:00
Mythos_Ruler 9ca9a88bfa Beefed up hero health since you can only have one alive at a time.
This was SVN commit r12992.
2012-12-14 19:02:45 +00:00
historic_bruno 29ac57409e Adds warning about incorrect use of time warp mode, refs #1409
This was SVN commit r12990.
2012-12-14 13:41:25 +00:00
stwf 012e1585b1 fix for ticket 1758, not fixing the underlying problem but will limit the error messages to 1 per failed allocation and shouldn't crash anymore
This was SVN commit r12989.
2012-12-14 03:10:03 +00:00
historic_bruno 60987d46cf Fixes memory leak in sound manager, refs #1736
This was SVN commit r12987.
2012-12-12 22:43:57 +00:00
Enrique dd69fac774 Added generic stone rubbles for sizes 4x2, 4x4, 4x6, 5x5 and 6x4 with AO and their respective destruct decals.
Modified several templates to spawn its correct rubble on death.

This was SVN commit r12985.
2012-12-12 19:06:58 +00:00
Mythos_Ruler 683ce0a176 Fixing sheep on this map.
This was SVN commit r12984.
2012-12-12 19:06:26 +00:00
Mythos_Ruler 8eb7ac7094 Adjusting sheep.
This was SVN commit r12983.
2012-12-12 18:56:16 +00:00
stwf cdaab29d2b make sure file was opened successfully before processing
This was SVN commit r12982.
2012-12-12 13:59:36 +00:00
Yves 39910affd0 Changes various urls to point to the new website and fixes some broken forum urls.
This was SVN commit r12980.
2012-12-11 23:04:03 +00:00
quantumstate 095566c126 Serialize the armour component so that the temporary invulnerability from promotion is synchronised.
This was SVN commit r12978.
2012-12-11 22:01:10 +00:00
Pureon ea36dc5b3d Elephant sounds created by EvanBogunia
This was SVN commit r12977.
2012-12-11 00:44:41 +00:00
leper a3ca29138e Check for all cases. Really fix #1753.
This was SVN commit r12976.
2012-12-10 23:55:16 +00:00
leper 6fd6295644 Check whether the attack/gather target is visible and if not abort. Fixes #1662 and #1753.
This was SVN commit r12975.
2012-12-10 23:35:09 +00:00
Pureon 03e10011ad Balance tweaks to Ram WalkSpeed, House cost, Herd Buildtime, Melee Cavalry, Hannibal
This was SVN commit r12974.
2012-12-10 23:17:29 +00:00
historic_bruno d616a86c7a Fixes unit promotions triggering a selection sound, based on patch by zoot. Fixes #1713
This was SVN commit r12973.
2012-12-10 21:35:52 +00:00
Mythos_Ruler 47275d9416 Updated some terrains. Adds a 2v2 Median Oasis 5.
This was SVN commit r12972.
2012-12-10 02:30:44 +00:00
historic_bruno 2779512c6e Removes user feedback message from main menu. Adds "Report a Bug" button instead, with link to ReportingErrors.
Updates URLs to new website play0ad.com

This was SVN commit r12971.
2012-12-10 01:29:02 +00:00
Mythos_Ruler 1ed2d70e2d Added normal and spec maps for these 3 terrains.
This was SVN commit r12970.
2012-12-09 23:36:05 +00:00
leper 1cd2c48e0b Fix entity limits error on ownership change/destruction.
This was SVN commit r12969.
2012-12-09 21:40:51 +00:00
Mythos_Ruler d7f418c82c Updated pers stables portrait.
This was SVN commit r12968.
2012-12-09 21:20:06 +00:00
Mythos_Ruler e43d1f35e4 Some map updates.
This was SVN commit r12967.
2012-12-09 21:16:41 +00:00
leper 2a3f221d11 Check if cmpFormation is set (which should be as we're a formation member)
This was SVN commit r12966.
2012-12-09 17:52:44 +00:00
quantumstate 53397d1b9d Show hidden AIs when they are used by a map. Fixes #1748.
This was SVN commit r12965.
2012-12-09 14:40:43 +00:00
Pureon b3d3d3f5b9 Some texture work on Mediterranean Cove map
This was SVN commit r12964.
2012-12-08 23:43:56 +00:00
Pureon 3d72291d19 Update to user interface background textures
This was SVN commit r12963.
2012-12-08 20:32:57 +00:00
Mythos_Ruler 032692e14e Tweaked chariot texture.
This was SVN commit r12962.
2012-12-08 20:21:32 +00:00
Mythos_Ruler b2bc5268a7 Mauryan chariot tweaks.
This was SVN commit r12961.
2012-12-08 20:04:57 +00:00
Yves 2e37bf10bc Fixes #1700 (Increasing max-health by tech)
This was SVN commit r12960.
2012-12-08 19:17:48 +00:00
Enrique 8cbb7bb674 Maur_champion chariot and hero chariot with animations added
This was SVN commit r12959.
2012-12-08 18:26:08 +00:00
Mythos_Ruler de4adca0f0 Heroes only trainable in City Phase.
This was SVN commit r12958.
2012-12-08 18:21:11 +00:00
Mythos_Ruler 24b6e690b2 Adds "Long Walls" tech for Athenians.
Adds "Village Phase" requirement to Palisades templates.

This was SVN commit r12957.
2012-12-08 08:53:34 +00:00
Mythos_Ruler abdfcadbbf This was SVN commit r12956. 2012-12-07 19:30:31 +00:00
Mythos_Ruler b20e727ca5 This was SVN commit r12955. 2012-12-07 19:05:30 +00:00
Mythos_Ruler d1e22a09d1 Theatron description isn't so chauvinistic in the Hellenic civ descriptions.
Changed Athenian her Xenophon (a Laconophile) to Iphicrates (a patriot)
after discussion on the forums.

This was SVN commit r12954.
2012-12-07 19:00:34 +00:00
Mythos_Ruler 95f7858a24 Delian League bonus given to the Athenians.
This was SVN commit r12953.
2012-12-07 18:39:23 +00:00
leper 875aa1235b Civ history changes by Jeru.
This was SVN commit r12952.
2012-12-07 17:26:36 +00:00
Mythos_Ruler f08eaea533 This was SVN commit r12950. 2012-12-06 22:35:04 +00:00
leper 8c931bfa52 Add animation override to VisualActor to fix carrying resource animations. Patch by Deiz. Fixes #1260, #1741.
This was SVN commit r12949.
2012-12-06 19:46:13 +00:00
leper d18b9dd2dc Check if the renderer is initialised. Fixes crash in replay mode.
This was SVN commit r12948.
2012-12-06 19:23:31 +00:00
Spahbod 11d0b5ffdb New portrait for anusyia.
This was SVN commit r12947.
2012-12-06 10:10:29 +00:00
historic_bruno 186224612c Fixes tests by checking CConfigDB is initialized before using CFG_GET_USER_VAL
This was SVN commit r12946.
2012-12-05 18:27:42 +00:00
Pureon f528e58983 Macedonian library scroll icon
This was SVN commit r12944.
2012-12-04 23:10:36 +00:00
historic_bruno 555e54f088 Workaround for game settings window being hidden behind session UI
This was SVN commit r12943.
2012-12-04 21:41:30 +00:00
historic_bruno 35c8df02c6 Adds support for Pack/Time tech modification
This was SVN commit r12942.
2012-12-04 21:13:27 +00:00
leper a923cdd139 Fix serialization failure.
This was SVN commit r12941.
2012-12-04 16:59:08 +00:00
leper 5e6c845f4d Fix a test failure caused by eb4805d73d.
This was SVN commit r12940.
2012-12-04 13:21:52 +00:00
Spahbod f705a2910d Fixing a bug in wall_builder by FeXoR:
This was SVN commit r12939.
2012-12-04 13:07:49 +00:00
historic_bruno 610623f010 Fixes small bug introduced by aa68198747.
Clarifies new serialization test options in readme.txt.

This was SVN commit r12938.
2012-12-04 01:48:05 +00:00
historic_bruno aa68198747 Factors out common properties from siege templates, refs #1718. Simplifies pack-related tooltips.
This was SVN commit r12937.
2012-12-04 00:28:28 +00:00
historic_bruno b4b1f521b5 Fixes incorrect siege templates
This was SVN commit r12936.
2012-12-03 22:47:10 +00:00
historic_bruno c02fca79c6 Adds garrison auto-packing for siege units, refs #1718
This was SVN commit r12935.
2012-12-03 22:00:19 +00:00
leper 6562cbea7e ... Refs #1746.
This was SVN commit r12934.
2012-12-03 21:57:28 +00:00
leper b06452bf0f Try to fix some warnings. Refs 1746.
This was SVN commit r12933.
2012-12-03 21:53:37 +00:00
Pureon 53ae87de93 Mauryan elephant stables ui icon
This was SVN commit r12932.
2012-12-03 20:56:06 +00:00
quantumstate ef5cde9f97 Add unit training hotkeys to in game manual.
This was SVN commit r12931.
2012-12-03 20:16:47 +00:00
historic_bruno eb4805d73d Adds command-line and config options for OOS log and serialization test modes: -ooslog and -serializationtest
This was SVN commit r12930.
2012-12-03 20:06:58 +00:00
gregory 6f4b1ec5a1 eihrul's shadow filter patch, fixes ticket #1738.
This was SVN commit r12929.
2012-12-03 19:34:43 +00:00
historic_bruno 17a50c8d93 Fixes crash when using serialization test mode
This was SVN commit r12928.
2012-12-03 19:00:20 +00:00
historic_bruno e91a918164 Fixes race condition in EnsureMonotonic on 32-bit builds, which was causing unreliable timer behavior, fixes #1729
This was SVN commit r12927.
2012-12-03 13:24:12 +00:00
historic_bruno ad3fbc543d Increases garrison loading range for fortresses and army camp, as workaround for siege engines being larger
This was SVN commit r12926.
2012-12-03 05:01:52 +00:00
Mythos_Ruler e91d8a0c47 Toona tree sways now.
This was SVN commit r12925.
2012-12-03 00:38:44 +00:00
Mythos_Ruler 9bff9b3b6d Spartan woman defends herself. This is still a work in progress. Not quite right yet.
This was SVN commit r12924.
2012-12-03 00:37:58 +00:00
historic_bruno feca7e0be7 Updates Polynesia map as a demo with appropriate description
This was SVN commit r12923.
2012-12-03 00:23:43 +00:00
leper c3c655aaa5 Display time cost for walls. Fixes #1740.
This was SVN commit r12922.
2012-12-02 23:45:34 +00:00
leper 26a22a7bcb Make hunting units disband earlier.
Fix formation disbanding.

This was SVN commit r12921.
2012-12-02 23:11:55 +00:00
Pureon 37109f5c70 Packed siege unit icons
This was SVN commit r12920.
2012-12-02 22:33:40 +00:00
leper 2004fb5e62 Fix error caused by unit dying while attacking.
This was SVN commit r12919.
2012-12-02 22:02:36 +00:00
Mythos_Ruler 94c7a0dcf6 Tweaking map settings.
This was SVN commit r12918.
2012-12-02 21:29:39 +00:00
leper 116c4674b3 Handle undefined team setting properly.
This was SVN commit r12916.
2012-12-02 17:29:32 +00:00
leper 5806ed94e1 Fix bug with gather-near-position.
Use the max range for attacking.

This was SVN commit r12915.
2012-12-02 17:25:23 +00:00
quantumstate a4f27dc3e0 Add "score" tab in post-game summary. Patch from EMontana. FIxes #1721.
This was SVN commit r12914.
2012-12-02 15:55:06 +00:00
quantumstate 232dee5a9c Don't show slaughter attack in tooltips and hide the tutorial AI. Patch from zoot. Fixes #1732
This was SVN commit r12913.
2012-12-02 15:22:15 +00:00
Pureon 5e8993fd8f Rome rock packed model fix
This was SVN commit r12912.
2012-12-02 13:50:05 +00:00
leper 5800be1334 Formation order queueing. Fixes #592, #593 and #1716.
Allow changing the formation, while under attack. Fixes #1624. Patch by
Simikolon.

This was SVN commit r12911.
2012-12-02 01:52:27 +00:00
leper ddd8c36d6f Fix tests.
This was SVN commit r12910.
2012-12-01 23:04:49 +00:00
Yves 9d0da11eab Fixes compile error introduced in 3787f17e4d
This was SVN commit r12909.
2012-12-01 20:34:35 +00:00
janwas 308db6627a fix synchronization of TimerState (refs #1729)
This was SVN commit r12908.
2012-12-01 06:33:30 +00:00
janwas 3787f17e4d merge with local codebase: fix PopulationCount
This was SVN commit r12907.
2012-12-01 03:06:24 +00:00
janwas 9001cba02c fix: remove unnecessary failure check concerning window class atom. fixes #1729
This was SVN commit r12906.
2012-12-01 02:34:19 +00:00
leper e7ef4796ee Group civs in info screen by culture. Fixes #1734.
This was SVN commit r12905.
2012-12-01 00:39:26 +00:00
historic_bruno 6fd99e34ce Implements siege packing. Closes #1718.
Adds templates for packed and unpacked siege units - needs stat
tweaking.

This was SVN commit r12904.
2012-12-01 00:34:03 +00:00
leper 090e2a74cf Sync with upstream. Refs #1518.
This was SVN commit r12903.
2012-11-30 21:35:48 +00:00
historic_bruno f7608bf270 Attempted fix to prevent strange timer-related bug in Atlas (fails to start when opened from the game's main menu), refs #1729
This was SVN commit r12902.
2012-11-30 21:34:33 +00:00
Enrique 0e7e6e88e0 Added mauryan scout tower with ao
This was SVN commit r12901.
2012-11-29 23:49:07 +00:00
Pureon 3e7e8d1528 Icons for siege packing/unpacking/cancelling
This was SVN commit r12900.
2012-11-28 20:46:50 +00:00
stwf 3e531b7571 removed improper comparison warning
This was SVN commit r12899.
2012-11-28 04:31:52 +00:00
Mythos_Ruler ad13ded9a5 Some normal and spec maps for these terrains.
This was SVN commit r12898.
2012-11-27 18:59:10 +00:00
fcxSanya fdd2b92723 Simplify formatBatchTrainingString function a bit: remove always true condition/unreachable code. Refs #1432
This was SVN commit r12897.
2012-11-27 15:57:45 +00:00
historic_bruno a4a060cd86 Fixes build warning and cleans up a few things
This was SVN commit r12895.
2012-11-26 02:28:35 +00:00
Mythos_Ruler b2efabdf66 This map -> Demo.
This was SVN commit r12894.
2012-11-26 01:43:43 +00:00
Pureon 5142c2e9bd Added operator infantry unit to the siege scorpio
This was SVN commit r12893.
2012-11-25 22:39:12 +00:00
Mythos_Ruler 9654715773 Swaying grass. Most noticeable with the tall grass sprites on maps like Punjab.
Environmental settings edited on a bunch of maps.

Belgian Bog Night added.

This was SVN commit r12892.
2012-11-25 21:52:39 +00:00
Mythos_Ruler 91fbcf7eb6 This was SVN commit r12891. 2012-11-25 21:26:39 +00:00
Mythos_Ruler dc70751fc8 Made this map a "demo" map.
This was SVN commit r12890.
2012-11-25 21:13:28 +00:00
leper 1f2047f04e Consider the unit's build time in the calculation.
This was SVN commit r12889.
2012-11-25 21:01:03 +00:00
Mythos_Ruler f6e1e15a5d Fixed an icon error.
This was SVN commit r12888.
2012-11-25 20:36:20 +00:00
Mythos_Ruler f9fce9d43a This was SVN commit r12887. 2012-11-25 20:33:59 +00:00
Mythos_Ruler 0a622c0454 Mausoleum has normal and spec maps.
This was SVN commit r12886.
2012-11-25 20:30:12 +00:00
Pureon 6de4300c01 Packed Roman ballista and Packed Carthaginian rock thrower
This was SVN commit r12885.
2012-11-25 19:28:18 +00:00
myconid f456112492 Shadowmapping bugfixes and tweaks.
This was SVN commit r12884.
2012-11-25 18:35:59 +00:00
leper 1052cb9ee0 Rename property. Refs #1717.
This was SVN commit r12883.
2012-11-25 16:23:59 +00:00
leper a6f1620621 Add nop rendering technique to water and waterfall to stop crashes in fixed and arb mode when those are used.
This was SVN commit r12882.
2012-11-25 15:26:09 +00:00
Pureon cdcd3e504b Hele siege rock thrower packed and four wheel wagon
This was SVN commit r12881.
2012-11-25 14:40:23 +00:00
Pureon 86293398eb Roman siege scorpio packed donkey
This was SVN commit r12880.
2012-11-25 13:58:42 +00:00
leper 2ab8c8b874 Fix technology pair affordable mask.
This was SVN commit r12879.
2012-11-25 13:18:01 +00:00
Pureon 3674524c6c Carthaginian mausoleum icon
This was SVN commit r12878.
2012-11-25 12:36:45 +00:00
leper 5f2d30c7f7 Make batch time factor tech modifiable and a template property.
Fix unit test map.

This was SVN commit r12877.
2012-11-25 02:52:13 +00:00
leper 27ae648d9c Show cost in tooltips for batches. Closes #1717, patch by zoot.
This was SVN commit r12876.
2012-11-24 22:04:29 +00:00
leper a326aa63a9 Add check to the hotkeys. Fix #1726.
This was SVN commit r12875.
2012-11-24 20:19:13 +00:00
leper f0493e7060 Spelling fixes. Fixes #1727, patch by zoot.
This was SVN commit r12874.
2012-11-24 19:47:36 +00:00
Pureon f96aeb1bd8 2 wheeled wagon and hele spear packed. Wooden wagon texture
This was SVN commit r12873.
2012-11-24 17:42:42 +00:00
leper ed98320acc Fix non-pch build.
This was SVN commit r12872.
2012-11-24 17:15:07 +00:00
Mythos_Ruler b1720ebdbc This was SVN commit r12871. 2012-11-24 00:51:57 +00:00
Mythos_Ruler 250ba9a3ed Fireflies particle.
This was SVN commit r12870.
2012-11-24 00:32:09 +00:00
Mythos_Ruler ea2626106e This was SVN commit r12869. 2012-11-24 00:29:46 +00:00
Pureon 21b4f33184 Animated Roman bireme
This was SVN commit r12868.
2012-11-24 00:12:29 +00:00
Pureon 39eba0928b Carthaginian mausoleum building
This was SVN commit r12867.
2012-11-23 22:24:00 +00:00
stwf 909956f8c3 fixed possible null access crash
This was SVN commit r12866.
2012-11-22 03:20:51 +00:00
quantumstate 081c846ff1 Network synchronise the projectile id to prevent out of sync errors. Fixes #1681
This was SVN commit r12865.
2012-11-20 23:46:23 +00:00
stwf a23d245405 volume roilloff returned to standard with bug fixed. Added hints to help stereo playback
This was SVN commit r12864.
2012-11-18 22:39:20 +00:00
wraitii 355bdfb748 Updates the water settings of many scenarios. Most should have been updated now. Refs #1706
This was SVN commit r12863.
2012-11-18 15:23:19 +00:00
wraitii 8c86beb0fa Made silhouettes display correctly in the fog.
This was SVN commit r12862.
2012-11-18 12:34:42 +00:00
quantumstate 89217603a1 Unit training hotkeys from mammadori. Fixes #1226.
This was SVN commit r12861.
2012-11-17 18:27:31 +00:00
historic_bruno bd6a39961a More updates to contributors.txt, adds forum usernames for WFG programmers
This was SVN commit r12860.
2012-11-15 00:18:00 +00:00
Mythos_Ruler 9df9d24a26 Fixing the rubble.
This was SVN commit r12859.
2012-11-14 18:28:35 +00:00
historic_bruno 1cb2a0ba69 Partial update of contributors.txt, based on WFG programmers who contributed to source/ and whose names are publicly visible in their profile (if you contributed and don't see your name on the list, please add it)
This was SVN commit r12858.
2012-11-14 17:52:52 +00:00
Enrique 51f5025b96 Added custom docks rubbles with ao for each civ except Mauryans.
Fixed Hellenic dock origin
Added custom decal for celt docks

This was SVN commit r12857.
2012-11-14 04:24:59 +00:00
gregory 7ea7b7cd44 Added peacock two death animations, one for when it's showing off, one for when it's not.
This was SVN commit r12856.
2012-11-13 17:08:07 +00:00
quantumstate 89ced839f2 Added "Starting Economy Walkthrough" as a demo map.
This was SVN commit r12855.
2012-11-12 22:21:20 +00:00
quantumstate 742b265209 Added a couple moremediterranean dirt textures
This was SVN commit r12854.
2012-11-12 20:33:07 +00:00
quantumstate 4006a00012 Added Introductory Tutorial
Removed some buggy optimisation from common-api-v2

This was SVN commit r12853.
2012-11-12 19:55:11 +00:00
ShieldBearer b3f08869ff This was SVN commit r12852. 2012-11-12 18:53:08 +00:00
OmriLahav 180a66f9f4 This was SVN commit r12850. 2012-11-12 12:43:19 +00:00
ShieldBearer c00cfa2e5d Roman Bireme fixed.
This was SVN commit r12849.
2012-11-12 04:36:37 +00:00
leper 7125e72e52 Add build/research/train time to tooltips.
This was SVN commit r12848.
2012-11-11 23:08:44 +00:00
Mythos_Ruler fe45a2b046 Small "time" icon for tooltips. (build time/research time/train time)
This was SVN commit r12847.
2012-11-11 21:25:22 +00:00
Mythos_Ruler 55be4f8d0e Made houses construct 20% faster.
Made the Mauryan "Warrior" into a siege dude.

Started switching over the Mauryan cav jav to Mauryan textures and
actors.

This was SVN commit r12846.
2012-11-11 21:16:50 +00:00
leper 93b0048576 Replace resource names with icons in tooltips. Based on patch by zoot. Fixes #1675.
This was SVN commit r12845.
2012-11-11 15:35:01 +00:00
Enrique beff7a187d Fixed mauryan civic centre projectile attach point and AO added
This was SVN commit r12844.
2012-11-11 04:34:21 +00:00
Enrique cd153ad0c8 Mauryan fortress size increased. Added custom iber_civil_centre rubble
This was SVN commit r12843.
2012-11-11 03:38:57 +00:00
gregory ca5a09ff65 Made round roof normal maps more strawish.
This was SVN commit r12842.
2012-11-10 20:31:23 +00:00
Mythos_Ruler be0beacd1a Brit War Dog nerf.
This was SVN commit r12841.
2012-11-10 19:14:16 +00:00
ShieldBearer 3f334bbdb3 This was SVN commit r12840. 2012-11-10 16:44:12 +00:00
Spahbod 33cb23afa5 New random map: "Corinthian Isthmus"
This was SVN commit r12839.
2012-11-10 16:35:36 +00:00
wraitii d4ea031334 Fix a warning, a bug, and modifies the setting for the Cycladic Archipelagos maps.
This was SVN commit r12838.
2012-11-10 07:48:43 +00:00
Enrique cd3a727cd4 Added custom civic centre rubbles for each faction except Iberians.
This was SVN commit r12837.
2012-11-10 03:50:00 +00:00
fcxSanya 4cf5703125 Return back the focus on rally point button mistakenly replaced with an additional delete button in a21e01150a
This was SVN commit r12836.
2012-11-09 09:16:20 +00:00
fcxSanya 3a02bc296c Fix setupUnitPanel usage broken in 7e21db08d5. Refs #1432
This was SVN commit r12835.
2012-11-08 03:54:00 +00:00
historic_bruno 116281f830 Fixes Atlas and Collada dylib loading on OS X, for non-bundled binaries. Thanks to wraitii for the suggestion.
This was SVN commit r12834.
2012-11-08 01:57:50 +00:00
historic_bruno fa56c11820 Removes JuBot AI which is no longer maintained and has been superseded by qBot. The latest code will remain on Trac for reference.
This was SVN commit r12833.
2012-11-07 21:11:50 +00:00
fcxSanya 7e21db08d5 Training limits. Limit heroes to one living per player. Allow heroes to be trained again. Closes #1432
This was SVN commit r12832.
2012-11-07 17:56:14 +00:00
wraitii 669b7e6e2c Fixes #1714. Also updates the Mediterranean Cove map water settings.
This was SVN commit r12831.
2012-11-07 15:40:34 +00:00
wraitii c722fbd93f Change hwdetect to handle slightly more cases with the water detection.
Updates a few more maps with new settings.

This was SVN commit r12830.
2012-11-07 10:53:37 +00:00
leper 10752c798d Prevent attacking yourself (caused by splash damage).
This was SVN commit r12829.
2012-11-06 14:58:34 +00:00
leper d57926fa5b Adjust diplomacy according to irc discussion. Refs #7.
This was SVN commit r12828.
2012-11-05 20:16:35 +00:00
leper e969340b6c Fix diplomacy for atlas.
This was SVN commit r12827.
2012-11-05 19:34:21 +00:00
wraitii c1da925786 Change some scenario water settings. Refs #1711.
This was SVN commit r12825.
2012-11-05 17:31:28 +00:00
Enrique 9ebdeff90e mauryan fortress small fix
This was SVN commit r12824.
2012-11-05 16:30:57 +00:00
Enrique d52cac9c1a Mauryan fortress commited, second mauryan texture (maur_struct_b.png) commited.
This was SVN commit r12823.
2012-11-05 16:15:15 +00:00
wraitii 76676b1e38 Fix a non-fatal GL error, fix me forgetting to commit a file, remove the "3D" waviness setting as it was mostly redundant with HQ.
This was SVN commit r12822.
2012-11-05 12:14:04 +00:00
leper 1e3c885f45 Allow trading with neutral players.
This was SVN commit r12821.
2012-11-04 23:01:12 +00:00
wraitii d8f22c860d Fix when not using shadows.
This was SVN commit r12820.
2012-11-04 20:39:01 +00:00
wraitii e633196698 Updates the Belgian Bog settings. Changes the water shader to have refraction look more similar between different quality levels.
This was SVN commit r12818.
2012-11-04 18:07:41 +00:00
wraitii ed7c66eb82 Updates the water settings: features can now be enabled individually for more modularity. Fixes a few bugs. Allows it to be run at an acceptable speed in Atlas.
This was SVN commit r12817.
2012-11-04 15:54:36 +00:00
historic_bruno 7848f4edef Fixes Roman Mars temple by dvangennip, adds garrison prop point and fixes collada warning (unknown polygons set input). Fixes #1708
This was SVN commit r12816.
2012-11-03 21:08:17 +00:00
Enrique 1048ab4a1d Fixed water color in Belgian_Bog_night.xml, fixed normals in maur_long_sword.dae
This was SVN commit r12815.
2012-11-03 14:00:06 +00:00
historic_bruno b90a4ef776 Fixes some typos in civ json files, patch by grillaz. Fixes #1168
This was SVN commit r12814.
2012-11-02 23:07:42 +00:00
wraitii 21e284f8eb Adds the Belgian Uplands random map, and the Polynesia (Water Demo) demo scenario.
This was SVN commit r12813.
2012-11-02 21:18:46 +00:00
leper a0e13d9625 Fix tests. BuildingAI now handles DiplomacyChanged messages.
This was SVN commit r12812.
2012-11-02 17:20:32 +00:00
wraitii d75ae52f56 Particles now correctly update with the fog. Refs #276 .
This was SVN commit r12811.
2012-11-02 16:31:27 +00:00
leper 9930500661 Diplomacy is now mutual. Refs #7.
This was SVN commit r12810.
2012-11-02 13:44:35 +00:00
wraitii a3ddd7b1b3 Fix for some problems when using shadows with the superfancywater.
This was SVN commit r12809.
2012-11-02 13:08:58 +00:00
wraitii 114593b9ad Fix the "Advanced water" box from being ticked when then it shouldn't be on loading.
This was SVN commit r12808.
2012-11-02 09:59:15 +00:00
Enrique f63b795906 Fixed Mauryan shields origin and thickness, fixed mauryan club and spiked mace
This was SVN commit r12807.
2012-11-01 15:31:01 +00:00
wraitii cf23990192 Updates random maps with new settings for the new water shader. Type ambiguity tweaks in WaterManager.
This was SVN commit r12806.
2012-11-01 10:17:54 +00:00
historic_bruno 79f2fc1ac1 Fixes build error on MSVC, use of sqrt was ambiguous. Refs #1572
This was SVN commit r12804.
2012-10-31 20:59:43 +00:00
wraitii f3984a6c0e Forgot the waves shader.
This was SVN commit r12803.
2012-10-31 18:54:10 +00:00
wraitii fb035d08e3 fixes #1572 and fixes #932
Changes the water rendering in game to support higher quality effects
and to look nicer.

This was SVN commit r12802.
2012-10-31 18:42:17 +00:00
myconid 97b46d402c Removing GL3 dependency from GPU skinning code.
This was SVN commit r12801.
2012-10-30 21:57:00 +00:00
Mythos_Ruler 608e01a5b2 Iberian walls and Roman gate use normal/parallax mapping now.
This was SVN commit r12800.
2012-10-30 18:31:05 +00:00
Mythos_Ruler c5fae74ac7 Normal mapping for Craterus.
This was SVN commit r12799.
2012-10-30 17:34:40 +00:00
historic_bruno 7c1b03d031 Fixes MSVC warnings of truncation from double to float
This was SVN commit r12797.
2012-10-30 02:03:40 +00:00
historic_bruno 5b7564da37 Adds moved mikktspace source files to premake4.lua.
Mentions mikktspace licensing in LICENSE.txt

This was SVN commit r12796.
2012-10-30 00:56:24 +00:00
myconid 367c67d6ad GPU-skinned tangent-space effects for non-instanced units, plus a bit of cleanup.
This was SVN commit r12795.
2012-10-29 13:20:21 +00:00
Mythos_Ruler ae4b3cc9b6 Fixed player color for Mauryan shields.
Made a "Boudicca swordswoman" for fun.

This was SVN commit r12794.
2012-10-29 00:46:33 +00:00
Mythos_Ruler 0353177a94 This was SVN commit r12793. 2012-10-28 23:19:19 +00:00
Mythos_Ruler 37d3adcf23 Females now have an attack animation.
"Short hair" female head texture, ready for a turban prop.

This was SVN commit r12792.
2012-10-28 22:08:45 +00:00
Mythos_Ruler 8f573c9aae New Mauryan shields.
New Mauryan weapons.

Mauryan champion infantry is now a mace man.

Resized Mauryan swordsman textures.

This was SVN commit r12791.
2012-10-28 00:34:03 +00:00
leper 22b2343192 Fix name/color in diplomacy messages.
This was SVN commit r12790.
2012-10-27 23:31:16 +00:00
Mythos_Ruler cb8123ffc9 Maiden Guard Archer, until we can combine them into one unit.
This was SVN commit r12789.
2012-10-27 22:52:08 +00:00
Mythos_Ruler 5d960a136a Bactrian archer cav.
Tweaked HQDOF settings.

This was SVN commit r12788.
2012-10-27 22:18:29 +00:00
gregory cd79b8e57b Changed DOF size and position.
This was SVN commit r12787.
2012-10-27 21:26:33 +00:00
Spahbod 5ef6d1f92b Adds "English Channel" random map.
This was SVN commit r12786.
2012-10-27 13:03:34 +00:00
gregory 97554bd726 Made sampling code remove blurring from around fully-focused foreground objects and cleaned up some of the code a bit.
This was SVN commit r12785.
2012-10-26 05:25:50 +00:00
Mythos_Ruler 7bd5872dd7 Fixed info in Rome civ json
This was SVN commit r12784.
2012-10-25 16:28:13 +00:00
Mythos_Ruler 749b685c64 Mauryans selectable in random map.
Fixed animations for Mauryan sword dudes.

Added placeholder Mauryan heroes.

This was SVN commit r12783.
2012-10-25 07:42:31 +00:00
Mythos_Ruler 9dc1724e57 Mauryan Maiden Guard.
This was SVN commit r12782.
2012-10-24 18:32:50 +00:00
stwf 402ea61581 don't set location info by default, music and sounds should not have it set
This was SVN commit r12781.
2012-10-24 13:12:55 +00:00
leper ca4dedbc3e Improve neutral and ally combat handling. Refs #7.
This was SVN commit r12780.
2012-10-23 23:13:39 +00:00
fcxSanya c98a97924d Fix some inconsistent newline characters from 902fc4a541 in unit_commands.js via unix2dos. Refs #1432
This was SVN commit r12779.
2012-10-23 20:42:03 +00:00
leper a21e01150a Basic diplomacy. Refs #7.
This was SVN commit r12778.
2012-10-23 16:31:07 +00:00
Mythos_Ruler 8208b52faf Testing new hero selection ring.
This was SVN commit r12777.
2012-10-21 22:30:04 +00:00
Mythos_Ruler 932bb87046 New spec and normal maps for some Mediterranean terrains.
This was SVN commit r12776.
2012-10-21 22:28:04 +00:00
quantumstate 4a8e14004c Make markets and traders non conquest critical (from alkazar).
This was SVN commit r12775.
2012-10-21 20:59:54 +00:00
gregory 9698b67400 Made manual DOF scale with focus.
This was SVN commit r12774.
2012-10-20 23:39:56 +00:00
quantumstate 347b5e18cf Aviv's adjustment to the tooltips for trading.
This was SVN commit r12773.
2012-10-20 21:36:36 +00:00
gregory 753d151959 Added comments listing the changes from the original shader by Martinsh.
This was SVN commit r12772.
2012-10-18 20:06:25 +00:00
gregory e963b43dcc Made bokeh DOF blur stronger, made it use the postproc manager's zNear and zFar values, and moved its settings into its effect XML file.
This was SVN commit r12771.
2012-10-18 18:52:52 +00:00
Mythos_Ruler 0981911542 Test strat map city.
This was SVN commit r12770.
2012-10-18 18:18:10 +00:00
Mythos_Ruler cc88d057ee This was SVN commit r12769. 2012-10-18 18:17:56 +00:00
Spahbod ec8b49e822 Fixing a small bug suggested by FeXoR.
This was SVN commit r12768.
2012-10-18 18:03:01 +00:00
Spahbod 2cb81bc87a Adding a new cheat
This was SVN commit r12766.
2012-10-18 13:13:41 +00:00
Spahbod 742a68d055 Adding Syria random map. Updating the preview of Unknown random maps.
This was SVN commit r12765.
2012-10-18 06:34:14 +00:00
gregory 2c292798bc Changed sample count on high-quality DOF to increase performance.
This was SVN commit r12764.
2012-10-18 01:31:13 +00:00
gregory 43ad3569e1 Added higher-quality DOF postproc filter.
This was SVN commit r12763.
2012-10-18 01:21:24 +00:00
historic_bruno 7fafeec767 Fixes splash screen to display only once at startup. Fixes #1701.
Adds some spacing between splash screen icons and text.

This was SVN commit r12762.
2012-10-17 20:33:50 +00:00
Enrique 8e48beeeef Added Belgian_Bog_night map
This was SVN commit r12761.
2012-10-17 16:32:34 +00:00
Mythos_Ruler 71b27dd281 Post processing updates to these maps.
This was SVN commit r12760.
2012-10-16 18:10:20 +00:00
historic_bruno bc1efba1dc Moves water rendering update to CCmpWaterManager and uses sim time instead of real time. Fixes water not animating in Atlas and incorrectly animating while the game is paused.
This was SVN commit r12758.
2012-10-15 19:36:04 +00:00
gregory 092498f961 (hopefully) fixed errors with the boar skeleton.
This was SVN commit r12757.
2012-10-15 19:30:29 +00:00
Spahbod 9177683653 Match setup GUI revamp. Adds pop-cap and starting resource options. Refs #802
This was SVN commit r12756.
2012-10-15 15:19:24 +00:00
myconid 1fb7889539 Postproc manager
This was SVN commit r12755.
2012-10-15 10:34:23 +00:00
gregory 538286054a Just some floating barrels.
This was SVN commit r12754.
2012-10-15 03:38:47 +00:00
Mythos_Ruler cb3e94a746 New wood gathering tech (iron axes) at the Mill, paired with a capacity tech (wheelbarrows).
New special technologies for the Carthaginian faction: Colonisation
(research at the Civ Centre) and Exploration (research at the Super
Dock).

New special technology for the Macedonians: Hellenistic Metropolis
(research at the Library).

Athenian special tech Iphicratean Reforms now unlocks Cretan archers for
the Athenian Triremes.

Sandbox scenario for Macedonians.

This was SVN commit r12753.
2012-10-15 03:11:17 +00:00
Mythos_Ruler 93c21d8965 Reordering these sandbox maps by renaming them.
This was SVN commit r12752.
2012-10-15 01:54:15 +00:00
Mythos_Ruler b581e54185 This was SVN commit r12751. 2012-10-15 00:59:05 +00:00
quantumstate 51496f1d40 Restructured phase_city techs so that phase_city is auto researched.
This means that there can be civ specific techs for phase_city, but
phase_city is always researched so can be used as a requirement.
Added phase_city_generic which is the tech which will actually be
researched from the building.

This was SVN commit r12750.
2012-10-14 16:12:22 +00:00
Mythos_Ruler dd462c5b8f Moved these civ bonus techs to their civ folders.
This was SVN commit r12749.
2012-10-13 20:51:12 +00:00
Mythos_Ruler 57a8fcc724 -Mauryan population cap bonus (+10%)
-Persian population cap bonus (+10%)

-"Immortals" technology for Persians. Reduces training time for Anusiya
by half. This is their "special" for now, since they are otherwise
unchanged from the default Champion Spearman.

-"Persian Architecture" technology for Persians (removes the inherent
health bonus and makes it a "special tech" instead).

-Added the Spartan City Phase civ bonus. Spartan citizen-soldiers now
promote directly from Basic to Elite after one kill. Pop cap is reduced
by -10% at the City Phase to balance.

-Updated civ JSON files (and their civ profiles on Trac).

-Adds map preview image for Acropolis 7.

This was SVN commit r12748.
2012-10-13 20:38:40 +00:00
Spahbod 7f8adcf8cb Adding the demo Unknown-Nomad map.
This was SVN commit r12747.
2012-10-11 15:32:10 +00:00
Mythos_Ruler 6fd4a75312 This was SVN commit r12745. 2012-10-08 18:10:29 +00:00
Mythos_Ruler fa6ce56fde This was SVN commit r12744. 2012-10-08 17:42:47 +00:00
Mythos_Ruler a27ef1c4b4 Adjusted some destruction dust to better hide the building->rubble transition.
This was SVN commit r12743.
2012-10-08 17:36:57 +00:00
Enrique a9417be899 Set some buildings to spawn stone_rubble 2x2, and added custom decals sizes for wall segments rubbles.
This was SVN commit r12742.
2012-10-08 00:51:24 +00:00
Enrique 6f4b3b6e5c This was SVN commit r12741. 2012-10-07 23:10:18 +00:00
Mythos_Ruler 3a816f0616 This was SVN commit r12740. 2012-10-07 22:21:20 +00:00
quantumstate 7d0e660fbb Added Player/MaxPopulation for technologies.
This was SVN commit r12739.
2012-10-07 22:19:03 +00:00
Mythos_Ruler cc34cf169c Nerfed stone throwers based on gameplay and discussion with quantumstate. More game testing will be needed.
Tweaked some rubble stuff.

This was SVN commit r12738.
2012-10-07 21:19:01 +00:00
quantumstate 6a100996bf Added civ requirement for technologies.
This was SVN commit r12737.
2012-10-07 20:34:37 +00:00
Mythos_Ruler 14d74055ef Lowered the cost of 5 pop houses after discussion with quantumstate.
This was SVN commit r12736.
2012-10-07 18:05:36 +00:00
Yves 5ce5ef9286 Adds a splashscreen that appears on startup and informs the player about the status of the game (bugs, missing features). The splashscreen can be disabled for future startups by unckecking a checkbox on the splashscreen.
This was SVN commit r12735.
2012-10-07 12:43:08 +00:00
Enrique fc294e5ff9 Added rubble_stone_6x6 and set to CC deaths
This was SVN commit r12734.
2012-10-06 14:04:18 +00:00
Enrique 45de2907ea Added prop points for falmes to rubble_stone_3x3.dae
This was SVN commit r12733.
2012-10-06 11:21:13 +00:00
Mythos_Ruler 06d0c05a31 Spec and Normal maps for Mediterranean grass terrains.
This was SVN commit r12732.
2012-10-06 06:49:11 +00:00
Mythos_Ruler 868c5488b1 Added mountains and mountain passes to Oasis 11.
This was SVN commit r12731.
2012-10-05 18:09:17 +00:00
Mythos_Ruler 35b1a5305d Enrique's stone rubble mesh and actor for 3x3 footprints (large houses).
This was SVN commit r12730.
2012-10-05 18:07:30 +00:00
stwf 65c0f3efc5 removed extra whitespace
This was SVN commit r12728.
2012-10-03 15:14:20 +00:00
myconid 9e328e6b9f Changing sky manager to render sky using cubemaps, to avoid duplication of sky textures in memory.
This was SVN commit r12727.
2012-10-03 12:40:01 +00:00
historic_bruno 5cff74f4e7 Replaces FAM file monitoring with inotify on Linux, based on patch by noKid. Fixes #1316, refs #1687.
Removes FAM dependency.

This was SVN commit r12726.
2012-10-02 00:03:14 +00:00
Mythos_Ruler 222256bd59 This was SVN commit r12725. 2012-10-01 01:47:01 +00:00
Mythos_Ruler 85c8fa9aec A test normal map for units. Causes error though.
This was SVN commit r12724.
2012-10-01 00:01:46 +00:00
Mythos_Ruler 7c7ab773a7 Normal map for destroyed farm field rubble actor.
Defense Towers added to Oasis 1 for a little variation.

This was SVN commit r12723.
2012-09-30 02:34:06 +00:00
Mythos_Ruler 01e36d1756 Added heroes to Persians Sandbox.xml
New farm field "rubble" actor. Looks pretty good. May need a normal map
to look excellent.

This was SVN commit r12722.
2012-09-30 00:55:52 +00:00
Mythos_Ruler 6820ee1fc3 Spec and normal maps for farm fields.
This was SVN commit r12721.
2012-09-30 00:05:42 +00:00
Mythos_Ruler c4267fb3f8 This was SVN commit r12720. 2012-09-29 21:45:04 +00:00
Mythos_Ruler 439f67b5d8 3x3 Destruction mesh for example purposes. Others will need to make other rubble meshes based on this example.
Place and "delete/destroy" a Greek house to see in action.

This was SVN commit r12719.
2012-09-29 21:43:55 +00:00
historic_bruno 03261b8ade Adds rubble entities to most structures. This and bf55acadaa based on patch by quonter. Refs #1166
This was SVN commit r12718.
2012-09-28 22:06:07 +00:00
historic_bruno bf55acadaa Implements SpawnEntityOnDeath property for entities (i.e. rubble). Fixes #1166.
Adds some placeholder rubble entities. They currently reuse foundation
actors until proper rubble models are created.

This was SVN commit r12717.
2012-09-28 22:02:13 +00:00
historic_bruno 772c10801c Fixes missing Atlas selection rings for decorative actors
This was SVN commit r12716.
2012-09-28 19:16:32 +00:00
historic_bruno 7d8dc05c68 Fixes actor viewer bug where view was obstructed by map's water level. Fixes #1562.
Adds water plane option to actor viewer.

This was SVN commit r12715.
2012-09-28 18:20:36 +00:00
Spahbod 9fadd9017f Fixing the name of tamarix tree.
This was SVN commit r12714.
2012-09-27 08:15:53 +00:00
Spahbod 59f3f1830c This was SVN commit r12713. 2012-09-27 06:23:53 +00:00
Spahbod fb6493d33c This was SVN commit r12712. 2012-09-27 06:23:19 +00:00
Spahbod a9ae4e2c80 This was SVN commit r12711. 2012-09-27 06:15:28 +00:00
Spahbod 4c8159d47f Adding cultures to the civs. Fixing the recent problem with random maps.
This was SVN commit r12710.
2012-09-27 06:12:25 +00:00
stwf 44821da620 new threaded soundmanager and proper distance roll off
This was SVN commit r12709.
2012-09-27 02:42:03 +00:00
historic_bruno e72b603cce Implements Vision/Range tech modification
This was SVN commit r12707.
2012-09-24 22:27:32 +00:00
quantumstate ef81521dc9 Stop a technology from being queued multiple times.
Also fixed formatting in Attack.js

This was SVN commit r12706.
2012-09-24 20:20:14 +00:00
quantumstate 94f469e705 Added a Slaughter attack type which instantly kills all herdable animals with a melee attack. Fixes #1652.
This was SVN commit r12705.
2012-09-24 19:31:31 +00:00
Spahbod e464332c74 Fixing a bug in "random" map selection.
This was SVN commit r12704.
2012-09-24 11:13:37 +00:00
historic_bruno 4c37e8de95 Adds hotkey for forcing unit attack (useful for destroying enemy farms), based on patch by quonter. Fixes #1489
This was SVN commit r12703.
2012-09-24 01:14:21 +00:00
historic_bruno 60f9fece29 Fixes build on GNU/kFreeBSD, patch by vincent. Fixes #1322
This was SVN commit r12702.
2012-09-24 00:41:35 +00:00
historic_bruno de6653e255 Adds max attack range to training tooltip and unit details panel for ranged units.
Adds attack type to unit details panel. Refs #1657

This was SVN commit r12700.
2012-09-23 20:50:23 +00:00
historic_bruno b8baa54722 Implements Health/Max tech modification
This was SVN commit r12699.
2012-09-23 19:24:43 +00:00
historic_bruno 7064e0673c Adds TechnologyModification message for newly created entities, so they are notified of previously researched techs (this will streamline implementation of certain techs). Fixes #1410
This was SVN commit r12698.
2012-09-23 19:19:57 +00:00
myconid db4b08d1ad Slight changes to the cubemap stuff in the sky manager, to make it behave better after archivebuild.
This was SVN commit r12697.
2012-09-21 20:22:23 +00:00
Mythos_Ruler 8a57ed2e7b Updated Persian stables portrait.
This was SVN commit r12696.
2012-09-20 17:43:39 +00:00
Mythos_Ruler 4b7ff6f375 Higher health for the Persian gardens.
This was SVN commit r12695.
2012-09-20 17:19:51 +00:00
Mythos_Ruler d6ffba5e43 Updated Persian sandbox demo map.
This was SVN commit r12693.
2012-09-20 17:10:42 +00:00
Mythos_Ruler 9340e0bf8a Fixed texture typo.
This was SVN commit r12692.
2012-09-20 17:04:31 +00:00
Mythos_Ruler 7cab4f2bce Persian gardens template. Some normal and spec maps for Persian structures. Someone else please redo them, as they suck.
This was SVN commit r12691.
2012-09-19 18:13:11 +00:00
Enrique bead0319ab Fixed gardens_water to no longer cast shadows. Updated gardens_struct and waterfall
This was SVN commit r12690.
2012-09-18 23:28:58 +00:00
Enrique 94c15987d6 added prop points to gardens_struct
This was SVN commit r12689.
2012-09-17 23:49:55 +00:00
Enrique 811a0aa5a2 Fixed pers_gardens_waterfall.dae
This was SVN commit r12688.
2012-09-17 22:37:25 +00:00
Mythos_Ruler 4b1df39d55 Macedonian Library template.
This was SVN commit r12687.
2012-09-17 17:51:22 +00:00
myconid bf5b7938f4 First attempt at adding waterfall splashes...
This was SVN commit r12686.
2012-09-17 12:22:21 +00:00
Spahbod bdab01b381 Making the "random" option in the map selection dropdown orange. Refs #1668
This was SVN commit r12685.
2012-09-17 08:24:04 +00:00
Spahbod 91f3463bd3 Adding the "Random" option in map selection. Fixes #1668
This was SVN commit r12684.
2012-09-17 02:58:47 +00:00
historic_bruno a03ce4d904 Removes skeletal animated pine tree
This was SVN commit r12683.
2012-09-17 01:05:54 +00:00
historic_bruno b8e0f02b31 Updates remaining actors to new format
This was SVN commit r12682.
2012-09-17 00:55:45 +00:00
historic_bruno 987d677072 Cleaning up some unused/duplicate files
This was SVN commit r12681.
2012-09-17 00:54:21 +00:00
Enrique 7153c50d10 Mace_library, spart_sissyton and pers_gardens commited. New waterfall and gardens_turf textures added.
This was SVN commit r12679.
2012-09-16 18:05:28 +00:00
Pureon 3dd887a193 Roman army camp icon
This was SVN commit r12678.
2012-09-16 16:53:52 +00:00
myconid 11b1c59397 A minor change to water rendering on models.
This was SVN commit r12677.
2012-09-16 11:39:04 +00:00
Deiz bdde574ade Wall build orders shouldn't always be queued. Fixes #1673.
This was SVN commit r12676.
2012-09-15 05:45:49 +00:00
Deiz c4c65c02ac Need to explicitly return values to silence warnings.
This was SVN commit r12675.
2012-09-14 20:55:49 +00:00
Deiz 27c390cdf2 Always abort the FSM transition when failing to enter a state. Fixes #1669.
This was SVN commit r12674.
2012-09-14 20:00:03 +00:00
Deiz f91111aec8 Load default MP player name from the config.
This was SVN commit r12673.
2012-09-14 05:38:29 +00:00
Deiz 8bd54eef71 Handle nested garrison holder death properly.
This was SVN commit r12672.
2012-09-13 22:47:47 +00:00
historic_bruno 71cfdec62b Removes obsolete reference to wxjs and adds Mongoose to LICENSE.txt
This was SVN commit r12671.
2012-09-13 19:03:48 +00:00
Mythos_Ruler f732fd801e A bunch of stuff.
This was SVN commit r12670.
2012-09-13 18:22:09 +00:00
Mythos_Ruler 710ed7adb6 Some AI name stuffs.
This was SVN commit r12669.
2012-09-13 17:24:47 +00:00
Mythos_Ruler c78ab91740 This was SVN commit r12668. 2012-09-13 17:13:17 +00:00
Spahbod 064c28408d Fixing some tooltips from changeset 513876ffd6
This was SVN commit r12667.
2012-09-13 06:21:01 +00:00
Spahbod 4365cc639d Default ai player names patch: Codes. Fixes #1582.
This was SVN commit r12666.
2012-09-13 06:18:01 +00:00
Spahbod 513876ffd6 Default ai player names patch: Names
This was SVN commit r12665.
2012-09-13 06:17:03 +00:00
Deiz 41e5f88aae Support appending and global selection via the 'find idle' keys.
This was SVN commit r12664.
2012-09-12 21:37:04 +00:00
Deiz 958fce0438 Prevent naval gatherers from trying to reach land drop sites.
This was SVN commit r12663.
2012-09-11 21:03:08 +00:00
Deiz 7ff34fedc4 Turn formation Gather orders into GatherNearPosition if necessary.
This was SVN commit r12662.
2012-09-11 00:56:23 +00:00
Mythos_Ruler 820d6856ee Map updates. Made "Reservoir" a demo map.
This was SVN commit r12661.
2012-09-10 17:21:09 +00:00
myconid 34b9bd4bca Reservoir test map.
This was SVN commit r12660.
2012-09-09 21:15:54 +00:00
Pureon fdc3322eec New treasure icon
This was SVN commit r12659.
2012-09-09 20:46:54 +00:00
Yves fef2bdf39b Removed unused file
This was SVN commit r12658.
2012-09-09 19:41:32 +00:00
Deiz 0784d75dfe Removed out-of-date, often-forgotten civilization count.
This was SVN commit r12657.
2012-09-09 18:52:47 +00:00
myconid 37cdcdc6fa Removing use of textureGrad function in shaders, as it requires too new a version of OpenGL.
This was SVN commit r12656.
2012-09-09 14:53:34 +00:00
leper 6528751875 Fix non-pch build. Fixes #1664.
This was SVN commit r12655.
2012-09-09 13:51:04 +00:00
Spahbod 25682da568 Improving the layout of "Unknown" random map. Improving the random biome system. Adding "Unknown Land" random map.
This was SVN commit r12654.
2012-09-09 08:38:36 +00:00
Spahbod 7618625884 Tweaking Persian Highlands random map.
This was SVN commit r12653.
2012-09-09 07:19:11 +00:00
Spahbod 8e71ae35e7 Fixing the texture parameter of iceberg.
This was SVN commit r12652.
2012-09-09 04:28:35 +00:00
Deiz 7d8ef7a2ef Add support for non-integer GarrisonHolder regen rates; round health up in the GUI. Refs #1633.
This was SVN commit r12651.
2012-09-09 00:52:10 +00:00
Mythos_Ruler 502311fe5c Normal and spec maps for Tropic Cliff B.
This was SVN commit r12650.
2012-09-08 23:39:47 +00:00
Pureon 2797cacd21 Ship tech and temple tech tweaks
This was SVN commit r12648.
2012-09-08 21:50:07 +00:00
Pureon 5456e75761 New background textures
This was SVN commit r12647.
2012-09-08 21:44:29 +00:00
Pureon 8c1b51bdda Garrison healing tech for temples
This was SVN commit r12646.
2012-09-08 20:22:31 +00:00
Pureon 411884f607 Small nerf to all warships. Less attack and range
This was SVN commit r12645.
2012-09-08 19:48:35 +00:00
Pureon ae3c9fb318 Three new technologies for ships
This was SVN commit r12644.
2012-09-08 19:20:26 +00:00
myconid 779a33ee30 Water and waterfall shaders, materials and examples.
This was SVN commit r12643.
2012-09-08 18:56:13 +00:00
Deiz 1fec7c382b Respect the queued flag for garrison orders.
This was SVN commit r12642.
2012-09-08 16:17:25 +00:00
Spahbod 3c6bce057e Fixing the buggy passageMaker function. Smoothing the edges of the passes.
This was SVN commit r12641.
2012-09-08 10:04:20 +00:00
Spahbod 326e4a75d6 Committing FeXoR's new fortress arrangement for Fortress random map. Fixes #1654.
This was SVN commit r12640.
2012-09-08 08:20:27 +00:00
stwf 1fce30839f zero out buffers before loading sounds
This was SVN commit r12639.
2012-09-08 02:54:49 +00:00
stwf df0c4559ad silence repeated errors when buffers don't allocate, fix up reference counting
This was SVN commit r12638.
2012-09-07 12:05:29 +00:00
myconid d04f737c5e Putting a check for bad texture references, in case anyone tries to use old-style texture tags in actors.
This was SVN commit r12637.
2012-09-06 21:05:34 +00:00
3837 changed files with 214390 additions and 22876 deletions
-1
View File
@@ -8,5 +8,4 @@
*.png filter=lfs diff=lfs merge=lfs -text
*.psa filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
binaries/data/mods/internal/maps/**/*.xml filter=lfs diff=lfs merge=lfs -text
binaries/data/mods/public/maps/**/*.xml filter=lfs diff=lfs merge=lfs -text
+27 -18
View File
@@ -14,21 +14,6 @@ the file's path.
Some files don't yet have licensing details specified - if you care about any
in particular, let us know and we can try to clarify it.
/source
GPL version 2 (or later) - see license_gpl-2.0.txt
/source/lib
MIT
/source/tools
Various (unspecified)
/source/tools/atlas
GPL version 2 (or later) - see license_gpl-2.0.txt
/source/tools/atlas/wxJS
LGPL version 2.1 (or later) - see license_lgpl-2.1.txt
/binaries/data
GPL version 2 (or later) - see license_gpl-2.0.txt
@@ -45,11 +30,35 @@ in particular, let us know and we can try to clarify it.
Proprietary - see license_dbghelp.txt for restrictions you must agree to
before distributing this particular file
/libraries
Various - see individual directories and files for details
/build
Various (unspecified)
/build/premake/premake4
BSD
/build/premake/*.lua
MIT
/docs
Various (unspecified)
/libraries
Various - see LICENSE.txt within that directory
/source
GPL version 2 (or later) - see license_gpl-2.0.txt
/source/lib
MIT
/source/third_party/mikktspace
zlib
/source/third_party/mongoose
MIT
/source/tools
Various - see LICENSE.txt within that directory
/source/tools/atlas
GPL version 2 (or later) - see license_gpl-2.0.txt
+1 -1
View File
@@ -11,7 +11,7 @@ project of this scope.
There are several ways to contact us and find more information:
Web site: http://wildfiregames.com/0ad/
Web site: http://play0ad.com/
Forums: http://www.wildfiregames.com/forum/
+66 -28
View File
@@ -20,9 +20,18 @@
; Enable/disable windowed mode by default. (Use Alt+Enter to toggle in the game.)
windowed = false
; Enable/disable the splashscreen
splashscreenenable = true
; Pause the game on window focus loss (Only applicable to single player mode)
pauseonfocusloss = true
; Default player name to use in multiplayer
; playername = "anonymous"
; Default server name or IP to use in multiplayer
multiplayerserver = "127.0.0.1"
; Force a particular resolution. (If these are 0, the default is
; to keep the current desktop resolution in fullscreen mode or to
; use 1024x768 in windowed mode.)
@@ -34,7 +43,14 @@ bpp = 0
; System settings:
fancywater = true
waternormals = true
waterrealdepth = true
waterfoam = false
watercoastalwaves = false
waterrefraction = true
waterreflection = true
watershadows = false
shadows = true
shadowpcf = true
vsync = false
@@ -66,12 +82,18 @@ renderpath = default
; Prefer GLSL shaders over ARB shaders (not recommended). REQUIRES gentangents=true.
preferglsl = false
; Generate tangents for normal and parallax mapping. REQUIRES preferglsl=true. Incompatible with gpuskinning.
; Generate tangents for normal and parallax mapping. REQUIRES preferglsl=true.
gentangents = false
; Experimental probably-non-working GPU skinning support; requires preferglsl; use at own risk
gpuskinning = false
; Use smooth LOS interpolation; REQUIRES preferglsl=true.
smoothlos = false
; Use screen-space postprocessing filters (HDR, bloom, DOF, etc). Incompatible with fixed renderpath.
postproc = false
; Quality level of shader effects (set to 10 to display effects)
materialmgr.quality = 0.0
@@ -86,9 +108,6 @@ materialmgr.PARALLAX_VHQ_DIST.max = 0
; Replace alpha-blending with alpha-testing, for performance experiments
forcealphatest = false
; Experimental probably-non-working GPU skinning support; requires preferglsl; use at own risk
gpuskinning = false
; Opt-in online user reporting system
userreport.url = "http://feedback.wildfiregames.com/report/upload/v1/"
@@ -140,41 +159,41 @@ view.height.min = 16
; See keys.txt for the list of key names.
; > SYSTEM SETTINGS
hotkey.exit = "Alt+F4", "Ctrl+Break" ; Exit to desktop
hotkey.exit = "Alt+F4", "Ctrl+Break", "Super+Q" ; Exit to desktop
hotkey.leave = Escape ; End current game or Exit
hotkey.pause = Pause ; Pause/unpause game
hotkey.screenshot = F2 ; Take PNG screenshot
hotkey.bigscreenshot = "Shift+F2" ; Take large BMP screenshot
hotkey.togglefullscreen = "Alt+Return" ; Toggle fullscreen/windowed mode
hotkey.screenshot.watermark = "K" ; Toggle product/company watermark for official screenshots
hotkey.screenshot.watermark = "Alt+K" ; Toggle product/company watermark for official screenshots
hotkey.wireframe = "Alt+W" ; Toggle wireframe mode
hotkey.silhouettes = "Alt+S" ; Toggle unit silhouettes
hotkey.showsky = "Alt+Z" ; Toggle sky
; > CAMERA SETTINGS
hotkey.camera.reset = "H" ; Reset camera rotation to default.
hotkey.camera.follow = "F" ; Follow the first unit in the selection
hotkey.camera.zoom.in = Plus, Equals, NumPlus ; Zoom camera in (continuous control)
hotkey.camera.zoom.out = Minus, NumMinus ; Zoom camera out (continuous control)
hotkey.camera.zoom.wheel.in = WheelUp ; Zoom camera in (stepped control)
hotkey.camera.zoom.wheel.out = WheelDown ; Zoom camera out (stepped control)
hotkey.camera.rotate.up = "Ctrl+UpArrow", "Ctrl+W" ; Rotate camera to look upwards
hotkey.camera.rotate.down = "Ctrl+DownArrow", "Ctrl+S" ; Rotate camera to look downwards
hotkey.camera.rotate.cw = "Ctrl+LeftArrow", "Ctrl+A", Q ; Rotate camera clockwise around terrain
hotkey.camera.rotate.ccw = "Ctrl+RightArrow", "Ctrl+D", E ; Rotate camera anticlockwise around terrain
hotkey.camera.reset = "H" ; Reset camera rotation to default.
hotkey.camera.follow = "F" ; Follow the first unit in the selection
hotkey.camera.zoom.in = Plus, Equals, NumPlus ; Zoom camera in (continuous control)
hotkey.camera.zoom.out = Minus, NumMinus ; Zoom camera out (continuous control)
hotkey.camera.zoom.wheel.in = WheelUp ; Zoom camera in (stepped control)
hotkey.camera.zoom.wheel.out = WheelDown ; Zoom camera out (stepped control)
hotkey.camera.rotate.up = "Ctrl+UpArrow", "Ctrl+W" ; Rotate camera to look upwards
hotkey.camera.rotate.down = "Ctrl+DownArrow", "Ctrl+S" ; Rotate camera to look downwards
hotkey.camera.rotate.cw = "Ctrl+LeftArrow", "Ctrl+A", Q ; Rotate camera clockwise around terrain
hotkey.camera.rotate.ccw = "Ctrl+RightArrow", "Ctrl+D", E ; Rotate camera anticlockwise around terrain
hotkey.camera.rotate.wheel.cw = "Shift+WheelUp", MouseX1 ; Rotate camera clockwise around terrain (stepped control)
hotkey.camera.rotate.wheel.ccw = "Shift+WheelDown", MouseX2 ; Rotate camera anticlockwise around terrain (stepped control)
hotkey.camera.pan = MouseMiddle, ForwardSlash ; Enable scrolling by moving mouse
hotkey.camera.left = A, LeftArrow ; Scroll or rotate left
hotkey.camera.right = D, RightArrow ; Scroll or rotate right
hotkey.camera.up = W, UpArrow ; Scroll or rotate up/forwards
hotkey.camera.down = S, DownArrow ; Scroll or rotate down/backwards
hotkey.camera.scroll.speed.increase = "Ctrl+Shift+S" ; Increase scroll speed
hotkey.camera.scroll.speed.decrease = "Ctrl+Alt+S" ; Decrease scroll speed
hotkey.camera.rotate.speed.increase = "Ctrl+Shift+R" ; Increase rotation speed
hotkey.camera.rotate.speed.decrease = "Ctrl+Alt+R" ; Decrease rotation speed
hotkey.camera.zoom.speed.increase = "Ctrl+Shift+Z" ; Increase zoom speed
hotkey.camera.zoom.speed.decrease = "Ctrl+Alt+Z" ; Decrease zoom speed
hotkey.camera.pan = MouseMiddle, ForwardSlash ; Enable scrolling by moving mouse
hotkey.camera.left = A, LeftArrow ; Scroll or rotate left
hotkey.camera.right = D, RightArrow ; Scroll or rotate right
hotkey.camera.up = W, UpArrow ; Scroll or rotate up/forwards
hotkey.camera.down = S, DownArrow ; Scroll or rotate down/backwards
hotkey.camera.scroll.speed.increase = "Ctrl+Shift+S" ; Increase scroll speed
hotkey.camera.scroll.speed.decrease = "Ctrl+Alt+S" ; Decrease scroll speed
hotkey.camera.rotate.speed.increase = "Ctrl+Shift+R" ; Increase rotation speed
hotkey.camera.rotate.speed.decrease = "Ctrl+Alt+R" ; Decrease rotation speed
hotkey.camera.zoom.speed.increase = "Ctrl+Shift+Z" ; Increase zoom speed
hotkey.camera.zoom.speed.decrease = "Ctrl+Alt+Z" ; Decrease zoom speed
; > CONSOLE SETTINGS
hotkey.console.toggle = BackQuote, F9 ; Open/close console
@@ -224,10 +243,13 @@ hotkey.selection.group.add.9 = "Shift+9"
; > SESSION CONTROLS
hotkey.session.kill = Delete ; Destroy selected units
hotkey.session.attack = "Ctrl+Alt" ; Modifier to force attack instead of another action
hotkey.session.garrison = Ctrl ; Modifier to garrison when clicking on building
hotkey.session.attackmove = Ctrl ; Modifier to attackmove when clicking on a point
hotkey.session.queue = Shift ; Modifier to queue unit orders instead of replacing
hotkey.session.batchtrain = Shift ; Modifier to train units in batches
hotkey.session.massbarter = Shift ; Modifier to barter bunch of resources
hotkey.session.masstribute = Shift ; Modifier to tribute bunch of resources
hotkey.session.unloadtype = Shift ; Modifier to unload all units of type
hotkey.session.deselectgroup = Ctrl ; Modifier to deselect units when clicking group icon, instead of selecting
hotkey.session.rotate.cw = RightBracket ; Rotate building placement preview clockwise
@@ -235,6 +257,15 @@ hotkey.session.rotate.ccw = LeftBracket ; Rotate building placement preview
hotkey.timewarp.fastforward = Space ; If timewarp mode enabled, speed up the game
hotkey.timewarp.rewind = Backspace ; If timewarp mode enabled, go back to earlier point in the game
; > UNIT TRAINING
hotkey.session.queueunit.1 = "Z" ; add first unit type to queue
hotkey.session.queueunit.2 = "X" ; add second unit type to queue
hotkey.session.queueunit.3 = "C" ; add third unit type to queue
hotkey.session.queueunit.4 = "V" ; add fourth unit type to queue
hotkey.session.queueunit.5 = "B" ; add fivth unit type to queue
hotkey.session.queueunit.6 = "N" ; add sixth unit type to queue
hotkey.session.queueunit.7 = "M" ; add seventh unit type to queue
; > OVERLAY KEYS
hotkey.fps.toggle = "Alt+F" ; Toggle frame counter
hotkey.session.devcommands.toggle = "Alt+D" ; Toggle developer commands panel
@@ -259,11 +290,15 @@ hotkey.profile.save = "Shift+F11" ; Save current profiler data to logs
hotkey.profile2.enable = "F11" ; Enable HTTP/GPU modes for new profiler
profiler2.http.autoenable = false ; Enable HTTP server output at startup (default off for security/performance)
profiler2.script.enable = false ; Enable Javascript profiling. Needs to be set before startup and can't be changed later. (default off for performance)
profiler2.gpu.autoenable = false ; Enable GPU timing at startup (default off for performance/compatibility)
profiler2.gpu.arb.enable = true ; Allow GL_ARB_timer_query timing mode when available
profiler2.gpu.ext.enable = true ; Allow GL_EXT_timer_query timing mode when available
profiler2.gpu.intel.enable = true ; Allow GL_INTEL_performance_queries timing mode when available
; > JS DEBUGGER
jsdebugger.enable = false ; Enable Javascript debugging (default off for security/performance)
; > QUICKSAVE
hotkey.quicksave = "Shift+F5"
hotkey.quickload = "Shift+F8"
@@ -277,3 +312,6 @@ joystick.camera.rotate.x = 3
joystick.camera.rotate.y = 2
joystick.camera.zoom.in = 5
joystick.camera.zoom.out = 4
; GENERAL GUI SETTINGS
gui.cursorblinkrate = 0.5 ; Cursor blink rate in seconds (0.0 to disable blinking)
+5 -3
View File
@@ -120,16 +120,18 @@ Caps Lock, CapsLock
Scroll Lock, ScrlLock
Right Shift, RightShift
Left Shift, LeftShift
Shift, AnyShift
Right Ctrl, RightCtrl
Left Ctrl, LeftCtrl
Ctrl, AnyCtrl
Right Alt, RightAlt
Left Alt, LeftAlt
Right Meta
Left Meta
Alt, AnyAlt
Left Super, LeftWin
Right Super, RightWin
Super, AnyWindows ## Windows key, also Command/meta key on Macs
Alt Gr, AltGr
Compose
Compose
Help
Print Screen, PrtSc
@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="straight_a">
<mesh>gaia/cliff_a.dae</mesh>
</variant>
<variant name="corner_inside">
<mesh>gaia/cliff_a_corner_inside.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>gaia/cliff_desert_a.dds</texture>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="chinese merchant sail">
<mesh>props/chin_merch_sail.dae</mesh>
<texture>props/chin_sail_dragon.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="chinese trireme sail">
<mesh>props/chin_tri_sail.dae</mesh>
<texture>props/chin_sail_dragon.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/iber_barracks_a.dae</mesh>
<texture>props/iber_prop_shields.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="shields-a">
<mesh>props/iber_civic_centre.dae</mesh>
<texture>props/iber_prop_shields.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>props/iber_pc.pmd</mesh>
<props/>
<texture>props/iber_prop_a.dds</texture>
</variant>
</group>
</actor>
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/iber_dock_boat.dae</mesh>
<texture>structural/iber_ship.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>props/iber_fc.dae</mesh>
<props/>
<texture>props/iber_prop_a.dds</texture>
</variant>
</group>
</actor>
@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/iber_farmstead_hay.dae</mesh>
<texture>props/wrld_hay_a.dds</texture>
</variant>
</group>
</actor>
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="mesh">
<mesh>props/iber_fishship_sail.dae</mesh>
<texture>props/iber_sail_b.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1">
<mesh>props/iber_fortress_props.dae</mesh>
<texture>props/iber_prop_a.dds</texture>
</variant>
</group>
</actor>
@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="props-1">
<mesh>props/iber_gate_door.dae</mesh>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="props-1">
<mesh>props/iber_gate_door_2.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>props/iber_prop_a.dds</texture>
</variant>
</group>
</actor>
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/iber_wallgate_shields.dae</mesh>
<texture>props/iber_prop_shields.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="House A - props 1">
<mesh>props/iber_house_a_1.dae</mesh>
</variant>
<variant frequency="1" name="House A - props 2">
<mesh>props/iber_house_a_2.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="House B - props 1">
<mesh>props/iber_house_b_1.dae</mesh>
</variant>
<variant frequency="1" name="House B - props 2">
<mesh>props/iber_house_b_2.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="House C - props 1">
<mesh>props/iber_house_c_1.dae</mesh>
</variant>
<variant frequency="1" name="House C - props 2">
<mesh>props/iber_house_c_2.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>props/iber_tc.dae</mesh>
<props/>
<texture>props/iber_prop_a.dds</texture>
</variant>
</group>
</actor>
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Market Props 1">
<mesh>props/iber_market_props_01.dae</mesh>
</variant>
<variant frequency="1" name="Market Props 2">
<mesh>props/iber_market_props_02.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="mesh">
<mesh>props/iber_merch_sail.dae</mesh>
<texture>props/iber_sail_a.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="mill-props-a">
<mesh>props/iber_mill_a.dae</mesh>
</variant>
<variant frequency="1" name="mill-props-b">
<mesh>props/iber_mill_b.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="monument_props_a">
<mesh>props/iber_sb_props_a.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="monument_props_b">
<mesh>props/iber_sb_props_b.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>props/iber_prop_shields.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="shields-a">
<mesh>props/iber_scout_tower.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>props/iber_prop_shields.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="temple-shields-a">
<mesh>props/iber_temple_a.dae</mesh>
</variant>
<variant frequency="1" name="temple-shields-b">
<mesh>props/iber_temple_b.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>props/iber_prop_shields.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/iber_hc_fancy.dae</mesh>
<texture>structural/wrld_stone_iber.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant name="Chinese Merchant Ship">
<mesh>structural/chin_merch.dae</mesh>
<props>
<prop actor="props/structures/chinese/merchant_sail.xml" attachpoint="root"/>
</props>
<texture>structural/chin_ship.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant name="Chinese Trireme">
<mesh>structural/chin_tri.dae</mesh>
<props>
<prop actor="props/structures/chinese/trireme_sail.xml" attachpoint="root"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
</props>
<texture>structural/chin_ship.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>structural/wonder_colosseum_main.dae</mesh>
<props>
<prop actor="props/structures/miscellaneous/colosseum_details.xml" attachpoint="root"/>
<prop actor="props/structures/miscellaneous/colosseum_interior.xml" attachpoint="root"/>
<prop actor="props/structures/miscellaneous/colosseum_roof.xml" attachpoint="root"/>
</props>
<texture>null_white.dds</texture>
</variant>
</group>
</actor>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Some files were not shown because too many files have changed in this diff Show More