1
0
forked from 0ad/0ad
Commit Graph

6801 Commits

Author SHA1 Message Date
8026685a06 Don't display the rally point tooltip for trading for enemy markets.
This was SVN commit r13448.
2013-06-02 20:17:44 +00:00
2ef6ec3f73 Rounds trader gain to avoid fractions with garrisoned traders in a merchant ship, patch by Markus, fixes #1954
This was SVN commit r13447.
2013-06-01 21:28:31 +00:00
eebe7972df Lighting tweaks to Mauryan emblem
This was SVN commit r13446.
2013-06-01 12:09:34 +00:00
5af503405f last bunch of ogg files not converted from wav correctly
This was SVN commit r13445.
2013-06-01 02:56:31 +00:00
b6e0661b8f New BRASIDAS Spartan hero.
"The Agoge" tech for Spartans.

Fixed Leonidas' selection ring.

This was SVN commit r13444.
2013-06-01 02:33:58 +00:00
67b42210aa mono ogg sounds rendered from original wav files recommitted
This was SVN commit r13443.
2013-06-01 02:30:05 +00:00
4882aac409 New techs for Carthage: Mercenary Captains, reduce metal costs for merc units, based on ethnicity.
Melee cav more starting pierce armor.

This was SVN commit r13441.
2013-05-31 02:52:06 +00:00
690619ce5e many fauna sounds in stereo converted to mono so the OpenAL can locate them
This was SVN commit r13440.
2013-05-31 02:50:47 +00:00
d3e40792ff Added a "wooden structures" civ bonus for the Celtic civs. Their buildings are 20% weaker, but they construct 20% faster than other cultures.
Fixed health for "Greek" walls.

Adjusted "preferredclasses" stuff on some templates.

This was SVN commit r13438.
2013-05-30 00:58:07 +00:00
085e9c620d Tweaked armor stats for battering ram and siege tower.
Fixed "rollover" tag to "history".

This was SVN commit r13437.
2013-05-29 23:39:13 +00:00
4a8c7e72b5 Lowered crush armor for these buildings.
This was SVN commit r13431.
2013-05-27 18:21:57 +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
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
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
013fc9558a Fix typo. Fixes #1935.
This was SVN commit r13412.
2013-05-21 22:11:15 +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
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
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
e0a2e5790d Exponential Armor patch by Alpha123, with new updated armor values.
Needs a ton of testing.

This was SVN commit r13381.
2013-04-29 07:51:51 +00:00
4493f2986f Wonder support for civs currently with Wonders.
This was SVN commit r13380.
2013-04-29 02:46:13 +00:00
0686c6a553 Resetting 'default' maps.
This was SVN commit r13379.
2013-04-29 02:36:57 +00:00
5a88f0fce0 Fix entity limits for buildings.
This was SVN commit r13378.
2013-04-29 00:36:21 +00:00
f4e0007733 Cavalry are a bit faster.
Attempting to add Wonders, but no success (need help). Adding files here
to see if someone can fix what I've started.

This was SVN commit r13377.
2013-04-28 22:51:08 +00:00
4233acfa36 Slight clean up of the water code. Uses vertex data instead of a texture for foam. Should be faster to generate and render. Still no Atlas support.
This was SVN commit r13374.
2013-04-27 12:20:42 +00:00
71486bd57d SoundManager supports playlists
This was SVN commit r13368.
2013-04-24 12:03:42 +00:00
6115c3fc13 Remove some duplication from ProcessCommand.
This was SVN commit r13367.
2013-04-22 17:50:25 +00:00
62f24af68d Some new portraits by LordGood.
This was SVN commit r13366.
2013-04-21 18:47:11 +00:00
75f332ce20 Stop hotkey. Patch by alpha123. Fixes #1870.
This was SVN commit r13364.
2013-04-18 19:20:29 +00:00
cd6a76bcaa Gates now handle allies made using diplomacy.
This was SVN commit r13363.
2013-04-18 18:18:34 +00:00
18a2b7d093 Fix roman merchant ship trading distance. Fixes #1874.
This was SVN commit r13362.
2013-04-18 18:18:31 +00:00
dc9889c190 Display number of garrisoned units when trying to garrison. Patch by mimo. Fixes #1915.
This was SVN commit r13361.
2013-04-18 18:18:29 +00:00
a362b41029 Fix grouping of garrisoned units. Patch by mimo. Fixes #1918.
This was SVN commit r13360.
2013-04-18 18:18:24 +00:00
b22320a85f Fix tests. Refs #1807.
This was SVN commit r13358.
2013-04-14 00:52:00 +00:00
d0a695f7fb Allow mutual allies to garrison in each others buildings. Patch by mimo. Fixes #1807.
This was SVN commit r13357.
2013-04-14 00:34:14 +00:00
7562c79e89 Change target for all orders on EntityRenamed. Patch by mimo. Fixes #1903.
This was SVN commit r13355.
2013-04-10 22:48:02 +00:00
95a10e7f42 Reduce duplicate GuiInterfaceCalls some more. Patch by sbte. Fixes #1878.
This was SVN commit r13354.
2013-04-10 21:05:46 +00:00
19ce9657bc This was SVN commit r13351. 2013-04-10 09:11:08 +00:00
3074b930cc Tech.
This was SVN commit r13350.
2013-04-08 08:27:30 +00:00
789991c5d2 New food gathering tech for village phase.
Adjusted some food gather rates.

