1
0
forked from 0ad/0ad
Commit Graph

6860 Commits

Author SHA1 Message Date
1421b21f82 Added spec and normal mapping to Crannog.
This was SVN commit r13087.
2013-01-19 08:22:58 +00:00
369050bdcb Crannog settlement for the Britons
This was SVN commit r13086.
2013-01-17 23:47:00 +00:00
062c1aba6c Added playercolor to mauryan stables, decal changed.
This was SVN commit r13085.
2013-01-17 21:11:42 +00:00
c46d964afb metalworker tech icon
This was SVN commit r13084.
2013-01-17 20:50:30 +00:00
24ec6b8040 Added decal to Mauryan stables
This was SVN commit r13083.
2013-01-17 19:07:52 +00:00
36eacbfd06 Added Mauryan stables with AO map
This was SVN commit r13082.
2013-01-17 18:27:28 +00:00
46841bc963 New shield textures by Lion.
This was SVN commit r13081.
2013-01-16 19:07:15 +00:00
defe8f8b98 Military Engineers, Artillery Instructors, and Metalworker techs
This was SVN commit r13080.
2013-01-16 01:05:26 +00:00
31fe58db82 Stop formation members from sliding. Fixes #1823. Thanks to zoot for the test case!
This was SVN commit r13079.
2013-01-15 18:53:19 +00:00
96d389dee2 Mauryan mill model
This was SVN commit r13078.
2013-01-15 00:39:59 +00:00
25de88a68b Take distance between attacker and target into account when fleeing. Patch by mimo. Fixes #1723.
This was SVN commit r13077.
2013-01-15 00:21:25 +00:00
21a70c0399 Bloom shader rewrite.
This was SVN commit r13076.
2013-01-14 16:57:09 +00:00
9cd647a2a0 Fixed Mauryan temple selection ring size and obstruction
This was SVN commit r13075.
2013-01-14 12:41:27 +00:00
63fa3d5ea1 Mauryan temple with AO added. Fixed mauryan fortress garrison flag
This was SVN commit r13074.
2013-01-13 23:55:52 +00:00
56db7fa945 Don't use the carrying animation when a unit is ungarrisoned and it dropped of the resources while garrisoning. Patch by zoot. Fixes #1759.
This was SVN commit r13073.
2013-01-13 20:55:55 +00:00
02ac06e293 Allow ungarrisoning units even if they cannot be built due to tech requirements. Patch by mimo. Fixes #1808, #1672.
Fix batch training tooltip if we have more units than the entity limit
allows for.

This was SVN commit r13072.
2013-01-13 19:39:11 +00:00
aec8d6ff96 Stop foundation health from jumping. Fixes #1809.
This was SVN commit r13071.
2013-01-13 17:37:26 +00:00
637fb6d258 Fixes a bug in player assignment and prevents starting games with no assigned human players, fixes #1054
This was SVN commit r13070.
2013-01-12 05:39:04 +00:00
a074eb814a Adds blinking cursors with configurable rate, based on patch by kingadami. Fixes #876
This was SVN commit r13068.
2013-01-12 01:20:01 +00:00
1f8d0cacdc Adds manual to in-game menu, based on patches by _vincent and grillaz. Fixes #1338
This was SVN commit r13067.
2013-01-12 00:09:42 +00:00
bec33070ea Change attack animation naming to allow for multiple attacks. Patch/script by dvagennip. Fixes #1686.
This was SVN commit r13060.
2013-01-09 14:39:25 +00:00
fd274a6e70 Add template helper function. Fix some errors. Refs #1692.
This was SVN commit r13059.
2013-01-09 13:25:11 +00:00
ca41c22b71 New Mauryan house models
This was SVN commit r13058.
2013-01-09 00:10:45 +00:00
d4572e555e Fixes tests
This was SVN commit r13057.
2013-01-08 15:45:39 +00:00
5caddcdd20 Make technology code cleaner with helper functions. Refs #1692.
This was SVN commit r13056.
2013-01-08 00:00:21 +00:00
d29f6c5c49 Fix dicrepancy in the settings dialog when using hotkeys. Patch by kingadami. Fixes #1817.
This was SVN commit r13054.
2013-01-07 15:19:10 +00:00
8a2baec240 Fixes multiline text alignment, fixes #723. Patch by kingadami.
Adds text alignment to tooltips, fixes text alignment for dropdowns.

This was SVN commit r13051.
2013-01-06 01:46:44 +00:00
50fcbc1fc5 Fixes some alignment issues in the match setup UI
This was SVN commit r13050.
2013-01-06 00:34:21 +00:00
1549e1c91c Fixed Mauryan Civ Centre footprint.
This was SVN commit r13049.
2013-01-05 22:33:13 +00:00
179df7e173 Elephant archer tweaks.
This was SVN commit r13048.
2013-01-05 22:05:28 +00:00
0cd3f74a62 New Mauryan shields by Lion.Kanzen.
New Carthage War Elephant texture.

