1
0
forked from 0ad/0ad
Commit Graph

3415 Commits

Author SHA1 Message Date
4cf3467819 New siege ram for the Spartans
This was SVN commit r11890.
2012-05-20 11:32:35 +00:00
d5e3e975c8 This was SVN commit r11888. 2012-05-20 00:26:18 +00:00
f72d820cd4 Added randomized arrow positions with hit detection when the missile lands and splash damage. Fixes #18.
This was SVN commit r11886.
2012-05-19 23:07:41 +00:00
6cc98a6763 Add heal order sound.
This was SVN commit r11885.
2012-05-19 18:27:00 +00:00
7be67fe6b7 Added new voice sounds to all female units. Recorded by khegarty
This was SVN commit r11884.
2012-05-19 16:02:16 +00:00
7ad6a6012f Persians: Cav techs to Stables. Infantry techs to Barracks.
This was SVN commit r11883.
2012-05-19 06:24:12 +00:00
7f3bd8fb48 Shiny Bactrian lancers.
This was SVN commit r11882.
2012-05-19 06:16:55 +00:00
97bf4df2a6 Some Athenian shields for their buildings.
This was SVN commit r11881.
2012-05-19 04:46:50 +00:00
5d59175953 Footprint sizes for these things.
This was SVN commit r11880.
2012-05-18 22:41:31 +00:00
c2c0469472 Make qBot swap gatherers based on gathering speed and always deposit resources when switching resource.
Also added missing var's in for loops.

This was SVN commit r11879.
2012-05-18 22:27:08 +00:00
d7faa813f4 Update territory bitmask and add a returnResource command for entities.
This was SVN commit r11878.
2012-05-18 22:10:56 +00:00
0d9dcac82a Changing the Greek civs on these maps.
This was SVN commit r11877.
2012-05-18 21:42:55 +00:00
68d1cf167e Add repair order queueing to formations. Refs #592.
This was SVN commit r11876.
2012-05-18 21:31:57 +00:00
e7689342f8 Implements TerritoryDecay/HealthDecayRate and Promotion/RequiredXp tech modifications.
This was SVN commit r11875.
2012-05-18 03:58:37 +00:00
8fba8097ce Reverts bfb7526bcf.
This was SVN commit r11874.
2012-05-17 23:24:12 +00:00
786896bf8d Prevents fishing ship from attacking structures (docks).
This was SVN commit r11873.
2012-05-17 22:33:46 +00:00
862f6fb3e3 Update to Necropolis.
This was SVN commit r11872.
2012-05-17 13:43:15 +00:00
fb44299104 This was SVN commit r11871. 2012-05-17 13:10:12 +00:00
96b2c1e89b Makes territory_pull selectable in Atlas only.
This was SVN commit r11870.
2012-05-17 02:32:16 +00:00
5d72fa689e Updated spartan emblem.
This was SVN commit r11869.
2012-05-17 01:53:41 +00:00
a4e701fcf9 Lightened up the shark textures.
This was SVN commit r11867.
2012-05-16 20:56:08 +00:00
a5a7bf3c5d Spartan females can make palisades.
This was SVN commit r11866.
2012-05-16 17:57:56 +00:00
cdafb50278 Selection groups for wall lengths.
This was SVN commit r11865.
2012-05-16 17:56:06 +00:00
04fe6d2363 Add reminders to keep alpha names in sync
This was SVN commit r11864.
2012-05-15 21:34:28 +00:00
f8c22634de oops
This was SVN commit r11863.
2012-05-15 00:26:24 +00:00
a317d20b39 Romans Sandbox map.
This was SVN commit r11862.
2012-05-14 04:19:22 +00:00
f18365830b Fixed foundation size.
This was SVN commit r11861.
2012-05-14 03:47:32 +00:00
3bb1c01ccc Removed territory effect from Roman siege walls.
Removed palisades from Roman infantry prod queue.

This was SVN commit r11860.
2012-05-14 01:39:04 +00:00
f14fc977e3 Moved thebans civ json to Internal.
This was SVN commit r11858.
2012-05-13 23:49:23 +00:00
09414078fd Switched warning to a debug so that only AI devs see it. Fixes #1403.
This was SVN commit r11856.
2012-05-13 15:04:25 +00:00
8bd73e774e Deleted Granicus River.
Fixed Isthmus description.

Renamed and tweaked Battle for Tiber.

This was SVN commit r11855.
2012-05-12 22:05:05 +00:00
26531bcdc7 War dog footprint increased.
This was SVN commit r11854.
2012-05-12 21:34:21 +00:00
6f2b90ba70 Default starting resources decreased.
This was SVN commit r11853.
2012-05-12 21:31:00 +00:00
3668f691ef Made the river traversable to help the AI.
This was SVN commit r11852.
2012-05-12 20:53:25 +00:00
d35ec1840e Tweaked these structures.
This was SVN commit r11851.
2012-05-12 17:58:25 +00:00
0b1d911675 Added check for existance of ent.resourceSupplyType(). Fixes #1402
This was SVN commit r11850.
2012-05-12 14:18:40 +00:00
2ba6b90a1c Fixed starting camera.
This was SVN commit r11849.
2012-05-12 06:12:38 +00:00
0cef14be54 Removed these wall entities, which were throwing errors.
This was SVN commit r11848.
2012-05-12 05:47:04 +00:00
13d8caa0f2 Spartan shield stuff.
This was SVN commit r11847.
2012-05-12 05:28:46 +00:00
3d685a2c91 New shield prop textures for Macedonians.
This was SVN commit r11846.
2012-05-12 05:20:18 +00:00
2a719a44f4 Removes unnecessary specular.
This was SVN commit r11845.
2012-05-12 04:42:57 +00:00
6fcf84250a Gallic Fields prettied up a bit.
This was SVN commit r11844.
2012-05-12 03:49:59 +00:00
cc2f3647a3 Zagros Mountains 2: Macedonia vs. Persia.
This was SVN commit r11843.
2012-05-12 01:15:55 +00:00
3c747d21d4 This was SVN commit r11842. 2012-05-12 01:09:26 +00:00
2b893117c9 Added territory effect to stone walls in order to prevent the creep of enemy territory. Ensured that palisades do not have this effect.
Tweaked the description of Athenian temple and dock.

