Commit Graph

11707 Commits

Author SHA1 Message Date
7a8c8e439b Fixes warning in VC2012 build (C4706: assignment within conditional expression)
This was SVN commit r13434.
2013-05-28 01:23:43 +00:00
d2b0d25457 Fixes macro redefinition of FACILITY_VISUALCPP in VC2012 (it's defined in winerror.h).
Removes obsolete hack for old Boost and VC2005 (broke VC2005 build with
modern Boost).

This was SVN commit r13433.
2013-05-28 01:14:41 +00:00
4a8c7e72b5 Lowered crush armor for these buildings.
This was SVN commit r13431.
2013-05-27 18:21:57 +00:00
93d0084266 incorporate patch from ticket 1937, fix memory leak in SoundManager
This was SVN commit r13430.
2013-05-27 13:36:17 +00:00
88c4e5bdd0 Extends binary serializer to support some standard JS classes: Number, String, Boolean. Fixes #406.
Extends binary serializer to support typed arrays.
Extends binary serializer to support custom JS prototype objects in AIs,
fixes #407.
Allows full serialization of AIs (not yet implemented). Refs #1089,
#1886
Increases binary serializer script backref arena from 8 MB to 16 MB,
refs #1842

This was SVN commit r13429.
2013-05-26 21:57:24 +00:00
e58fe92892 Tweaked Walls stats and costs.
Carthaginians' 'Triple Walls' civ bonus moved from wall templates to
auto-researching (free) tech. It just cleans things up quite a bit.

Changed sound groups for "special buildings."

This was SVN commit r13428.
2013-05-25 23:10:16 +00:00
97b28e7343 Some sound file changes to hopefully add more aural variation.
Cavalry blacksmith techs moved from City to Town.

Trying to give the female citizen the order_build soundgroup, but it
doesn't seem to work. The game seems to use order_repair for both
repairing and building. These are two different actions so should
support two different sound groups.

This was SVN commit r13427.
2013-05-25 18:07:29 +00:00
2c52099ddd Fix previous commit because of course there was test code in there. Make Aegis build more farms because of recent changes.
This was SVN commit r13426.
2013-05-25 16:24:05 +00:00
f372f9184c Fix Aegis breaking the profiler after some time (Fixes #1945. Fix typo (Fixes #1947). Patches by Markus.
Also one other fix for something attack related (probably, code is old
and I can't recall).

This was SVN commit r13425.
2013-05-25 15:56:11 +00:00
17bb997e0e Fixes memory leak in CVertexBuffer::Release, patch by Markus, fixes #1933
This was SVN commit r13423.
2013-05-23 23:16:36 +00:00
bc8d461b81 Display rally point lines when setting rally points using the minimap. Patch by TrinityDeath. Fixes #1848.
This was SVN commit r13422.
2013-05-23 20:34:15 +00:00
a8a968d32c Catch exceptions by reference (by convention), based on patch from Markus, refs #1852
This was SVN commit r13421.
2013-05-22 22:27:53 +00:00
72a8b88b7d Fixes some unconventional assignment operators, patch by Markus, refs #1852.
Fixes typo in test_ShaderManager

This was SVN commit r13420.
2013-05-22 22:04:58 +00:00
94c57085e9 Makes some classes NONCOPYABLE, based on patch by Markus, refs #1852
This was SVN commit r13419.
2013-05-22 21:40:56 +00:00
d7dcd3b26c Use prefix increment operator for iterators (for consistency), refs #1852, #1064
This was SVN commit r13418.
2013-05-22 18:41:13 +00:00
3ce14e3f4b fix memory leak in SoundManager, patch taken from ticket #1934
This was SVN commit r13417.
2013-05-22 12:13:21 +00:00
56a4d6417c Small cleanup.
This was SVN commit r13416.
2013-05-21 23:50:42 +00:00
e5523754b3 Check if a building is already at full health when trying to repair it. Fixes #1930.
This was SVN commit r13415.
2013-05-21 23:45:20 +00:00
4356badfa9 Pause production if the producing entity is garrisoned. Fixes #1931.
This was SVN commit r13414.
2013-05-21 23:01:53 +00:00
3f00d4d997 Change some size() > 0 to Based on patches by kuranes and Markus. Refs #1852, #1923.
This was SVN commit r13413.
2013-05-21 22:11:47 +00:00
013fc9558a Fix typo. Fixes #1935.
This was SVN commit r13412.
2013-05-21 22:11:15 +00:00
136f1891c1 Fixes a fix about a fix on the waterManager. Fixes #1891
This was SVN commit r13411.
2013-05-21 08:55:49 +00:00
346df43a43 Persian Apadana build limit.
This was SVN commit r13410.
2013-05-19 08:24:36 +00:00
67d072108b Bloody dead camel.
New wall technologies (research at Wall Tower, since for now techs can't
be researched at wall segments).

Adjusted default BatchTrainModifier from 0.7 to 0.8 in all buildings
since the new training techs were making unit batches train insanely
fast.

Added 'Naval Architects' batch training tech to the Dock (and Carth
Super Dock).

Attempting to add "Apadana" build limit, with no success. Need help
here. I thought BuildRestrictions.js and EntityLimits.js were the files
I needed to change, but it's not working (there should be a build limit
of 1 for the Persian Apadana).

Tweaked the levy techs.

Fixed Hero elephant unit RequiredTechnology.

This was SVN commit r13409.
2013-05-19 08:19:16 +00:00
09108e6a97 Some more vars
This was SVN commit r13408.
2013-05-16 16:17:37 +00:00
1ea0bac280 New train time techs. For most factions, you choose either faster training infantry or faster training cavalry (either one unlocks Conscription, which boosts batch training considerably). For Persians, you get to research both at the barracks and stables, which unlocks conscription techs for both buildings. For Persians, I also moved the champion unlock tech to their Palace (Apadana), which now unlocks the "Immortals" technology (the tech that makes the Anusiya train twice as fast).
This was SVN commit r13407.
2013-05-15 08:11:20 +00:00
ccb4ecc9f2 Renamed this tech.
This was SVN commit r13406.
2013-05-15 04:07:07 +00:00
9ceab639f3 Bloody dead sheep.
Unlocking tech for champions.

Champions trainable in barracks (after unlocking tech).

Farm Field yield increased from 2000 food to 5000 food. Max gatherers: 5
per field.

This was SVN commit r13405.
2013-05-14 09:48:37 +00:00
de5d4491ab var-fare
This was SVN commit r13404.
2013-05-12 22:28:02 +00:00
f5f0bc701a Completely changed the "Stockbreeding" tech.
Fixed the 'Conscription' tech. It should work as advertised now.

Added some classes to the structures.

Reduced archer bonus vs. cav spears by 50%.

Moves Iphicratean Reforms from the Athenian Trireme to the Athenian
Dock.

This was SVN commit r13403.
2013-05-12 21:30:01 +00:00
2aa3ab8b03 conscription tech fix
This was SVN commit r13402.
2013-05-12 16:59:54 +00:00
3bec6ced85 Fix hero button for heroes without attack
This was SVN commit r13401.
2013-05-12 16:02:53 +00:00
daf572eb43 Temporary Blacksmith structures for prototyping and playtesting.
Lots of new techs. Healing techs. Vision for outpost. "Conscription"
tech boosts batch training speed. Implemented Macedonian "Hellenistic
Metropolis" special tech.

Testing placing Champions in the barracks (unlocked with a tech). Try
this out with the Macedonians.

Reduced archer attack damage. Reduced cost of healer.

Lots of other stuff.

This was SVN commit r13400.
2013-05-12 07:23:05 +00:00
209d8c4fd4 Made death screams slightly quieter. We actually need new male death/battle sounds.
This was SVN commit r13399.
2013-05-09 16:36:49 +00:00
eae28bad5a Gold Oasis 3. Iberians vs. Mauryans.
This was SVN commit r13398.
2013-05-06 00:40:40 +00:00
57644fba50 Some art stuff: Scaffolds to other foundations, tweaking some Mauryan animations, new turban for maiden guards, etc.
This was SVN commit r13397.
2013-05-05 21:07:40 +00:00
d49cc6fc8b Some armor changes. Also adds hero training restriction to hero elephant template. Fixes #1927.
This was SVN commit r13396.
2013-05-05 19:25:33 +00:00
47e9431d29 Check if one of the technologies in a pair is already in progress. Fixes #1820.
This was SVN commit r13395.
2013-05-05 13:54:00 +00:00
cb7964a1db Make some gather techs work.
This was SVN commit r13394.
2013-05-05 13:13:38 +00:00
56fa123718 Fix error when constructing with the first selected entity being a building.
This was SVN commit r13392.
2013-05-04 21:44:32 +00:00
fc5e2d27c7 Cancel building placement or reset selection on Esc. Patch by Josh. Fixes #1928.
This was SVN commit r13391.
2013-05-04 21:02:11 +00:00
0d09f290d9 Allow setting rally points for foundations. Patch by Josh. Fixes #902.
This was SVN commit r13390.
2013-05-02 20:29:22 +00:00
bf959e1c46 fix build when using --without-audio
This was SVN commit r13389.
2013-05-02 13:58:28 +00:00
683f22cdb1 Display entity limits for buildings. Patch by Josh. Fixes #1924.
This was SVN commit r13388.
2013-05-01 19:25:55 +00:00
f42b77919d Future-proof the code for civ specific non-peace tracks.
This was SVN commit r13387.
2013-05-01 16:48:55 +00:00
9a0749f3c9 Make sure to actually prevent Atlas from trying to render coastal waves. Fixes #1925
This was SVN commit r13386.
2013-05-01 06:47:49 +00:00
ac3e9d8bc7 clear peace tracks before reloading music from civ files
This was SVN commit r13385.
2013-05-01 01:51:30 +00:00
67ff52a07f More armor adjustments.
This was SVN commit r13384.
2013-04-30 08:36:47 +00:00
181db44ab5 Enforce technology restrictions when training units.
This was SVN commit r13383.
2013-04-29 21:51:14 +00:00
35daf00336 Snuck through without armor changes. Fixed now.
This was SVN commit r13382.
2013-04-29 18:33:03 +00:00