Work in progress Mauryan elephant archer.

This was SVN commit r13047.
2013-01-05 21:38:27 +00:00
0ef172db74 New Mauryan civic centre with ao added
This was SVN commit r13046.
2013-01-05 21:15:28 +00:00
a2aa4b77fa Change watermark hotkey to Alt-K to prevent accidental presses.
This was SVN commit r13045.
2013-01-04 20:12:32 +00:00
58fa0c7c58 Fix errors when using autostart to launch a game. Use setters instead of accessing cmpPlayers properties directly.
Tidy the formatting in Player.js

This was SVN commit r13044.
2013-01-04 19:50:54 +00:00
8e382d98a2 Fixes cost spacing in wall construction tooltips, refs #1675
This was SVN commit r13042.
2013-01-04 00:52:21 +00:00
be63de5a7c Add fps counter to game setup. Fixes #1264. Patch by kingadami.
This was SVN commit r13041.
2013-01-03 23:01:54 +00:00
0d204037b6 Added right click selection removal. Fixes #1028. Thanks to kingadami and GerbilOfDoom for the patch.
This was SVN commit r13040.
2013-01-03 22:53:46 +00:00
8ef7e45a0a Mauryan barracks re-centered and ao maps fixed
This was SVN commit r13038.
2013-01-03 22:11:14 +00:00
276f0a41a0 New Year's clean-up.
Throw a warning if a invalid (not present) AI is specified in a map.
Replace the last occurences of jubot with qbot.
Exclude the common siege templates from the Units Demo map.
Fix an error with flying units.
Replace CFG_GET_SYS_VAL with CFG_GET_USER_VAL and rename it to
CFG_GET_VAL to reflect its behaviour better.
Fix linker error with clang 3.2. Refs 1588.
Remove some useless includes.

This was SVN commit r13031.
2013-01-01 18:33:53 +00:00
4764af695a Update to Mauryan structure texture b
This was SVN commit r13030.
2012-12-30 15:52:41 +00:00
danschub
cbfffbe32f Fireworks!
This was SVN commit r13029.
2012-12-29 22:38:56 +00:00
a223b986e4 New corral and sheep icons
This was SVN commit r13028.
2012-12-29 15:26:40 +00:00
4c5ff9579b This was SVN commit r13027. 2012-12-27 23:39:03 +00:00
ab9463e13f Miscellaneous Mauryan structure based on Eggbird's old Civ Centre.
This was SVN commit r13026.
2012-12-27 23:27:41 +00:00
478de5b001 elephant stables icon update
This was SVN commit r13025.
2012-12-27 23:02:29 +00:00
02d95b99ff Adjusting Mauryan barracks footprint and obstruction.
This was SVN commit r13024.
2012-12-27 21:38:52 +00:00
eee68581b8 new fortress icon
This was SVN commit r13023.
2012-12-26 23:10:23 +00:00
adc4012944 Save last multiplayer server. Based on patch by Aurium. Fixes #1778.
Fix bug in ConfigDB: Creating a value could result in changing a value
in a different namespace.

This was SVN commit r13021.
2012-12-25 22:49:18 +00:00
b1a606eb08 Increased Mauryan barracks size
This was SVN commit r13020.
2012-12-24 11:10:27 +00:00
0df7a67ad1 Reordered unit roster for Mauryan barracks.
This was SVN commit r13019.
2012-12-24 01:34:46 +00:00
a685541d52 Portraits for some Mauryan unit. Celtic Fanatic is now a spearman (more historically accurate). Fixed some other things.
This was SVN commit r13017.
2012-12-24 00:40:49 +00:00
b33ff333dd Added two Mauryan barracks variations with AO
Fixed garrison flag type in mauryan defense tower

This was SVN commit r13016.
2012-12-24 00:23:10 +00:00
f4da84f15a Some Mauryan unit textures and spec maps.
This was SVN commit r13015.
2012-12-23 22:34:33 +00:00
18b532a195 Remove current targets when changing ownership. Fixes #1794.
This was SVN commit r13014.
2012-12-23 20:03:00 +00:00
9fa7273c2c Backport from API v3 to API v2 that should fix a bug happening with sheeps. fixes #1754
This was SVN commit r13012.
2012-12-23 10:31:39 +00:00
74cce87692 Nerfed heroes and Champion Archer.
This was SVN commit r13011.
2012-12-22 23:39:18 +00:00
00c1766907 Adds and updates some hotkeys in the game manual
This was SVN commit r13009.
2012-12-22 22:00:27 +00:00
0322f2ea59 Hannibal is a bit slower.
This was SVN commit r13008.
2012-12-22 21:10:37 +00:00
f19dbcdc7b Increase cavalry health (70 for melee, 30 for ranged) and pierce armour (3 for melee, 1 for ranged). Also increase melee cavalry speed by 1. Thanks to alpha123 for his stats changing script.
Fix some minor validation errors in some other templates