This was SVN commit r11841.
2012-05-11 23:25:04 +00:00
4a73b85a4b Increase maximum treasure priority distance and check that a dropsite has nearby resources
This was SVN commit r11840.
2012-05-11 22:44:37 +00:00
8c6a1995e5 teams
This was SVN commit r11837.
2012-05-11 00:06:06 +00:00
3d6c3752ae Restores player data to _default.xml as a temporary fix for some problems related to #1398.
This was SVN commit r11836.
2012-05-10 23:35:48 +00:00
9610f72636 Typo.
This was SVN commit r11833.
2012-05-10 22:46:14 +00:00
2fa29d0115 Acropolis tweaks.
This was SVN commit r11832.
2012-05-10 22:41:12 +00:00
502047b746 Fix unit demo map.
This was SVN commit r11831.
2012-05-10 22:35:57 +00:00
6f29e27ae0 "Delian League" bonus for Athenians.
This was SVN commit r11830.
2012-05-10 22:25:03 +00:00
8d66340329 Really set Oasis 11 as the default multiplayer map.
This was SVN commit r11829.
2012-05-10 22:23:09 +00:00
3b25e106b2 Fix bug in nearby resource caching so that a dropsite which had nearby resource depleted will be marked undepleted if new resources appear (farms) and add soem ecnomic upgrades strongly inspired by Marilyn (thanks Wraitii).
This was SVN commit r11828.
2012-05-10 22:17:21 +00:00
ad87febd25 Improve gathering behaviour if the target is exhausted.
This was SVN commit r11827.
2012-05-10 22:02:59 +00:00
bcf7c98b66 Nerfed hero Health for Alpha 10 (until we get build limits).
This was SVN commit r11826.
2012-05-10 21:52:32 +00:00
831da7f93e Fixed this map.
This was SVN commit r11825.
2012-05-10 21:44:55 +00:00
bfb35a6484 Add SetNextStateAlwaysEnter() function to reload a state when switching to it from itself. Fixes #1395.
This was SVN commit r11824.
2012-05-10 21:14:43 +00:00
a8528f74c6 Greek market by Enrique.
This was SVN commit r11823.
2012-05-10 20:58:03 +00:00
db1b4dcc4f Added an existance check for metadata on unit destruction
This was SVN commit r11822.
2012-05-10 19:45:34 +00:00
75433f1d5d This was SVN commit r11821. 2012-05-10 19:43:47 +00:00
c1c00d1617 Added resource gatherer counting for qBot and fixed nearby gathering locations code.
Also switched to SquareVectorDistance in filters as suggested by
wraitii.

This was SVN commit r11820.
2012-05-10 18:38:13 +00:00
23cd022eff Map stuff.
This was SVN commit r11819.
2012-05-10 18:07:25 +00:00
a8e548ff5e This was SVN commit r11818. 2012-05-10 17:45:50 +00:00
b36b9da9a0 Single player default map now Punjab 3.
This was SVN commit r11817.
2012-05-10 17:05:19 +00:00
b247e198d7 Healer has a "Run" value now. It didn't before, so would skate around the map when fleeing.
This was SVN commit r11816.
2012-05-10 05:41:15 +00:00
7d00b830aa Changed default maps.
This was SVN commit r11815.
2012-05-10 05:04:10 +00:00
b3f9daead8 Deletes some obsolete data files.
This was SVN commit r11814.
2012-05-10 04:36:18 +00:00
e6dcd0480f Fix promotion.
This was SVN commit r11813.
2012-05-10 03:29:25 +00:00
737a2f3de4 Spartans can't build stone walls.
This was SVN commit r11811.
2012-05-10 01:41:44 +00:00
cb3d71f43a New Greek barracks by Enrique.
This was SVN commit r11810.
2012-05-10 01:12:26 +00:00
1f5f82f375 Fixes invalid civ check in rmgen.
Removes some default data from the Atlas blank map.
Changes default civ in autostart-random mode.

This was SVN commit r11809.
2012-05-09 23:06:03 +00:00
OmriLahav
c8d68f6e0b This was SVN commit r11807. 2012-05-09 21:45:47 +00:00
89821855c7 Check that a nearby resource has >0 resources left. Fixes #1395.
Also added a check to TechnologyManager to see if player is defined.

This was SVN commit r11806.
2012-05-09 21:32:21 +00:00
9fa1145fe8 Update to GUI
This was SVN commit r11805.
2012-05-09 19:52:23 +00:00
282d0f39e2 Remove unused variables
This was SVN commit r11804.
2012-05-09 15:39:16 +00:00
f2515bec84 Fix some whitespace in scripts
This was SVN commit r11803.
2012-05-09 12:14:22 +00:00
a0f122bfd4 Fix #1394 (UnitAI FSM serialization error).
Replace evil eval/uneval with deepcopy.

This was SVN commit r11802.
2012-05-09 12:10:01 +00:00
1f51f4a0a3 Trying again.
This was SVN commit r11801.
2012-05-09 01:26:48 +00:00
116a9887d2 "Herocide" attack bonus for Alexander.
This was SVN commit r11800.
2012-05-09 01:25:42 +00:00
1de1a9b9d8 Fixed error on Necropolis.
This was SVN commit r11799.
2012-05-08 23:22:06 +00:00
ddd3e702d5 Fixes units ignoring player orders in most stances by expanding the concept of "forced" orders.
Documents more functions of UnitAI.

This was SVN commit r11798.
2012-05-08 23:00:14 +00:00
93eed49d85 Conflict with Michael's last commit fix
This was SVN commit r11797.
2012-05-08 21:55:23 +00:00
483dc4cb65 Removing some unused audio files
This was SVN commit r11796.
2012-05-08 21:43:41 +00:00
7a59ea16c7 Added shininess to the metal shuttle prop.
This was SVN commit r11795.
2012-05-08 20:24:09 +00:00
32a01c2ed8 Temporary palisade foundations for Alpha 10. (We should probably make better looking ones than these.)
This was SVN commit r11794.
2012-05-08 19:59:59 +00:00
9fecad12c3 FeXor's updated map stuffs.
This was SVN commit r11793.
2012-05-08 17:45:32 +00:00
e5c9cf6146 Meat units now cannot attack walls.
This was SVN commit r11791.
2012-05-08 00:19:00 +00:00
vts
a57a0e22cb Forgot one spartan unit in da2f7a9000
This was SVN commit r11790.
2012-05-07 23:17:14 +00:00
vts
da2f7a9000 Dropped some unused templates
Gave spartans their walls back

