Commit Graph

11244 Commits

Author SHA1 Message Date
2004fb5e62 Fix error caused by unit dying while attacking.
This was SVN commit r12919.
2012-12-02 22:02:36 +00:00
94c7a0dcf6 Tweaking map settings.
This was SVN commit r12918.
2012-12-02 21:29:39 +00:00
116c4674b3 Handle undefined team setting properly.
This was SVN commit r12916.
2012-12-02 17:29:32 +00:00
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
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
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
5e8993fd8f Rome rock packed model fix
This was SVN commit r12912.
2012-12-02 13:50:05 +00:00
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
ddd8c36d6f Fix tests.
This was SVN commit r12910.
2012-12-01 23:04:49 +00:00
9d0da11eab Fixes compile error introduced in 3787f17e4d
This was SVN commit r12909.
2012-12-01 20:34:35 +00:00
308db6627a fix synchronization of TimerState (refs #1729)
This was SVN commit r12908.
2012-12-01 06:33:30 +00:00
3787f17e4d merge with local codebase: fix PopulationCount
This was SVN commit r12907.
2012-12-01 03:06:24 +00:00
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
e7ef4796ee Group civs in info screen by culture. Fixes #1734.
This was SVN commit r12905.
2012-12-01 00:39:26 +00:00
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
090e2a74cf Sync with upstream. Refs #1518.
This was SVN commit r12903.
2012-11-30 21:35:48 +00:00
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
0e7e6e88e0 Added mauryan scout tower with ao
This was SVN commit r12901.
2012-11-29 23:49:07 +00:00
3e7e8d1528 Icons for siege packing/unpacking/cancelling
This was SVN commit r12900.
2012-11-28 20:46:50 +00:00
3e531b7571 removed improper comparison warning
This was SVN commit r12899.
2012-11-28 04:31:52 +00:00
ad13ded9a5 Some normal and spec maps for these terrains.
This was SVN commit r12898.
2012-11-27 18:59:10 +00:00
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
a4a060cd86 Fixes build warning and cleans up a few things
This was SVN commit r12895.
2012-11-26 02:28:35 +00:00
b2efabdf66 This map -> Demo.
This was SVN commit r12894.
2012-11-26 01:43:43 +00:00
5142c2e9bd Added operator infantry unit to the siege scorpio
This was SVN commit r12893.
2012-11-25 22:39:12 +00:00
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
91fbcf7eb6 This was SVN commit r12891. 2012-11-25 21:26:39 +00:00
dc70751fc8 Made this map a "demo" map.
This was SVN commit r12890.
2012-11-25 21:13:28 +00:00
1f2047f04e Consider the unit's build time in the calculation.
This was SVN commit r12889.
2012-11-25 21:01:03 +00:00
f6e1e15a5d Fixed an icon error.
This was SVN commit r12888.
2012-11-25 20:36:20 +00:00
f9fce9d43a This was SVN commit r12887. 2012-11-25 20:33:59 +00:00
0a622c0454 Mausoleum has normal and spec maps.
This was SVN commit r12886.
2012-11-25 20:30:12 +00:00
6de4300c01 Packed Roman ballista and Packed Carthaginian rock thrower
This was SVN commit r12885.
2012-11-25 19:28:18 +00:00
f456112492 Shadowmapping bugfixes and tweaks.
This was SVN commit r12884.
2012-11-25 18:35:59 +00:00
1052cb9ee0 Rename property. Refs #1717.
This was SVN commit r12883.
2012-11-25 16:23:59 +00:00
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
cdcd3e504b Hele siege rock thrower packed and four wheel wagon
This was SVN commit r12881.
2012-11-25 14:40:23 +00:00
86293398eb Roman siege scorpio packed donkey
This was SVN commit r12880.
2012-11-25 13:58:42 +00:00
2ab8c8b874 Fix technology pair affordable mask.
This was SVN commit r12879.
2012-11-25 13:18:01 +00:00
3674524c6c Carthaginian mausoleum icon
This was SVN commit r12878.
2012-11-25 12:36:45 +00:00
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
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
a326aa63a9 Add check to the hotkeys. Fix #1726.
This was SVN commit r12875.
2012-11-24 20:19:13 +00:00
f0493e7060 Spelling fixes. Fixes #1727, patch by zoot.
This was SVN commit r12874.
2012-11-24 19:47:36 +00:00
f96aeb1bd8 2 wheeled wagon and hele spear packed. Wooden wagon texture
This was SVN commit r12873.
2012-11-24 17:42:42 +00:00
ed98320acc Fix non-pch build.
This was SVN commit r12872.
2012-11-24 17:15:07 +00:00
b1720ebdbc This was SVN commit r12871. 2012-11-24 00:51:57 +00:00
250ba9a3ed Fireflies particle.
This was SVN commit r12870.
2012-11-24 00:32:09 +00:00
ea2626106e This was SVN commit r12869. 2012-11-24 00:29:46 +00:00
21b4f33184 Animated Roman bireme
This was SVN commit r12868.
2012-11-24 00:12:29 +00:00