1
0
forked from 0ad/0ad
Commit Graph

4341 Commits

Author SHA1 Message Date
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
fc3b5637c8 Ambient occlusion for Mauryan houses
This was SVN commit r13304.
2013-03-16 15:53:20 +00:00
03c3b1daa3 Fixes a few changes in my previous commit. Makes "Medium" the default difficulty setting.
This was SVN commit r13303.
2013-03-16 12:55:03 +00:00
77999f6b42 Ashoka pillar variations and footprint fix
This was SVN commit r13302.
2013-03-16 11:18:33 +00:00
e78da0b3e4 Mauryan mill ambient occlusion
This was SVN commit r13301.
2013-03-16 11:00:24 +00:00
5ba7153541 Placeholder Mauryan merchant ship
This was SVN commit r13300.
2013-03-16 10:30:29 +00:00
b0f1afa994 Change Punjab 1 water settings.
Fix a little mess-up on my last commit.

This was SVN commit r13299.
2013-03-16 10:16:41 +00:00
d709fe50ed Clean-up of Aegis scripts. Most deprecated functions have been removed, some comments updated. Also makes resource maps 8-bit to save a little memory.
Fix the placement of the "civ info" button to avoid overlapping on
1024*768.

This was SVN commit r13298.
2013-03-16 09:59:43 +00:00
d70db48173 Mauryan ship footprints
This was SVN commit r13297.
2013-03-16 09:56:22 +00:00
0fc8dba671 Fixed mauryan market stall color.
This was SVN commit r13296.
2013-03-16 01:06:51 +00:00
fd74292f2b Added specular map for Chanakya hero.
Fixed defense tower shields when destroyed.
Added Chandragupta texture with spec.
Fixed wall tower projectile and garrisoned prop-points.

This was SVN commit r13295.
2013-03-16 00:32:04 +00:00
3958c03dbc Changes default scenarios to Punjab 1
This was SVN commit r13294.
2013-03-15 23:06:16 +00:00
4bcbd14f71 Resets most land scenarios to default AIs, so they'll use Aegis Bot.
Removes AIs from some demo maps.

This was SVN commit r13293.
2013-03-15 23:02:29 +00:00
4769481796 Makes sure to remove the entity from the Gatherer array of the resource it was gathering from when dying. Fixes #1867 (if all goes well).
This was SVN commit r13290.
2013-03-15 18:12:17 +00:00
5af7544918 Bug fixes and small improvements to Aegis. Change the "C" button into a "Settings" button. Fix to -autostart-aidiff.
This was SVN commit r13289.
2013-03-15 12:35:16 +00:00
066cfa5893 Improve workers' reactions when they find out that the resource they gathered from is full. Refs #1387
This was SVN commit r13288.
2013-03-15 10:26:46 +00:00
d40a66f310 Fix particle to correctly display in the FOW, and to adapt slightly to sunColor settings (both on ARB and GLSL).
This was SVN commit r13287.
2013-03-15 10:22:24 +00:00
26cc813cf5 Update for release trailer recording
This was SVN commit r13286.
2013-03-14 23:24:53 +00:00
afe87f720a Mauryan Corral AO
This was SVN commit r13285.
2013-03-14 23:13:31 +00:00
c23181a1e0 Make towers weaker by reducing range fro 80 to 70 and decreasing the arrow tech multiplier to 40% more arrows from 100%.
This was SVN commit r13284.
2013-03-14 22:57:59 +00:00
9dac1bf89b Fixed inverted green channel in elephants normal maps (fixed normals)
This was SVN commit r13282.
2013-03-14 00:48:31 +00:00
1cf1707ce7 Added mauryan hero chanakya and mauryan elephants static meshes.
This was SVN commit r13281.
2013-03-14 00:05:46 +00:00
163fc7cbfd Mauryan farmstead AO stuff
This was SVN commit r13280.
2013-03-13 23:58:38 +00:00
25293ce0cc Many small bugfixes for AIs. Adds support for difficulty (and along with that, some behind-the-door architecture for a handicap system).
Adds -autostart-aidiff to set the difficulty from the command line from
testing.

This was SVN commit r13278.
2013-03-13 20:44:48 +00:00
8ac9f1d8ea Limit the number of gatherer per resource, as described in #1387. Based on work by crezax. Fixes #1387
This was SVN commit r13277.
2013-03-13 20:10:46 +00:00
844f71681a Add notification for missing resources when tributing. Patch by alpha123. Fixes #1839.
This was SVN commit r13276.
2013-03-13 18:37:06 +00:00
60a91cb032 fixes death variation for mauryan walls, fortress, defense tower, and temple.
This was SVN commit r13272.
2013-03-12 23:06:20 +00:00
2bcb03f049 Fix messages.js for "/team" messages when no teams were set.
Change to AI logic, makes Aegis more efficient with a better attack,
eco, and defense. Bugfixes.

This was SVN commit r13271.
2013-03-12 21:58:25 +00:00
e37012a9fd Added Omri's latest track to the Hellenic civs
This was SVN commit r13270.
2013-03-12 21:55:33 +00:00
21f4a94242 New Mauryan emblem
This was SVN commit r13269.
2013-03-12 21:48:42 +00:00
3f6702075b Fix my previous commit where if you had enough units buildings would never construct (rounding issue).
This was SVN commit r13268.
2013-03-12 10:07:53 +00:00
791a901df9 Fix a bug with the foundation changes that caused buildings to be built too fast with multiple units.
This was SVN commit r13267.
2013-03-12 08:22:45 +00:00
9b1b8cc8fd A few bugfixes, slight change in logic for smoother play. Makes Aegis gather with cavalry. Allows it to send chat messages to warn about attacks.
This was SVN commit r13266.
2013-03-11 19:58:29 +00:00
ca40764dc6 Fixes bug in map reader that caused actor variations to default to seed 0. Fixes #1861.
Fixes maps that were affected by this bug.

This was SVN commit r13264.
2013-03-11 16:42:41 +00:00
dab9175f30 Foundations now require 100% health for construction to be completed. Progress now linked with health. Patch by Malcom. Fixes #1853
This was SVN commit r13263.
2013-03-11 15:47:16 +00:00