This was SVN commit r11789.
2012-05-07 23:15:24 +00:00
5881c1e495 Audio files added
This was SVN commit r11788.
2012-05-07 22:25:09 +00:00
961db840b2 Work on some descriptions.
This was SVN commit r11787.
2012-05-07 21:44:24 +00:00
10e96798e8 Scale images to power of 2 sizes. Fixes #1382.
This was SVN commit r11786.
2012-05-07 17:15:36 +00:00
385f9e13d7 This was SVN commit r11785. 2012-05-07 06:12:41 +00:00
c036a7d7e3 Adds control groups to saved game data, based on patch by mk12. Fixes #1261.
This was SVN commit r11783.
2012-05-07 04:18:54 +00:00
e6afc62545 Adds silhouettes option to in-game settings menu. Refs #1186
This was SVN commit r11782.
2012-05-07 02:14:01 +00:00
79c6a2cecc Adds config and hotkey options for toggling unit silhouettes, based on patches by Ello and mk12. Fixes #1186.
This was SVN commit r11779.
2012-05-07 01:09:53 +00:00
2fbca07f6d Adds random civ option to game setup, based on patch by deebee. Fixes #1082.
This was SVN commit r11778.
2012-05-06 23:20:57 +00:00
a40a12e794 Typo
This was SVN commit r11777.
2012-05-06 21:21:04 +00:00
8f762b8248 Fix error caused by e8cb2a71da. Refs #1220.
This was SVN commit r11776.
2012-05-06 21:17:29 +00:00
vts
e8cb2a71da Fix floating units when a building they were tasked to construct finishes while they're still en-route, based on a patch by mattlott.
This was SVN commit r11775.
2012-05-06 14:38:03 +00:00
OmriLahav
cb599d4ae5 This was SVN commit r11773. 2012-05-06 09:33:36 +00:00
82dcfe4301 Updates to these Oasis maps.
This was SVN commit r11772.
2012-05-06 02:21:42 +00:00
4268f43587 This was SVN commit r11771. 2012-05-06 01:19:15 +00:00
088876b23c Palisade costs.
This was SVN commit r11770.
2012-05-06 00:53:43 +00:00
vts
d615ac64da Fix wall preview not disappearing when starting building placement immediately afterwards.
Adds some extra buildings to WallTest map to make Town Phase available
faster.

This was SVN commit r11769.
2012-05-06 00:07:34 +00:00
a6e256bd1e This was SVN commit r11768. 2012-05-05 23:50:43 +00:00
5befbd1a02 Palisades for all civs. Tweaked stone walls for errbody too.
This was SVN commit r11767.
2012-05-05 23:15:11 +00:00
vts
d67d2e2370 Updated some documentation in CmpObstructionManager
This was SVN commit r11766.
2012-05-05 23:10:25 +00:00
7180cd9076 Added advanced buildings for new civs and hopefully stopped heroes from being trained.
This was SVN commit r11765.
2012-05-05 21:59:15 +00:00
cbed78be37 Wallset stuff for Athens, Sparta, and Macedonia.
This was SVN commit r11764.
2012-05-05 21:57:38 +00:00
3be4eb44fa fix global from commit c4efc223ed
This was SVN commit r11763.
2012-05-05 21:29:36 +00:00
c4efc223ed Don't serialize the technology modifications cache. Fixes #1384.
This was SVN commit r11761.
2012-05-05 21:21:36 +00:00
vts
490182ddd0 Wall placement. Closes #786.
This was SVN commit r11760.
2012-05-05 19:22:22 +00:00
a6a7883af3 Updated map
This was SVN commit r11759.
2012-05-05 19:17:25 +00:00
cd833a09b8 This was SVN commit r11758. 2012-05-05 04:38:06 +00:00
7fcc350df9 Preferred Classes for these templates.
This was SVN commit r11756.
2012-05-05 00:14:33 +00:00
e0f670ddfb This was SVN commit r11755. 2012-05-05 00:10:03 +00:00
9c3e94acfd FeXor's Iberian Walls.
This was SVN commit r11754.
2012-05-04 23:50:43 +00:00
7797aca9c4 Cuirass icon for techs
This was SVN commit r11753.
2012-05-04 23:36:18 +00:00
0463068947 Adds more checks for tech manager before using it. Refs #1377.
This was SVN commit r11751.
2012-05-04 22:51:14 +00:00
a5713c1264 Try to fix tech error. Refs #1377.
This was SVN commit r11749.
2012-05-04 18:13:23 +00:00
egbert
f2f434ded4 This was SVN commit r11747. 2012-05-04 10:10:42 +00:00
egbert
1aaef48ea4 This was SVN commit r11746. 2012-05-04 10:09:21 +00:00
egbert
c039fb8b0a iberian special building main model
This was SVN commit r11745.
2012-05-04 09:48:26 +00:00
egbert
99672f83f9 iberian special building models
This was SVN commit r11744.
2012-05-04 09:47:38 +00:00
egbert
99d8d03988 iberian special building actor
This was SVN commit r11743.
2012-05-04 09:46:11 +00:00
egbert
964f58504c iberian special building prop actors
This was SVN commit r11742.
2012-05-04 09:45:15 +00:00
egbert
2e5b62ea3e iberian special building textures
This was SVN commit r11741.
2012-05-04 09:43:51 +00:00
a9faa59545 Adjusting available formations.
This was SVN commit r11738.
2012-05-04 02:03:54 +00:00
98c8767b6e Siege wall moved to City Phase.
This was SVN commit r11737.
2012-05-04 01:44:40 +00:00
0035cc37f0 This was SVN commit r11736. 2012-05-04 00:40:23 +00:00
58836c624a Read formations from civ JSON files. Fixes #1234, #601.
This was SVN commit r11735.
2012-05-03 23:32:10 +00:00
20afc75657 Champion icon update
This was SVN commit r11734.
2012-05-03 22:09:33 +00:00
6efe056fef Fist holding spear icon for techs
This was SVN commit r11733.
2012-05-03 21:36:15 +00:00
e1c8307bb6 First crack at a Special Technology.
This was SVN commit r11732.
2012-05-03 21:08:27 +00:00
6db0dc8679 Fixed syntax in these techs.
This was SVN commit r11731.
2012-05-03 20:33:37 +00:00
7edc1e7092 Two new technologies (they need debugged for JSON syntax though).
This was SVN commit r11730.
2012-05-03 20:18:24 +00:00
e215446ada Four variants of the corinthian helmet tech icons
This was SVN commit r11729.
2012-05-03 19:56:30 +00:00
af64a2112f Technology stuff.
This was SVN commit r11727.
2012-05-03 19:15:07 +00:00
825e1ec7a3 Allow replace with 0.
This was SVN commit r11726.
2012-05-03 18:03:57 +00:00
d68d8cdee1 Added "class": "Foo", "number": 5 technology requirement
This was SVN commit r11724.
2012-05-02 20:31:25 +00:00
f01806772f Fixed changes from [11719] for case where ent is not set. Thanks to leper.
This was SVN commit r11723.
2012-05-02 19:50:48 +00:00
303191b0ad Really fixed this time. ;)
This was SVN commit r11722.
2012-05-02 16:39:42 +00:00
8db5b841e6 Fixes bad character.
This was SVN commit r11721.
2012-05-02 16:35:56 +00:00
4d35f78819 Template and tech tweaks.
This was SVN commit r11720.
2012-05-02 16:22:33 +00:00
94eaa9d1d5 Bug fixing for common-api
Fixed entity collection length sometime being NaN
Added a "not" filter
Added create events to resource map updates, should help with farming.