This was SVN commit r13006.
2012-12-22 01:28:10 +00:00
b27d4c26b0 Work around the sheep bug on Acropolis 7. Refs #1754, #1793.
This was SVN commit r13005.
2012-12-21 19:11:31 +00:00
9c34b1ffed Major random map bugfixes:
Fixes the chicken problem
There are no more unreachable trees around the map (hopefully)
Fixed the bug that caused edges of the map ruin the layout of painters
(One of the best examples to look is archipelago, before and after this
revision).
Fixed those out of memory errors caused by pathplacer (Mostly noticeable
in alpine valley and corinthian isthmus)
And some other minor tweaks.
Fixes #1577

This was SVN commit r13004.
2012-12-21 09:48:36 +00:00
9a2dfa3fc0 Read default multiplayer server name/IP address from config. Patch by Aurium. Refs #1778.
This was SVN commit r13003.
2012-12-20 21:44:56 +00:00
6ab0ab586a Gates added for Iberian player on Acropolis 7.
This was SVN commit r13002.
2012-12-20 19:31:26 +00:00
573d47d9a9 Disable diplomacy settings when player is defeated. Fixes #1764.
This was SVN commit r13000.
2012-12-19 20:19:54 +00:00
4d6d514029 New icons for dock, mill, stoa, theatron, and monument structures.
This was SVN commit r12999.
2012-12-19 19:28:51 +00:00
9665a17f7a Removes "root" attribute from the Mauryan elephant stables.
This was SVN commit r12996.
2012-12-18 18:43:51 +00:00
188a60315b Update release name.
This was SVN commit r12995.
2012-12-14 19:56:58 +00:00
1c97d819d8 Updated some tips images.
This was SVN commit r12994.
2012-12-14 19:38:20 +00:00
0da37326d6 Fixes bug that caused training icons for unavailable units to not be greyed out
This was SVN commit r12993.
2012-12-14 19:22:08 +00:00
9ca9a88bfa Beefed up hero health since you can only have one alive at a time.
This was SVN commit r12992.
2012-12-14 19:02:45 +00:00
29ac57409e Adds warning about incorrect use of time warp mode, refs #1409
This was SVN commit r12990.
2012-12-14 13:41:25 +00:00
dd69fac774 Added generic stone rubbles for sizes 4x2, 4x4, 4x6, 5x5 and 6x4 with AO and their respective destruct decals.
Modified several templates to spawn its correct rubble on death.

This was SVN commit r12985.
2012-12-12 19:06:58 +00:00
683ce0a176 Fixing sheep on this map.
This was SVN commit r12984.
2012-12-12 19:06:26 +00:00
8eb7ac7094 Adjusting sheep.
This was SVN commit r12983.
2012-12-12 18:56:16 +00:00
39910affd0 Changes various urls to point to the new website and fixes some broken forum urls.
This was SVN commit r12980.
2012-12-11 23:04:03 +00:00
095566c126 Serialize the armour component so that the temporary invulnerability from promotion is synchronised.
This was SVN commit r12978.
2012-12-11 22:01:10 +00:00
ea36dc5b3d Elephant sounds created by EvanBogunia
This was SVN commit r12977.
2012-12-11 00:44:41 +00:00
a3ca29138e Check for all cases. Really fix #1753.
This was SVN commit r12976.
2012-12-10 23:55:16 +00:00
6fd6295644 Check whether the attack/gather target is visible and if not abort. Fixes #1662 and #1753.
This was SVN commit r12975.
2012-12-10 23:35:09 +00:00
03e10011ad Balance tweaks to Ram WalkSpeed, House cost, Herd Buildtime, Melee Cavalry, Hannibal
This was SVN commit r12974.
2012-12-10 23:17:29 +00:00
d616a86c7a Fixes unit promotions triggering a selection sound, based on patch by zoot. Fixes #1713
This was SVN commit r12973.
2012-12-10 21:35:52 +00:00
47275d9416 Updated some terrains. Adds a 2v2 Median Oasis 5.
This was SVN commit r12972.
2012-12-10 02:30:44 +00:00
2779512c6e Removes user feedback message from main menu. Adds "Report a Bug" button instead, with link to ReportingErrors.
Updates URLs to new website play0ad.com

