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
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
e91d8a0c47
Toona tree sways now.
...
This was SVN commit r12925.
2012-12-03 00:38:44 +00:00
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
feca7e0be7
Updates Polynesia map as a demo with appropriate description
...
This was SVN commit r12923.
2012-12-03 00:23:43 +00:00
c3c655aaa5
Display time cost for walls. Fixes #1740 .
...
This was SVN commit r12922.
2012-12-02 23:45:34 +00:00
26a22a7bcb
Make hunting units disband earlier.
...
Fix formation disbanding.
This was SVN commit r12921.
2012-12-02 23:11:55 +00:00
37109f5c70
Packed siege unit icons
...
This was SVN commit r12920.
2012-12-02 22:33:40 +00:00
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
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
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
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
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
39eba0928b
Carthaginian mausoleum building
...
This was SVN commit r12867.
2012-11-23 22:24:00 +00:00
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
8c86beb0fa
Made silhouettes display correctly in the fog.
...
This was SVN commit r12862.
2012-11-18 12:34:42 +00:00
89217603a1
Unit training hotkeys from mammadori. Fixes #1226 .
...
This was SVN commit r12861.
2012-11-17 18:27:31 +00:00
9df9d24a26
Fixing the rubble.
...
This was SVN commit r12859.
2012-11-14 18:28:35 +00:00
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
89ced839f2
Added "Starting Economy Walkthrough" as a demo map.
...
This was SVN commit r12855.
2012-11-12 22:21:20 +00:00
742b265209
Added a couple moremediterranean dirt textures
...
This was SVN commit r12854.
2012-11-12 20:33:07 +00:00
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
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
c00cfa2e5d
Roman Bireme fixed.
...
This was SVN commit r12849.
2012-11-12 04:36:37 +00:00
7125e72e52
Add build/research/train time to tooltips.
...
This was SVN commit r12848.
2012-11-11 23:08:44 +00:00
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
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
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
beff7a187d
Fixed mauryan civic centre projectile attach point and AO added
...
This was SVN commit r12844.
2012-11-11 04:34:21 +00:00
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
be0beacd1a
Brit War Dog nerf.
...
This was SVN commit r12841.
2012-11-10 19:14:16 +00:00
3f334bbdb3
This was SVN commit r12840.
2012-11-10 16:44:12 +00:00
33cb23afa5
New random map: "Corinthian Isthmus"
...
This was SVN commit r12839.
2012-11-10 16:35:36 +00:00
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
cd3a727cd4
Added custom civic centre rubbles for each faction except Iberians.
...
This was SVN commit r12837.
2012-11-10 03:50:00 +00:00
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
3a02bc296c
Fix setupUnitPanel usage broken in 7e21db08d5. Refs #1432
...
This was SVN commit r12835.
2012-11-08 03:54:00 +00:00
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
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
669b7e6e2c
Fixes #1714 . Also updates the Mediterranean Cove map water settings.
...
This was SVN commit r12831.
2012-11-07 15:40:34 +00:00
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
10752c798d
Prevent attacking yourself (caused by splash damage).
...
This was SVN commit r12829.
2012-11-06 14:58:34 +00:00
d57926fa5b
Adjust diplomacy according to irc discussion. Refs #7 .
...
This was SVN commit r12828.
2012-11-05 20:16:35 +00:00
e969340b6c
Fix diplomacy for atlas.
...
This was SVN commit r12827.
2012-11-05 19:34:21 +00:00
c1da925786
Change some scenario water settings. Refs #1711 .
...
This was SVN commit r12825.
2012-11-05 17:31:28 +00:00
9ebdeff90e
mauryan fortress small fix
...
This was SVN commit r12824.
2012-11-05 16:30:57 +00:00
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
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
1e3c885f45
Allow trading with neutral players.
...
This was SVN commit r12821.
2012-11-04 23:01:12 +00:00
d8f22c860d
Fix when not using shadows.
...
This was SVN commit r12820.
2012-11-04 20:39:01 +00:00
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
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
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
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
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
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
a0e13d9625
Fix tests. BuildingAI now handles DiplomacyChanged messages.
...
This was SVN commit r12812.
2012-11-02 17:20:32 +00:00
d75ae52f56
Particles now correctly update with the fog. Refs #276 .
...
This was SVN commit r12811.
2012-11-02 16:31:27 +00:00
9930500661
Diplomacy is now mutual. Refs #7 .
...
This was SVN commit r12810.
2012-11-02 13:44:35 +00:00
a3ddd7b1b3
Fix for some problems when using shadows with the superfancywater.
...
This was SVN commit r12809.
2012-11-02 13:08:58 +00:00
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
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
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
f3984a6c0e
Forgot the waves shader.
...
This was SVN commit r12803.
2012-10-31 18:54:10 +00:00
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
97b46d402c
Removing GL3 dependency from GPU skinning code.
...
This was SVN commit r12801.
2012-10-30 21:57:00 +00:00
608e01a5b2
Iberian walls and Roman gate use normal/parallax mapping now.
...
This was SVN commit r12800.
2012-10-30 18:31:05 +00:00
c5fae74ac7
Normal mapping for Craterus.
...
This was SVN commit r12799.
2012-10-30 17:34:40 +00:00
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
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
0353177a94
This was SVN commit r12793.
2012-10-28 23:19:19 +00:00
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
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
22b2343192
Fix name/color in diplomacy messages.
...
This was SVN commit r12790.
2012-10-27 23:31:16 +00:00
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
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
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
7bd5872dd7
Fixed info in Rome civ json
...
This was SVN commit r12784.
2012-10-25 16:28:13 +00:00
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
9dc1724e57
Mauryan Maiden Guard.
...
This was SVN commit r12782.
2012-10-24 18:32:50 +00:00
ca4dedbc3e
Improve neutral and ally combat handling. Refs #7 .
...
This was SVN commit r12780.
2012-10-23 23:13:39 +00:00
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
a21e01150a
Basic diplomacy. Refs #7 .
...
This was SVN commit r12778.
2012-10-23 16:31:07 +00:00
8208b52faf
Testing new hero selection ring.
...
This was SVN commit r12777.
2012-10-21 22:30:04 +00:00
932bb87046
New spec and normal maps for some Mediterranean terrains.
...
This was SVN commit r12776.
2012-10-21 22:28:04 +00:00
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
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
0981911542
Test strat map city.
...
This was SVN commit r12770.
2012-10-18 18:18:10 +00:00
cc88d057ee
This was SVN commit r12769.
2012-10-18 18:17:56 +00:00
ec8b49e822
Fixing a small bug suggested by FeXoR.
...
This was SVN commit r12768.
2012-10-18 18:03:01 +00:00
2cb81bc87a
Adding a new cheat
...
This was SVN commit r12766.
2012-10-18 13:13:41 +00:00
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
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
8e48beeeef
Added Belgian_Bog_night map
...
This was SVN commit r12761.
2012-10-17 16:32:34 +00:00
71b27dd281
Post processing updates to these maps.
...
This was SVN commit r12760.
2012-10-16 18:10:20 +00:00
gregory
092498f961
(hopefully) fixed errors with the boar skeleton.
...
This was SVN commit r12757.
2012-10-15 19:30:29 +00:00
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
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
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
93c21d8965
Reordering these sandbox maps by renaming them.
...
This was SVN commit r12752.
2012-10-15 01:54:15 +00:00
b581e54185
This was SVN commit r12751.
2012-10-15 00:59:05 +00:00