This was SVN commit r11719.
2012-05-02 16:18:32 +00:00
89978332de Fixes tests.
This was SVN commit r11718.
2012-05-01 23:58:03 +00:00
62adf20f37 Check if we have a postition.
This was SVN commit r11716.
2012-05-01 23:06:16 +00:00
7e2dd48d14 Trade convoys tech for the market
This was SVN commit r11715.
2012-05-01 23:05:01 +00:00
fc47098743 Implements TerritoryInfluence/Radius tech modification. Adds C++ interface for TechnologyManager. Renames its message to MT_TechnologyModification defined in TypeList.h. Refs #1357.
This was SVN commit r11711.
2012-05-01 22:44:27 +00:00
d4347a8466 Add Preferred and RestrictedClasses, based on patch by Zsol. Fixes #1144.
This was SVN commit r11710.
2012-05-01 22:20:08 +00:00
0990f7f395 Stockbreeding tech for the corral
This was SVN commit r11709.
2012-05-01 21:46:02 +00:00
0c03b6a5d1 Changes to Iberian wall obstruction widths
This was SVN commit r11707.
2012-05-01 20:44:32 +00:00
d92ef0d13e Fix a small issue with tech overlays.
This was SVN commit r11706.
2012-05-01 18:56:47 +00:00
bfb7526bcf Fixes bug in tech modifications ("affects" was ignored in some situations).
This was SVN commit r11705.
2012-05-01 05:56:53 +00:00
1eaf80d011 Armour and Attack techs for siege weapons
This was SVN commit r11704.
2012-04-30 22:42:10 +00:00
68638a92b8 Updates TakeDamage to apply tech modifications.
This was SVN commit r11703.
2012-04-30 20:39:27 +00:00
363ac861de Stop dead sheep from walking
This was SVN commit r11702.
2012-04-29 22:20:25 +00:00
2069e57a6c Territory radius of Civ Centre increased.
This was SVN commit r11701.
2012-04-29 21:31:18 +00:00
4406b85883 This was SVN commit r11700. 2012-04-29 21:21:29 +00:00
44ac273d21 Changing range values of defense outpost template
This was SVN commit r11699.
2012-04-29 19:35:50 +00:00
c640415f0c Giving all faction outposts projectile and garrison nodes
This was SVN commit r11698.
2012-04-29 19:06:53 +00:00
d03d36b1f3 Add attack ability to outposts.
Fix a issue with dying units with stance standground.

This was SVN commit r11697.
2012-04-29 18:43:10 +00:00
10687410cd Enrique's new Roman siege walls. :)
This was SVN commit r11696.
2012-04-29 18:28:37 +00:00
2f5b81a37e Fix broken test.
This was SVN commit r11695.
2012-04-29 17:39:16 +00:00
13e5c56015 Additional icons for cavalry, ranged, and hack armor
This was SVN commit r11691.
2012-04-28 20:20:30 +00:00
88fde1054f Armor plating tech icon
This was SVN commit r11690.
2012-04-28 19:47:28 +00:00
b3ef24b12d Change gathering behaviour to fix #1353, based on patch by mattlott.
This was SVN commit r11689.
2012-04-28 19:25:44 +00:00
1ac55806ec This was SVN commit r11688. 2012-04-28 18:19:31 +00:00
734f072d62 Testing out a new selection shape. Should work for citizen-cavalry if you want to try it out.
This was SVN commit r11687.
2012-04-28 05:08:56 +00:00
e4365b2f71 New Spartan hero Agis III.
Started to update tooltips to show attack bonuses. It would be nice if
this was automatic though, and the tooltip pulled the information from
the templates.