This was SVN commit r12971.
2012-12-10 01:29:02 +00:00
1ed2d70e2d Added normal and spec maps for these 3 terrains.
This was SVN commit r12970.
2012-12-09 23:36:05 +00:00
1cd2c48e0b Fix entity limits error on ownership change/destruction.
This was SVN commit r12969.
2012-12-09 21:40:51 +00:00
d7f418c82c Updated pers stables portrait.
This was SVN commit r12968.
2012-12-09 21:20:06 +00:00
e43d1f35e4 Some map updates.
This was SVN commit r12967.
2012-12-09 21:16:41 +00:00
2a3f221d11 Check if cmpFormation is set (which should be as we're a formation member)
This was SVN commit r12966.
2012-12-09 17:52:44 +00:00
53397d1b9d Show hidden AIs when they are used by a map. Fixes #1748.
This was SVN commit r12965.
2012-12-09 14:40:43 +00:00
b3d3d3f5b9 Some texture work on Mediterranean Cove map
This was SVN commit r12964.
2012-12-08 23:43:56 +00:00
3d72291d19 Update to user interface background textures
This was SVN commit r12963.
2012-12-08 20:32:57 +00:00
032692e14e Tweaked chariot texture.
This was SVN commit r12962.
2012-12-08 20:21:32 +00:00
b2bc5268a7 Mauryan chariot tweaks.
This was SVN commit r12961.
2012-12-08 20:04:57 +00:00
2e37bf10bc Fixes #1700 (Increasing max-health by tech)
This was SVN commit r12960.
2012-12-08 19:17:48 +00:00
8cbb7bb674 Maur_champion chariot and hero chariot with animations added
This was SVN commit r12959.
2012-12-08 18:26:08 +00:00
de4adca0f0 Heroes only trainable in City Phase.
This was SVN commit r12958.
2012-12-08 18:21:11 +00:00
24b6e690b2 Adds "Long Walls" tech for Athenians.
Adds "Village Phase" requirement to Palisades templates.

This was SVN commit r12957.
2012-12-08 08:53:34 +00:00
abdfcadbbf This was SVN commit r12956. 2012-12-07 19:30:31 +00:00
b20e727ca5 This was SVN commit r12955. 2012-12-07 19:05:30 +00:00
d1e22a09d1 Theatron description isn't so chauvinistic in the Hellenic civ descriptions.
Changed Athenian her Xenophon (a Laconophile) to Iphicrates (a patriot)
after discussion on the forums.

This was SVN commit r12954.
2012-12-07 19:00:34 +00:00
95f7858a24 Delian League bonus given to the Athenians.
This was SVN commit r12953.
2012-12-07 18:39:23 +00:00
875aa1235b Civ history changes by Jeru.
This was SVN commit r12952.
2012-12-07 17:26:36 +00:00
f08eaea533 This was SVN commit r12950. 2012-12-06 22:35:04 +00:00
8c931bfa52 Add animation override to VisualActor to fix carrying resource animations. Patch by Deiz. Fixes #1260, #1741.
This was SVN commit r12949.
2012-12-06 19:46:13 +00:00
11d0b5ffdb New portrait for anusyia.
This was SVN commit r12947.
2012-12-06 10:10:29 +00:00
f528e58983 Macedonian library scroll icon
This was SVN commit r12944.
2012-12-04 23:10:36 +00:00
555e54f088 Workaround for game settings window being hidden behind session UI
This was SVN commit r12943.
2012-12-04 21:41:30 +00:00
35c8df02c6 Adds support for Pack/Time tech modification
This was SVN commit r12942.
2012-12-04 21:13:27 +00:00
f705a2910d Fixing a bug in wall_builder by FeXoR:
This was SVN commit r12939.
2012-12-04 13:07:49 +00:00
610623f010 Fixes small bug introduced by aa68198747.
Clarifies new serialization test options in readme.txt.

This was SVN commit r12938.
2012-12-04 01:48:05 +00:00
aa68198747 Factors out common properties from siege templates, refs #1718. Simplifies pack-related tooltips.
This was SVN commit r12937.
2012-12-04 00:28:28 +00:00
b4b1f521b5 Fixes incorrect siege templates
This was SVN commit r12936.
2012-12-03 22:47:10 +00:00
c02fca79c6 Adds garrison auto-packing for siege units, refs #1718
This was SVN commit r12935.
2012-12-03 22:00:19 +00:00
6562cbea7e ... Refs #1746.
This was SVN commit r12934.
2012-12-03 21:57:28 +00:00
b06452bf0f Try to fix some warnings. Refs 1746.
This was SVN commit r12933.
2012-12-03 21:53:37 +00:00
53ae87de93 Mauryan elephant stables ui icon
This was SVN commit r12932.
2012-12-03 20:56:06 +00:00
ef5cde9f97 Add unit training hotkeys to in game manual.
This was SVN commit r12931.
2012-12-03 20:16:47 +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