Adjusted some tech costs.

This was SVN commit r13349.
2013-04-08 07:59:57 +00:00
5429052b06 Lots of normal maps and spec maps. Ongoing project.
Added camel death scream (lol) to camel units.

Added sheep sounds to sheep.

Changed over the Mauryan elephant unit actors.

This was SVN commit r13348.
2013-04-07 22:28:36 +00:00
555f06acbe Fix errors when the hero is garrisoned. Patch by alpha123. Refs #1802.
This was SVN commit r13346.
2013-04-06 19:32:07 +00:00
2af37c3590 Adds player color to rubble entities, thanks to ericb for the patch, fixes #1887
This was SVN commit r13344.
2013-04-05 02:52:01 +00:00
7f9b486a48 This was SVN commit r13341. 2013-04-03 23:28:29 +00:00
16de5c75ac Adds game speed option to match setup, adds in-game control for single player games, fixes #785.
Refactors some GUI utility functions.

This was SVN commit r13340.
2013-04-03 23:24:22 +00:00
62dc594a71 Hero button. Based on patch by Malcom and edits to that by alpha123. Fixes 1802.
This was SVN commit r13339.
2013-04-03 17:27:55 +00:00
f2da77ff72 "Oh myyyyy" -- George Takei. Lots of stuff:
- Town Phase cost increased to 1000 Food, 1000 Wood (from 500 of each).
This makes Village Phase longer and more interesting. Still need to
test.

- Lots of new normal maps and spec maps (for a bunch of desert terrains
and cretan date palms). This is an ongoing project.

- Fixed some spec maps for being too 'bright.'

- Changed the attack of melee spear units from a combo of pierce and
hack to just hack. Per discussion with Quantumstate. Needs testing.

- Changed the Median Oasis 1 scenario to include Mauryans and
Carthaginians.

This was SVN commit r13338.
2013-04-03 06:48:38 +00:00
f82adf3ef3 Don't call GetSimulationState too often. Patch by sbte. Fixes #1878.
This was SVN commit r13336.
2013-04-02 21:06:20 +00:00
3c693245bd Portraits for the Mauryan healer and Chanakya.
This was SVN commit r13335.
2013-04-02 17:06:15 +00:00
edea5d04e7 Portraits for Mauryan healer and Chanakya.
This was SVN commit r13334.
2013-04-02 17:05:51 +00:00
329b3e3d28 Adds notice of saved game issues to Aegis' description
This was SVN commit r13332.
2013-04-01 15:03:31 +00:00
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
3b5ab7ab51 Fixes #1884 . Should Fix #1883 .
This was SVN commit r13328.
2013-03-30 07:30:54 +00:00
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
475c722327 Fix serialization issues with Aegis.
This was SVN commit r13326.
2013-03-24 09:10:32 +00:00
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
0d069954b7 waterfall textures reduced 50%
This was SVN commit r13321.
2013-03-22 00:37:33 +00:00
3d94f3a5be Added 4 geology waterfalls variations.
Added water splash particle effect.

This was SVN commit r13320.
2013-03-22 00:24:46 +00:00
4560bb62b0 Updated contributor Paperkat merch ship texture
This was SVN commit r13319.
2013-03-19 09:58:06 +00:00
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
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
e031d71b78 Added chakra wheel to ashoka pillar 4 lions variation-
This was SVN commit r13316.
2013-03-18 01:46:44 +00:00
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
063fa52252 removes chandragupta normal texture line from his actor
This was SVN commit r13314.
2013-03-17 23:16:40 +00:00
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
cfbde115b8 Maur hero Ashoka skin tone change
This was SVN commit r13312.
2013-03-17 12:46:24 +00:00
e367cf0d7e maur barracks death variation semi-fix
This was SVN commit r13311.
2013-03-17 12:34:03 +00:00
6a1a1c16cb maur market stalls cloth small fix
This was SVN commit r13310.
2013-03-17 12:27:15 +00:00
49f52500de Mauryan ship icons
This was SVN commit r13309.
2013-03-17 11:53:09 +00:00
25c800e9c4 Chanakya hero template
This was SVN commit r13308.
2013-03-17 10:10:49 +00:00
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
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
9e46759ada Mauryan actor indent cleanup
This was SVN commit r13305.
2013-03-16 16:05:53 +00:00