This was SVN commit r11686.
2012-04-28 02:16:36 +00:00
21caaa4573 Fixes some bugs in tech modifications relating to data types. Explicitly convert template data to numbers before calling ApplyModifications (using + operator).
This was SVN commit r11685.
2012-04-27 23:06:40 +00:00
7c93499c7d Fix qBot infinite loop due to NaN priorities
This was SVN commit r11684.
2012-04-27 21:57:38 +00:00
97bcdfb208 Tweaks to healing range and rate techs
This was SVN commit r11683.
2012-04-26 22:15:16 +00:00
eda4c082fd Add tech support to BuildingAI, GarrisonHolder and Builder.
This was SVN commit r11682.
2012-04-26 21:58:05 +00:00
6fc3d3f9a2 Healing rate and range techs for all temples
This was SVN commit r11681.
2012-04-26 21:38:53 +00:00
aca61b3ccf This was SVN commit r11680. 2012-04-26 20:41:17 +00:00
e6641ad14f Make some healer modifiable by techs. Refs #1357.
This was SVN commit r11679.
2012-04-26 20:11:18 +00:00
bb81a9d81b Move single techs to the bottom row.
This was SVN commit r11678.
2012-04-26 17:43:33 +00:00
060a1fd004 This tech didn't like the è character.
This was SVN commit r11677.
2012-04-26 03:37:47 +00:00
f3fa70cf35 Tech names
This was SVN commit r11676.
2012-04-26 03:32:09 +00:00
85b433d48f Tweaked techs + 2 more techs for Barracks.
This was SVN commit r11675.
2012-04-26 03:15:50 +00:00
c396c2a1ca Fixed default civs.
This was SVN commit r11674.
2012-04-26 00:08:29 +00:00
241be5fa7c Pair of infantry techs for the barracks
This was SVN commit r11673.
2012-04-25 23:51:34 +00:00
65e85dcc40 Selection ring tweaks.
This was SVN commit r11672.
2012-04-25 21:14:32 +00:00
fee0ec6648 Added some debug commands (quit and set-shading-color) which shoudl be useful for AI development
This was SVN commit r11671.
2012-04-25 20:56:35 +00:00
e765f6865f Add a red overlay to the paired tech on hover. Fixes #1356.
This was SVN commit r11670.
2012-04-25 17:58:16 +00:00
4f905584c9 Clarify tech pairs. Refs #1356.
This was SVN commit r11669.
2012-04-25 17:02:41 +00:00
06996590bb Fixes typo from [11660]
This was SVN commit r11668.
2012-04-24 21:59:46 +00:00
b2d399fe47 A bunch of stuff.
This was SVN commit r11667.
2012-04-24 21:36:54 +00:00
29739575cd Link graphics for technology icons
This was SVN commit r11666.
2012-04-24 21:04:17 +00:00
8714eec949 A few more technology icons
This was SVN commit r11664.
2012-04-24 18:56:53 +00:00
e6cb5fade6 Shift-clicking the control group button adds to selection. Patch by mk12. Fixes #1345.
Add AI to Battle for the Tiber map.

This was SVN commit r11662.
2012-04-24 15:58:02 +00:00
17c77ad2ac Adds detection for lower-end Intel Mac GPUs and Apple software renderer. Disables shadows and fancy water on those devices.
This was SVN commit r11660.
2012-04-24 01:20:06 +00:00
9680c8637b grain and meat icons for techs
This was SVN commit r11659.
2012-04-23 23:39:36 +00:00
vts
f72bfb1cf1 Add option to disable particles, based on patch by rogue-spectre. Fixes #1222.
This was SVN commit r11658.
2012-04-23 22:57:51 +00:00
49883c2d57 siege ram icon for techs
This was SVN commit r11657.
2012-04-23 22:47:48 +00:00
01d8358248 anvil and walk icons for techs
This was SVN commit r11655.
2012-04-23 19:29:42 +00:00
ac4e25e17f Added volcanic lands and a new islands random maps. Changed the name of previous islands map to "cycladic archipelago".
This was SVN commit r11653.
2012-04-23 08:58:55 +00:00
1325c4e35f spear icon for techs
This was SVN commit r11652.
2012-04-23 06:06:17 +00:00
f031e2a7e0 Tooltip updates.
This was SVN commit r11651.
2012-04-23 01:51:31 +00:00
e4f1cd10ba Fixes #1349
This was SVN commit r11650.
2012-04-23 01:46:04 +00:00
5101393f26 This was SVN commit r11648. 2012-04-23 00:51:21 +00:00
c6291403bd Fixed some javascript things because the names of the phases were changed. Changed thickness of mine selections.
This was SVN commit r11647.
2012-04-23 00:36:06 +00:00
af0769f19d Nerfed default mining rates slightly, since we now have mining technologies.
This was SVN commit r11646.
2012-04-22 23:03:00 +00:00
6821e838c1 This was SVN commit r11645. 2012-04-22 22:53:01 +00:00
d9a6ee53d0 This was SVN commit r11643. 2012-04-22 22:02:03 +00:00
a0cc289174 This was SVN commit r11642. 2012-04-22 21:50:20 +00:00
5f1f98970f Yet more tech tweaks.
This was SVN commit r11641.
2012-04-22 21:45:28 +00:00
vts
bb9af6da12 Requested update from quantumstate via IRC
This was SVN commit r11640.
2012-04-22 21:36:37 +00:00
b01a9c5471 Fixes broken defense tower reference
This was SVN commit r11639.
2012-04-22 20:48:53 +00:00
99777c8d3f 4 horseshoe icons for techs
This was SVN commit r11638.
2012-04-22 20:24:31 +00:00
a41250b0af Fixing some name stuff.
This was SVN commit r11637.
2012-04-22 20:21:44 +00:00
9c5379c9ed This was SVN commit r11636. 2012-04-22 20:06:58 +00:00
97715cb617 Added stone and mining rate techs for all Mills
This was SVN commit r11635.
2012-04-22 17:50:04 +00:00
4830cebf5e Wheel tech graphic
This was SVN commit r11633.
2012-04-22 15:38:56 +00:00
d836c6a26e Returned the "looter" ability to these units because as an unwanted side-effect they could not gain promotion.
This was SVN commit r11632.
2012-04-22 15:22:52 +00:00
31cec14575 Selection tweaks.
This was SVN commit r11631.
2012-04-22 14:25:44 +00:00
6032ab88e7 Battle axe and wood chopping icons for techs
This was SVN commit r11630.
2012-04-22 14:05:06 +00:00
62ec2bac69 Selection texture tweaks.
This was SVN commit r11628.
2012-04-22 13:17:54 +00:00
d9b8df65be Some refactoring of the military qbot code.
This was SVN commit r11627.
2012-04-22 13:04:31 +00:00
bdc5ad3f0d Some mining icons for techs
This was SVN commit r11626.
2012-04-22 11:19:04 +00:00
0d81325cc7 Fixed Attack and Armour bug by removing Armour/All and Attack/.../All technology modifications.
This was SVN commit r11625.
2012-04-22 10:53:38 +00:00
vts
34fc883317 Pretty unit selection overlay rings. Fixes #824.
This was SVN commit r11623.
2012-04-22 04:04:02 +00:00
60944a1439 Updated phase icons.
This was SVN commit r11622.
2012-04-22 01:47:30 +00:00
8cf72a5ab9 Fixed syntax error
This was SVN commit r11621.
2012-04-22 01:35:08 +00:00
c52d1293d7 Added "Citizen" class to these templates. I feel like "CitizenSoldier" class should be split into Citizen and Soldier, but I was told that this might break some stuff.
This was SVN commit r11620.
2012-04-22 01:26:50 +00:00
0befd88deb Plough tweak.
This was SVN commit r11619.
2012-04-22 01:04:06 +00:00
ddafad84f6 Moved 'plough' tech from Civ Centre to Farmstead.
This was SVN commit r11618.
2012-04-22 00:32:10 +00:00
1bbd226ff4 Renamed these techs more generically.
This was SVN commit r11617.
2012-04-22 00:26:44 +00:00
041da02ff9 This was SVN commit r11616. 2012-04-22 00:23:26 +00:00
db2c7929fd First tech pair.
This was SVN commit r11615.
2012-04-22 00:16:59 +00:00
4881e638e5 Arrow and sword icons for techs
This was SVN commit r11614.
2012-04-22 00:12:00 +00:00
12e46a35fd 128x128 version of the plough icon
This was SVN commit r11612.
2012-04-21 22:54:12 +00:00
60088384a6 Plough tech graphic
This was SVN commit r11611.
2012-04-21 22:42:17 +00:00
99c60789da Tech tweaks.
This was SVN commit r11610.
2012-04-21 22:24:55 +00:00
5ceea39a59 Added technology pairs.
This was SVN commit r11609.
2012-04-21 21:40:07 +00:00
b9695db52c Don't add units to selection if the selected unit isn't owned by the player. Fixes #1256, based on patch by mk12.
Update AI API to Health changes.

This was SVN commit r11608.
2012-04-21 20:50:07 +00:00
03f04e54fc Fix garrisoning issue.
This was SVN commit r11607.
2012-04-21 20:12:52 +00:00
b25d7a4bab Display all trainable/builable (by selected entities) entities.
This was SVN commit r11606.
2012-04-21 20:10:11 +00:00
6938ecf431 Allow switching to not yet buildable entities, if they are in the current selection. Use consts if we already define them.
This was SVN commit r11605.
2012-04-21 17:26:06 +00:00
96549e0418 Modified caching behavior to work similarly to how k776 suggested. Also added modification level affects as also suggested by k776.
This was SVN commit r11604.
2012-04-21 16:37:35 +00:00
dfc86d8ab2 This was SVN commit r11599. 2012-04-21 11:32:52 +00:00
3e3a8d5414 Fix error when no items of a class exist and that class is used for techology requirements.
This was SVN commit r11598.
2012-04-21 10:55:02 +00:00
1b49c53f4c Buildings now unlock per phase. :)
This was SVN commit r11597.
2012-04-21 10:51:32 +00:00
d3d95c6b66 This was SVN commit r11595. 2012-04-21 07:19:43 +00:00
497c1ff948 A few portrait tweaks.
This was SVN commit r11593.
2012-04-21 04:48:13 +00:00
774809b0a9 Allow training in all selected buildings. Fixes #1210.
This was SVN commit r11592.
2012-04-21 00:21:01 +00:00
a6ceceb79c Renaming the old celt wall files and new templates for them
This was SVN commit r11591.
2012-04-20 22:27:17 +00:00
06b342db46 Fix save/load with common-api-v2
This was SVN commit r11590.
2012-04-20 21:31:43 +00:00
85d5962328 Roman wall gate model updated
This was SVN commit r11589.
2012-04-20 21:25:34 +00:00
03d625dd2e Added tech modification for carrying capacity and fixed warning for min range
This was SVN commit r11588.
2012-04-20 20:37:12 +00:00
b7cf51be34 Check properties exist in resourceSupplyAmount and resourceCarrying to avoid warnings. Code from wraitii
This was SVN commit r11587.
2012-04-20 19:48:25 +00:00
ed6e5bdaf0 Fixed phase detection in GUIInterface and added Armour and Attack tech modification.
This was SVN commit r11586.
2012-04-20 19:47:01 +00:00
755e407aeb Technologies. Refs #3. Full unlocking technology implementation. Only unit gathering rates can be modified currently because the patch was big enough already.
This was SVN commit r11584.
2012-04-20 17:21:04 +00:00
be0109331c New update. Tightens up some of the military side of things.
This was SVN commit r11583.
2012-04-20 16:53:31 +00:00
2037c1fc6e Spartan Helot Skirmishers less reliable. Spartan female citizen stronger.
This was SVN commit r11582.
2012-04-20 04:02:03 +00:00
813f7e9102 Updated Prytaneion template.
This was SVN commit r11579.
2012-04-20 03:09:25 +00:00
a99e1236be New Prytaneion by Enrique.
This was SVN commit r11577.
2012-04-20 02:48:27 +00:00
c8745ee41f Handle game ending in Atlas a bit more gracefully, it now continues until the user stops the simulation test. Fixes #641.
This was SVN commit r11575.
2012-04-20 01:41:54 +00:00
7d47407c70 Carthaginian wall segments
This was SVN commit r11574.
2012-04-20 00:08:31 +00:00
9a58afcb62 Internal to Public.
This was SVN commit r11573.
2012-04-19 22:38:00 +00:00
b535c76ca1 This was SVN commit r11572. 2012-04-19 21:40:31 +00:00
ba17009767 Deposit resources when garrisoned in a dropsite. Patch by MattDoerksen. Fixes #1124.
This was SVN commit r11571.
2012-04-19 20:34:59 +00:00
388d77f37d Structures from Internal to Public. Thanks Leper.
This was SVN commit r11570.
2012-04-19 18:43:39 +00:00
82263fd3d3 Shift-N adds that groups units to selection. Fixes #1262.
This was SVN commit r11569.
2012-04-19 09:00:51 +00:00
496445c615 New mapz0rz
This was SVN commit r11568.
2012-04-19 08:31:05 +00:00
0e6ecdcf48 Some art assets moved from Internal mod.
This was SVN commit r11567.
2012-04-19 08:28:48 +00:00
4a54b29250 Moving some minor stuff from Internal to Public mod.
This was SVN commit r11566.
2012-04-19 08:21:13 +00:00
aa07511739 This was SVN commit r11565. 2012-04-19 08:09:24 +00:00
65f4cb1d18 Units arent as efficient food gatherers anymore.
This was SVN commit r11564.
2012-04-19 07:56:25 +00:00
d9cb518904 Updated maps.
This was SVN commit r11563.
2012-04-19 07:19:23 +00:00
7653043759 Changed some old class filters from Super to Champion
This was SVN commit r11559.
2012-04-18 21:05:36 +00:00
a9475c3854 Stops qBot training heroes and makes it build a market after abuot 10 minutes.
This was SVN commit r11557.
2012-04-18 20:54:14 +00:00
9572a4314a Iberian wall.
This was SVN commit r11555.
2012-04-18 19:59:53 +00:00
2e65416489 Healer range tweaks.
This was SVN commit r11554.
2012-04-18 19:57:49 +00:00
454af1928d Selection groups for healers.
This was SVN commit r11553.
2012-04-18 19:53:10 +00:00
131d5eb88f Tweak default healer behaviour, fix a small bug.
This was SVN commit r11552.
2012-04-18 18:26:49 +00:00
egbert
f5344d37e1 The new Iberian fortress model
This was SVN commit r11551.
2012-04-18 17:55:39 +00:00
egbert
159453f13d adjusted prop positions for the new Iberian fortress
This was SVN commit r11550.
2012-04-18 17:54:03 +00:00
egbert
032a6b1557 adjusted prop positions for the new Iberian fortress
This was SVN commit r11549.
2012-04-18 17:53:38 +00:00
egbert
3ffeb1eee5 adjusted dirt decal reference from size 4x4 to 6x6.
This was SVN commit r11548.
2012-04-18 17:52:32 +00:00
13281e230d Handle updates for foundation progress, resource carrying and resource supply amount for AIProxy. Fixes #1327
This was SVN commit r11547.
2012-04-18 11:30:28 +00:00
4b4411116f Actually committed the Filters.byOwners fix mentioned in 167cd7151e
This was SVN commit r11546.
2012-04-18 10:49:45 +00:00
167cd7151e Bug fixes and dead code removal
Fixed Filters.byOwners, before it was using indexOf() which caused
problems with number/string inequality.
Fixed the countUnassignedUnits and getAvailablenits functions to work
with the new filters.
Removed old updating entity collection code since it has been replaced
by the common-api-v2

This was SVN commit r11545.
2012-04-18 10:46:24 +00:00
41f50e6b4c specular added for more objects.
Boosted healing stats for healer ranks.

This was SVN commit r11542.
2012-04-17 21:57:55 +00:00
4926dc53ee Celt wall segments
This was SVN commit r11541.
2012-04-17 21:51:43 +00:00
46bf2cac22 Fix remaining issue
This was SVN commit r11539.
2012-04-17 21:05:01 +00:00
c56f96040e Implement healing. Fixes #999.
This was SVN commit r11536.
2012-04-17 20:22:13 +00:00
OmriLahav
9a719c32be This was SVN commit r11533. 2012-04-17 12:01:34 +00:00
bee7ecc90c Iberian Walls for these maps.
This was SVN commit r11531.
2012-04-17 05:39:12 +00:00
af207e1c0a Fixed the gameState.GetEntityById() function
This was SVN commit r11526.
2012-04-16 16:54:11 +00:00
d7b31da2dc Loot stuffs. :)
This was SVN commit r11524.
2012-04-16 00:17:41 +00:00
52efb54673 Added serialize and deserialize functions to common-api-v2
This was SVN commit r11522.
2012-04-15 22:31:17 +00:00
c6f9df4020 Map name tweaks. Use Arabic numerals instead of Roman.
This was SVN commit r11521.
2012-04-15 20:55:27 +00:00
cb45fd2800 Tweaked Iberian civ file.
This was SVN commit r11520.
2012-04-15 20:44:01 +00:00
46c23d1c3c Template tweaks, namely attack bonuses.
This was SVN commit r11519.
2012-04-15 20:35:38 +00:00
4a795dd631 Wall costs and health.
This was SVN commit r11518.
2012-04-15 19:08:29 +00:00
f004b0cd94 Roman wall segments - long, medium, and short. Gate needs work
This was SVN commit r11517.
2012-04-15 18:28:09 +00:00
c942d3e8c6 Fixed these maps.
This was SVN commit r11516.
2012-04-15 18:23:45 +00:00
1ee8bfe231 Update wall_builder and add wall_demo map. Patch by FeXoR. Closes #1311.
This was SVN commit r11515.
2012-04-15 17:23:05 +00:00
9c4a7b8086 Clean up gui code.
This was SVN commit r11514.
2012-04-15 16:27:44 +00:00
544f5ff048 Fixing errors in a number of demo maps
This was SVN commit r11513.
2012-04-15 11:25:07 +00:00
27906080e2 Wall bonus for Iberians on these maps.
This was SVN commit r11512.
2012-04-15 06:50:21 +00:00
7cc39dc461 Wall bonus for Iberians on Acropolis II.
This was SVN commit r11511.
2012-04-15 06:34:11 +00:00
72056a32e7 Removed shadow casting from grass.
This was SVN commit r11510.
2012-04-15 05:31:20 +00:00
2c3801743a Hide the barter buy button when it is the same as selected sell button
This was SVN commit r11505.
2012-04-15 03:44:57 +00:00
8848099dc3 Pericles and Craterus are in.
This was SVN commit r11504.
2012-04-15 03:09:12 +00:00
a07dd82a70 Allow materials to disable receiving shadows
This was SVN commit r11500.
2012-04-14 17:32:22 +00:00
43a30fcddd Add explicit castshadow flag to all actors, since the engine currently enables it implicitly anyway
This was SVN commit r11497.
2012-04-14 17:21:20 +00:00
78105070a9 Convert actor line endings from CRLF to LF for consistency
This was SVN commit r11496.
2012-04-14 16:43:00 +00:00
97a67662c5 Some Internal stuff.
Gave trees uniform portraits.

Fixed costs for ranged heroes.

This was SVN commit r11495.
2012-04-14 06:02:45 +00:00
2312d1379a Be more robust to invalid positions
This was SVN commit r11492.
2012-04-12 22:32:58 +00:00
227f9e403f Experimental GPU skinning.
Share inverse bind pose matrices between models.

This was SVN commit r11490.
2012-04-12 15:43:59 +00:00
ce215cace3 Add support for custom vertex attributes and array-of-matrix uniforms in GLSL.
This was SVN commit r11489.
2012-04-12 14:10:02 +00:00
5e38f4b49d Themistocles now has shiny helmet!
This was SVN commit r11488.
2012-04-12 07:40:31 +00:00
5184edde14 New patch for JuBot
- Speeds up a lot of functionality by using persistent entity
collections, speed boost should be significant and noticeable.
- Adds defence towers covering all dropsites, with garrisons

This was SVN commit r11487.
2012-04-12 07:08:12 +00:00
3ca6ee461c Palisade wall models optimised
This was SVN commit r11486.
2012-04-11 22:12:45 +00:00
25b3242ba4 Adds a "byNotOwner" filter for finding enemies, non-gaia objects, etc more easily.
This was SVN commit r11485.
2012-04-11 20:32:25 +00:00
17daa5ce8b Fixed a couple of helmets.
This was SVN commit r11483.
2012-04-11 05:31:43 +00:00
d42ac2b106 This was SVN commit r11481. 2012-04-11 00:23:30 +00:00
368dda421a New Hele walls
This was SVN commit r11479.
2012-04-10 23:14:58 +00:00
71a57ed3a7 Allow gathering regardless of resource owner
This was SVN commit r11478.
2012-04-10 21:09:21 +00:00
d3a24c26ba Do alpha-testing earlier in ARB shaders, for performance.
This was SVN commit r11477.
2012-04-10 21:08:54 +00:00
f2260892bd Add config option to force alpha-tested materials.
This was SVN commit r11475.
2012-04-10 21:03:22 +00:00
05008d190e Clean up terrain shader a bit
This was SVN commit r11473.
2012-04-10 20:55:01 +00:00
9796fbf59b Eggbird's new Iberian Temple.
This was SVN commit r11472.
2012-04-10 18:27:25 +00:00
577676810b Make domestic herd animals controllable by the player
This was SVN commit r11471.
2012-04-10 16:37:34 +00:00
a035fc3949 Delete some unnecessary folders and files. Add shiny stuff to more helmets.
This was SVN commit r11469.
2012-04-10 02:43:42 +00:00
764b173f6e Shield tweaks.
This was SVN commit r11467.
2012-04-10 01:25:03 +00:00
b3e519c278 Remove sheets.
This was SVN commit r11466.
2012-04-09 23:13:45 +00:00
e5d3a2b312 Adjusting the Iberian wall tower's windows
This was SVN commit r11465.
2012-04-09 19:23:48 +00:00
67bca5a6ed Use an overlay image to mark selected icons instead of using a separate image.
Remove some useless sheets.

This was SVN commit r11464.
2012-04-09 18:58:03 +00:00
a21fc77212 A minor improvement for enabling/disabling user feedback. It was set to enabled/disabled in every tick which triggered some code.
Now it's only enabled or disabled when the user clicks the button and
therefore much less events are triggered.

This was SVN commit r11463.
2012-04-09 12:30:56 +00:00
3db7f32d17 Specular for a few more things.
This was SVN commit r11462.
2012-04-09 00:37:50 +00:00
25d1affef2 Adding specular to some items.
This was SVN commit r11461.
2012-04-08 23:53:05 +00:00
4b5bd36d9b Multiply specular lighting by sun color
This was SVN commit r11460.
2012-04-08 23:03:22 +00:00
c93f17827f Make use of the grayscale opion.
Move some icon files to a more adequate location.
Closes #1214 as that was already commited and this commit fixes some
minor issues.

This was SVN commit r11459.
2012-04-08 22:56:11 +00:00
f3a393d2e5 Add alpha-tested materials
This was SVN commit r11457.
2012-04-08 21:55:21 +00:00
566a4588b6 This update to JuBot transfers to the v2 SVN, and adds tower garrisoning.
This was SVN commit r11455.
2012-04-08 16:58:57 +00:00
f3617822e0 Make AlwaysVisible objects always visible in shader mode. Fixes #908.
This was SVN commit r11454.
2012-04-08 16:36:23 +00:00
b7888aea52 Add support for specular materials.
Let materials specify shader uniform values.
Use interned strings for shader uniform/attribute names.
Remove confusing float* cast operator on CVector4D.
Simplify and clean up CVector4D.
Remove non-supported 'old' lighting model.

This was SVN commit r11453.
2012-04-08 15:55:06 +00:00
8a0e47fdd6 Adds the GarrisonTower and GarrisonFortress classes to towers and fortresses.
This was SVN commit r11452.
2012-04-08 12:09:49 +00:00
2dc3c36ee6 Adds the classes "GarrisonTower" and "GarrisonFortress" to more easily demarcate the buildings the AI wants to garrison for defense.
This was SVN commit r11451.
2012-04-08 12:08:21 +00:00
fda1d07794 Tweaking some pop costs.
This was SVN commit r11450.
2012-04-08 07:27:56 +00:00
6b5034e313 Iberian wall model updates
This was SVN commit r11448.
2012-04-07 10:36:32 +00:00
4a12049df5 Put resource accessibility checks back for the new worker code
This was SVN commit r11445.
2012-04-06 19:53:50 +00:00
83422923aa Added deep forest map by FeXoR. Fixes #1287.
This was SVN commit r11444.
2012-04-06 19:15:58 +00:00
07ea6673c3 Use grayscale option instead of grayscaled icons
This was SVN commit r11443.
2012-04-06 15:51:26 +00:00