mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-21 09:24:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: mirrors/0ad:a14
Branches Tags
mirrors/0ad:main
mirrors/0ad:v0.28.0 mirrors/0ad:v0.28.0-rc4 mirrors/0ad:v0.28.0-rc3 mirrors/0ad:v0.28.0-rc2 mirrors/0ad:v0.28.0-rc1 mirrors/0ad:v0.28.0-rc0 mirrors/0ad:a27.1-rc3 mirrors/0ad:a27.1 mirrors/0ad:a27.1-rc2 mirrors/0ad:a27.1-rc1 mirrors/0ad:a27 mirrors/0ad:a26 mirrors/0ad:a25b mirrors/0ad:a25 mirrors/0ad:a24 mirrors/0ad:a23b mirrors/0ad:a23 mirrors/0ad:a22 mirrors/0ad:a21 mirrors/0ad:a20 mirrors/0ad:a19 mirrors/0ad:a18 mirrors/0ad:a17 mirrors/0ad:a16 mirrors/0ad:a15 mirrors/0ad:a14 mirrors/0ad:a13 mirrors/0ad:a12 mirrors/0ad:a11 mirrors/0ad:a10 mirrors/0ad:a09 mirrors/0ad:a08 mirrors/0ad:a07 mirrors/0ad:a06 mirrors/0ad:a05 mirrors/0ad:a04 mirrors/0ad:a03 mirrors/0ad:a02 mirrors/0ad:a01
..
compare: mirrors/0ad:a16
Branches Tags
mirrors/0ad:main
mirrors/0ad:v0.28.0 mirrors/0ad:v0.28.0-rc4 mirrors/0ad:v0.28.0-rc3 mirrors/0ad:v0.28.0-rc2 mirrors/0ad:v0.28.0-rc1 mirrors/0ad:v0.28.0-rc0 mirrors/0ad:a27.1-rc3 mirrors/0ad:a27.1 mirrors/0ad:a27.1-rc2 mirrors/0ad:a27.1-rc1 mirrors/0ad:a27 mirrors/0ad:a26 mirrors/0ad:a25b mirrors/0ad:a25 mirrors/0ad:a24 mirrors/0ad:a23b mirrors/0ad:a23 mirrors/0ad:a22 mirrors/0ad:a21 mirrors/0ad:a20 mirrors/0ad:a19 mirrors/0ad:a18 mirrors/0ad:a17 mirrors/0ad:a16 mirrors/0ad:a15 mirrors/0ad:a14 mirrors/0ad:a13 mirrors/0ad:a12 mirrors/0ad:a11 mirrors/0ad:a10 mirrors/0ad:a09 mirrors/0ad:a08 mirrors/0ad:a07 mirrors/0ad:a06 mirrors/0ad:a05 mirrors/0ad:a04 mirrors/0ad:a03 mirrors/0ad:a02 mirrors/0ad:a01

1241 Commits
a14 .. a16

Author SHA1 Message Date
Yves 96c806841d Fixes the packaging script for some changes related to l10n and SpiderMonkey 
This was SVN commit r15148.
 2014-05-12 01:36:32 +00:00
Ykkrosh 3ecbb7667b Restrict set of translations included in releases 
This was SVN commit r15147.
 2014-05-11 17:43:36 +00:00
sanderd17 0a880413fe Fix the out-of-world error we saw in the team game yesterday 
This was SVN commit r15145.
 2014-05-11 09:36:12 +00:00
JoshuaJB d70abd548a Move yellow modern buttons to their own style to correct naming issues (eg. ModernButtonRed was yellow). New name is ModernButtonYellow. Also switched the default button color back to red due to complaints by team members on IRC. 
This was SVN commit r15144.
 2014-05-11 03:25:34 +00:00
Mythos_Ruler 056d740e7f Fixes #2542 
This was SVN commit r15143.
 2014-05-10 23:40:53 +00:00
mimo fb2cda5aba prevent weird behaviour when the ship in which we want to garrison is selected with the units to garrison 
This was SVN commit r15142.
 2014-05-10 22:21:24 +00:00
Mythos_Ruler b2ec4e0e2a Portrait for Roman bireme. 
Modern button from red to yellow.

This was SVN commit r15141.
 2014-05-10 21:33:46 +00:00
Mythos_Ruler f287a7da12 Elephants can transport aboard Medium and Heavy warships. 
This was SVN commit r15140.
 2014-05-10 16:15:26 +00:00
sanderd17 da8843127c Fix displaying wrong text when no tooltip was defined, as reported by Kanetaka. Also cleans up the code to make it shorter. 
This was SVN commit r15139.
 2014-05-10 13:37:38 +00:00
sanderd17 f15160412a Enlarge the ideographic ranges in the word boundaries, fixes Japanese rendering a bit 
This was SVN commit r15138.
 2014-05-09 12:13:42 +00:00
Mythos_Ruler e79ad6b30b Switch Military Colonies to use the mercenary camp actor. 
Update a few tech names (shouldn't affect translations).

This was SVN commit r15137.
 2014-05-09 00:18:23 +00:00
mimo a5708873db set the right civ for mace dock 
This was SVN commit r15136.
 2014-05-08 23:15:01 +00:00
sanderd17 2c1917176a Use untranslated playerState.civ, if the civName 'Gaia' happened to be translated, this resulted in an undefined texture, which was the case in Chinese, and reported by Gameboy. 
This was SVN commit r15135.
 2014-05-08 14:07:48 +00:00
sanderd17 8cec641156 Replace strictness test by a different one, as the old test wasn't considered non-strict anymore. 
This was SVN commit r15134.
 2014-05-08 13:26:21 +00:00
sanderd17 955e6e788a Fix counting foundations as concuestCritical. 
This was SVN commit r15133.
 2014-05-08 11:27:09 +00:00
mimo 8e39a2297d fix delete selection broken (again) in bb65358dac. Code is changed to prevent this to happen again 
This was SVN commit r15131.
 2014-05-08 08:21:20 +00:00
scythetwirler a620cf8e17 Fixes an issue with unassigned players being functionally ready but not having the green marker 
This was SVN commit r15130.
 2014-05-08 04:47:57 +00:00
JoshuaJB bb65358dac After discussion with scythetwirler with input from Philip and Mythos, popup dialogs (like for delete, resign, and exit) should have no on the right as we want the user to click no in most of those cases. It's the 'recommended' action. In the case of save/cancel or continue/back, save and continue should always be on the right as that's the 'recommended' action. With some review, this placement seems consistant across operating systems. 
This was SVN commit r15129.
 2014-05-08 03:43:03 +00:00
historic_bruno c37a8cafc3 Fixes a few building warnings and convention issues from 19ca1e3ebf 
This was SVN commit r15128.
 2014-05-07 23:33:21 +00:00
sanderd17 db0376fdc2 Temporarily disable the Spidermonkey warnings for release 
This was SVN commit r15127.
 2014-05-07 19:42:12 +00:00
Gallaecio 83b6175358 Added a script to check translations for URLs that are not in the original strings. 
This was SVN commit r15126.
 2014-05-07 19:02:17 +00:00
sanderd17 cbeb40a14b Fix foundations changing entity limits. Fixes #2536 
This was SVN commit r15123.
 2014-05-07 08:24:31 +00:00
sanderd17 19ca1e3ebf Fix locale verification to also allow ICU locales without data, but still don't allow bogus locales. Patch by Yves. Fixes #2533. 
This was SVN commit r15122.
 2014-05-07 08:14:57 +00:00
mimo c5b184744c stop failed attack in aegis, see #2486 
This was SVN commit r15121.
 2014-05-07 07:03:21 +00:00
JoshuaJB 27382a7d78 Swap OK and Cancel positions on the AI config GUI page. (Also cleanup the XML a bit) 
This was SVN commit r15120.
 2014-05-06 19:02:34 +00:00
sanderd17 9fadc2709c Clean up the gate transformation tooltips as it caused problems for mods. 
This was SVN commit r15119.
 2014-05-06 18:52:05 +00:00
Mythos_Ruler 34a9b8c260 New song by Omri to the Celtic civs. 
This was SVN commit r15118.
 2014-05-06 12:28:25 +00:00
OmriLahav 93cfdce090 This was SVN commit r15116. 2014-05-06 08:19:45 +00:00
mimo f181a89c34 fixes wrong test 
This was SVN commit r15115.
 2014-05-05 19:22:54 +00:00
sanderd17 3a008ba532 Mask lobby password so it doesn't appear in any logs 
This was SVN commit r15113.
 2014-05-05 15:41:17 +00:00
historic_bruno bb43a71460 Updates checkrefs.pl to support skirmish maps 
This was SVN commit r15112.
 2014-05-05 01:09:53 +00:00
mimo 48bb533895 temporarily disable trader formation, see #2528 
This was SVN commit r15111.
 2014-05-04 21:38:31 +00:00
sanderd17 06685a3f9b Fix small issue 
This was SVN commit r15110.
 2014-05-04 20:22:31 +00:00
historic_bruno 44b40a85bb Fixes some broken actor references 
This was SVN commit r15109.
 2014-05-04 08:08:48 +00:00
historic_bruno ba5e6d9168 Removes duplicate FleeDistance property from template_unit_fauna_decorative (found by checkrefs.pl) 
This was SVN commit r15108.
 2014-05-04 05:52:51 +00:00
historic_bruno d2ecbecf32 Fixes tex_codec typo that broke BMP writing and big screenshots, fixes #2515 
This was SVN commit r15107.
 2014-05-04 05:49:31 +00:00
scythetwirler 9b136a45fc Fixes a couple dialog buttons 
This was SVN commit r15106.
 2014-05-04 02:44:14 +00:00
sanderd17 2eb2845c29 Extra check on the existance of a replacement, be more forgiving in the skirmish replacer. 
This was SVN commit r15104.
 2014-05-03 17:53:37 +00:00
sanderd17 dd13e01ac6 Extra check on existance of template, to be more forgiving if some template in the productionqueue doesn't exist. 
This was SVN commit r15103.
 2014-05-03 17:29:22 +00:00
Enrique e70eccf0ca Added Stan's contributor ptol_corral details in Lordgood's model 
Added Stan's Cleopatra texture

This was SVN commit r15102.
 2014-05-03 13:05:34 +00:00
sanderd17 575cdd7979 A spearman isn't ranged 
This was SVN commit r15101.
 2014-05-03 13:04:08 +00:00
sanderd17 b09925b27e switch the game setup confirmation buttons and move the welcome screen buttons 
This was SVN commit r15100.
 2014-05-03 09:21:05 +00:00
sanderd17 542bc1b273 Further fix switched buttons 
This was SVN commit r15099.
 2014-05-03 09:07:31 +00:00
Yves c1d5f6882c Also switch the button name to disable the correct one. 
4e0a588456 only switched the label and the action.

This was SVN commit r15098.
 2014-05-03 08:59:31 +00:00
sanderd17 12ec51783d Fix in-game manual display 
This was SVN commit r15097.
 2014-05-03 08:53:06 +00:00
sanderd17 4e0a588456 Switch more buttons, see 911be4e860 
This was SVN commit r15096.
 2014-05-03 08:45:19 +00:00
scythetwirler f066549523 Makes the other players default to unassigned instead of Default AI in a sandbox map. 
This was SVN commit r15095.
 2014-05-03 04:00:14 +00:00
Yves 122dae799b Don't allow returning an invalid locale from the advanced language menu. 
This was SVN commit r15094.
 2014-05-02 21:14:28 +00:00
sanderd17 99486ed7ab Add camera to the second player, somehow avoids strange errors. 
This was SVN commit r15093.
 2014-05-02 20:08:48 +00:00
mimo b8e9bae75e fixes Petra trying to keep going with a canceled attack 
This was SVN commit r15092.
 2014-05-02 11:03:24 +00:00
sanderd17 15f56cd984 Fix armour and attack display of heroes 
This was SVN commit r15091.
 2014-05-02 10:32:21 +00:00
sanderd17 ace3269768 Fix problem with sprintf errors being thrown when the AI places structures on the wrong places, make the code more uniform. Fixes #2485 
This was SVN commit r15090.
 2014-05-02 10:09:53 +00:00
sanderd17 a36a0bbd87 Improve my previous fix by throwing error objects instead of strings 
This was SVN commit r15089.
 2014-05-02 07:34:05 +00:00
sanderd17 aaf92409c9 Fix sprintf error reporting by printing the stack trace, and not trying to translate the calls 
This was SVN commit r15088.
 2014-05-02 07:27:44 +00:00
mimo 5658bb391b fix delete selection no more working after #15074 
This was SVN commit r15087.
 2014-05-01 21:06:43 +00:00
Yves 210374d86d Fixes Aegis not training additional units when no starting units are around. 
Patch by Teiresias.

Fixes #2460

This was SVN commit r15086.
 2014-05-01 13:13:38 +00:00
sanderd17 b9af0ac0e4 Enlarge various elements of the lobby login page to fit other languages. 
This was SVN commit r15085.
 2014-05-01 12:59:50 +00:00
sanderd17 a64456e6d8 Fix small space issue in the lobby (still some work to do there) 
This was SVN commit r15084.
 2014-05-01 11:38:53 +00:00
Gallaecio 47fc05d696 String freeze? Who said that? 
Fix typo: avalible → available.

This was SVN commit r15082.
 2014-05-01 01:22:59 +00:00
Gallaecio d51f2a0c35 Version bump and regeneration of translation templates accordingly. 
This was SVN commit r15081.
 2014-05-01 00:44:47 +00:00
leper c7b0261860 Fix the numbering in the Terms of Use for the lobby. Reverts 813db55b08. 
This was SVN commit r15079.
 2014-04-30 23:24:24 +00:00
leper 62f5476dec Add support for adding translation context to XML elements. Patch by Gallaecio. 
Add translation context to some lobby headers.

This was SVN commit r15078.
 2014-04-30 22:33:08 +00:00
sanderd17 057fa79bdb Revert db6c3f86f2. Changing something like that right before release is dangerous. 
This was SVN commit r15077.
 2014-04-30 17:53:51 +00:00
JoshuaJB 11865a8865 Revert a hack that snuck into an earlier commit of mine. 
This was SVN commit r15076.
 2014-04-30 17:22:38 +00:00
JoshuaJB db6c3f86f2 Missing file 
This was SVN commit r15075.
 2014-04-30 06:29:42 +00:00
JoshuaJB 911be4e860 The convention is confirm button on right, decline button on left (updates some in-game dialogs). Also enables GLSL. 
This was SVN commit r15074.
 2014-04-30 06:28:57 +00:00
JoshuaJB 90581f366c This was SVN commit r15073. 2014-04-30 05:36:50 +00:00
JoshuaJB e7b4c8b92a Make game automatically resume after closing the options menu. Refs #2507 
This was SVN commit r15072.
 2014-04-30 05:31:44 +00:00
JoshuaJB a88f1222c0 Update AI descriptions, closes #2500. Also correct some capitalization and developer overlay transparency for #2507. 
This was SVN commit r15071.
 2014-04-30 05:04:12 +00:00
JoshuaJB 748ebdfdb0 Various GUI fixes and cleanup. 
This was SVN commit r15070.
 2014-04-30 04:38:53 +00:00
JoshuaJB dfacf5358c New lobby connect/registration page. Not perfect but fixes most of the outstanding issues. Refs #2312 
This was SVN commit r15069.
 2014-04-30 00:46:57 +00:00
scythetwirler 15e9ffa21b Converts the save dialog to the modern UI. Refs #2507. 
This was SVN commit r15068.
 2014-04-29 21:45:00 +00:00
leper 29cab5f5ed Also change reveal map to revealed map. 
Fix typo in tutorial map. Remove message refering to finite fields.

This was SVN commit r15066.
 2014-04-29 14:51:21 +00:00
leper b246017f9f Explore_d_ map. 
This was SVN commit r15065.
 2014-04-29 13:10:56 +00:00
sanderd17 b3ab49bb30 Really remove the minimum damage of 1, what 37c8e77d8e was supposed to do 
This was SVN commit r15064.
 2014-04-29 07:15:10 +00:00
JoshuaJB 1e6614918b Initial modern buttons. Lobby/prelobby now only rely on the modern common files. 
This was SVN commit r15063.
 2014-04-29 00:07:27 +00:00
leper c77826e9aa Translate some message boxes when opening websites. 
Fix a typo. Refs #2501.

This was SVN commit r15062.
 2014-04-28 22:30:40 +00:00
leper 683170ea19 Enable/disable GenTangents when enabling/disabling PreferGLSL. Fixes #2505. 
This was SVN commit r15061.
 2014-04-28 22:30:27 +00:00
sanderd17 876d0e4e66 Forgot to fix some strings 
This was SVN commit r15060.
 2014-04-28 20:19:32 +00:00
sanderd17 e6e5b9f11f Add a link in the main menu to for translators. Patch by Stan, fixes #2501 
This was SVN commit r15059.
 2014-04-28 20:17:39 +00:00
leper 64d3d0b4b2 Remove falsely attributed quote. 
This was SVN commit r15058.
 2014-04-28 17:59:02 +00:00
sanderd17 4695f3425b Add the possibility to show the welcome screen on every update, next to the possibility to disable it completely. Patch by Itms, fixes #2116 
This was SVN commit r15057.
 2014-04-28 17:18:46 +00:00
Gallaecio f26a2917d3 Translate map name in the summary page 
This was SVN commit r15056.
 2014-04-28 15:54:47 +00:00
sanderd17 b8245da606 Improve disabled technology tooltip. Fixes #2497 
This was SVN commit r15055.
 2014-04-28 15:17:26 +00:00
sanderd17 a49b359748 Fix formations attacking by adding a combat.approaching state. Fixes #2496 
This was SVN commit r15054.
 2014-04-28 13:05:47 +00:00
Gallaecio b5dfacbf18 Translated map name in the loading screen, regenerated translation templates and updated translations from Transifex 
This was SVN commit r15053.
 2014-04-28 12:31:28 +00:00
Gallaecio fb80e29d41 Changes to English tooltips for consistency 
Reported by an Italian translator, Fabio, at Transifex:
https://www.transifex.com/projects/p/0ad/translate/#it/public/13718374
https://www.transifex.com/projects/p/0ad/translate/#it/public/24494405

The periods were added in the main menu (only 2 tooltips without them)
and removed from the options menu (only 1 tooltip with it). In the
future, we might want to be consistent with tooltips through all the
GUI.

This was SVN commit r15052.
 2014-04-28 10:11:11 +00:00
JoshuaJB 75713cc101 Don't display 'UNR' in the gamesetup on unranked players. This makes unranked lobby playernames consistant with those of rankless players who join via IP. 
This was SVN commit r15051.
 2014-04-28 05:39:18 +00:00
JoshuaJB 3014df2280 Disable wireframe mode in ranked games. Fixes #2401. 
This was SVN commit r15050.
 2014-04-28 05:02:20 +00:00
Mythos_Ruler da7526dbd4 Tweaked button. 
This was SVN commit r15049.
 2014-04-27 23:48:15 +00:00
scythetwirler e6ec0b2fc9 Add the limit back to provisionality in the rating system. 
This was SVN commit r15048.
 2014-04-27 23:42:56 +00:00
scythetwirler fde558b4b2 Implements a (hopefully) better rating system with an inflation test. 
This was SVN commit r15047.
 2014-04-27 23:13:29 +00:00
Gallaecio a8b50a66da Fixes to the lobby internationalization by sanderd17 and me 
All strings are now translated at the last point, right before they are
added to the GUI.
Some other fixes are included.

This was SVN commit r15046.
 2014-04-27 20:24:48 +00:00
JoshuaJB b3acb5657f Fix moderater prefixes in the lobby. 
This was SVN commit r15045.
 2014-04-27 19:26:12 +00:00
JoshuaJB 251372a062 Missing var statement. 
This was SVN commit r15044.
 2014-04-27 19:10:28 +00:00
JoshuaJB cfb72e990b Make gamesetup chat formatting more similar to the lobby and note that all players must be ready before starting a multiplayer game. 
This was SVN commit r15043.
 2014-04-27 19:06:21 +00:00
Yves 8f53ddd6b9 Unifies some translatable strings on the gamesetup screen. 
This was SVN commit r15042.
 2014-04-27 19:03:15 +00:00
Yves 2f8487b84b Adds translation support for the "More options" window on the gamesetup screen. 
This was SVN commit r15041.
 2014-04-27 18:41:56 +00:00
scythetwirler 983abd1952 Updates splashscreen style and adds a background to the scrollbar to match the dropdown 
This was SVN commit r15040.
 2014-04-27 18:30:40 +00:00
scythetwirler a163ac1c11 Reverts a rogue copy-paste in the last commit. 
This was SVN commit r15039.
 2014-04-27 18:23:15 +00:00
scythetwirler b8d3ef71f7 Fixes the updated dropdowns for multiplayer clients broken in 65f4c8b0e8 
This was SVN commit r15038.
 2014-04-27 18:18:05 +00:00
Gallaecio 461a17c95d Reverted d91756b251 after breaking the fix for the lobby that sanders17 had implemented 
This was SVN commit r15037.
 2014-04-27 17:38:19 +00:00
scythetwirler 65f4c8b0e8 Moves Select number of players to a more fitting and translation-friendly location. Also makes the map selection texts more translation-friendly in terms of space. 
This was SVN commit r15036.
 2014-04-27 17:24:37 +00:00
scythetwirler f9ccf05aa8 Change the style of dropdowns as per Mythos_Ruler. Also moves the rating list to the right side of the leaderboard (where it is on most rating lists). 
This was SVN commit r15035.
 2014-04-27 16:28:59 +00:00
Gallaecio 60334f05c8 Fix error introduced in 95b0a8d9bf while fixing a warning 
This was SVN commit r15034.
 2014-04-27 15:56:10 +00:00
scythetwirler 63bcf2fef6 Don't display I'm ready in single player setup. Refs #2447. 
This was SVN commit r15033.
 2014-04-27 15:32:22 +00:00
scythetwirler ce0f439817 Adjusts the lobby gamelist and dropdowns to support more translations (space-wise). 
This was SVN commit r15032.
 2014-04-27 14:52:32 +00:00
Gallaecio 95b0a8d9bf Fixed warnings in ‘gui’ due to the new SpiderMonkey 
Refs #2372

This was SVN commit r15030.
 2014-04-27 13:51:43 +00:00
Gallaecio 60e1ff59f5 Fix warning about msg.guid not being defined 
This was SVN commit r15029.
 2014-04-27 13:38:17 +00:00
Gallaecio 341bcb1cf9 Fix unfinished change in accidental commit d4109916a3 
This was SVN commit r15028.
 2014-04-27 13:37:26 +00:00
Gallaecio d4109916a3 Moved the translation of AI messages to a later point 
This avoids attempts to translate messages prefixed with keywords,
such as “/team Message prefixed with a keyword”, and translates them
only after the keyword has been removed. Some keywords may hide the
message, removing the need for a translation altogether.

This was SVN commit r15027.
 2014-04-27 13:33:15 +00:00
Gallaecio d91756b251 Moved the translation of map data to the loadMap() function 
This avoids the translation of strings that had been previously
translated later in the code.

This was SVN commit r15026.
 2014-04-27 13:28:47 +00:00
Mythos_Ruler e344225b72 Tweaked this description. 
This was SVN commit r15025.
 2014-04-27 13:11:50 +00:00
Mythos_Ruler ad5fb85de3 A bunch of tech tweaks. 
Tweaked Belgian Bog environment.

This was SVN commit r15024.
 2014-04-27 13:10:38 +00:00
Gallaecio 813db55b08 Fixed the numbering in the terms of user of the lobby 
Reported by ‘tema’ (Italian translator) at Transifex:
https://www.transifex.com/projects/p/0ad/translate/#it/public/24566468

This was SVN commit r15022.
 2014-04-27 10:02:23 +00:00
Gallaecio 243411f0c5 Internationalization of the lobby terms of service and terms of use 
This was SVN commit r15021.
 2014-04-27 09:13:28 +00:00
sanderd17 0db4cc690e Check for hero attack before querying it. Fixes #2490 
This was SVN commit r15020.
 2014-04-27 08:03:15 +00:00
JoshuaJB 81883806ec First version of the lobby Terms of Service and Terms of Use. 
This was SVN commit r15019.
 2014-04-27 05:59:48 +00:00
JoshuaJB 2ad7187f92 Move XMPP polling to the mainloop. Should reduce lobby disconnects. Fixes #2491 
This was SVN commit r15018.
 2014-04-27 05:37:34 +00:00
scythetwirler fe490df93a Revert an unnecessary part of the last commit (bc9b7f9af3). 
This was SVN commit r15017.
 2014-04-27 03:26:45 +00:00
scythetwirler bc9b7f9af3 Fixes the tutorial AI and updates the tutorial with the blacksmith. 
This was SVN commit r15016.
 2014-04-27 03:22:02 +00:00
Gallaecio 98905af6eb Added a context to some very generic strings and regenerated the public mod POT file 
This was SVN commit r15015.
 2014-04-27 00:23:19 +00:00
scythetwirler 0d3c608b05 Increases title bar width for internationalization support and unsquishes map preview in the lobby 
This was SVN commit r15014.
 2014-04-27 00:07:27 +00:00
Mythos_Ruler f9dec493fc Changed Ptolemaic and Seleucid Military Colonies to use the merc camp actor for now until proper Military Colony meshes are modeled. 
Shrank the size of the gear icon.

Added a "seeds" particle. Doesn't seem to be working though.

This was SVN commit r15013.
 2014-04-26 22:49:33 +00:00
scythetwirler aaf5ad1a63 Cosmetic cleanup - Delete full stop and make scrollbar a circle 
This was SVN commit r15012.
 2014-04-26 22:45:48 +00:00
JoshuaJB 9a809c3131 Revert overlay resizing (forgot about translations) and minor fixes to my last changes. 
This was SVN commit r15010.
 2014-04-26 19:52:56 +00:00
sanderd17 2ae1e16628 Fix translation of some game setup elements in multiplayer games 
This was SVN commit r15009.
 2014-04-26 19:52:16 +00:00
JoshuaJB abf12fb503 Enhance the main menu options page and use it to replace the in-game settings page.. 
This was SVN commit r15007.
 2014-04-26 19:31:23 +00:00
scythetwirler d1d7afe46c Implements ready status into gamesetup. Fixes #2447. 
This was SVN commit r15006.
 2014-04-26 18:34:34 +00:00
Gallaecio 4770e64449 Some i18n fixed on the JavaScript side 
Do not try to translate empty strings in translateObjectKeys().
Do not try to translate empty formation tooltips.
Do not translate player names at a point where they are already
translated.

This was SVN commit r15005.
 2014-04-26 18:27:53 +00:00
JoshuaJB f5b0fc1076 Swap button placement on options page to be more consistant with other parts of the GUI. 
This was SVN commit r15004.
 2014-04-26 18:03:29 +00:00
Gallaecio 2b192a4fb5 Do not call Translate() on empty lines 
Reported by Yves at Github:
https://github.com/leper/0ad/issues/11

This was SVN commit r15003.
 2014-04-26 16:05:41 +00:00
Gallaecio 8fea36cdd0 Made tinygettext’s debug output optional 
You can now enable tinygettext’s output from the user.cfg file
(tinygettext.debug).
This enhancement also solved a warning due to the previous workaround,
which was
to uncomment the output line to avoid the debug messages.

This issue was reported by Yves at Github:
https://github.com/leper/0ad/issues/10

This was SVN commit r15002.
 2014-04-26 15:32:18 +00:00
Gallaecio baf04bad53 Added support for message extraction from INI files 
Refs #2487

This was SVN commit r15001.
 2014-04-26 14:06:00 +00:00
Gallaecio 3dd76c84bc Added a translation comment to the ‘Locale:’ string of the language menu 
In order to do this, I added support for extracting the ‘comment’
attribute of translatable XML elements.

This was SVN commit r15000.
 2014-04-26 12:51:12 +00:00
Gallaecio c82544be9f Use an early return in L10n::GetDictionaryLocale() 
Suggested by l777 on the IRC.

This was SVN commit r14999.
 2014-04-26 12:29:01 +00:00
Gallaecio d4f701d5f5 Remove MarkToTranslate from the JavaScript interface 
The ‘l10n.js’ global JavaScript file already defines this function as
markForTranslation(),
and defines a context-aware twin function as well. Those two functions
are the only ones
currently used in the mod code (as it should be), and there are no
remaining calls to the
engine for that.

This was SVN commit r14998.
 2014-04-26 12:26:04 +00:00
Gallaecio d6e37321d5 Removed an obsolete TODO comment in the L10n class implementation 
This was SVN commit r14997.
 2014-04-26 12:11:08 +00:00
Gallaecio fc793609eb Added API documentation to ‘source/i18n/’ 
This was SVN commit r14996.
 2014-04-26 12:10:15 +00:00
Yves 7acdde5c86 Changes tests to use global g_ScriptRuntime instead of creating a new JSRuntime for each test. 
The tests crashed on my Debian systems but not on my Ubuntu system.
The crash happened in line 142 of SpiderMonkey's ThreadLocal.h.

I know that I had to use a workarounnd for contexts to avoid destroying
the context that was created first. I also had in mind that in newer
versions a JS_Init function got introduced which presumably solves this
kind of issues.
Based on this experience I assumed runtimes could have a similar problem
and this patch indeed fixes the issues.
Unfortunately the correct usage of JSRuntimes in that regard is not
documented.
There's only a rater misterious comment in JSAPI.h which hasn't been
cleared up so far and is most likely completely outdated
(https://bugzilla.mozilla.org/show_bug.cgi?id=992641).

This was SVN commit r14995.
 2014-04-25 21:19:51 +00:00
Gallaecio 49fc88ff81 Fixed typos on the English strings of the tutorial AI 
This was SVN commit r14994.
 2014-04-25 19:47:41 +00:00
Enrique 4cbaba418b Improved syntagma animations 
Added seeding animation for farms. Only applied in Macedonian women at
the moment.

This was SVN commit r14993.
 2014-04-25 14:29:05 +00:00
Gallaecio e92bf0c89d Show translated player name in chat messages 
This should only affect player names that users do not define, such as
“Player 2”.
I’ve checked that:
• This change translate the name of the AI player in chat messages of
tutorial scenarios.
• If I name myself “Player 1” and host a multiplayer game, “Player 1” is
not translated.

This was SVN commit r14992.
 2014-04-25 04:28:06 +00:00
Gallaecio 7afe0afbca Internationalized the messages of the tutorial AI 
This was SVN commit r14991.
 2014-04-25 03:41:01 +00:00
Gallaecio abed1b1734 Made the developer overlay wide enough for the Long Strings locale 
This was SVN commit r14990.
 2014-04-25 03:11:22 +00:00
Gallaecio dc0deb5f52 Fixed bad fix in bc1ed335e2 
Note: l777 had given me the right fix (%s), I fixed it wrong for no good
reason…

This was SVN commit r14989.
 2014-04-25 02:56:08 +00:00
Gallaecio c1c10667df Improved the internationalization of the construction “Insufficient resources” message 
This was SVN commit r14988.
 2014-04-25 02:45:19 +00:00
Gallaecio 0c04b90a2d Fixed the extraction of messages with leading spaces from plain text files 
This was SVN commit r14987.
 2014-04-25 01:55:43 +00:00
Gallaecio 0c88edc2f2 Internationalized rank names 
In order to do so, I had to extend the XML message extractor to support
using XML tags as context.
This is because one of the ranks is “Advanced”, which is a pretty common
string.

This was SVN commit r14986.
 2014-04-25 01:47:42 +00:00
Gallaecio bc1ed335e2 Fix GCC warning on “source/gui/scripting/ScriptFunctions.cpp” 
Reported by JoshuaJB at Github: https://github.com/leper/0ad/issues/27
Fix provided by l777 (who I believe to be leper but I don’t really know)
on IRC.

This was SVN commit r14985.
 2014-04-25 00:38:30 +00:00
Yves fd3d335265 Sacrifices a goat to the gods of insanity. 
Fixes random crashes on Windows due to differences of STL types on the
binary level between different static libraries.
The differences are caused by the definition of _HAS_ITERATOR_DEBUGGING
and _SECURE_SCL in lib/precompiled.h.
All our engine static libs use precompiled headers but we didn't use
them for tinygettext because they aren't needed (except for these two
defines).
I've decided to add precompiled headers to tinygettext too instead of
just copying these defines. That should cause less headaches in the
future.

This was SVN commit r14983.
 2014-04-24 20:05:48 +00:00
sanderd17 0027dcef31 Remove the actual serif fonts from the repo (they're completely unused now, and keeping them makes the package bigger) 
This was SVN commit r14981.
 2014-04-24 13:36:29 +00:00
sanderd17 73470a3610 Remove all references to serif fonts in the GUI files (see cde72788a2) 
Rebuild the sans fonts to include the missing glyph character (fixes
#2483)
Update the pot files

This was SVN commit r14980.
 2014-04-24 13:33:15 +00:00
Gallaecio bfa6bbd0e0 Internationalized the wall cost string 
Also, added a check for the getCostComponentDisplayName() function, as I
once got an empty string, although I was not able to reproduce it.

This was SVN commit r14979.
 2014-04-24 06:16:43 +00:00
Gallaecio 1fa5f13133 Improved the internationalization of the Diplomacy dialog box 
You can now translate resource names differently depending on whether
they are in the middle of a sentence or at the beginning.
The Close button in the Diplomacy dialog box is now internationalized.

This was SVN commit r14978.
 2014-04-24 05:48:23 +00:00
Gallaecio d2cbda3755 Fixed an English string in the Celtic and Gaul civilization files 
Reported by kanetaka, a Japanese translator, at Transifex:
https://www.transifex.com/projects/p/0ad/translate/#ja/public/17634039

This was SVN commit r14976.
 2014-04-24 04:41:03 +00:00
historic_bruno 92f2a16a88 Suppresses MSVC warning C4005 'macro redefinition' from SpiderMonkey upgrade 
This was SVN commit r14975.
 2014-04-23 21:12:28 +00:00
sanderd17 0d33f6412d Fixes #2482 
This was SVN commit r14974.
 2014-04-23 08:22:55 +00:00
sanderd17 311acea712 Fit UI for longer translations 
This was SVN commit r14973.
 2014-04-23 07:47:46 +00:00
sanderd17 3b571406f8 Enlarge tooltip size to fit all locales 
This was SVN commit r14972.
 2014-04-22 17:51:56 +00:00
sanderd17 9b9a96382c Fix boolean type 
This was SVN commit r14971.
 2014-04-22 12:52:49 +00:00
sanderd17 21362de6ac Add workaround for testing long strings with the separate po. ICU wouldn't accept a non-existing language. 
This was SVN commit r14969.
 2014-04-22 11:38:15 +00:00
Gallaecio 9dd4e71f1d Internationalized some messages 
• You can now translate “The production queue is full”.
• Internationalized the “Pause” and “Resume” buttons. Only the initial
label was internationalized, it would switch to English as soon as you
pause the game for the first time.
• Internationalized the “Screenshot written to” message in the engine.

This was SVN commit r14968.
 2014-04-22 06:35:51 +00:00
JoshuaJB 5a8bc1158a Add some more GUI graphics settings while fixing some persistence issues. Refs #2310 
This was SVN commit r14967.
 2014-04-22 05:09:31 +00:00
Gallaecio 93c94e45b7 “All nearby bipedal melee units” → “All nearby soldiers” (suggested by Mythos_Ruler on the IRC) 
This was SVN commit r14966.
 2014-04-21 14:37:42 +00:00
Gallaecio 46d7d5eb23 Removed trailing spaces detected in translatable strings 
This was SVN commit r14965.
 2014-04-21 14:35:33 +00:00
Gallaecio 21cb76b9f9 centre → center 
This was SVN commit r14964.
 2014-04-21 14:32:52 +00:00
Gallaecio e82a9f1a4d Removed a line break to make more space for translations 
This was SVN commit r14963.
 2014-04-21 14:27:02 +00:00
Yves 510ad15e6c Adds missing libs, fixes some svn properties and a build-problem on Windows. 
In 1b3261b8f4 empty text files were committed instead of the libs.
The text files had svn:eol-style properties set and the mime-type was
text.
This removes the eol-style properties, changes the mime type and addes
the content of the files.

This was SVN commit r14959.
 2014-04-20 23:47:52 +00:00
Yves 5aab36670c Give some more space to the labels in the advanced localization menu. 
This was SVN commit r14958.
 2014-04-20 22:38:29 +00:00
Enrique 6b1cde8f52 Added Micket's wolf mesh with Strannik's animations. Thank you guys! 
Added two texture variations.

This was SVN commit r14957.
 2014-04-20 22:24:37 +00:00
Gallaecio bba60424b0 Moved tinygettext licensing information 
Moved from libraries/LICENSE.txt to LICENSE.txt. Reported by l777 on
IRC.

This was SVN commit r14956.
 2014-04-20 22:04:16 +00:00
Gallaecio 64d204228a Message extraction and localization 
It includes the translation template files (POT) as well as translation
files
(PO) developer through the Transifex platform by our awesome
translators.

It also includes tools to generate the translation template files,
generate a
special translation file with the longest strigns of all translations,
and a
tool to download translations from Transifex into the right game folders
automatically.

Fixes #67

This was SVN commit r14955.
 2014-04-20 21:48:23 +00:00
Gallaecio e05c8263c5 Internationalization of the public mod (JavaScript and GUI XML side) 
It includes a marvelous language selection menu developed by Yves.

It also includes the introduction of a sprintf implementation for
JavaScript, as well as
translation helper functions that use JavaScript-side translation
caching.

This patch includes code by Yves, sanderd17, leper and Gallaecio.

Ref #67

This was SVN commit r14954.
 2014-04-20 20:51:48 +00:00
Gallaecio d6db5a466d Internationalization of the C++ side 
Provides the logic to detect the system language, load translations, and
use
loaded translations both in the C++ and the JavaScript side.

This patch includes code by Yves, sanderd17, leper, historic_bruno and
Gallaecio. It’s worth noting that Yves and historic_bruno were also the
main
contributors behind the changes in 1b3261b8f4 as well.

This was SVN commit r14953.
 2014-04-20 20:03:57 +00:00
Yves 30d5b572a6 Remove tinygettext from the build-osx-libs.sh file. 
That's not needed anymore in the latest i18n branch. We build
tinygettext as a static library with the game now.

This was SVN commit r14952.
 2014-04-20 19:30:01 +00:00
Gallaecio 1b3261b8f4 Added third-party libraries for internationalization and localization: ICU and tinygettext 
This was SVN commit r14951.
 2014-04-20 19:17:32 +00:00
Gallaecio 52c0a9b908 Changes to English strings after reports in Transifex by translators 
This was SVN commit r14950.
 2014-04-20 19:00:37 +00:00
mimo 130a394e27 a few fixes and some tweaks to petra 
This was SVN commit r14949.
 2014-04-20 17:19:56 +00:00
Mythos_Ruler f9e980ba5f Trying to blend some old UI assets with the new look. 
Darkened the croc texture a bit.

This was SVN commit r14948.
 2014-04-20 16:58:47 +00:00
Mythos_Ruler f27640de9b Minor tweaks to some maps. 
This was SVN commit r14947.
 2014-04-20 14:38:24 +00:00
Mythos_Ruler dde91b8c66 The attack notification should be less frequent. 
This was SVN commit r14946.
 2014-04-20 14:35:02 +00:00
Mythos_Ruler 2336f97ead Spartans get Oxybeles (but no Lithobolos). 
This was SVN commit r14945.
 2014-04-20 12:50:59 +00:00
Mythos_Ruler ff77676c60 Fixed auras and tooltips for some heroes. 
Added some techs for houses and removed some from the Civic Center.
Makes a lot more sense this way.

This was SVN commit r14944.
 2014-04-20 11:36:23 +00:00
Enrique 0bbf43dc5f upgraded sarissa's models 
This was SVN commit r14943.
 2014-04-20 00:34:48 +00:00
Enrique cf04dc9601 Missing units to use the new pikemen attack animation 
This was SVN commit r14942.
 2014-04-20 00:09:40 +00:00
Mythos_Ruler 78f8afd912 Changed some formation spacing. 
This was SVN commit r14941.
 2014-04-20 00:01:50 +00:00
Enrique 4f4455ec3a Added new attack animation for pikemen 
This was SVN commit r14940.
 2014-04-19 23:56:05 +00:00
Enrique b387458e33 Syntagma formation animations added to all hellenic pikemen. 
This was SVN commit r14939.
 2014-04-19 23:35:25 +00:00
Mythos_Ruler 2e7e46b399 Moves some blacksmith techs to Village Phase for Celtic civs. Fixes #2473 
This was SVN commit r14938.
 2014-04-18 11:28:28 +00:00
Mythos_Ruler 831d3ae69f This was SVN commit r14937. 2014-04-16 16:32:15 +00:00
JoshuaJB fe4f17fd73 Only send game report if ranking is enabled. 
This was SVN commit r14936.
 2014-04-16 14:00:09 +00:00
JoshuaJB a9b34da617 Fix some merge conflicts 9e2d0b9506 missed. 
This was SVN commit r14935.
 2014-04-16 13:58:56 +00:00
JoshuaJB 9e2d0b9506 Fix #2404. Rating auto-configure TODO (eg 2v2 games do not automatically show as being unrated). See #2276. 
This was SVN commit r14934.
 2014-04-16 06:03:49 +00:00
leper 47a516df34 Fix some JS warnings. Refs #2372. 
This was SVN commit r14933.
 2014-04-15 01:12:48 +00:00
sanderd17 e1488fee56 Add an 'explore map' option to the game setup. 
This was SVN commit r14931.
 2014-04-14 19:52:49 +00:00
sanderd17 a9d0a3bcae Fix how per tech modification affects work + fix the technologies that implement it. Fixes #2366 
This was SVN commit r14930.
 2014-04-14 16:33:00 +00:00
sanderd17 bb71823aee Make the actor tech-modifiable. Fixes #2243 
This was SVN commit r14928.
 2014-04-14 15:00:49 +00:00
scythetwirler 1073382e3b Sorts the lobby player list, ignoring case 
This was SVN commit r14927.
 2014-04-13 18:29:32 +00:00
Pureon b08e364e81 New shipwreck models 
This was SVN commit r14926.
 2014-04-13 11:16:30 +00:00
Mythos_Ruler 106638a9b8 This was SVN commit r14925. 2014-04-13 09:42:55 +00:00
Mythos_Ruler 01decbcd90 Train time changes. 
Unlock champions tech more expensive.

This was SVN commit r14924.
 2014-04-13 09:05:02 +00:00
scythetwirler 40e2a1e065 Fixes some javascript warnings in the lobby. 
This was SVN commit r14923.
 2014-04-13 01:48:24 +00:00
scythetwirler 180aa5c60d Makes the moderator prefix visible in the chatbox. 
This was SVN commit r14922.
 2014-04-12 23:40:36 +00:00
Mythos_Ruler 5a0c1a799b Some more portraits. Updated the portrait for the Macedonian siege workshop. 
Tweaked some sandbox maps.

This was SVN commit r14921.
 2014-04-12 14:55:04 +00:00
Mythos_Ruler f02a8a4c59 Some population techs. 
Tweaking some training techs.

This was SVN commit r14920.
 2014-04-12 13:39:19 +00:00
Mythos_Ruler 5740e22cd5 Fix health for these cavalry spearmen. 
This was SVN commit r14919.
 2014-04-12 11:52:39 +00:00
Mythos_Ruler c2d1aece02 Fixed female citizen selections. 
This was SVN commit r14918.
 2014-04-12 10:36:37 +00:00
Mythos_Ruler 08c1c8ed2d Minor tweaks to some particles. 
Updated quinquereme tip image and text.

Minor updates to some maps.

Seleucids now use some Ptolemies ship actors temporarily.

This was SVN commit r14917.
 2014-04-12 07:13:37 +00:00
sanderd17 ad36c0eb7b Parse entity ids to numbers again 
This was SVN commit r14916.
 2014-04-11 12:35:50 +00:00
mimo 41b8d06e27 remove forgotten debug printouts 
This was SVN commit r14915.
 2014-04-10 21:00:40 +00:00
Enrique f41c51359f Mauryan trader actor missing 
This was SVN commit r14914.
 2014-04-10 20:56:12 +00:00
mimo bb8e14fae1 some minor tweaks to petra ai 
This was SVN commit r14913.
 2014-04-10 20:25:02 +00:00
sanderd17 7840fd3049 fix capitalisation 
This was SVN commit r14912.
 2014-04-10 14:00:44 +00:00
sanderd17 7f77bb7cb0 Small improvements to entitycollection + add a serialization method (serialization is never executed though) 
This was SVN commit r14911.
 2014-04-10 09:51:43 +00:00
sanderd17 ff2979ca68 Save formation rotation when loading a new formation 
This was SVN commit r14910.
 2014-04-09 18:01:12 +00:00
sanderd17 1f63325ede Rotate entities to the right angle when forming a formation 
This was SVN commit r14909.
 2014-04-09 11:15:00 +00:00
Enrique 4ddf1ac4dc Added rowing, gathering, 3Idles and death animations for ptolemaic fisherman. 
This was SVN commit r14908.
 2014-04-06 21:06:17 +00:00
sanderd17 d27dffa31d Now really fix the issue with promoting and formation animations 
This was SVN commit r14906.
 2014-04-06 18:43:06 +00:00
mimo 833c2bac7a save/restore camera position and orientation in saved games, fixes #2354 
This was SVN commit r14905.
 2014-04-06 16:27:57 +00:00
leper fbfd87e7f7 Replace hawk with duplicated head bone with fixed version by stanislas69. Fixes #2454. 
This was SVN commit r14904.
 2014-04-06 16:00:12 +00:00
leper fb1827bee7 Fix ungarrisoning bug caused by promoting garrisoned entities. Fixes #2471. 
This now uses the Autogarrsion order as both already work with an
already garrisoned entity.

This was SVN commit r14903.
 2014-04-06 03:04:30 +00:00
mimo fd4cd56224 fixed petra map management when not circular 
This was SVN commit r14901.
 2014-04-05 12:18:37 +00:00
sanderd17 c5e59d02e1 Fix formation animations with promoted units 
This was SVN commit r14900.
 2014-04-05 09:48:57 +00:00
Mythos_Ruler 1908723188 Testudo for a few more Roman units. 
This was SVN commit r14899.
 2014-04-05 08:47:29 +00:00
sanderd17 61da102371 Add testudo animations to the right actor files and use it in the formation template 
This was SVN commit r14898.
 2014-04-04 18:38:13 +00:00
Enrique 776a098a1c Tetsudo formation test animation. Front and middle stances. 
This was SVN commit r14897.
 2014-04-04 10:17:15 +00:00
mimo d04f035f9a numerous fixes and improvments to petra ai 
This was SVN commit r14896.
 2014-04-03 20:48:54 +00:00
mimo ac9aaaa369 supplement the ai common-api 
This was SVN commit r14895.
 2014-04-03 20:31:59 +00:00
Enrique 26fdf74de3 Mauryan trader basic commit with idle and move animations. Needs zebu animation and trader texture or use a mauryan one. 
Model and texture by paperkat, move animation by Wijitmaker, blender
exportation by stan

This was SVN commit r14894.
 2014-04-03 18:31:56 +00:00
leper 3e03c9d08a Return something valid in a mock function to fix a warning while running tests. 
This was SVN commit r14893.
 2014-04-02 23:10:07 +00:00
leper b8b3542d25 Fix tests. 
This was SVN commit r14892.
 2014-04-02 23:09:59 +00:00
Enrique b287cbf805 New ptolemaic sail for merchant ship based on Lion's eagle. 
fixes #2236

This was SVN commit r14891.
 2014-04-02 02:52:13 +00:00
Enrique 2f12068a8f Ptolemaic merchant ship commit. 
Model by Stanislas69 with some fixes.

This was SVN commit r14890.
 2014-04-01 20:35:49 +00:00
Mythos_Ruler 55bb33dec8 Particle tweaks. 
Mediterranean Cove skirmish map.

This was SVN commit r14888.
 2014-03-30 01:56:35 +00:00
Mythos_Ruler 84016df11c Map tweaks and map preview changes. 
This was SVN commit r14887.
 2014-03-30 01:38:20 +00:00
Mythos_Ruler e715c60942 Cleaning up the scenarios folder. 
This was SVN commit r14886.
 2014-03-30 00:10:07 +00:00
JoshuaJB a7b2f6ba47 Fix more then one observer by allowing a game to have multiple players with the -1 ID. 
This was SVN commit r14885.
 2014-03-29 15:09:42 +00:00
sanderd17 22867fa9a3 Further complete the definitition of the entity state 
This was SVN commit r14884.
 2014-03-29 13:56:03 +00:00
sanderd17 8615f38803 Always define the entire entity state, but initialize it to null 
This was SVN commit r14883.
 2014-03-29 13:37:48 +00:00
sanderd17 132020f88e Fix some of the undefined warnings reported by the new SpiderMonkey. Initialize the player diplomacy arrays earlier in PlayerManager. 
This was SVN commit r14882.
 2014-03-29 11:03:00 +00:00
mimo 120f71d944 a couple a bugfixes 
This was SVN commit r14881.
 2014-03-29 08:51:09 +00:00
Mythos_Ruler b815fa8dd9 Portraits for the Ptolemaic dieres, penteres, and octeres. 
Actor and texture for Antiochus the Great.

Histories for the Ptolemaic warships.

This was SVN commit r14880.
 2014-03-29 00:16:16 +00:00
Yves e9e05f4efc Second (main) commit for the SpiderMonkey upgrade. 
This commit contains all the required changes to our source files and
build scripts (hopefully).
A next commit will remove the old stuff of SpiderMonkey 1.8.5.

Spcial thanks to:
 - H4writer who helped a lot mainly with the performance issues we
had/have, but also with other problems or questions.
 - Leper for the review.
 - Historic_bruno for implementing the build scripts on Mac OS X and
testing on the Mac.
 - The people from the #jsapi channel and from
mozilla.dev.tech.js-engine who answered a lot of questions and helped
solving problems.
 - All the other people who helped

Refs #1886
Fixes #2442
Fixes #2416

This was SVN commit r14877.
 2014-03-28 20:26:32 +00:00
Enrique 6f6b841af3 Upgraded ptoemaic quinquereme textures and made the model narrower. 
This was SVN commit r14875.
 2014-03-28 16:03:32 +00:00
Yves 0d9a7dab6b Works around infinite recursion problem. 
This problems occurs with the new SpiderMonkey in debug mode, but it's
not a SpiderMonkey issue.
Unfortunately I couldn't find a clean solution, so I just documented the
problem in an extensive comment block and applied a workaround.
A clean solution would probably require changing the approach for
counting allocations completely.

This was SVN commit r14874.
 2014-03-28 11:33:37 +00:00
mimo 0419f5500e another set of petra improvments, main one is a first try to place markets for trade (was random before) 
This was SVN commit r14873.
 2014-03-27 22:10:03 +00:00
Enrique 0a32b2d687 Ptolemaic trireme commit. 
Fixed some texture stretching in the bireme.

This was SVN commit r14872.
 2014-03-27 18:13:07 +00:00
mimo bc428e1649 some fixes (i.e.building placement) and cleanings of petra 
This was SVN commit r14871.
 2014-03-26 21:07:47 +00:00
Enrique 52af5b29a1 Ptolemaic bireme commit. 
Fixed error in sparten temple when destroyed found bi Sanderd17

This was SVN commit r14870.
 2014-03-26 20:34:54 +00:00
sanderd17 7c0c294814 Move some resources to passable terrain 
This was SVN commit r14869.
 2014-03-26 18:28:00 +00:00
mimo d5ff29d181 fix a flaw in UnitAI trade management 
This was SVN commit r14868.
 2014-03-26 09:11:06 +00:00
mimo 3dfa858229 remove some leftover warnings in petra 
This was SVN commit r14867.
 2014-03-25 19:26:45 +00:00
mimo 5de3b30742 fix previous tag 
This was SVN commit r14866.
 2014-03-24 22:51:15 +00:00
mimo 97afd25171 commit first version of new ai bot (named Petra) 
This was SVN commit r14865.
 2014-03-24 22:33:50 +00:00
mimo b03e3644ac add a few usefull functions in ai/common-api 
This was SVN commit r14864.
 2014-03-24 22:15:40 +00:00
Yves 90b9926ca1 Fixes warning showing up with the new SpiderMonkey. 
The changed return value isn't related but returning false makes more
sense there IMO.

Refs #2372

This was SVN commit r14863.
 2014-03-22 23:31:40 +00:00
Yves 5372b27142 Silences some warnings that show up on the gamesetup screen with the new SpiderMonkey without changing any behaviour. 
Refs #2372

This was SVN commit r14862.
 2014-03-22 13:54:10 +00:00
Mythos_Ruler 3fb46640cc Fix civ for Ptol Military Colony. 
This was SVN commit r14861.
 2014-03-21 22:51:47 +00:00
Mythos_Ruler 907ef01322 Added starting units to Deccan Plateau. 
Added some detail to Nile River.

Updated Syria a little bit.

Added Pureons new tech portraits to some techs.

Portrait for Ptol champ elephant.

Gave the Military Settlement system to the Ptolemies. We'll use their
merc camp for a developing merc camp system. Ptol heroes can found civic
centers just like the Sele heroes.

This was SVN commit r14860.
 2014-03-21 00:47:23 +00:00
Yves 2eeb7c2ba1 Workaround to reduce the impact of AI performance problems when planning new bases. 
When no free territory was left on the map, the AI tried to place a CC
every 10th AI turn.
That's about all 10 seconds and it freezed the game for about a second.
Now when you played against 4 players it freezed aobut 4 seconds every
10 seconds, which is very bad.
I wanted to solve this properly but realized that I'd have to change a
lot in the terrain analysis code that will probably be replaced anyway
when we have a new pathfinder with a proper interface.
Also removes an unused variable (creating a territory map and not using
it can't be good for performance either).

This was SVN commit r14859.
 2014-03-20 14:26:15 +00:00
Pureon 6eaad6cbb6 new tech portraits 
This was SVN commit r14858.
 2014-03-20 00:58:54 +00:00
mimo 1c81a96a50 fix bug in AI 
This was SVN commit r14857.
 2014-03-18 21:34:23 +00:00
JoshuaJB 63248bdc33 Fix issue with GUI reveal map status display. 
This was SVN commit r14856.
 2014-03-18 01:13:02 +00:00
mimo 209799aa4c fix 94c02ec33c for AI 
This was SVN commit r14855.
 2014-03-17 21:23:40 +00:00
Yves 5c4282a21c Fixes a small memory leak in the profiler shutdown code. 
This was SVN commit r14854.
 2014-03-17 21:16:38 +00:00
sanderd17 cde72788a2 * Add support for fallback fonts in the font builder. 
* Replace DejaVu with Biolinium for the existign sans-styles.
* Add additional sans-styles using Biolinum.
* Update the GUI style definitions to use the sans-styles instead of
serif styles.
(Wait with updating custom defined fonts in strings, as it will cause a
mess with the internationalisation that's about to be included)
* Add fonts from the quite complete FreeFont family as fallback fonts.
* Render all glyphs supported by the different fonts to support as many
scripts as possible.
* Fixes #2457.
(Now hope I included all needed files)

This was SVN commit r14853.
 2014-03-17 10:13:49 +00:00
Mythos_Ruler c1b839c21b Military Colony's territory weight reduced. 
Updated icon for Syria map. Updated nisian war horses portrait from
Pureon.

Reduced the volume of the attack notification a little.

This was SVN commit r14852.
 2014-03-17 00:10:13 +00:00
Mythos_Ruler 84ef2c1335 A test for Latin names for animals. Won't complete this until after next alpha. 
This was SVN commit r14851.
 2014-03-17 00:08:24 +00:00
JoshuaJB 883f307b40 Implement a basic observer mode. Any player which joins a multiplayer game but is not assigned a player slot automatically becomes an observer. Refs #69 
This was SVN commit r14849.
 2014-03-16 23:29:27 +00:00
JoshuaJB 94c02ec33c Revert gather limits to be global instead of per-player. Refs #1387 
This was SVN commit r14848.
 2014-03-16 20:35:23 +00:00
Mythos_Ruler 19724f7f41 "Syria" skirmish map. 
This was SVN commit r14846.
 2014-03-15 23:10:06 +00:00
wraitii ffe0faeca4 Move the skybox up per Mythos' ruler recommendation. This should probably be a map setting. 
This was SVN commit r14844.
 2014-03-15 21:07:02 +00:00
scythetwirler caeaf62723 Adjust widths in the lobby to make the map size dropdown fit. 
This was SVN commit r14843.
 2014-03-15 20:58:59 +00:00
Mythos_Ruler 722ad7264d Some updated maps. Acropolis Bay especially. 
This was SVN commit r14842.
 2014-03-15 19:56:51 +00:00
historic_bruno 49b0e1ce42 Eliminates some duplication in build-osx-libs.sh and sets more useful variables 
This was SVN commit r14841.
 2014-03-14 05:18:40 +00:00
historic_bruno dfa4766dab Reverts [[SVN:14831]] - wasn't a valid fix. 
Patches MiniUPnPc to explicitly export symbols for GCC/Clang, fixes
build when -fvisibility=hidden is used, refs #2304.
Fixes incorrect use of CPPFLAGS in build-osx-libs.sh, it should be
CXXFLAGS. CPPFLAGS get passed to the C/C++ preprocessor, CXXFLAGS get
passed to the C++ compiler.

This was SVN commit r14840.
 2014-03-14 04:17:42 +00:00
Enrique b18a899287 Added Ptolemaic healer body and head textures. Fixes #2234 
This was SVN commit r14839.
 2014-03-13 19:46:15 +00:00
wraitii 6ab578a6eb Fix out of date comments in Tex and ITexCodec, Fixes #2458. 
This was SVN commit r14838.
 2014-03-13 19:00:22 +00:00
Spahbod e17dd1ac12 Applying the new improvements: Gulf of Bothnia. 
This was SVN commit r14837.
 2014-03-13 09:45:09 +00:00
JoshuaJB ef888367aa Cleanup tex_codec, fixes #2456, patch by IronNerd. 
This was SVN commit r14836.
 2014-03-13 04:16:20 +00:00
JoshuaJB a5639631ee Texture system refactoring and cleanup, fixes #2455, patch by IronNerd. 
This was SVN commit r14835.
 2014-03-13 02:37:05 +00:00
Enrique a068935789 Ptolemaic dock upgrade. Fixes #2217 
This was SVN commit r14834.
 2014-03-12 18:38:16 +00:00
mimo 180b44e565 let the AI know that a unit has no more orders 
This was SVN commit r14832.
 2014-03-11 22:42:41 +00:00
Enrique 6274c7ffe8 Added ptolemaic quinquereme. Fixes #2232 
This was SVN commit r14830.
 2014-03-10 13:37:18 +00:00
mimo 9f1bcc2475 fix AI error 
This was SVN commit r14829.
 2014-03-09 22:26:41 +00:00
scythetwirler 0e0cd65134 Some GUI alignment/sizing improvements. 
This was SVN commit r14828.
 2014-03-09 19:24:17 +00:00
Yves 0e7c92e1e6 Fixes behaviour change in Atlas' JSON serialization after the switch to JSON Spirit (#2434). 
This caused problems setting the starting camera.

Refs #2434

This was SVN commit r14827.
 2014-03-09 17:55:54 +00:00
JoshuaJB 8959e63a53 Add back unintentionally removed idle workers button tooltip. 
This was SVN commit r14826.
 2014-03-09 02:42:42 +00:00
Mythos_Ruler e6f7ef78dc Removes legacy "technologies" folder. 
This was SVN commit r14824.
 2014-03-09 00:10:41 +00:00
Mythos_Ruler 7698e75962 Pyrrhus template. 
This was SVN commit r14823.
 2014-03-09 00:08:25 +00:00
Mythos_Ruler 0603392f03 Acropolis Bay. 
This was SVN commit r14822.
 2014-03-09 00:08:00 +00:00
Mythos_Ruler 119849defc Pyrrhus hero. 
Some map stuff and actor changes (remove the elephants from Pericles).

This was SVN commit r14821.
 2014-03-09 00:07:28 +00:00
Mythos_Ruler d214d8f61c Some map changes. 
This was SVN commit r14820.
 2014-03-09 00:02:33 +00:00
JoshuaJB fb65288463 Fix hover effect not regenerating after mousedown events, minor GUI code cleanup, and fix #2414 
This was SVN commit r14819.
 2014-03-07 22:43:57 +00:00
Yves c8bdd993c0 Upgrades cxxtest. 
Switches to the already committed new cxxtest sources and deletes the
old sources.
Applies the changes from 6374080b60 and 4a57fed5a7 to the updated
sources.
Replaces the cxxtestgen.exe for Windows. This file was created from
cxxtest's python script using pywin32.
Modifies update-workspace.sh to force a rebuild when cxxtest options
could have been changed during the premake step.
Adds an additional option (--jenkins-tests) to
premake4.lua/update-workspaces.sh to use cxxtest's XmlPrinter which
generates output than can be used by Jenkins.

Fixes #2450

This was SVN commit r14818.
 2014-03-07 20:58:17 +00:00
feneur a9368a4463 Updated tooltip to reflect the new max gatherer limit 
This was SVN commit r14816.
 2014-03-07 12:09:39 +00:00
sanderd17 66942c74fa Be more forgiving for training spaces (which cause empty strings on splitting) and avoid using bigger fonts for non-capitalisable signs in headings 
This was SVN commit r14815.
 2014-03-07 11:11:45 +00:00
sanderd17 32cf46f01c Fix some 'undefined' problems reported by Lion.Kanzen + improve coding style. 
This was SVN commit r14814.
 2014-03-07 08:27:13 +00:00
JoshuaJB 29f94a759c Fix an issue with lobby registration and a minor wording tweak. 
This was SVN commit r14813.
 2014-03-07 01:52:06 +00:00
scythetwirler abbd6efef1 Updates outdated/incorrect hotkeys. 
This was SVN commit r14812.
 2014-03-06 23:57:02 +00:00
scythetwirler 8a98bca9b2 Fixes the last z order (hopefully) and a style inconsistency. 
This was SVN commit r14811.
 2014-03-06 22:45:13 +00:00
scythetwirler ec26f1de83 Reduces z order to fix ai dialog. 
This was SVN commit r14810.
 2014-03-06 22:34:15 +00:00
JoshuaJB 8f30e722ab Some inconsequential style adjustments. 
This was SVN commit r14809.
 2014-03-06 02:24:06 +00:00
scythetwirler ef76d24e66 Fixes z order and a capitalization error. 
This was SVN commit r14808.
 2014-03-06 02:00:12 +00:00
scythetwirler 5f5cfb10ee Fixes a typo and makes naming of the fading consistent with other sprites. 
This was SVN commit r14807.
 2014-03-05 21:24:48 +00:00
sanderd17 f3714a7075 Fix invalid count for entityMaps 
Improve error reporting on failed deserializations
Fixes #2328

This was SVN commit r14806.
 2014-03-05 14:58:17 +00:00
JoshuaJB 02024370d8 Fix a warning in Visual Studio 2010 related to some of my recent changes. 
This was SVN commit r14805.
 2014-03-05 01:06:13 +00:00
scythetwirler 5582409973 Converts most parts of the game to use Pureon's new UI 
This was SVN commit r14804.
 2014-03-04 02:23:01 +00:00
Yves 1a2f889bb9 7cba43c9db changed the behaviour in case of undefined values which was not intended even if there's a warning now. 
This should revert to correct behaviour for undefined values again (even
though this value should never be undefined).

Refs 2372

This was SVN commit r14803.
 2014-03-03 23:01:49 +00:00
Yves 7cba43c9db Fixes warnings printed by the new SpiderMonkey. 
Sets SelectableInGameSetup to true in all civ json files that didn't
have it set.
Having this value set to undefined (not set) was interpreted as true,
which is quite arbitrary.
With the new SpiderMonkey a warning will be printed if the value is
undefined.
This avoids ambiguity but makes the setting mandatory.

Refs #2372

This was SVN commit r14802.
 2014-03-03 21:58:15 +00:00
Yves df43e32a59 Second try fixing the eol-styles 
This was SVN commit r14801.
 2014-03-03 21:36:24 +00:00
Yves 234f2003a3 Fix inconsistent line endings and add svn:eol-style property 
This was SVN commit r14800.
 2014-03-03 21:13:36 +00:00
Enrique 2d0e996725 Added modified Stanislas69 Pyrrhus helmet with textures. 
Added an extra variation for brass and iron textures variations of
ptolemaic_romanized and thracian horned helmets.
Added playercolor to the thracian horned helmet crest.

This was SVN commit r14799.
 2014-03-02 10:59:36 +00:00
Yves e290abc40f Should fix the Atlas build issues with the autobuilder. 
For some reason the autobuilder does not know uint32_t but my Windows
system with VC2010 and my Linux system both do.

Refs #2434

This was SVN commit r14797.
 2014-03-01 14:41:32 +00:00
mimo c2c172271f fix AI error, not reseting all units after a successful attack 
This was SVN commit r14796.
 2014-03-01 14:36:35 +00:00
Mythos_Ruler 05225a66ac Horned helmet to Thracian cavalry. 
This was SVN commit r14794.
 2014-03-01 10:37:45 +00:00
mimo 57e995e618 fix AI error, the freeze of this collection prevented promoted and packed units to be updated during attack 
This was SVN commit r14793.
 2014-03-01 09:35:30 +00:00
wraitii 4e5eeba27b Fix the skybox. 
This was SVN commit r14792.
 2014-02-28 18:23:24 +00:00
Enrique 999490bbf5 Added playercolor to ptolemaic romanized crest helmet. 
This was SVN commit r14791.
 2014-02-28 11:46:23 +00:00
Enrique 162a4c42f3 Stan's helmets ptolemaic romanized with and without crest, thracian horned cavalry and perseus hero. Heavily modified. 
playercolor in crests still pending. Added brass and iron variations,
more subtle variations to come.

This was SVN commit r14790.
 2014-02-28 11:32:23 +00:00
wraitii 02860690eb fix unused parameter warning. 
This was SVN commit r14789.
 2014-02-26 19:16:44 +00:00
wraitii 3f78042f45 Fix tests and C++11 build. 
This was SVN commit r14788.
 2014-02-26 19:08:03 +00:00
Mythos_Ruler 3573a6e9a8 Updated some portraits. 
Added a Mercenary Thracian Swordsman.

Tweaked some textures.

Added a "gray skin" variation to the Ptolemaic elephant.

Added Saharan Oases skirm map.

This was SVN commit r14787.
 2014-02-26 14:29:42 +00:00
Enrique 6b94ae9f59 Added two ptolemaic howdah variations for the champion elephant. 
This was SVN commit r14786.
 2014-02-26 13:53:36 +00:00
mimo d8903c0c6f fix AI error 
This was SVN commit r14785.
 2014-02-25 22:43:03 +00:00
wraitii e2f4379e9a Fix an issue with corruption of water data when the actor editor opened in Atlas. 
Potential marginal optimizations to the water data creation code.

This was SVN commit r14784.
 2014-02-25 06:27:15 +00:00
Yves 17f8f09399 Removes the ScriptInterface and SpiderMonkey dependencies from Atlas. 
Replaces the code for JSON parsing and writing with an implementation
using the JSON Spirit library.

Fixes #2434
Refs #1886

This was SVN commit r14783.
 2014-02-24 20:22:02 +00:00
mimo 33918a5c41 Fix AI error (with 3eaa9ac4d3) preventing promoted units to stay idle 
This was SVN commit r14779.
 2014-02-24 14:03:13 +00:00
sanderd17 50d93b4332 Was messed up by b3201acd93 
This was SVN commit r14778.
 2014-02-24 12:10:38 +00:00
Enrique c5f15a13d0 Modified Stanislas69 Seleucid romanized helmet and thracian helmet with several texture variations and organized in actors with variations. 
Applied the romanized brass helmet with crest to the Seleucid heavy
swordman infantry.

This was SVN commit r14777.
 2014-02-23 16:51:10 +00:00
mimo 3eaa9ac4d3 fix AI error 
This was SVN commit r14776.
 2014-02-23 09:51:07 +00:00
Yves 43377fdc5e Fixes an assertion when DEBUG_SERIALIZER_ANNOTATE is set to 1 and you click on "Host Game" from the main menu. 
The reason was that CSimulationMessage uses the CBufferBinarySerializer
which did not add debugging annotations and deserialized the created
data with the CStdDeserializer which expects these annotations.
I did not fix the tests which remain broken as before this patch when
annotation is enabled.

This was SVN commit r14775.
 2014-02-22 14:30:29 +00:00
Mythos_Ruler e38fc5f861 Increased Fanatic armor. 
This was SVN commit r14774.
 2014-02-22 13:10:54 +00:00
Mythos_Ruler 554cd510f2 Basic and Advanced Egyptian Pikemen textures. 
Spec and norm maps for Mediterranean forest floor terrain.

This was SVN commit r14773.
 2014-02-22 12:16:20 +00:00
JoshuaJB a3e1c68b9a Fix #2373. Have player resign if not returning to a networked game. Also notify host of networked game that by leaving all other players will be disconnected. Based off patch by boeseRaupe 
This was SVN commit r14772.
 2014-02-21 20:02:23 +00:00
Mythos_Ruler 8c21ec4dfd Quilted helms for Egyptian pikemen, based on work by Enrique. 
This was SVN commit r14771.
 2014-02-21 14:38:09 +00:00
Enrique 42d31da1bb ptolemaic quilted helmet commit. 
This was SVN commit r14770.
 2014-02-21 14:13:46 +00:00
sanderd17 c44b48bd59 Fix Atlas lag due to Position component that listens to the territoriesChanged message 
This was SVN commit r14768.
 2014-02-21 13:42:46 +00:00
scythetwirler 0ea3b7b7dd Adds the moderator prefix to the playerlist in the lobby. 
This was SVN commit r14767.
 2014-02-20 23:26:36 +00:00
JoshuaJB a725266337 Slightly better options menu. 
This was SVN commit r14766.
 2014-02-20 22:45:43 +00:00
JoshuaJB e182b4ddd2 Fix a valgrind warning about uninitilized variables in the scrollbar code and some comment/style fixes. 
This was SVN commit r14764.
 2014-02-19 21:59:07 +00:00
Mythos_Ruler facf119241 Farm fields back to 5 workers. 
This was SVN commit r14763.
 2014-02-19 17:54:34 +00:00
scythetwirler 2429f1e93c Displays ratings on the gamesetup page and formats ratings less than 1000 correctly. 
This was SVN commit r14762.
 2014-02-19 00:40:35 +00:00
mimo a4ec034bb5 fixes some AI errors 
This was SVN commit r14761.
 2014-02-18 18:19:33 +00:00
sanderd17 039b06e012 Enable selection of dogs when selecting idle warriors. Patch by tau. Fixes #2436 
This was SVN commit r14760.
 2014-02-17 21:40:47 +00:00
Mythos_Ruler b5c8faa367 Aura tooltip for Ptolemaic heroes. Auras themselves are not complete. 
This was SVN commit r14759.
 2014-02-17 15:54:17 +00:00
Mythos_Ruler 41534b1eda Arrow shooting buildings only increase arrows when ranged infantry are garrisoned inside. 
Removing some unused textures.

This was SVN commit r14758.
 2014-02-17 15:11:47 +00:00
Enrique c3dd79aa22 Ptolemaic mercenary camp commit. 
This was SVN commit r14757.
 2014-02-17 13:13:25 +00:00
sanderd17 322d78b9a5 remove debug warning 
This was SVN commit r14755.
 2014-02-16 15:23:50 +00:00
sanderd17 19965ce37a Fix missing territory decay when moving out of territory without changing the actual territory. Add possibility to check movement over territory boders in the JS simulation part. Based on patch by niektb 
This was SVN commit r14754.
 2014-02-16 15:22:11 +00:00
scythetwirler f92a46330d Anti-disconnect addition to the gamesetup screen. Also fixes typo in the lobby bot README. 
This was SVN commit r14753.
 2014-02-16 06:22:16 +00:00
scythetwirler be881dc420 Reformat the database to accept the additional summary counters as well as adding a couple summary counters. Also deletes unnecessary welcome message and deletes whitespace. Refs #686. 
This was SVN commit r14752.
 2014-02-16 06:06:16 +00:00
Enrique ab9a6b6303 Stanislas69' iberian tower modification commit. 
This was SVN commit r14751.
 2014-02-14 21:46:37 +00:00
Enrique 05bfe7dca0 Ptolemaic market commit 
This was SVN commit r14750.
 2014-02-14 17:18:29 +00:00
mimo 35f3dd03d9 improve ship behaviour when picking units 
This was SVN commit r14749.
 2014-02-13 20:21:27 +00:00
Yves 581c7635e1 Makes our favourite example of escaping even more awesome. 
Codeblocks 12.11 requires an additional $ sign. This will break 10.05
and I haven't tested it with 13.12 or on other systems than Ubuntu.

This was SVN commit r14748.
 2014-02-13 15:21:14 +00:00
Mythos_Ruler a921c5c2fb Portrait for Egyptian Pikeman. 
Fixed a thing with the Ptolemies sandbox map.

Tweaked the elite Egyptian pikeman shield.

This was SVN commit r14747.
 2014-02-13 15:08:01 +00:00
Mythos_Ruler 14a7e60bd5 Elite Egyptian Pikeman. 
This was SVN commit r14746.
 2014-02-11 17:51:01 +00:00
mimo e49b1e1ceb fix AI error 
This was SVN commit r14745.
 2014-02-09 19:54:50 +00:00
mimo d8152f1eda exchange if order otherwise we can't make a trade route with a damaged market 
This was SVN commit r14744.
 2014-02-09 18:42:06 +00:00
Enrique 44eb336dfe Added 4 stall variations as eyecandy with different cloth textures. 
Added material for barley/wheat props.
Modified spec and normal maps of ptolemaic struct (for matching last
edit adding carpets)

This was SVN commit r14743.
 2014-02-09 16:51:33 +00:00
Yves 9780d7177d Adds some missing vars. 
This was SVN commit r14742.
 2014-02-09 16:04:30 +00:00
Mythos_Ruler dea18ed318 4-player Greek Acropolis skirmish map 
This was SVN commit r14741.
 2014-02-09 13:07:33 +00:00
mimo c5beeb7a02 rename Median Oasis maps, fixes #2425 
This was SVN commit r14740.
 2014-02-09 09:48:14 +00:00
JoshuaJB df1221e9f5 Correct inverted sprites on modern tickbox and add a default modern tooltip style. 
This was SVN commit r14739.
 2014-02-09 05:31:25 +00:00
wraitii 01611c1675 Fixes AI error when building a new base, and improves the AI's early game and tendency to grab terrain. Fixes incorrect release of some units by the defense manager. 
This was SVN commit r14738.
 2014-02-07 18:36:37 +00:00
mimo 05f13bb1d8 fix ai bug 
This was SVN commit r14737.
 2014-02-07 18:00:41 +00:00
mimo 563768363b clean useless formations 
This was SVN commit r14736.
 2014-02-07 17:01:01 +00:00
Spahbod a0b0b6d74e Applying the new improvements: Gear, Guadalquivir River. 
This was SVN commit r14735.
 2014-02-07 09:23:14 +00:00
mimo 7277385891 fix typo 
This was SVN commit r14734.
 2014-02-07 07:52:10 +00:00
Yves 31e98e5c03 Reverts f25edfd8f1. Structured clones don't support cyclic references in SpiderMonkey v1.8.5. 
SpiderMonkey v24 supports it and I'll add this change to #1886 instead.

Refs #2416
Refs #2415
Refs #1886

This was SVN commit r14733.
 2014-02-06 13:32:09 +00:00
JoshuaJB fa85527baf Send messages in queue before closing connection, patch by boeseRaupe. Fixes #2420 
This was SVN commit r14732.
 2014-02-05 02:44:25 +00:00
historic_bruno 035078c317 Disables checks in os_cpu_LargePageSize Windows implementation, since they failed on Vista SP2 with old Xeon CPU, fixes #2346 
This was SVN commit r14731.
 2014-02-04 22:30:29 +00:00
JoshuaJB 72d306873f Correctly handle the keypad enter in CInput.cpp and make the return key case catch SDLK_RETURN instead of '/r' for consistancy and readability. 
This was SVN commit r14730.
 2014-02-03 21:46:27 +00:00
Mythos_Ruler 91be7d9bd1 New history blurb for Skiritai by forum contributor Thorfinn. 
This was SVN commit r14729.
 2014-02-03 16:25:08 +00:00
Mythos_Ruler e408ac46b1 2 player skirmish Median Oasis. 
This was SVN commit r14728.
 2014-02-03 16:16:31 +00:00
LordGood e329a93978 Ghost commit for fields 
This was SVN commit r14727.
 2014-02-03 05:12:36 +00:00
sanderd17 9971e3cfab Add formation check 
This was SVN commit r14726.
 2014-02-02 09:15:34 +00:00
historic_bruno 4be80f9322 Improves error handling in sound manager. Fixes some crashes and errors that could occur when OpenAL failed to init properly, fixes #2183, #2345 
This was SVN commit r14725.
 2014-02-02 05:58:27 +00:00
Yves f25edfd8f1 Removes ValueCloner. 
Fixes #2416
Refs #2415
Refs #1886

This was SVN commit r14724.
 2014-02-01 20:37:33 +00:00
wraitii c9aeaa1612 Fix a "big typo" in the attack plans, thanks mimo. 
This was SVN commit r14723.
 2014-02-01 18:34:24 +00:00
wraitii ddf9d948cf Fix some more debug in the AI. 
This was SVN commit r14722.
 2014-02-01 18:05:39 +00:00
mimo 5b506ceee3 prevent AI to try to attack its allies, fix #2393 
This was SVN commit r14721.
 2014-02-01 17:59:29 +00:00
mimo e21f052803 prevent error when an animal changes ownership 
This was SVN commit r14720.
 2014-02-01 17:55:27 +00:00
Mythos_Ruler 94a240737c Added more territory auras. 
Fixed the Theatron for Hellenic civs. It now uses the Hellenization
effect correctly!

This was SVN commit r14719.
 2014-02-01 12:09:06 +00:00
Spahbod 1f1a2ead44 Adding the missing cheats from [14712]. Refs #2072 
This was SVN commit r14718.
 2014-02-01 09:11:38 +00:00
scythetwirler e4e32c8cd7 Fixes a typo from 1d3ac14d35. 
This was SVN commit r14717.
 2014-02-01 03:55:24 +00:00
wraitii e6cf2f23c5 Fix AI debug mode. 
This was SVN commit r14716.
 2014-02-01 03:29:55 +00:00
wraitii c3cdf40f33 Somewhat experimental rewrite and simplification of the worker's logic to choose dropsites. Might behave unexpectedly now and then. 
Error fixes here and there.

This was SVN commit r14715.
 2014-02-01 00:44:12 +00:00
Mythos_Ruler 12aa170c58 Trying different territory weights. 
This was SVN commit r14713.
 2014-01-31 18:47:08 +00:00
sanderd17 60619dbf3f Add technologies cheat. Fixes #2072. Patch by boeseRaupe 
This was SVN commit r14712.
 2014-01-31 15:30:16 +00:00
Spahbod 1fad924411 Checking if cmpPlayer is valid. 
This was SVN commit r14711.
 2014-01-31 14:47:23 +00:00
Spahbod 9fe465884d Implements resource trickle. Allows decimal player resources. Fixes #2413. 
This was SVN commit r14710.
 2014-01-31 12:01:49 +00:00
JoshuaJB 0157e640cc Make my last commit C++98 compatible. 
This was SVN commit r14709.
 2014-01-31 01:26:08 +00:00
Enrique c3d9769622 Fixed iberian corral cloth ao texture assigned 
This was SVN commit r14708.
 2014-01-30 19:36:38 +00:00
Spahbod 708f003df3 Applying the new improvements: English Channel, Fortress 
More cleanup and tweaks.

This was SVN commit r14707.
 2014-01-30 17:09:45 +00:00
JoshuaJB ff4ed09b6f Backend for special formatting of moderaters in the lobby userlist. 
This was SVN commit r14706.
 2014-01-30 15:46:19 +00:00
Yves bab3a08643 Fixes a crash introduced in fd187f466f by ensuring that the CScriptValRooted values are destroyed before calling JS_DestroyContext. 
I've tested the performance on Combat Demo (Huge) again with the code
from #2394.
It's very close but probably a little bit lower (hard to tell because
it's so close).

Closes #2408
Refs #2394

This was SVN commit r14705.
 2014-01-30 13:21:36 +00:00
JoshuaJB b9eea330d0 Strip some whitespace and fix a warning in session.js 
This was SVN commit r14704.
 2014-01-29 19:00:47 +00:00
sanderd17 1d3ac14d35 Better summary screen. Fixes #686. Patch by Bajter and Kabzerek 
This was SVN commit r14703.
 2014-01-29 18:30:56 +00:00
sanderd17 459f13e72b Clean up the colorfade code. Patch by boeseRaupe, fixes #2395 
This was SVN commit r14702.
 2014-01-29 14:49:36 +00:00
Spahbod 7395d9c75a Applying the new improvements: Canyon, Continent, Corinthian Isthmus 
Some cleanup and small tweaks.

This was SVN commit r14701.
 2014-01-29 14:21:48 +00:00
sanderd17 639b583d31 Fix scatter formation 
This was SVN commit r14700.
 2014-01-29 14:01:21 +00:00
leper d6f8742f9b Change hawk and boar skeletons so that the root identifiers are unique. Fixes #2332. 
Also adjust the DAEs to fit the new identifiers.

This was SVN commit r14699.
 2014-01-29 04:14:24 +00:00
sanderd17 f097078d46 Send the move command directly instead of going through the FSM. That way, the failure can be catched earlier on. Should fix #2410 
This was SVN commit r14698.
 2014-01-28 20:40:38 +00:00
mimo 8953179e1a allow the possibility to define route with waypoints when doing trade, fixes #1207, #1821 and #1822 
This was SVN commit r14697.
 2014-01-28 18:56:39 +00:00
mimo 23777ba736 fix cbc1c9f0ab 
This was SVN commit r14696.
 2014-01-27 19:25:38 +00:00
Mythos_Ruler 325f9ca9a9 Sorry Brits. Changed "plough" (British spelling) to "plow" (American/Canadian spelling) after seeing more than one person on Youtube mispronounce the word. 
Can only build 1 Juggernaut.

All champion cavalry now cost Food and Metal.

This was SVN commit r14695.
 2014-01-27 16:16:32 +00:00
sanderd17 c751500907 Refactor some formation code to let it make use of the prototypes 
This was SVN commit r14693.
 2014-01-27 12:34:59 +00:00
JoshuaJB 7bcdb9f46d Remove two un-needed string initilizations from my earlier changes. 
This was SVN commit r14692.
 2014-01-27 05:46:21 +00:00
leper 78ff9a8480 Fix compilation failures with wxWidgets 3.0. Fixes #2375. 
This was SVN commit r14691.
 2014-01-27 00:02:03 +00:00
historic_bruno 0406c89908 Implements GetMonitorSize for OS X, patch by Echelon9, fixes #2390 
This was SVN commit r14690.
 2014-01-26 23:03:45 +00:00
mimo cbc1c9f0ab fixes remaining town bell defects, closes #2353, patch by Itms 
This was SVN commit r14689.
 2014-01-26 20:37:39 +00:00
JoshuaJB c61badb04c Fix typo. 
This was SVN commit r14688.
 2014-01-26 19:29:21 +00:00
JoshuaJB 2a1240008c Make my previous changes < C++11 compatible. 
This was SVN commit r14687.
 2014-01-26 19:23:50 +00:00
JoshuaJB 5e70bd3628 Fix and cleanup my recent changes. 
This was SVN commit r14686.
 2014-01-26 19:01:21 +00:00
mimo cb3a8d868a fix bug when garrisoning under alert and garrisonHolder is full, patch by Itms, see #2353 
This was SVN commit r14685.
 2014-01-26 18:28:55 +00:00
mimo 3e1fc74add improve alert tooltip, see #2353 
This was SVN commit r14684.
 2014-01-26 18:17:13 +00:00
mimo 9ed11bc404 keep work orders when in alert, patch by Itms, addresses #2353 
This was SVN commit r14683.
 2014-01-26 18:01:29 +00:00
sanderd17 09a2729503 fix a fix 
This was SVN commit r14682.
 2014-01-26 09:40:54 +00:00
sanderd17 f1ab9b8e57 Check isInWorld before asking position 
This was SVN commit r14681.
 2014-01-26 09:24:32 +00:00
JoshuaJB 5ec0dc8ae8 Fix a bug with one of the lobby settings I added to the options window. 
This was SVN commit r14680.
 2014-01-26 05:51:48 +00:00
JoshuaJB 39fef5c299 Add the ability to display chat messages when joining the lobby and quickly mostly update the options window to the new UI style. 
This was SVN commit r14679.
 2014-01-26 05:39:55 +00:00
scythetwirler a8fbe4eedc Centralizes centering rating into one function. 
This was SVN commit r14678.
 2014-01-26 05:27:00 +00:00
JoshuaJB 041c6ab1b3 More lobby cleanup. 
This was SVN commit r14677.
 2014-01-26 04:25:35 +00:00
historic_bruno 58a44bfbcb Adds missing comment in build-osx-libs.sh 
This was SVN commit r14676.
 2014-01-26 03:40:54 +00:00
historic_bruno 5187c6e4a5 Explicitly disables SDL X video driver in build-osx-libs.sh, to fix SDL_VIDEO_DRIVER_X11 definition used in HWDetect.cpp 
This was SVN commit r14675.
 2014-01-26 03:12:05 +00:00
historic_bruno 937ee8f77c Fixes clang "hidden overloaded virtual function" warning, patch by Echelon9, fixes #2388 
This was SVN commit r14674.
 2014-01-26 01:20:34 +00:00
JoshuaJB 0db9a18d39 Fix issue where lobby spam was being sent to external clients. 
This was SVN commit r14672.
 2014-01-25 21:58:22 +00:00
JoshuaJB 851c05a038 Cleanup and spam blocker redesign in lobby.js. 
This was SVN commit r14671.
 2014-01-25 20:51:01 +00:00
JoshuaJB 41a7c78e62 Fix some stuff in XmppClient.cpp on leper's recommendation. 
This was SVN commit r14670.
 2014-01-25 20:49:48 +00:00
mimo 28a707f98f small cleaning 
This was SVN commit r14669.
 2014-01-25 19:58:59 +00:00
scythetwirler 69991cd110 Deletes extra whitespace from last commit. 
This was SVN commit r14668.
 2014-01-25 19:00:22 +00:00
scythetwirler e183e87333 Adds a message that is triggered whenever the bot's name is mentioned when a user doesn't recognize the bot isn't human (which happens quite a lot) 
This was SVN commit r14667.
 2014-01-25 18:57:28 +00:00
Enrique 2b407a03eb Added Stanislas69 iberian corral with several fixes. 
Fixed iberian struct normal and specmap.

This was SVN commit r14666.
 2014-01-25 16:50:21 +00:00
sanderd17 9eb26c2622 Fix infinite loop when attacking a formation without valid targets 
This was SVN commit r14665.
 2014-01-25 16:27:55 +00:00
Mythos_Ruler 0f5e5fddd6 This was SVN commit r14664. 2014-01-25 14:45:58 +00:00
JoshuaJB 12a691edc2 Make my previous changes support < C++11 and Windows. 
This was SVN commit r14661.
 2014-01-24 20:31:39 +00:00
Mythos_Ruler 3f00d0cc9c Fix some broken maps. Delete some others. 
This was SVN commit r14660.
 2014-01-24 20:23:11 +00:00
sanderd17 ecaded076f Improve the Vector prototype with static functions. Replace the usage of the Math vector functions with functions from the Vector class. 
This was SVN commit r14659.
 2014-01-24 19:51:00 +00:00
JoshuaJB 5d4f509810 Update existing minimap idle button, add minimap idle button highlight and disabled, and some style fixes in session.xml. Refs #823 and refs #2357 
This was SVN commit r14658.
 2014-01-24 18:40:01 +00:00
Mythos_Ruler 2f145b1578 Iron Spearheads tech now affects all spear units (not just infantry spearmen). 
Javelin Thong tech now affects all javelin units (not just infantry
javelinists).

Some shield tweaking.

Some more portraits.

This was SVN commit r14657.
 2014-01-24 18:28:26 +00:00
JoshuaJB b46a6de335 Allow using the XMPP room subject to display lobby information to user, make the lobby GUI code more readable, and cleanup the modern styles. 
This was SVN commit r14656.
 2014-01-24 18:20:15 +00:00
JoshuaJB dd274113bc Fix #2403 
This was SVN commit r14655.
 2014-01-24 18:15:42 +00:00
Enrique d5609e33a6 Fixed elephant african bush actor and mesh 
This was SVN commit r14654.
 2014-01-24 15:04:58 +00:00
Spahbod 609e789cea Fixing the bug with the ramp in Cantabrian Highlands. 
Applying the new improvements: Archipelago, Atlas Mountains, Cantabrian
Highlands.

This was SVN commit r14653.
 2014-01-24 12:28:30 +00:00
scythetwirler f94a1aeac0 Checks for game end after toggling diplomacy. Also adds a comment for clarification to the lobby bot. Refs #2402. 
This was SVN commit r14652.
 2014-01-24 00:38:08 +00:00
scythetwirler 53900c082b Added some criteria for rated games. Fixes #2402. 
This was SVN commit r14651.
 2014-01-24 00:22:50 +00:00
scythetwirler e5e634f768 Displays ratings in the userlist. Fixes #2371. 
This was SVN commit r14650.
 2014-01-23 23:13:13 +00:00
Enrique d82282e358 Added animations for african bush elephant. 
This was SVN commit r14649.
 2014-01-23 21:41:58 +00:00
Mythos_Ruler cf851a7789 A bunch of naming stuff. 
This was SVN commit r14648.
 2014-01-23 18:32:21 +00:00
Enrique 35517f2cd6 commited basic_glow.xml material for self-illumination objects. 
This was SVN commit r14647.
 2014-01-23 17:50:00 +00:00
sanderd17 fd187f466f Add vector prototype to vector-like return values from C++ to JS. Fixes #2394. 
This was SVN commit r14645.
 2014-01-23 11:32:08 +00:00
sanderd17 d677033c4c Serialise Cost component since the population bonus is tech-modifiable. Fixes #2399 
This was SVN commit r14644.
 2014-01-23 08:56:22 +00:00
JoshuaJB df0cdf8561 Fix typo in the Lake random map script. 
This was SVN commit r14643.
 2014-01-23 04:48:52 +00:00
Enrique 8d5c02091a Added greek, arabic and big tents as eyecandy, they will be used in the ptolemaic mercenary camp. 
Added Stanislas69's new gaul farmstead with some fixes. (Thanks
Stanislas69!)
Added carpet texture fragments to the ptolemaic struct texture

This was SVN commit r14642.
 2014-01-22 22:59:06 +00:00
sanderd17 ef79e8305b An addition to bd3f5a8085, also refs #1964 
This was SVN commit r14641.
 2014-01-22 20:56:14 +00:00
sanderd17 bd3f5a8085 Removing the AI check for producing un-allowed units. Should be fixed in the AI side with ad8fa37f17. Refs #1964. 
This was SVN commit r14640.
 2014-01-22 20:47:51 +00:00
wraitii ad8fa37f17 Improve some building placement. May improve dropsite usage slightly. 
Should fix #1964

This was SVN commit r14639.
 2014-01-22 20:26:45 +00:00
sanderd17 1fedf11e9e Use a filter to pick a new attack target in the same turn, while still avoiding an infinite loop 
This was SVN commit r14638.
 2014-01-22 18:38:15 +00:00
wraitii a58acb28f0 Style improvements (thanks Leper). 
Fix AI building its buildings closer together by properly moving failed
foundations out of the world.

This was SVN commit r14637.
 2014-01-22 17:54:20 +00:00
Mythos_Ruler 546a26467f Cavalry Spearmen for Sparta. Gives them a melee cavalry for proper anti-siege. 
This was SVN commit r14636.
 2014-01-22 16:34:00 +00:00
Mythos_Ruler 01ec56cc0c A bunch of updated portraits. Thinking of going this color-coded route: Blue for citizen-soldiers. Red for champions and heroes. Maybe green for mercenary soldiers. 
Tweaked a couple footprints.

This was SVN commit r14635.
 2014-01-22 15:42:28 +00:00
sanderd17 32844e9a16 Fix tests + improve behaviour of attacking when not in formation 
This was SVN commit r14634.
 2014-01-22 15:13:07 +00:00
sanderd17 04aba0e41a Let certain formations stay in formation while attacking 
This was SVN commit r14633.
 2014-01-22 13:20:55 +00:00
wraitii de02ab2e53 Fix various bugs. Try to make the AI build its buildings closer together (WIP, and it's brute-force). 
This was SVN commit r14632.
 2014-01-22 03:11:19 +00:00
mimo df3bdcf8ca add back some lines removed unintentionally by previous tag 
This was SVN commit r14631.
 2014-01-21 22:59:21 +00:00
mimo 41d3366f6a check version and mods before loading a file, fixes #2361 and #2385. 
This was SVN commit r14630.
 2014-01-21 22:49:42 +00:00
wraitii 7d18fecbcd Fix some errors reported by Gildas, Lion_Kanzen and Gameboy. Prepare for formation fighting in the attack plans by having a more generic "army" component. 
This was SVN commit r14629.
 2014-01-21 20:24:51 +00:00
sanderd17 e466565c35 Let formations attack other formations (still without keeping their formation position though) 
This was SVN commit r14628.
 2014-01-21 16:50:58 +00:00
sanderd17 2ca25a6d3e differentiate between formations that can attack, and formations that can only move. Use the differentiation in the range calculation. 
This was SVN commit r14627.
 2014-01-21 09:10:17 +00:00
leper 453bd6c8a0 Fix typo (Cepio -> Caepio), reported by qwertz. 
This was SVN commit r14626.
 2014-01-21 00:41:17 +00:00
Spahbod 3955447b5b Applying the new improvements: Alpine Lakes, Anatolian Plateau 
This was SVN commit r14625.
 2014-01-20 15:44:28 +00:00
sanderd17 7763a22c08 revert having giving the attack state to formation controllers as it caused too much trouble 
This was SVN commit r14624.
 2014-01-19 18:03:43 +00:00
Spahbod 72ad5467e8 Applying the new improvements: Aegean Sea, Lake, Rivers 
This was SVN commit r14623.
 2014-01-19 15:38:02 +00:00
Mythos_Ruler 8b2037e5ee Some naming stuff. 
Reduced the size of a spec map.

This was SVN commit r14622.
 2014-01-19 12:58:18 +00:00
Spahbod 6036b48c1d WIP: Completing the unified random map syntax. 
This was SVN commit r14621.
 2014-01-19 11:58:24 +00:00
Spahbod d06ab6514b WIP: Setting ground for a unified random map syntax. Might break some current random maps. 
Faster generation.
Better mountains.
Larger forests.
Should make it easier to design/tweak random maps.

This was SVN commit r14620.
 2014-01-19 06:51:41 +00:00
alpha123 8845910f9c Of course the time I don't test before committing is the time I make a syntax error. I think the RNG hates me. 
This was SVN commit r14619.
 2014-01-19 02:57:40 +00:00
alpha123 7a520adbf3 Improve the wording of attack tooltips. 
This was SVN commit r14618.
 2014-01-19 02:01:21 +00:00
historic_bruno 3c04cdb8e0 Updates LICENSE.txt for 29a8df5029, refs #2308. 
Sets svn:ignore property on generated cpp from encryption tests.

This was SVN commit r14617.
 2014-01-18 23:41:27 +00:00
wraitii f2f0307a25 fix typo. 
This was SVN commit r14616.
 2014-01-18 21:05:53 +00:00
sanderd17 c2d43b009c Fix asking for non-existing templates of killed units 
This was SVN commit r14614.
 2014-01-18 20:56:21 +00:00
JoshuaJB 3cde5632ff Fix StoneCrossBox sizing. 
This was SVN commit r14613.
 2014-01-18 20:29:21 +00:00
wraitii 9330975d54 Fix Athens not researching civ phase. Make the AI adapt automatically to changing the max gatherers on fields. 
Fix auto-researched technologies not being properly researched on init.
Fix the tests (amazing!).
GarrisonHolder sends which entities were added or removed (mostly for AI
purposes but could benefit other things).
Streamline AIInterface events.

This was SVN commit r14612.
 2014-01-18 20:26:52 +00:00
Mythos_Ruler 76451a297e This was SVN commit r14611. 2014-01-18 20:21:06 +00:00
alpha123 c4643d925d Fix two bugs in attack tooltips. Add an extra Math.round to ensure we don't get huge decimals, and use a building's default arrow count as a minimum in rate calculation. 
This was SVN commit r14610.
 2014-01-18 19:20:17 +00:00
alpha123 ea526eedd1 Adjust the attack tooltips. Make the formatting for attack rate more consistent and use meters instead of tiles for range. 
This was SVN commit r14609.
 2014-01-18 18:59:51 +00:00
alpha123 046c5ef74c Make chariots faster, and give them a more consistent (and slightly smaller) obstruction radius. 
Citizen chariots are now 15.0 speed (1 faster than cavalry), champion
chariots 16.0, and hero chariots 18.0.

This was SVN commit r14608.
 2014-01-18 18:08:02 +00:00
Mythos_Ruler ca6301c399 Reduced number of gatherers for farms from 5 to 3 for testing. 
This was SVN commit r14607.
 2014-01-18 16:47:04 +00:00
JoshuaJB c02dafec74 Move simulation Vector math to globalscripts/Math.js. Refs #2032. 
This was SVN commit r14606.
 2014-01-18 15:27:30 +00:00
Mythos_Ruler ae35ed255f For the Celts, moved Blacksmith to the Village Phase. This isn't much of a bonus yet until we get some unique tech trees for the Blacksmith. 
This was SVN commit r14605.
 2014-01-18 15:04:20 +00:00
Mythos_Ruler 061c5f8ced Fixing pop cost for advanced Persian chariot. 
This was SVN commit r14604.
 2014-01-18 15:03:08 +00:00
Mythos_Ruler 36edaa5635 Siege Workshop for the Macedonians. Needs a new model. 
Persians get the Nisean War Horses tech.

This was SVN commit r14603.
 2014-01-18 15:02:16 +00:00
JoshuaJB 29a8df5029 Change the licence of sha.h to match the licence of sha.cpp. Refs #2308 
This was SVN commit r14602.
 2014-01-18 13:12:29 +00:00
Mythos_Ruler 8c971c4a10 Trying to make elephant attack sounds not so crazy. Unsuccessful. 
This was SVN commit r14601.
 2014-01-18 12:35:55 +00:00
Mythos_Ruler c316079cc7 Updated names for female citizens. 
Updated Seleucid rally banner (still not happy with it).

Fixed name of Nisean War Horses tech.

This was SVN commit r14600.
 2014-01-18 12:33:19 +00:00
JoshuaJB 1040cf2034 Add back a new minimap overlay, re-add and implement the original idle button, little whitespace cleanup, and delete some old unused ui images. 
This was SVN commit r14599.
 2014-01-18 02:38:07 +00:00
JoshuaJB 82ab190c5d Do what my previous commit was supposed to do. 
This was SVN commit r14598.
 2014-01-18 00:37:00 +00:00
JoshuaJB 9ad01e52fb Add third_party/encryption in premake as required for the lobby. 
This was SVN commit r14597.
 2014-01-17 23:51:23 +00:00
JoshuaJB 94822b791f Remove automatically generated test .cpp files. 
This was SVN commit r14596.
 2014-01-17 20:17:56 +00:00
JoshuaJB 32258b2ba3 Move lobby encryption code to third_party/encryption and add tests. Fixes #2308 
This was SVN commit r14595.
 2014-01-17 20:14:41 +00:00
Yves d80967111d Fixes a problem with the renderpath screen not being displayed. 
Refs #2241

This was SVN commit r14593.
 2014-01-17 18:40:36 +00:00
Yves 377c780ddd Fixes the problem that functions in globalscripts aren't available from GUI scripts anymore since 4b1297b328. 
Refs #2241

This was SVN commit r14592.
 2014-01-17 18:21:27 +00:00
historic_bruno c094e72ede Fixes scoping for icons in GUI text, instead of using only the top page on the stack, which caused errors when dialog boxes popped up over text containing icons 
This was SVN commit r14591.
 2014-01-17 02:54:57 +00:00
scythetwirler c39b541714 Fixes some typoes in the bot README 
This was SVN commit r14590.
 2014-01-16 23:22:14 +00:00
Mythos_Ruler aba3d8d9d5 Shield tweaking for the Bronze Shield and Gold Shield pikemen. 
Adjusted hero health.

Made champions use arrow selections, while citizen soldiers use circles.

A bunch of updated portraits.

Seleucids changes.

Map updates.

New techs.

Roman siege walls a little weaker.

This was SVN commit r14589.
 2014-01-16 23:21:57 +00:00
wraitii c1e86161b5 AIs now properly receive aura and technology updates. Fixes #2377, Refs #1520 . Consequently reimplement repairing for AIs. 
Fix a few style issues and a bug with the gatherer count.
Still need to fix the entity.js file to handle properly some things as
this uses raw templates values.
Cache the AIinterface in AIProxy.js, please report if this works
properly.

This was SVN commit r14588.
 2014-01-16 20:32:44 +00:00
sanderd17 4b828ae6bf Fix gaul fortress death variation. Fixes #2374 
This was SVN commit r14587.
 2014-01-16 19:26:39 +00:00
sanderd17 4a133264f5 Fix unit tests 
This was SVN commit r14586.
 2014-01-15 13:36:33 +00:00
wraitii 786afd9fcc Implement the number of gaia gatherers (it probably won't happen but it's safer that way). 
Change UnitAI to call "leave" handlers on a conversion, like on a
destruction, so a unit will safely go to idle state on
resignation/conversions. Might fix some very weird bugs that probably
haven't been reported yet.
Reported by AlThePhoenix.
Fixes #2383.

This was SVN commit r14585.
 2014-01-15 00:04:25 +00:00
sanderd17 a6dbf6a268 instead of removing members from formations as in e98478b68c, let the members stay in formation, but disable formation rearrangement in those cases. 
This fixes issues with queueing orders, and should also fix #2380

This was SVN commit r14584.
 2014-01-14 21:32:51 +00:00
wraitii 13105132a4 http://gifrific.com/wp-content/uploads/2012/06/You-Didnt-See-Anything-Madagascar.gif 
This was SVN commit r14583.
 2014-01-14 20:20:53 +00:00
wraitii d23b7deb98 Various improvements to AI's early game. Simplify some code and improve on other. Add a few different strategies (Rush/normal/boom, quite basic for now, refs #2344). 
Aegis should mostly respect tech limitations so I'll ref #1964.
I'm going to go with #2364 is fixed, the AI should be more efficient in
early-game, and late-game is a known problem.
Fixes #2274 and fixes #2379.
Refs #2372 as it should fix several of those warnings for AIs.
Fixes #2256 with a new bartering system, in parts taken from mimo's
patch.

This was SVN commit r14582.
 2014-01-14 19:54:31 +00:00
sanderd17 e98478b68c Make sure units in INDIVIDUAL state don't belong to a formation. Should fix #2380 
This was SVN commit r14581.
 2014-01-14 08:58:11 +00:00
JoshuaJB 0f56dceef2 Give the minimap 20px more on eack side and remove the ugly overlay. Also cleanup some nearby code. 
This was SVN commit r14580.
 2014-01-14 03:25:12 +00:00
leper 2ca0a20f81 Fix a bug in TestAllMemberFunction and initialize a variable in cmpBattleDetection. Refs #2372. 
This was SVN commit r14579.
 2014-01-12 23:13:24 +00:00
wraitii a26ab7b1e7 Should fix AI warnings (refs #2372). 
Slight configuration changes to improve the early-game slightly, WIP.

This was SVN commit r14578.
 2014-01-12 19:12:55 +00:00
sanderd17 0521d936a1 reduce a GuiInterface call for displaying formation tooltip 
This was SVN commit r14577.
 2014-01-12 18:39:47 +00:00
Yves 34949b0943 Fixes some AI errors and missing VARs. 
This was SVN commit r14576.
 2014-01-12 17:34:18 +00:00
wraitii 6c3bd4db1e Fix previous AI commit. 
This was SVN commit r14575.
 2014-01-12 02:40:42 +00:00
wraitii 9d02495a96 Fix a few bugs. 
Improve the AI gamestate to make better use of entity collections,
should be very slightly faster, and it's cleaner.
Remove enemy watchers that were no longer used.

This was SVN commit r14574.
 2014-01-12 01:07:07 +00:00
Yves 8195e767ef Fixes an occasional crash when hotloading GUI files. 
Refs #2241

This was SVN commit r14573.
 2014-01-11 20:53:01 +00:00
wraitii bc9b76c86b Fix an error in defense.js (thanks mimo), and an issue in the HQ that made the AI start super slowly on some maps. 
This was SVN commit r14572.
 2014-01-11 18:51:37 +00:00
wraitii 4ef80d26aa Proper fix for the gatherer count. Fix an AI bug. Thanks to Gameboy and Gildas for reporting. 
This was SVN commit r14571.
 2014-01-11 18:14:13 +00:00
sanderd17 0e0b4e3057 make population bonus technology modifiable 
This was SVN commit r14570.
 2014-01-11 14:55:22 +00:00
sanderd17 96448bfa4e * add a (currently useless) attack state to formations 
* add a formation attack component that will be used in the future to
coordinate formation attacks
* clean up some related methods, and move some to more appropriate
places

This was SVN commit r14569.
 2014-01-11 12:19:43 +00:00
JoshuaJB 20692a26b0 Fix some undefined errors with unknown presences in the lobby and recougnize the 'gone' presence as away. 
This was SVN commit r14568.
 2014-01-11 03:53:41 +00:00
mimo eee6ed65dc still another fix to the gatherer count 
This was SVN commit r14567.
 2014-01-10 22:50:13 +00:00
wraitii 82fa27bad4 http://i.imgur.com/iAwfubL.gif 
This was SVN commit r14566.
 2014-01-10 20:33:47 +00:00
wraitii df9fb05689 Fix the gatherer count per player further and some style niceness. 
This was SVN commit r14565.
 2014-01-10 20:27:34 +00:00
leper 7606230158 Vars and style fixes. 
This was SVN commit r14564.
 2014-01-10 20:04:37 +00:00
sanderd17 9f243a3372 Disabling the OFFSET_LINE doesn't change any functionality as far as seen, while it fixes #2368. 
This was SVN commit r14563.
 2014-01-10 19:56:36 +00:00
Yves 11430cf927 Remove scripting directory from premake4.lua 
(I forgot that in cbc0650a79)

This was SVN commit r14562.
 2014-01-10 19:52:57 +00:00
Yves cbc0650a79 Removes some unused files 
This was SVN commit r14561.
 2014-01-10 19:38:34 +00:00
wraitii bd22432fe8 Rename common-api-v3 to common-api. 
Fix warnings with the new AI.
Fix an error with the per-player gatherer counts.

This was SVN commit r14559.
 2014-01-10 17:46:48 +00:00
sanderd17 87250a79c9 delete groups with a right click. Fixes #2341. Patch by boeseRaupe 
This was SVN commit r14558.
 2014-01-10 16:51:13 +00:00
sanderd17 f9a2c30a17 fix tests 
This was SVN commit r14557.
 2014-01-10 16:36:04 +00:00
Yves ee39f21b52 Fixes a problem when messageboxes were called without callback function. 
Fixes #2367
Refs #2241

This was SVN commit r14556.
 2014-01-10 16:25:09 +00:00
sanderd17 3d23f81696 Show the number of attacks per second to show users some attack speed, without showing the actual timers, or calcualtion of the number of arrows. Fixes #2352 
This was SVN commit r14555.
 2014-01-10 09:17:40 +00:00
wraitii 72c2853563 Update the tutorial AI (somewhat untested and hacky). 
This was SVN commit r14554.
 2014-01-10 02:08:59 +00:00
wraitii a6032ddd3f Removes older AIs and APIs. 
For the sake of it, we should have a minimal AI sometimes.

This was SVN commit r14553.
 2014-01-10 01:48:09 +00:00
wraitii ede4f32bf2 Change the defense system used by Aegis to use more modular armies. This should be faster and easier to extend, though right now it might not be as efficient as before. 
Fix a few bugs, including a few bad ones in the economy.
Change the way messages are handled, should be marginally faster in the
later game.
Makes gatherers count limit be per-player (refs #1387 and #643).

This was SVN commit r14552.
 2014-01-10 01:46:27 +00:00
sanderd17 22a85b0eb4 add dummy setspeed method to UnitMotionFlying 
This was SVN commit r14551.
 2014-01-09 12:53:28 +00:00
mimo ec36222b20 add more flexibility to eject units when garrisonHolder is destroyed, fixes #2242 
This was SVN commit r14550.
 2014-01-08 18:27:58 +00:00
wraitii 2d806f81f0 If at first you don't succeed… 
Refs #2359

This was SVN commit r14549.
 2014-01-08 18:18:52 +00:00
sanderd17 641c65b1dd Give some explanation to my change in 0c336649e6 
This was SVN commit r14548.
 2014-01-08 17:57:12 +00:00
sanderd17 0c336649e6 fix repairing buildings 
This was SVN commit r14547.
 2014-01-08 15:39:32 +00:00
LordGood 774d56af7e Carthaginian farmstead remake 
This was SVN commit r14546.
 2014-01-08 15:19:35 +00:00
sanderd17 9229cea9cc allow repairing of moving objects 
This was SVN commit r14545.
 2014-01-08 13:39:33 +00:00
sanderd17 f9b950aa96 improve rearrange of idle formation when units are tasked away from the formation + fix formation-settable idle animations 
This was SVN commit r14544.
 2014-01-08 10:55:44 +00:00
sanderd17 e8c4031bea Don't disband idle formations anymore, but give the formations a decent idle state. Formationmembers still need to leave the formation to anything other than walking, but this is a small step towards attacking formations. 
This was SVN commit r14543.
 2014-01-08 09:47:27 +00:00
sanderd17 4585f7322c Make the tooltips and the required members part of the formation template + fix allowing the wedge formation only for cavalry 
This was SVN commit r14542.
 2014-01-08 08:02:15 +00:00
JoshuaJB bec7cfd520 Another attempt to fix the lobby disconnects. 
This was SVN commit r14541.
 2014-01-08 04:22:34 +00:00
historic_bruno 7e87211d91 Attempts to fix crash reported on OS X Mavericks by not calling SDL_SetGamma in that case (this patch was included in the A15 bundles), refs #2272 
This was SVN commit r14540.
 2014-01-08 01:29:04 +00:00
wraitii 0482038af2 Another go at #2359 
This was SVN commit r14539.
 2014-01-08 00:06:26 +00:00
historic_bruno ad6ed949ee Fixes unreferenced formal parameter warning in MSVC 
This was SVN commit r14538.
 2014-01-07 23:10:06 +00:00
sanderd17 aadd297cce Implement the ability to switch animations based on the formation position 
This was SVN commit r14537.
 2014-01-07 20:21:55 +00:00
sanderd17 ff2a7d6bad fix spelling mistakes 
This was SVN commit r14536.
 2014-01-07 19:43:32 +00:00
sanderd17 83c5d40cfb fix compiling problem caused by 8226d75715 
This was SVN commit r14535.
 2014-01-07 14:37:02 +00:00
sanderd17 b1e0f1b62a Clean up the mess of different ways to note the formations (capitalised, with spaces, with underscores, concatenated ...) by always referring to the template name. 
This was SVN commit r14534.
 2014-01-07 13:33:08 +00:00
sanderd17 94907897a7 Fix tests + fix classes Ashoka. Fixes #2362 
This was SVN commit r14533.
 2014-01-07 09:23:59 +00:00
JoshuaJB 8226d75715 Make PickEntitiesAtPoint faster yielding 1-3% overall performance improvement. Fixes #2358. Also removes some trailing whitespace. 
This was SVN commit r14532.
 2014-01-07 04:05:10 +00:00
mimo 729a795a44 of course, 7a3b1fe47e can be simplified 
This was SVN commit r14531.
 2014-01-06 23:23:18 +00:00
mimo 7a3b1fe47e Improve speed of territory computation, fixes #2360 
This was SVN commit r14530.
 2014-01-06 22:49:57 +00:00
wraitii d0e57cb0ff Change a few things to avoid warnings with gcc. Should fix #2359 
This was SVN commit r14529.
 2014-01-06 22:14:27 +00:00
leper baf6925b66 Tactical varfare. 
This was SVN commit r14528.
 2014-01-06 20:55:22 +00:00
sanderd17 8cc1ddf6de Small code style fix 
This was SVN commit r14527.
 2014-01-06 20:13:55 +00:00
mimo b4fa090435 fix losRangeQuery broken in e096df0070 
This was SVN commit r14526.
 2014-01-06 19:35:51 +00:00
sanderd17 3406f2f3e8 Fix code style of files committed too soon in f19a8d6b41 
Adds blinking overlay to ther hero icon when he's attacked
Adds a health bar to the hero icon
Fixes #1902
Patch by boeseRaupe

This was SVN commit r14525.
 2014-01-06 13:48:17 +00:00
sanderd17 f19a8d6b41 Take the box formation out of the special case formations 
This was SVN commit r14524.
 2014-01-06 13:32:48 +00:00
LordGood 5cde6f7046 small rome tower edit 
This was SVN commit r14523.
 2014-01-06 12:50:50 +00:00
sanderd17 9989359c46 Small code cleanup + fixed default formation orientation 
This was SVN commit r14522.
 2014-01-06 10:16:28 +00:00
sanderd17 2f077fd9e1 Remove wedge formation from being a special case in the formation code 
This was SVN commit r14521.
 2014-01-06 09:10:46 +00:00
historic_bruno 9ccaa42a54 Fixes MSVC warning C4706: assignment within conditional expression 
This was SVN commit r14519.
 2014-01-06 02:16:09 +00:00
sanderd17 92ed27e3c5 Treat the flank formation as a regular formation, rather than a special implementation. 
This was SVN commit r14518.
 2014-01-05 18:50:31 +00:00
mimo f814510b2e revise the chase and flee 
This was SVN commit r14517.
 2014-01-05 18:29:38 +00:00
sanderd17 b8ee766cd3 Remove some hardcoded formation shapes. Some special formations still have a special treatment though. Also implement speed modifiers for formations, so we can have faster and slower formations. 
This was SVN commit r14516.
 2014-01-05 17:13:22 +00:00
wraitii aa0d485d72 Fix improper disabling of waves. 
This was SVN commit r14515.
 2014-01-05 16:41:50 +00:00
wraitii 15ec863aec Substantial speed-up of the foam generation code. 
Remove waves for now as they were unsatisfactory.
Removes "shininess" as a water parameter as it was basically useless.
Add a button in Atlas to recompute water parameters so you can now see
fog in Atlas.

Fixes #1743, #1803 (invalid)
Refs #1875, #2114, #48.

This was SVN commit r14514.
 2014-01-05 16:15:20 +00:00
mimo d56595c802 Put into alert units trained during an alert, fixes #2342, patch by Itms 
This was SVN commit r14513.
 2014-01-05 15:12:17 +00:00
Yves 7193e29961 Adds precompiled.h include because Visual Studio checks for that even though the file only contains comments. 
Thanks to boeseRaupe for reporting.

Refs #2348

This was SVN commit r14512.
 2014-01-05 13:58:38 +00:00
Yves b20955436b I completely missed the header files when disabling the JS debugger. 
Refs #2348

This was SVN commit r14511.
 2014-01-05 10:26:27 +00:00
sanderd17 d0497c83f1 Split the formation template in different templates. This can be used later to remove hard-coded formation statistics and forms to attributes in those templates 
This was SVN commit r14510.
 2014-01-05 10:09:42 +00:00
LordGood d4f35f1061 Revised roman tower 
This was SVN commit r14509.
 2014-01-05 02:11:00 +00:00
Yves 6ca6a5f779 The patch in 4b65f77438 seems to have fixed the crash, but the initData value doesn't match the JSContext's compartment, so it's theoretically wrong. 
This should fix it correctly.

#Refs 2241

This was SVN commit r14508.
 2014-01-04 21:49:36 +00:00
Yves 4b65f77438 Fixes an occasional crash introduced in #2241 (hopefully). 
Refs #2241

This was SVN commit r14507.
 2014-01-04 21:36:12 +00:00
Yves 7d516e7e7a Disables the JS debugger. 
It's completely broken since 4b1297b328 and will have to be updated for
the new SpiderMonkey API.
I only uncomment it at the moment because I plan to fix/reimplement it
soon after the upgrade.

Closes #2348
Refs #2241
Refs #1886

This was SVN commit r14506.
 2014-01-04 20:47:56 +00:00
Mythos_Ruler da1a2eaba6 This was SVN commit r14505. 2014-01-04 20:42:34 +00:00
Mythos_Ruler d8e839daec Reduced armor for Roman siege walls. 
This was SVN commit r14504.
 2014-01-04 16:53:01 +00:00
sanderd17 58dd223018 Now really fix the temple aura. See d4b2c1285c 
This was SVN commit r14503.
 2014-01-04 15:43:05 +00:00
sanderd17 9fb6620edd Use an actual flee order to move animals away from the foundation. Fixes #2347 
This was SVN commit r14502.
 2014-01-04 15:36:20 +00:00
sanderd17 1e33dd1d5e fix targetPosition != null check 
This was SVN commit r14501.
 2014-01-04 13:15:44 +00:00
Yves 3d5f661447 Fixes assertion failure when opening the ingame manual. 
This problem happens because callback functions need to be passed to GUI
pages differently since 4b1297b328.

Refs #2241

This was SVN commit r14499.
 2014-01-04 11:48:28 +00:00
Yves 4a11b30b39 Fixes assertion failure when clicking the settings button (aiconfig) on the match setup screen. 
This problem happens because callback functions need to be passed to GUI
pages differently since 4b1297b328.

Refs #2241

This was SVN commit r14498.
 2014-01-04 11:29:35 +00:00
sanderd17 d4b2c1285c add the ability to exclude props from the selection size + add aura visualisation rings again 
This was SVN commit r14497.
 2014-01-04 10:41:32 +00:00
Yves 4b1297b328 Removes g_ScriptingHost and implements global to compartment 1 to 1 relation. 
Each GUI Page gets its own compartment and all ScriptInterfaces in the
same thread should now use the same JS Runtime.
This is required for the SpiderMonkey upgrade.
Check the ticket for details.

Closes #2241
Refs #1886
Refs #1966

This was SVN commit r14496.
 2014-01-04 10:14:53 +00:00
LordGood 743644f5ce Roman tower remake 
This was SVN commit r14495.
 2014-01-04 04:14:29 +00:00
sanderd17 e096df0070 fix units attacking harmless gaia buildings 
This was SVN commit r14494.
 2014-01-03 20:24:02 +00:00
JoshuaJB fb8032043b Use pointers instead of copying sprites in the GUI. Fixes #1984. Patch by jP_wanN. 
This was SVN commit r14493.
 2014-01-03 20:19:43 +00:00
JoshuaJB 28f022993a Fix template typos and inconsistaint whitespace. 
This was SVN commit r14492.
 2014-01-03 19:55:29 +00:00
Mythos_Ruler e85c3de782 Removed the Cavalry Stables from the Seleucids. Their training buildings started to get unwieldy compared to other civs. 
This was SVN commit r14491.
 2014-01-03 19:30:25 +00:00
mimo 9a41c588fe prevent traders to cycle between two adjacent markets 
This was SVN commit r14490.
 2014-01-03 14:03:12 +00:00
sanderd17 1eb5d730fc allow garissoning a small number of support units in houses as protection against early raids. Patch and suggestion from dumbo 
This was SVN commit r14489.
 2014-01-03 13:11:12 +00:00
sanderd17 f634a8db3e fix units fleeing too far 
This was SVN commit r14488.
 2014-01-03 12:49:04 +00:00
mimo 6e4adcba52 add missing rallypoint to garrisonholder wonders 
This was SVN commit r14487.
 2014-01-03 11:24:23 +00:00
LordGood 1c3da82869 New Carthaginian wonder commit 
This was SVN commit r14486.
 2014-01-03 03:17:53 +00:00
Mythos_Ruler f7c1b73a01 Some more tweaks for the Seleucids. 
Updated portraits.

This was SVN commit r14485.
 2014-01-02 23:24:18 +00:00
mimo 66de76e026 fixes #2340, patch by itms 
This was SVN commit r14484.
 2014-01-02 23:11:18 +00:00
sanderd17 8269f0cfd4 Group units in clusters of separate formations when they're too far apart. 
This was SVN commit r14483.
 2014-01-02 20:04:50 +00:00
wraitii 8b98e2d513 Fix osx libraries build script for WXwidgets and libiconv. 
This was SVN commit r14482.
 2014-01-02 17:24:48 +00:00
leper e73738d794 Do not pause multiplayer games if one player opens a dialog. Patch by boeseRaupe. Fixes #2275. 
This was SVN commit r14481.
 2014-01-02 16:30:24 +00:00
leper dd86995f77 Fix some newlines. 
This was SVN commit r14480.
 2014-01-02 16:22:03 +00:00
leper b3d799d950 Replace inconsistent separators in quotes. Fixes #2247. Patch by boeseRaupe. 
This was SVN commit r14479.
 2014-01-02 14:46:47 +00:00
mimo 7d26f93666 fix animals taken as target in move-attack after 66770feed6, use the same filter as in AttackEntitiesByPreference 
This was SVN commit r14478.
 2014-01-02 14:17:46 +00:00
sanderd17 5b2cb0e72f small code fix 
This was SVN commit r14477.
 2014-01-02 08:40:51 +00:00
JoshuaJB b1422137e5 Cleanup GUI Checkbox C++ code by removing broken, non-obvious internal text rendering. 
This was SVN commit r14476.
 2014-01-02 03:28:15 +00:00
sanderd17 d8e8f613cd small code cleanup 
This was SVN commit r14475.
 2014-01-01 19:56:27 +00:00
sanderd17 59525414ee fix automatically attacking buildings caused by 66770feed6 
This was SVN commit r14474.
 2014-01-01 19:54:15 +00:00
sanderd17 66770feed6 include gaia range query of UnitAI in general range query. Fixes #2156. Patch by dumbo 
This was SVN commit r14473.
 2014-01-01 18:59:16 +00:00
sanderd17 05baeae5bd fix units not dropping resources when they are already at the resource dropsite (e.g. fields right next to a farmstead). Fixes #2336 
This was SVN commit r14472.
 2014-01-01 18:17:47 +00:00
sanderd17 9cf55a5ed0 fix productionQueue failing to produce units while the upgrade tech is running 
This was SVN commit r14471.
 2014-01-01 16:35:49 +00:00
sanderd17 2197b80747 fix oos problem mentioned by Yves on IRC 
This was SVN commit r14470.
 2014-01-01 16:15:26 +00:00
JoshuaJB 3d171b54c9 New ModernTickBox style for the GUI. Replace the use of StoneCrossBox in the lobby GUI with the new style. 
This was SVN commit r14469.
 2014-01-01 06:15:06 +00:00
JoshuaJB 67570be8fa Make GUI button-based objects to behave more expectedly when doubleclicked, also some style tweaks. 
This was SVN commit r14468.
 2014-01-01 06:05:41 +00:00
JoshuaJB 1e522f9b2c Fix bug with rating in lobby bot, remove superfluous GUI typedef, and change the lobby chat autocompletion to use tab. 
This was SVN commit r14467.
 2014-01-01 00:23:18 +00:00
wraitii 9d9361ae44 Why you should test your code before committing, exhibit A. 
This was SVN commit r14466.
 2013-12-31 21:45:11 +00:00
wraitii a7cafe75aa "Reveal all player" id back to -1, add some "ensure" to catch invalid player ids and be safer. 
This was SVN commit r14465.
 2013-12-31 21:30:48 +00:00
wraitii fe2a97b0c9 Change some useless std::map into std::vector for LOS. Player "0" now reveals the LOS for all. 
This was SVN commit r14463.
 2013-12-31 16:38:11 +00:00
mimo d7f18c10de Add visual indicator when unsetting rally-points, closes #2117 
This was SVN commit r14462.
 2013-12-31 13:21:06 +00:00
Yves 75b8952d04 Delete help.txt. 
I wanted to update it first for some function names I changed.
Then I noticed that nearly all the functions described there don't exist
anymore or have changed. There are much better descriptions at the
places where the functions are declared/implemented.
We should either do it right (and force everyone to update that file for
every change) or don't to it at all. At this stage of development it
doesn't make sense and when we start documenting all the functions at a
central place, there are better locations than this file.

This was SVN commit r14461.
 2013-12-31 12:21:56 +00:00
JoshuaJB c0472f0de5 Fix trivial comment typo caught by wraitii. 
This was SVN commit r14460.
 2013-12-31 11:06:00 +00:00
sanderd17 f8ca47913d fix division by zero for zero-time technologies. Fixes #2334 
This was SVN commit r14459.
 2013-12-31 09:02:58 +00:00
JoshuaJB c7ff0bb486 Tweak some lobby login UI bits, rework scrollbar mousewheel handling, add ability to scroll through closed dropdowns with scrollwheel, general C++ GUI cleanup, and fix broken random map script 'Unknown Nomad'. 
This was SVN commit r14458.
 2013-12-31 04:54:16 +00:00
JoshuaJB b3a74e8f72 Add message to help new users register for the lobby. 
This was SVN commit r14457.
 2013-12-31 01:14:09 +00:00
leper 2008ebc9d6 Use ACLs in the ipstamp module to support multiple lobby bots. 
This was SVN commit r14456.
 2013-12-31 00:25:33 +00:00
JoshuaJB b2a535d838 Change the lobby registration to the new UI style and try to make it more ergonomic. 
This was SVN commit r14455.
 2013-12-31 00:01:27 +00:00
JoshuaJB e21464d960 Try to fix some errors in the bot by checking a player id's validity before using it as an index. 
This was SVN commit r14454.
 2013-12-30 20:48:15 +00:00
leper 1c9965999b Use another muc room for svn/a16. 
This was SVN commit r14453.
 2013-12-30 19:44:42 +00:00
wraitii dddc9bab7f Fix tests. 
This was SVN commit r14452.
 2013-12-30 18:55:37 +00:00
sanderd17 4776d85301 use UnitMotionFlying for the hawks 
This was SVN commit r14451.
 2013-12-30 18:03:01 +00:00
sanderd17 298115f4c5 Fix units chasing each other. Fixes #1537 
This was SVN commit r14449.
 2013-12-30 16:07:19 +00:00
wraitii ddee36e0a8 Hide map size for skirmish and scenarios. Refs #2301. 
Also fix my previous commit because obviously I had committed the wrong
default value.

This was SVN commit r14448.
 2013-12-30 15:59:00 +00:00
wraitii 08b44fe647 Fix water rendering (transparent objects now appear correctly when underwater/in reflections) 
Add a new config option (renderactors) that, if set to false, will
prevent actors from rendering in-game (grass…)

This was SVN commit r14447.
 2013-12-30 15:52:42 +00:00
Yves 4a15ac406b Move debug function and debug flag to API3 and use them from Aegis. 
Remove copyPrototype from Aegis because that function is currently not
used and is already in API3.

Refs #2322

This was SVN commit r14446.
 2013-12-30 14:28:30 +00:00
wraitii 5febe42aa9 Fix [14444] 
This was SVN commit r14445.
 2013-12-30 12:50:06 +00:00
wraitii bc136137fc Make hawks selectable in Atlas and alleviate their tendency to congregate in the upper right corner of maps. 
This was SVN commit r14444.
 2013-12-30 12:43:57 +00:00
wraitii bd2cd235fd Commit Micket's hawk model/rigging, textures using photos by unarmed, add an entity that moves around the map, change maps to use the entity and not the idle actor. Fixes #1228, Fixes #1975. 
This was SVN commit r14443.
 2013-12-30 11:10:54 +00:00
Yves 533f908f15 Some missing changes in #2322. 
Refs #2322

This was SVN commit r14442.
 2013-12-30 10:25:50 +00:00
Yves 3362c591f5 Moves AI players to one global using the module pattern. 
This avoids wrapping overhead that would otherwise be required because
multiple globals per compartment aren't supported anymore in newer
versions of SpiderMonkey.

Check the ticket for a detailed explanation.

Closes #2322
Refs #2241
Refs #1886

This was SVN commit r14441.
 2013-12-30 10:04:59 +00:00
Mythos_Ruler 9a8d5312d4 Removed Civic Center from the Seleucid female. They don't build civic centers (heroes can though). Citizen-Infantry build Military Colonies instead to expand. 
This was SVN commit r14440.
 2013-12-30 05:47:26 +00:00
Mythos_Ruler 3c630c2e63 Fixed Seleucid thureophoros accidentally calling on the Ptolemaic one. 
Made the 4th level of armor techs apply to champions instead of all
infantry.

This was SVN commit r14439.
 2013-12-30 05:38:24 +00:00
Mythos_Ruler 91bbc925e2 Completing the playability phase of the Seleucids. Now starts the long road of creating art and balancing and implementing bonuses (hero auras, unique techs, etc.). 
This was SVN commit r14438.
 2013-12-30 04:25:33 +00:00
leper 5e23445339 Make ConfigDB properly thread-safe. 
Replace CreateValue with SetValueString so we don't pass pointers to
internal
 ConfigDB structures around. Refs #1810.
Remove some splash screen related functions since we can achieve the
same
 with the ConfigDB functions exposed to scripts.

This was SVN commit r14437.
 2013-12-29 23:56:18 +00:00
JoshuaJB 92fba32c5e Some more C++ GUI cleanup. 
This was SVN commit r14436.
 2013-12-29 20:46:02 +00:00
JoshuaJB e729f46789 Make button-type GUI elements more responsive and cleanup in IGUIButtonBehavior.cpp 
This was SVN commit r14435.
 2013-12-29 19:31:48 +00:00
JoshuaJB d756e8d70e Add proper licences to lobby bot files. Also remove extranious config file. 
This was SVN commit r14434.
 2013-12-29 18:46:00 +00:00
sanderd17 45cfdf47f1 fix carthagian buildings being constructed with garrison flag up. Fixes #2318 
This was SVN commit r14433.
 2013-12-29 18:16:31 +00:00
leper 3746690f82 Define GLX_MESA_query_renderer functions unconditionally. Fixes #2325. 
This was SVN commit r14432.
 2013-12-29 17:13:55 +00:00
Mythos_Ruler 517e83b331 New map: Savanna River. Very defensive. Only 1 crossing, unless you cut through the trees around the river. 
Tweaked Gambia River for pathing.

Tweaked the obstruction of Farm Fields so that they don't overlap so
much.

Increased build time of Wonders.

This was SVN commit r14431.
 2013-12-29 16:36:25 +00:00
sanderd17 2146fa27c8 forgot to rename reference 
This was SVN commit r14429.
 2013-12-29 12:40:34 +00:00
wraitii 4158283fd4 Take unit obstruction size into account when checking if in range for garrisoning. Reduce CC loading range in consequence. Fixes #2190 . 
This was SVN commit r14428.
 2013-12-29 10:17:09 +00:00
sanderd17 10e8fb9105 remove debug message 
This was SVN commit r14427.
 2013-12-29 10:09:58 +00:00
sanderd17 cd125a94e2 fix tests + code style cleanup 
This was SVN commit r14426.
 2013-12-29 10:01:39 +00:00
wraitii 433293c7b2 Spread is now linearly tied to distance to target. Fixes #2093 . 
This was SVN commit r14425.
 2013-12-29 08:09:44 +00:00
Enrique 04d0f424df added wonder placeholders for generic hellenes and celts 
This was SVN commit r14424.
 2013-12-28 17:13:24 +00:00
wraitii ce7235a6aa Various art fixes. 
Polynesia map is back to hdr mode.
Improve shark animations, improve crocodile walking animation.
Fix mauryan bamboo bow prop (for some reason it had two models).

This was SVN commit r14423.
 2013-12-28 16:34:10 +00:00
wraitii 0029103153 Ptolemy fishing boat (along with props). fixes #2237 
This was SVN commit r14422.
 2013-12-28 15:59:08 +00:00
Enrique 15b42f0be5 Added wonder placeholders for civs without wonder. 
This was SVN commit r14421.
 2013-12-28 15:21:11 +00:00
Mythos_Ruler 139a1fd5ca Updated a bunch of civ jsons. 
Fixed a few other things.

This was SVN commit r14420.
 2013-12-28 15:07:19 +00:00
sanderd17 bf58f04511 add wonder victory condition. Refs #1649 
This was SVN commit r14418.
 2013-12-28 13:40:39 +00:00
mimo 749c4d5270 change the way to manage trade, closes #2311 
This was SVN commit r14417.
 2013-12-28 10:44:59 +00:00
Mythos_Ruler 6accb6faf6 Fixed bell icons. 
Seleucid Military Reforms.

Fixed inheritance for Ptol healers.

This was SVN commit r14416.
 2013-12-28 05:32:16 +00:00
JoshuaJB f254478d1b Revert accidentily committed changes. 
This was SVN commit r14415.
 2013-12-28 03:34:40 +00:00
JoshuaJB 177a7cd99d Make uninitilized players not show in the lobby leaderboard. 
This was SVN commit r14414.
 2013-12-28 03:32:31 +00:00
Mythos_Ruler 121345bd6a Name stuff. 
This was SVN commit r14413.
 2013-12-28 02:35:19 +00:00
Mythos_Ruler b3201acd93 Trimmed the descriptions for most of the random maps, per Josh's request. 
This was SVN commit r14412.
 2013-12-28 02:17:08 +00:00
Mythos_Ruler 5f1714dd83 Seleucids now have what used to be the Ptolemies' Military Settlement system (now called a Military Colony; needs a new model). 
Fixed a few other templates.

This was SVN commit r14411.
 2013-12-28 00:34:37 +00:00
Mythos_Ruler 02d38ceecd Fixed elephant stables class element. 
This was SVN commit r14410.
 2013-12-27 15:21:15 +00:00
sanderd17 bfa7f60251 add outpost skirmish entity, and apply it to the Gambia River skirmish map 
This was SVN commit r14409.
 2013-12-27 14:48:24 +00:00
sanderd17 659736301a define the limit changing elements together with the limits, so they can be queried by the GUI and the AI. Fixes #2187 
This was SVN commit r14408.
 2013-12-27 10:58:48 +00:00
wraitii 040e15ed51 Change shark model, skeleton, and change its animations. Add a shark entity that will roam the map and can be attacked, but will not attack and yields no food. Change Polynesia demo map to have a shark. 
This was SVN commit r14407.
 2013-12-27 10:32:53 +00:00
sanderd17 81f901d473 make the elphant stables count as town phase structure. Mentionned by Zeta1127 on the forums 
This was SVN commit r14406.
 2013-12-27 09:38:44 +00:00
sanderd17 f33d3193ca fix tests (fixes #2326) 
+ small code cleanup
+ move guiInterface call to GetEntityState
refs #2154

This was SVN commit r14405.
 2013-12-27 08:49:47 +00:00
Spahbod e4a124e768 WIP: Making the forests in random maps bigger as per people's request. 
This was SVN commit r14404.
 2013-12-27 08:07:05 +00:00
JoshuaJB dca3393195 Fix 'Carrier Pidgons' technology by checking that rawClasses is not NULL before operating on it. 
This was SVN commit r14403.
 2013-12-27 04:01:03 +00:00
Mythos_Ruler f42bf782bb Bactria map updated. 
This was SVN commit r14402.
 2013-12-27 00:47:26 +00:00
Mythos_Ruler c9b48c6e53 Updated a couple African maps with the new crocodiles. 
This was SVN commit r14401.
 2013-12-26 22:55:48 +00:00
Mythos_Ruler 60bcebf5b6 Fixed crocodile actor. 
This was SVN commit r14400.
 2013-12-26 22:45:04 +00:00
wraitii e942768b4d Add textured, normal-mapped, animated Nile crocodile to the game. Need to do a female version, possibly a saltwater croc version for mauryan maps? 
Add crocodile entity, which is about similar to the lion.
Add a (temporary?) crocodile portrait.
It uses the lion sounds which are probably the closest we have right
now.

This was SVN commit r14399.
 2013-12-26 22:33:06 +00:00
JoshuaJB 7688e9c93e Properly round rating calculation in the lobby bot to an integer. 
This was SVN commit r14398.
 2013-12-26 20:16:43 +00:00
JoshuaJB 4ac5aacc87 Strip some trailing spaces in the lobby bot. 
This was SVN commit r14397.
 2013-12-26 19:52:07 +00:00
JoshuaJB ad0d81cb8a Various lobby changes and some optimizations in the lobby bot by scythetwirler. 
This was SVN commit r14396.
 2013-12-26 19:45:20 +00:00
mimo 0780becb8a fix attack-move not working for packed units 
This was SVN commit r14395.
 2013-12-26 16:09:32 +00:00
Mythos_Ruler e9a269c01c Remove attack from Military Settlement for now. 
This was SVN commit r14394.
 2013-12-26 16:04:04 +00:00
sanderd17 953e44d9f8 try using footprint instead of obstruction for separation space between formation members + Fix some footprint sizes of siege units 
This was SVN commit r14393.
 2013-12-26 12:24:52 +00:00
sanderd17 41b3dfc89c Implement town bell 
* the icons are temporary, and can be replaced later
* The sounds are created by LAVS, but may also need some polishing, so
the current ones are placeholders too
* The patch code is created by Itms
fixes #2154

This was SVN commit r14392.
 2013-12-26 10:43:51 +00:00
sanderd17 9dcc3ee89e fix always picking the same processor core on some systems. Based on code hits by Philip 
This was SVN commit r14391.
 2013-12-26 10:05:44 +00:00
leper 1de1e2d5ba Fix typo. 
This was SVN commit r14390.
 2013-12-26 01:05:35 +00:00
JoshuaJB bdeae5d474 Don't send superfluous chat / commands in the lobby, also fix issues with the lobby system messages. Merge from my github branch. 
This was SVN commit r14389.
 2013-12-25 19:28:53 +00:00
Mythos_Ruler 4658cfa775 Mythos_Ruler's Christmas update for SVN users! 
Includes:

- Unit rank upgrades, based on a patch by Sanderd. Not all civs get all
rank upgrades. For instance, Spartans get the Infantry rank upgrades,
but not the cavalry rank upgrades. Conversely, the Persians get the
cavalry rank upgrades, but not the infantry rank upgrades. Carthaginians
get rank upgrades for their mercenaries, but not their native units.
etc.

- Updated and tweaked many of the skirmish maps. Too many tweaks to
mention. But I did add Iberian circuit walls to many of them! New
"Bactria" Skirmish Map. Will continue to tweak this one to make it more
unique. It's based on modern-day Afghanistan, which the ancients called
"Bactria." A 2nd Ptolemies sandbox demo map.

- Moved the Ptolemaic Lighthouse to Town Phase to have more impact for
the Ptolemy player on maps with water.

- New Thureos shield patterns by Enrique for a NEW unit: Mercenary
Thureos Spearman.

- TECHNOLOGIES: Some techs renamed and tweaked. Plus, a new "Iron Armor"
tech for Heroes. A new "Roman Logistics" tech for the Roman Army Camp
and Siege Walls. A new "Battlefield Medics" tech for the temple that
unlocks (slow) health regeneration for units. The portrait for this tech
is placeholder and needs replaced ASAP.

- Cavalry now have oval selection rings. Eventually I will implement a
selection ring system where the citizen-soldiers and support units have
round rings, while champions have arrows, and heroes have stars. This
helps visually differentiate the roles of these 3 classes of units. Not
yet implemented.

- Vision radius for infantry slightly reduced.

- Fixed sounds for Persian Wonder.

- Fixed footprint sizes for a few buildings and Ptolemaic walls.

- Ptolemies now have the "Military Settlement" system in place. But this
system might go to the Seleucids instead later for historical reasons.

- Cost of fields reduced. Gathering rates for grain reduced.

- Fixed some selection group names for some templates. (Double clicking
didn't select them all as it should have).

- Fixed/Changed/Added some unit and building names, specifically for the
Ptolemies, but for some others as well.

- Some new temp portraits for Ptolemaic units. Ongoing task.

Lastly, I hope these changes don't break anything. They are heavily
tested on my end, but I can't promise I caught all bugs.

This was SVN commit r14388.
 2013-12-25 15:49:49 +00:00
leper f7e68a4d4c Bot optimizations by scythetwirler. 
This was SVN commit r14387.
 2013-12-25 15:13:58 +00:00
sanderd17 40d407e8c6 use ptol fortress in random maps with the wall builder 
This was SVN commit r14385.
 2013-12-18 18:32:25 +00:00
leper 42bc5165ab Add compile time flag to disable use of miniupnpc. 
This was SVN commit r14384.
 2013-12-18 16:08:56 +00:00
sanderd17 7f5c2c4b83 enlarge the units demo map, so all units can be checked out again 
This was SVN commit r14383.
 2013-12-18 15:46:09 +00:00
Mythos_Ruler eb7215ecaf This was SVN commit r14381. 2013-12-18 14:14:37 +00:00
Mythos_Ruler 3d9fe04ab5 Added Egyptian names for Ptolemaic buildings. 
Deleted a bunch of maps. Added Lorraine Plain skirmish map.

This was SVN commit r14380.
 2013-12-18 13:54:30 +00:00
sanderd17 1b17ac50cc remove the aura visualisation from the actors, as it causes selection problems 
This was SVN commit r14379.
 2013-12-18 10:43:32 +00:00
sanderd17 63f2f85b01 make sure the non-garrisoned variant of the persian models is always picked while constructing 
This was SVN commit r14378.
 2013-12-18 10:28:32 +00:00
LordGood 6bc5e3f3a5 Ptolemies corral draft commit 
This was SVN commit r14377.
 2013-12-18 05:29:54 +00:00
alpha123 0b80cbe3ec Hide the password field by default on the lobby login box if there is a remembered password. Since we only store hashed passwords, this avoids potential confusing from seeing a password much longer than the user’s in the field. 
This was SVN commit r14376.
 2013-12-18 00:56:59 +00:00
alpha123 3c248e7501 Change the "Away" color in the lobby to be much easier to read on the dark background. 
This was SVN commit r14375.
 2013-12-17 23:58:53 +00:00
alpha123 c8fb750e43 Balance fix for CCs. Decrease build time from 600 to 500 and increase foundation armor from 3h/10p/3c to 5h/15p/3c. 
This was SVN commit r14374.
 2013-12-17 21:20:31 +00:00
leper c6d454ff2d Make ConfigDB threadsafe. 
This was SVN commit r14373.
 2013-12-17 19:58:39 +00:00
leper e83f24e3a6 Move UPnP port forwarding to a thread. 
Fix some typos.
Do not return the result, as we would need to allocate it, but we never
use it.

This was SVN commit r14372.
 2013-12-17 17:03:49 +00:00
JoshuaJB 4df4c0dec0 Try to actually do the threading my previous commit said it did. 
This was SVN commit r14371.
 2013-12-17 14:57:26 +00:00
JoshuaJB 0ba25e9968 Cache UPnP root URL to try to avoid searching each time. Also make searching asyncronous with the GUI to avoid hanging. 
This was SVN commit r14370.
 2013-12-17 14:21:49 +00:00
LordGood 60bbb50625 Ptolemaic dock draft commit 
This was SVN commit r14369.
 2013-12-17 03:17:35 +00:00
LordGood fa03aadaa5 Updated fixed unit icons 
This was SVN commit r14368.
 2013-12-16 04:09:35 +00:00
LordGood 8c5f583845 Ptolemaic blacksmith draft commit 
This was SVN commit r14367.
 2013-12-16 02:05:43 +00:00
leper 678d338670 Change bot name. 
This was SVN commit r14366.
 2013-12-15 21:02:58 +00:00
historic_bruno 2cdef4023c Fixes OS X libs build script 
This was SVN commit r14365.
 2013-12-15 20:56:58 +00:00
leper d2e671392b Fix bug in ipstamp module. 
Sync with server. Refs #2307.

This was SVN commit r14363.
 2013-12-15 18:33:01 +00:00
mimo 79252043ae fix the fish gatherer from b91ec9b449 
This was SVN commit r14362.
 2013-12-15 17:32:20 +00:00
Mythos_Ruler b91ec9b449 Added new Ptolemies track to the Ptolemies civ json. 
Removed fishing from land units. However, they still try to go fish
after building a dock. Looks like it needs a deeper fix.

Portrait for Ptol camel archer.

This was SVN commit r14361.
 2013-12-15 15:33:35 +00:00
OmriLahav 542861ba36 This was SVN commit r14359. 2013-12-15 14:14:22 +00:00
sanderd17 bcba922893 fix switching between column and other formations 
This was SVN commit r14358.
 2013-12-15 09:51:13 +00:00
historic_bruno e7d57136ef Updates license files for gloox, MiniUPnPc, and pkcs5_pbkdf2. Refs #2308 
This was SVN commit r14357.
 2013-12-15 02:49:11 +00:00
historic_bruno 2c3c8737e0 OS X libs build script improvements: 
* fixes failed build when using --force-rebuild
* cleans up old build output before starting new builds
* improves separation of libogg and vorbis
* updates wxWidgets to 3.0.0

This was SVN commit r14356.
 2013-12-15 02:14:45 +00:00
historic_bruno 99f44ff7a0 Reorganizes extern libs in alphabetical order 
This was SVN commit r14355.
 2013-12-15 01:34:16 +00:00
historic_bruno 99f90dd6de Adds MiniUPnPc to build-osx-libs.sh 
This was SVN commit r14354.
 2013-12-15 01:26:55 +00:00
LordGood c2c2177be4 forgot the death particles 
This was SVN commit r14353.
 2013-12-15 01:10:39 +00:00
historic_bruno 62a10ab938 Fixes Windows build. 
Fixes UPnP error handling to be more correct and conventional, refs
#2305

This was SVN commit r14352.
 2013-12-15 01:02:26 +00:00
LordGood b1a73d3c0e Ptolemaic market draft commit 
This was SVN commit r14351.
 2013-12-14 22:14:24 +00:00
JoshuaJB f890856c6d Seperate differently licenced portions of sha.cpp/h into pkcs5_pdkdf2.cpp/h and remove some extra std includes in sha.cpp. Refs #2308 
This was SVN commit r14350.
 2013-12-14 16:58:21 +00:00
JoshuaJB bf97148ddc Add proper licence header and remove tyedefs in sha.cpp/h. Refs #2308 
This was SVN commit r14349.
 2013-12-14 16:22:48 +00:00
JoshuaJB 5876ec38d1 Make sure we properly free some UPnP-related variables. 
This was SVN commit r14348.
 2013-12-14 03:21:21 +00:00
JoshuaJB 551eb3919d Change UPnP lease duration to 0 (permanent) and update comments. 
This was SVN commit r14347.
 2013-12-14 03:03:22 +00:00
Mythos_Ruler 63622a85d7 Fixed missing elephants in some maps, thanks mimo for catching it. 
This was SVN commit r14345.
 2013-12-13 19:10:04 +00:00
Mythos_Ruler 44587963e6 Reduced armor for palisade fort. 
Tweaked ptolemies sandbox, Alpine Valleys (removed player command of
some deer), and added a Greek Acropolis "Night" map for fun.

This was SVN commit r14344.
 2013-12-13 16:26:26 +00:00
Mythos_Ruler 685d37ddfa New Roman emblem. 
This was SVN commit r14342.
 2013-12-13 14:18:46 +00:00
leper fd47e6caee Name. 
This was SVN commit r14341.
 2013-12-13 13:30:59 +00:00
leper 619c59fd3f Read the default MUC room from the config file and set it to arena15. Fixes #2306. 
Change the jid of xpartamupp to WFGbot to make it work on the new
server. Refs #2307.

This was SVN commit r14339.
 2013-12-13 12:14:17 +00:00
Mythos_Ruler 5b9dfaef8f Tweaked Gallic Fields. 
Made the palisade spikes not lose health when outside territory.

Changed ptol military settlement actor from Athenian barracks to
Macedonian barracks.

Lowered the height of the farm field status bar slightly.

This was SVN commit r14338.
 2013-12-13 11:34:19 +00:00
JoshuaJB 8dab478691 Bundle miniUPnPc with 0AD. 
This was SVN commit r14333.
 2013-12-13 02:59:35 +00:00
JoshuaJB 667537ee49 UPnP-based automatic port-forwarding using miniupnpc. Breaks windows build at the moment. Refs #2305 
This was SVN commit r14332.
 2013-12-13 02:23:02 +00:00
Enrique b508fe848a Fixed celtic embassy textures in its actor 
This was SVN commit r14331.
 2013-12-12 10:09:14 +00:00
wraitii 1efd47c1ad Fix errors when loading a saved game with Aegis by making sure the AI re-inits properly. Still no real saved game support. 
This was SVN commit r14329.
 2013-12-11 17:10:14 +00:00
Enrique 1c890d64ee Fixed persian gate messed up in previous commit 
This was SVN commit r14328.
 2013-12-11 15:59:11 +00:00
sanderd17 c6cf074e7a Fix unitAI warning when member left the formation 
This was SVN commit r14327.
 2013-12-11 15:17:43 +00:00
Enrique 2a824acae6 Made ptolemaic walls thinner. Added door to the gate (no animations yet) fixed some stretched UVs 
This was SVN commit r14326.
 2013-12-11 01:53:10 +00:00
historic_bruno 8db3ada87f Improves debugging output to help troubleshoot some WSDL bugs, refs #2146, #1733 
This was SVN commit r14325.
 2013-12-10 18:54:18 +00:00
Mythos_Ruler c661bb01c3 Temp fix for Nubian archer. 
This was SVN commit r14324.
 2013-12-10 01:27:09 +00:00
alpha123 f3e53bfb7c Reduce splash radius of catapults from the rather ridiculous 20m to 10m. 
This was SVN commit r14322.
 2013-12-09 19:22:45 +00:00
mimo 683349333b tune the guard behaviour 
This was SVN commit r14321.
 2013-12-09 18:15:24 +00:00
wraitii a44e88fa42 Check for "Destroy" messages beforehand in the base manager to avoid a rare error. 
This was SVN commit r14320.
 2013-12-09 16:35:06 +00:00
Enrique ed93cebd28 garrison flag fixing in ptolemaic civic centre, edfu wonder and macedonian temple. 
Centered athenian temple, selection and obstruction adjusted.

This was SVN commit r14319.
 2013-12-09 14:46:35 +00:00
wraitii c3ef9b3685 Forgot I had renamed a file… 
This was SVN commit r14318.
 2013-12-09 14:23:56 +00:00
wraitii f9bee5d3ec Slight de-obfuscation of the AI code. 
This was SVN commit r14317.
 2013-12-09 14:20:11 +00:00
Enrique 9339e658a5 Two new head models for ptolemaic support females. Fixes #2235 
This was SVN commit r14316.
 2013-12-09 12:38:46 +00:00
Enrique 8351e794fa Added different textures for each ptolemaic camel rank 
This was SVN commit r14315.
 2013-12-09 02:01:21 +00:00
Enrique a04dfcf836 Camel rider tweaking 
This was SVN commit r14314.
 2013-12-09 00:33:33 +00:00
Enrique 3c70f25ca4 Final edfu temple normal and spec. 
Ptolemaic camel rider fix

This was SVN commit r14313.
 2013-12-09 00:21:45 +00:00
sanderd17 208200db28 fix querying unitAI of non-existing members 
This was SVN commit r14312.
 2013-12-08 19:57:34 +00:00
Yves 966f7c7145 Removes some duplicated code. 
This was SVN commit r14311.
 2013-12-08 19:23:09 +00:00
wraitii 36334a6fa7 Fix the AI incorrectly trying to place Civil Centres too close to each other. 
This was SVN commit r14310.
 2013-12-08 16:24:09 +00:00
mimo ad157ad325 fix test broken by #14306 
This was SVN commit r14309.
 2013-12-08 13:01:59 +00:00
Mythos_Ruler 71d378b7a5 A bunch of stuff. 
This was SVN commit r14308.
 2013-12-08 13:01:14 +00:00
Enrique 332e23ee9c Edfu temple commit. Needs normal and spec map tweaking (coming soon). Fixes #2220 
This was SVN commit r14307.
 2013-12-08 11:21:19 +00:00
mimo e173493621 separate gui entityState in two parts to improve gui timing, adresses #2179 
This was SVN commit r14306.
 2013-12-08 10:02:19 +00:00
wraitii 1f7019f8e6 Might fix an issue on Acropolis where Aegis tried to build a CC too close to his main one. 
This was SVN commit r14305.
 2013-12-08 09:07:33 +00:00
historic_bruno 3182d6c8ee Reverts 4c9cd2921d fundraiser splash screen now that the fundraiser has ended 
This was SVN commit r14304.
 2013-12-08 01:35:06 +00:00
Yves f0fe2acdcb Disables JIT compiling of a loop to work around OOS errors in multiplayer games with AI players. 
Fixes #2000

This was SVN commit r14303.
 2013-12-07 11:49:11 +00:00
sanderd17 ca3f697f9d add iberian monument aura 
This was SVN commit r14301.
 2013-12-06 18:14:22 +00:00
sanderd17 783907264f cache the offset positions for formations, and only recalculate if the rotation towards a new target is big enough 
This was SVN commit r14300.
 2013-12-06 10:21:07 +00:00
historic_bruno b1c081e36d Set svn:eol-style=native, fix some inconsistent line endings 
This was SVN commit r14299.
 2013-12-06 00:42:50 +00:00
sanderd17 8d56504778 fix switching between line and column formation 
This was SVN commit r14298.
 2013-12-05 20:26:51 +00:00
sanderd17 d3f7da1e27 Let formation attack from the moment the first unit is in range 
This was SVN commit r14297.
 2013-12-05 19:26:55 +00:00
mimo 9678cf547a cache quantities depending only on the selection, adresses #2179 
This was SVN commit r14296.
 2013-12-05 18:50:29 +00:00
wraitii 2f3ce82dc3 Fix Aegis no longer building dropsites after the skirmish fix. 
This was SVN commit r14295.
 2013-12-05 17:34:24 +00:00
Mythos_Ruler 56c805ae93 Texture stuff. 
This was SVN commit r14294.
 2013-12-05 13:23:22 +00:00
sanderd17 7b82fba8d0 remove distance sorting for formation place assignment, as it made the center of the formation run + remove debug warning in AI code 
This was SVN commit r14292.
 2013-12-05 12:31:04 +00:00
sanderd17 03d9db0bb7 fix comment 
This was SVN commit r14291.
 2013-12-05 10:44:39 +00:00
sanderd17 7a1dbca390 make the movement of formations and ships more natural 
This was SVN commit r14290.
 2013-12-05 10:38:39 +00:00
sanderd17 cf88da5829 improve formations a bit more 
* Take obstruction size into account, so bigger units have more space in
formations
* Minimize the maximum walk distance to get in formation by letting the
units far away from the centre pick their positions first

This was SVN commit r14289.
 2013-12-05 10:23:49 +00:00
sanderd17 4062e2011f fix tests 
This was SVN commit r14288.
 2013-12-05 08:53:40 +00:00
wraitii 0ef6397545 Optimize the "Move()" function by removing unnecessary message broadcast. Fixes #2094 
This was SVN commit r14287.
 2013-12-04 17:38:46 +00:00
wraitii 5f8b6be833 Some additions to the particle system: 
This was SVN commit r14286.
 2013-12-04 17:21:59 +00:00
wraitii 189ef85538 Fix AI errors on skirmish maps. 
This was SVN commit r14285.
 2013-12-04 16:52:44 +00:00
sanderd17 60c986c135 * Add method to rangemanager to query around a position instead of an entity 
* Use that method in the splash damage calculation
Fixes #2285

This was SVN commit r14283.
 2013-12-04 15:30:01 +00:00
sanderd17 367614343b add two files that were deleted by accident in 3afd8e9d9e 
This was SVN commit r14282.
 2013-12-04 13:15:43 +00:00
sanderd17 3afd8e9d9e better formation place assignments (units run around less) 
This was SVN commit r14281.
 2013-12-04 13:14:31 +00:00
Mythos_Ruler 3c6045308a Fixing some cursor issues. 
This was SVN commit r14280.
 2013-12-04 01:56:40 +00:00
Enrique a549d5a08b Fixed aura rays actor 
This was SVN commit r14279.
 2013-12-04 00:38:09 +00:00
Enrique cd32fafd63 Fixed shader in aura material 
This was SVN commit r14278.
 2013-12-04 00:35:05 +00:00
Enrique e268c059e5 Healing aura effect placeholder, applied only in athenian temple 
This was SVN commit r14277.
 2013-12-04 00:25:03 +00:00
Mythos_Ruler bddcd57dea - Fixed a prop typo in the Athenian temple.xml 
- Added the first Egyptian music track to the Ptolemies.

- Adjusted the Sacred Band tip text. New pic coming soon.

- Still trying to figure out what to do with "Wasteland" map.

This was SVN commit r14276.
 2013-12-04 00:18:52 +00:00
leper a96a333b47 Small cleanup. 
This was SVN commit r14274.
 2013-12-03 01:01:12 +00:00
quantumstate 68880ca5d5 Make atlas player assignment apply to all of the currently selected units 
This was SVN commit r14273.
 2013-12-02 22:46:33 +00:00
OmriLahav f09d56fb28 This was SVN commit r14271. 2013-12-02 20:46:25 +00:00
sanderd17 7c3c78f6c9 make sure target has health before taking damage 
This was SVN commit r14270.
 2013-12-01 20:55:54 +00:00
Mythos_Ruler 3fea8d7c1e Some tips tweaks and new tips. 
This was SVN commit r14269.
 2013-12-01 18:22:28 +00:00
Mythos_Ruler 168f92e1e9 "Equine Transports" tech for the Persians. 
Updated tip images.

This was SVN commit r14268.
 2013-12-01 02:49:26 +00:00
Mythos_Ruler d2fccef696 New 4-player skirmish map for Scythetwirler: Watering Holes. 
This was SVN commit r14267.
 2013-11-30 22:49:54 +00:00
Mythos_Ruler cb7a4fe39c Minor things. 
This was SVN commit r14266.
 2013-11-30 21:53:56 +00:00
mimo c134108154 remove duplicated code 
This was SVN commit r14264.
 2013-11-30 18:23:32 +00:00
mimo e88d05e0e4 allow units to guard/escort buildings or units, fixes #2034 
This was SVN commit r14263.
 2013-11-30 17:30:08 +00:00
sanderd17 1d914c4613 testing visualisation of auras (the elephants need to be replaced with some iconic meshes) 
This was SVN commit r14262.
 2013-11-30 12:36:48 +00:00
Mythos_Ruler 495716b3ed Reduced the size of a bunch of massive specular maps. 
Tweaked some maps.

A new map called "Wasteland". Don't know what to do with it yet.

Dust storm and other particles changes and tweaks.

Tweaks to some maps.

Spec and Norm maps for the Great Pyramid.

New Mace shield prop textures for buildings.

This was SVN commit r14261.
 2013-11-30 07:57:29 +00:00
Mythos_Ruler d8362700f0 4 new Successor/Hellenistic shield designs by Enrique. Each has a bronze, silver, bronze player color, and silver player color variation. 
Added final Seleucid unit, the Thracian Mercenary Swordsman.

Added spec and normal mapping to the Spartiate shields.

New Seleucid emblem.

This was SVN commit r14260.
 2013-11-30 02:58:43 +00:00
Enrique 61c9df2847 Increased ptolemaic barracks size 
This was SVN commit r14259.
 2013-11-30 01:34:15 +00:00
Mythos_Ruler 44c134e03f Cavalry Archer templates for Seleucids. 
This was SVN commit r14258.
 2013-11-29 22:24:11 +00:00
Mythos_Ruler 15d87b9ad1 Garrison and Waypoint flags for Seleucids. 
Cavalry Archer actors for Seleucids.

This was SVN commit r14257.
 2013-11-29 22:23:32 +00:00
JoshuaJB 2e2b1b04ff Fix #2285 by using the original design with additional checks. 
This was SVN commit r14256.
 2013-11-29 20:34:56 +00:00
Mythos_Ruler 5ce3880d53 Some more Seleucid units. 
Tweaked maps.

This was SVN commit r14255.
 2013-11-29 19:04:07 +00:00
JoshuaJB 860875c835 Triage #2285. Not the most efficiant, but it works. 
This was SVN commit r14254.
 2013-11-29 17:46:24 +00:00
sanderd17 25b92ec652 implement spart auras + female boost for males 
This was SVN commit r14253.
 2013-11-29 13:06:58 +00:00
sanderd17 d18444344c implement pers auras 
This was SVN commit r14252.
 2013-11-29 12:56:44 +00:00
sanderd17 7bab5421c6 implement mace auras 
This was SVN commit r14251.
 2013-11-29 12:47:39 +00:00
sanderd17 bb5515a9ee implement hele auras + fix vircengetorix (part 2) 
This was SVN commit r14250.
 2013-11-29 12:36:18 +00:00
sanderd17 53f376cdc2 implement hele auras + fix vircengetorix 
This was SVN commit r14249.
 2013-11-29 12:35:58 +00:00
Enrique b0f00d4836 Improved Ptolemaic flag emblem with retouched LionKranzen's eagle 
This was SVN commit r14248.
 2013-11-29 12:16:15 +00:00
sanderd17 d672c6cf7d make loot tech aware + implement celt and gaul hero auras 
This was SVN commit r14247.
 2013-11-29 12:13:37 +00:00
sanderd17 ca9944b09c brit + cart hero auras + small code fixes 
This was SVN commit r14246.
 2013-11-29 10:57:44 +00:00
sanderd17 d403545620 implement all athen auras + add missing files from previous commit 
This was SVN commit r14245.
 2013-11-29 09:02:41 +00:00
sanderd17 1784e6b9b1 fix some aura typos + implement iphicrates aura 
This was SVN commit r14244.
 2013-11-29 08:37:15 +00:00
Mythos_Ruler 6c81f23cc8 This was SVN commit r14243. 2013-11-29 04:10:57 +00:00
Mythos_Ruler 7ea031964c A /bunch/ more Seleucid entities and actors. They still need tons of props, textures, and models. Also, not all unit templates are there yet. 
Updated the Seleucid civ json.

Tweaked some tooltips to show their unit classes better.

Balancing: Slingers are now 1.5x vs. ranged infantry and 1.25x vs. melee
infantry.

This was SVN commit r14242.
 2013-11-29 04:04:10 +00:00
Enrique f54fe9a7d2 Fixed persian and carthaginian camel trader prop position. 
Scaled down several AO textures bigger than 1024
Ptolemaic barracks commited

This was SVN commit r14241.
 2013-11-29 02:25:47 +00:00
mimo 351468dbe5 fix initialisation of developper overlay for saved games 
This was SVN commit r14240.
 2013-11-28 18:08:41 +00:00
Mythos_Ruler 65f5fffd9e Partial commit of Seleucid entities and actors. 
Testing cost balance for cav skirms.

Reduce Town Phase cost to 800/800.

A bunch of other minor things.

This was SVN commit r14239.
 2013-11-28 15:52:18 +00:00
sanderd17 a6ec62c85d fix ptol cav archer upgrade. Fixes #2282 
This was SVN commit r14238.
 2013-11-28 12:54:28 +00:00
Mythos_Ruler 64c9f84f10 Tweaked Alpine Valleys. 
This was SVN commit r14237.
 2013-11-28 01:30:18 +00:00
historic_bruno acf1c420c1 Moves management of GL viewports to CRenderer, letting it store the current viewport; calling code can retrieve and restore it later (instead of using deprecated glPush/PopAttrib, previously removed for GLES compatibility by 7dec618898) 
This was SVN commit r14235.
 2013-11-28 00:57:39 +00:00
mimo 8b0f1c3f1f cleaning 
This was SVN commit r14234.
 2013-11-27 16:30:14 +00:00
JoshuaJB 43c2219b22 Fix my fix. 
This was SVN commit r14233.
 2013-11-26 21:38:48 +00:00
JoshuaJB 10b9ace654 Add missing line. 
This was SVN commit r14232.
 2013-11-26 20:01:09 +00:00
JoshuaJB 4b7ab63172 Fix #1496 with a revised version of my patch. Also moves damage-related functions from Attack.js to a seperate file in the global namespace. 
This was SVN commit r14231.
 2013-11-26 18:33:42 +00:00
sanderd17 7345d27c84 Summon planes back from the emptyness 
This was SVN commit r14230.
 2013-11-26 15:12:16 +00:00
JoshuaJB 433b32bdcd Various XpartaMuPP cleanup. 
This was SVN commit r14229.
 2013-11-25 04:05:41 +00:00
leper c3ebb50711 Fix ratings and print rating changes in the lobby. 
Fix game listings.
Fix non-hosts unregistering games.
Patch by scythetwirler.

This was SVN commit r14228.
 2013-11-25 02:55:47 +00:00
LordGood d6a9489ccb Ptolemaic walls commit 
This was SVN commit r14227.
 2013-11-25 00:34:31 +00:00
Mythos_Ruler 2db4f3fe40 A few new portraits from Pureon. 
This was SVN commit r14226.
 2013-11-24 23:53:29 +00:00
Mythos_Ruler ff0eb70f4a Portrait tweaks for NAF Ele and Tiger. 
Added tigers to these maps.

This was SVN commit r14225.
 2013-11-24 23:19:41 +00:00
Enrique b08b478403 tweaked tiger animations ratio 
This was SVN commit r14224.
 2013-11-24 23:07:11 +00:00
Enrique dc8cea3fa4 New tiger mesh, texture and animations 
This was SVN commit r14223.
 2013-11-24 21:38:36 +00:00
Mythos_Ruler 9fc30533d4 This was SVN commit r14222. 2013-11-24 15:29:23 +00:00
Mythos_Ruler 7109c34297 Observer Hack attempt. 
Tweaks to Alpine Valleys and Greek Acropolis.

This was SVN commit r14221.
 2013-11-24 15:27:03 +00:00
mimo 6a58044cc6 add missing protection to previous fix, fixes #1052 
This was SVN commit r14220.
 2013-11-24 10:37:23 +00:00
Mythos_Ruler b7c3efac50 Ptol camel archer a little faster. 
Brand new Alpine Valleys skirm map. My take on it anyway. 1v1.

This was SVN commit r14219.
 2013-11-23 21:34:03 +00:00
mimo d930244f02 update RallyPoint targets when renamed, fixes #1052 
This was SVN commit r14218.
 2013-11-23 19:32:59 +00:00
Mythos_Ruler 26c2ded9c5 New specific name for "Hellenization" = Exellinismós 
More accurate names for Spartiate and Spartan Woman.

Tweaked some maps.

This was SVN commit r14217.
 2013-11-23 15:50:15 +00:00
mimo 3d75d4e69c do not show carrying resources animation in attack-move 
This was SVN commit r14216.
 2013-11-22 17:43:26 +00:00
leper 5da63764e0 Fix compilation with wxWidgets 3.0. 
This was SVN commit r14215.
 2013-11-20 19:29:10 +00:00
mimo 09d5507ecb clean some useless code 
This was SVN commit r14214.
 2013-11-19 21:27:23 +00:00
mimo e8d8673734 let non-fighting units flee when attacked even if the attacker is not visible 
This was SVN commit r14213.
 2013-11-19 21:20:25 +00:00
Enrique 95d5a25be1 Fixed carry_meat animations for mauryan elephant archers and ptolemaic camel rider 
This was SVN commit r14212.
 2013-11-18 03:43:36 +00:00
historic_bruno 5ce8de1f0a Removes unused var from JS debugger, from patch by Markus. Fixes #1852 
This was SVN commit r14211.
 2013-11-17 23:41:19 +00:00
historic_bruno d672d9625d Changes update-workspaces.bat to not generate a vc2013 workspace by default, since the game won't successfully build yet, refs #2271 
This was SVN commit r14210.
 2013-11-17 23:11:56 +00:00
Enrique c1609697d7 camel armature rider fix. 
This was SVN commit r14209.
 2013-11-17 22:48:03 +00:00
Mythos_Ruler e397993dae Deleting a bunch of scenarios. 
Made peacock easier to hunt.

Fixed elite Ptolemaic slinger promotion.

Reduced the health of basic ranged citizen soldiers slightly.

Updated Deccan Plateau with moar forestry.

Fixed Athenian Marine specific name.

This was SVN commit r14207.
 2013-11-17 20:16:57 +00:00
leper e881099d43 Use functions to change variables. Remove broken branding of cheating player. 
This was SVN commit r14206.
 2013-11-17 18:24:09 +00:00
leper 3a24eab0f0 Cache technology modifiers based on original value. Patch from sanderd17 based on work by Spahbod. Fixes #2045. 
This was SVN commit r14205.
 2013-11-17 18:24:04 +00:00
mimo 0d876adc13 add some var 
This was SVN commit r14204.
 2013-11-17 12:28:26 +00:00
Yves 294aa142d8 Fixes compiling with the flag "--without-lobby". 
Refs #2267

This was SVN commit r14203.
 2013-11-17 11:52:11 +00:00
Mythos_Ruler 7595ea4534 2 player Badlands skirmish. 
This was SVN commit r14202.
 2013-11-17 01:40:39 +00:00
Mythos_Ruler d5e7c1c44a Fixed Ptolemies and Macedonians death variations in these actors. They were previously throwing an error. 
Champion spearmen -> 80 metal instead of 80 wood.

This was SVN commit r14201.
 2013-11-16 23:30:34 +00:00
Yves 6fba293088 In #2241 I'm going to change the GUI to have one ScriptInterface for each GUI page because that will be required for the Spidermonkey upgrade (#1886). 
The Multiplayer lobby needs some changes to avoid compartment
mismatches. Instead of initializing it with a ScriptInterface and
storing script values at different locations, it takes a ScriptInterface
argument in the functions that really need to read or write some script
values and avoids storing values as script values with an associated
compartment where possible.
The scripting interface of the lobby is also adjusted to use
JSInterface_Lobby.h/cpp files as other components instead of adding all
functions to ScriptFunctions.cpp. This makes it a bit more clearly
arranged IMO.

Fixes #2267
Refs #2241
Refs #1886

This was SVN commit r14199.
 2013-11-16 18:38:40 +00:00
Mythos_Ruler 451e801f6a Minor things. 
This was SVN commit r14198.
 2013-11-16 18:36:35 +00:00
Mythos_Ruler 1f677c17b1 Fixed deccan plateau. 
This was SVN commit r14197.
 2013-11-16 17:37:13 +00:00
Mythos_Ruler 30c2abd529 Hannibal now rides an Asian elephant. 
This was SVN commit r14196.
 2013-11-16 17:26:30 +00:00
Mythos_Ruler 6794bc5258 Made tropic forest floor darker. 
Tweaked Deccan Plateau skirmish map.

Tweaked Sahel skim map.

This was SVN commit r14195.
 2013-11-16 17:24:28 +00:00
Spahbod bde9d19b7a Adding wbg to more maps. 
This was SVN commit r14194.
 2013-11-16 16:11:43 +00:00
Spahbod d7ef47959d Sahel random map. 
This was SVN commit r14193.
 2013-11-16 15:17:18 +00:00
Enrique 7ab15cb721 Building animation for mauryan support elephant 
This was SVN commit r14192.
 2013-11-16 15:05:55 +00:00
Enrique b8e9f74070 Added animations to gaia asian elephant male. 
Maur support elephant is now asian, it has new texture.
Added normal texture for the skin of all asian elephants. (only armors
before)

This was SVN commit r14191.
 2013-11-16 13:03:58 +00:00
LordGood 19bd71af5d fixed unecessary prop point 
This was SVN commit r14190.
 2013-11-15 23:52:28 +00:00
LordGood 51b1de2dee Carthaginian Fortress commit! 
This was SVN commit r14189.
 2013-11-15 23:44:02 +00:00
Yves 3ab983f8a1 Some "varfare" again plus a call to initMusic because that will be needed for the Spidermonkey upgrade. 
This was SVN commit r14188.
 2013-11-15 18:35:19 +00:00
Mythos_Ruler 54fcb3b4ca Updated (and completed) Sahel skirmish map. 
This was SVN commit r14187.
 2013-11-15 16:41:05 +00:00
Mythos_Ruler 1cd4e6ffdd Round footprint for lighthouse. 
Some spec and normal maps for some shields.

Updated some skirmish maps.

This was SVN commit r14186.
 2013-11-15 15:26:57 +00:00
Spahbod 9dbd8dbb26 Fixing the broken water on gulf of bothnia. 
This was SVN commit r14185.
 2013-11-15 14:42:18 +00:00
Enrique 5dc7d8dc9f missing lighthouse files 
This was SVN commit r14184.
 2013-11-15 13:52:57 +00:00
Spahbod ca0575e422 Increasing thIncreasing the generation speed of the maps: Phoenician Levant 
This was SVN commit r14183.
 2013-11-15 08:57:32 +00:00
Enrique 98638a2d2f Ptolemaic lighthouse and LordGood's new carthaginian defense tower. 
Fixed ptolemaic fortress garrison flag

This was SVN commit r14182.
 2013-11-15 02:52:04 +00:00
leper 47b26e56d3 Remove unused VideoRecorder from Atlas. 
This was SVN commit r14181.
 2013-11-14 23:05:07 +00:00
alpha123 d459e97d33 Remove unnecessary Territory element from the fortress and defense tower templates. 
This was SVN commit r14180.
 2013-11-14 21:58:49 +00:00
alpha123 9266d30e17 Build on cf4f7d18a7 based on discussion on IRC. Allow fortresses, towers, and wall towers to attack siege again, but debonus them 0.5x against it. Bonus catapults 1.25x vs fortresses, but reduce their attack vs buildings slightly in order to make them effective against all buildings but slightly better against fortresses' huge HP. They still have far less DPS than rams, even against fortresses, but are more flexible and are ranged. Enforce a minimum distance of 60 between fortresses, meaning that fewer can fire on siege weapons at once, and turtling is slightly less effective in general. Minor stat changes dealing with range of towers, fortresses, and catapults. Increase catapult splash radius and decrease splash damage, to make catapults more effective as semi-static defense against large numbers of infantry. 
This was SVN commit r14179.
 2013-11-14 21:49:02 +00:00
alpha123 a3a7f1cd22 Adjust siege ram. 
- Decrease attack from 50c with 2x vs buildings (3x vs gates) to 80c
with 1.5x vs gates.
- Increase charge attack from 40c with 2x vs buildings (3x vs gates) to
100c with 1.5x vs gates.

This was SVN commit r14178.
 2013-11-14 21:15:51 +00:00
Ykkrosh 8ecfbd0899 Remove unused includes of tr1/unordered_map etc. 
They cause build errors with libc++, and we always use
boost::unordered_map instead.

This was SVN commit r14177.
 2013-11-14 20:47:59 +00:00
alpha123 cfba68f8d2 Increase Advanced Siege tech from +3 crush to +5 crush. 
This was SVN commit r14176.
 2013-11-14 20:36:05 +00:00
alpha123 cf4f7d18a7 Buff catapults slightly. 
- Add 'Siege' to the RestrictedClasses of towers, wall towers, and
fortresses. A fortress by itself should not be able to shoot down a
catapult, it should require some defense. This also nerfs building a ton
of towers and fortresses, which was previously very difficult to
penetrate and led to long, boring wars of attrition.
- Increase armor from 2h/10p/5c to 2h/30p/10c (matches siege rams).
- Increase attack from 30h/0p/30c to 0h/20p/35c. Would like to add techs
to increase damage further.
- Reduce splash damage to 0h/15p/30c from 40h/0p/40c.
- Increase maximum range from 68 to 75. May increase this more or add
techs.
Motivation is that siege catapults are relatively weak late-game, as
they have great difficulting penetrating fortified positions, leading to
both sides turtling. Additionally, this makes them roughly as strong as
siege rams, having less damage output than rams but having the ability
to attack from a distance. This balances out the civs without rams and
gives the ones with both rams and catapults an additional choice to
make.

This was SVN commit r14174.
 2013-11-14 20:30:00 +00:00
Spahbod a04cc9f01b Increasing the generation speed of the maps: Northern Lights, Rhine Marshlands 
This was SVN commit r14173.
 2013-11-14 18:58:55 +00:00
Yves 8dedf7bc3d Fixes a graphics issue on Linux (probably a driver bug) by scaling the images from 1x1024 px to 4x1024 px. 
Fixes #2265

This was SVN commit r14172.
 2013-11-14 17:19:49 +00:00
Enrique b4174664c6 hellenic walltower door fixed 
This was SVN commit r14171.
 2013-11-14 16:26:46 +00:00
Spahbod 0170db4a53 Adding advanced graphical features into random maps. Fixes #2262. 
This was SVN commit r14170.
 2013-11-14 14:33:55 +00:00
Spahbod 11c471273c Committing the fix for undefined civs in atlas, and the problem with ptolemics in Fortress map by FeXoR. Fixes #2258. 
This was SVN commit r14169.
 2013-11-14 12:27:56 +00:00
mimo 321e61617b Improve MoveToTarget when the target is moving, fixes #2253 
This was SVN commit r14168.
 2013-11-14 07:25:56 +00:00
leper 4915116ccc Fix glooxwrapper build on gcc 4.2 and warning on clang. 
This was SVN commit r14167.
 2013-11-14 00:32:28 +00:00
leper 4c395f4bf2 Remove Trigger and Cinematic sections from Atlas. 
This was SVN commit r14166.
 2013-11-14 00:10:04 +00:00
Ykkrosh bd900362ea Rebuild premake4.exe with VC++ 2008 again, so that it works on WinXP/2003 
This was SVN commit r14164.
 2013-11-13 21:16:06 +00:00
leper e58fa107cc Fix skeleton caching. 
This was SVN commit r14163.
 2013-11-13 20:05:57 +00:00
Spahbod 49721cff33 Increasing the generation speed of the maps: Unknown Land 
This was SVN commit r14162.
 2013-11-13 14:30:27 +00:00
Spahbod 62551be685 New Random Map: Mainland. A simple map without any body of water. Also the space between the forests is increased. Optimizing the map for relatively lag-free games. 
This was SVN commit r14161.
 2013-11-13 13:36:47 +00:00
Spahbod 0d323c020b Increasing the generation speed of the maps: Archipelago, Gulf of Bothnia, Lorraine Plain 
This was SVN commit r14160.
 2013-11-13 13:17:22 +00:00
Spahbod 5dac329c78 Increasing the generation speed of the maps: Aegean Sea 
This was SVN commit r14159.
 2013-11-13 10:20:22 +00:00
Spahbod 65bd13ac1e Increasing the generation speed of the maps: Syria 
This was SVN commit r14158.
 2013-11-13 08:07:05 +00:00
Enrique 4acbf86ffb Trying to fix crazy elephant armature 
This was SVN commit r14157.
 2013-11-12 21:30:25 +00:00
Enrique 2f0d6ee1e8 Upgraded asian elephant animations. 
This was SVN commit r14156.
 2013-11-12 19:13:45 +00:00
sanderd17 17fdb515f4 fix error when selecting multiple elephants 
This was SVN commit r14155.
 2013-11-12 19:03:12 +00:00
historic_bruno 7cb4c0dcfc Partial fix of minimap rendering for GLES. 
Replaces glBegin/End with glDrawArrays, GL_QUADS with GL_TRIANGLES, and
modifies shaders as needed.

This was SVN commit r14153.
 2013-11-12 01:31:52 +00:00
historic_bruno 7dec618898 Some attempts to fix GLES build in smooth LOS and post proc manager. 
Replaces glBegin/End with glDrawArrays, GL_QUADS with GL_TRIANGLES, and
replaces glPush/PopAttrib by resetting the viewport manually.
Adjusts GLSL shaders for these changes.

This was SVN commit r14152.
 2013-11-12 01:30:17 +00:00
historic_bruno f1613a3c90 Fixes fancy waves build on GLES (replaces GL_QUADS with GL_TRIANGLES) 
This was SVN commit r14151.
 2013-11-12 01:25:32 +00:00
historic_bruno 81eabfc934 Fixes basic water rendering on GLES (replaces GL_QUADS with GL_TRIANGLES). 
Sets SDL2 to use correct profile for GLES.
Cleans up some old SDL 1.3 version checks.

This was SVN commit r14150.
 2013-11-12 01:24:04 +00:00
historic_bruno 5771bee032 First pass at fixing GLES build - more to come 
This was SVN commit r14149.
 2013-11-12 01:17:16 +00:00
historic_bruno 0682c23fe3 Replaces BGRA textures with RGBA textures supported by GLES 
This was SVN commit r14148.
 2013-11-12 01:11:08 +00:00
Enrique 54abce1a3c hellenic walltower rotated 180 to match the droppoint with the wall RMS 
This was SVN commit r14147.
 2013-11-12 00:05:26 +00:00
mimo df1d5d2260 fix tag 2102648f7c which had unwanted changes 
This was SVN commit r14146.
 2013-11-11 16:29:44 +00:00
Mythos_Ruler 0e74e3a521 Removed Ostorius. 
This was SVN commit r14145.
 2013-11-11 16:09:00 +00:00
mimo 2102648f7c Allows autogarrison of newly trained units, fixes #1044 
This was SVN commit r14144.
 2013-11-11 15:37:16 +00:00
mimo fad8f7fce0 adds some needed protection 
This was SVN commit r14143.
 2013-11-11 15:03:22 +00:00
historic_bruno 3d8865f10b Adds gloox to OS X libs build script, with patch to fix build (fixed upstream in 5de9ed7444). 
Fixes lobby build on OS X.
Fixes zlib not building as static lib.

This was SVN commit r14142.
 2013-11-11 04:41:44 +00:00
historic_bruno 29ef5f3ce9 Adds patch for SDL 1.2 build on OS X 10.9 (Mavericks), CGDirectPaletteRef was deprecated and has now been removed. See https://bugzilla.libsdl.org/show_bug.cgi?id=2085 
This was SVN commit r14141.
 2013-11-11 01:19:55 +00:00
historic_bruno 45a7f577d3 A bunch of OS X SDK-related fixes. 
Adds runtime support for 10.5 APIs: display modes, bundle paths, system
paths, pasteboards. Previously this was compile-time support only, which
prevented building on later SDKs while targeting earlier APIs.
Adds hardcoded version for pre-10.6 builds, to avoid messing with
deprecated Gestalt or having to add a 10.5 non-dispatch singleton (Grand
Central Dispatch didn't exist in 10.5)

This was SVN commit r14140.
 2013-11-11 00:11:25 +00:00
historic_bruno 011cbb5725 Fixes OS X STL incompatibilities when building against later SDKs and targeting 10.5 (fixes stringstream build errors in these conditions) 
This was SVN commit r14139.
 2013-11-11 00:09:16 +00:00
historic_bruno 5c2c7248b1 Adds zlib, curl, iconv and libxml2 to OS X libs build script, to avoid using the non-backward-compatible versions provided by Apple. 
Adds patch for zlib configure to pick up CFLAGS/LDFLAGS, to better
support SDK builds.
Cleans up OS X libs build script, hides some extraneous output.

This was SVN commit r14138.
 2013-11-11 00:04:07 +00:00
leper 4406be3a69 Fix crash when trying to join the lobby again if the host disconnected in the game setup screen. 
This was SVN commit r14137.
 2013-11-10 22:42:48 +00:00
alpha123 f070bf9d1e Prohibit the user from picking the 'system' lobby name, as that's reserved for special messages. 
This was SVN commit r14136.
 2013-11-10 21:52:38 +00:00
alpha123 e01445818a Nerf/rebalance siege towers. 
- Armor changed from 2h/20p/10c to 5h/20p/2c
- Attack changed from 25p to 10p/5c
- Bonus added: 2x vs structures
- Ranged reduced from 65 to 55
- Elevation bonus of 10 added
- PreferredClasses is now 'Structure'
- Ungarrisoned arrow count decreased to 0 from 2
- Build time increased to 60 from 50
- BuffHeal is now 0 (decreased from 1)
- Health reduced from 800 to 500
- Walking speed reduced to 5 from 6

The idea is for siege towers to be useful for siege, but also for
cleaning out large numbers of units. Previously they were very good at
the latter and useless for the former. They should still be very
powerful units, but not uncounterable and massing siege towers
(previously unbeatable if enough were acquired) should no longer be
feasible.

This was SVN commit r14135.
 2013-11-10 20:21:50 +00:00
Mythos_Ruler 2811d4c367 Fixed this map. 
This was SVN commit r14134.
 2013-11-10 19:22:24 +00:00
Mythos_Ruler 912e485a64 Elephant changes and tweaks. 
This was SVN commit r14133.
 2013-11-10 19:08:38 +00:00
Enrique 85e9a2b0ce Added 3 idle animations and attack, death and walk animations for all asian elephants. 
Maurya hero howdah added with normal and specular maps

This was SVN commit r14132.
 2013-11-10 17:39:04 +00:00
Spahbod a2477f9d40 Increasing the generation speed of the maps: Alpine Lakes 
This was SVN commit r14131.
 2013-11-10 17:29:40 +00:00
Ykkrosh a96ed190a5 Add GLX_MESA_query_renderer support to hwdetect 
This was SVN commit r14130.
 2013-11-10 16:24:03 +00:00
Ykkrosh d178f32698 Fix Unicode in JS print() on Linux 
This was SVN commit r14129.
 2013-11-10 16:13:40 +00:00
JoshuaJB c27c663697 Print a traceback after an exception in the bot. 
This was SVN commit r14128.
 2013-11-10 04:28:18 +00:00
JoshuaJB 59da5fad2a Fix some spidermonkey lobby complaints when run in strict mode. 
This was SVN commit r14127.
 2013-11-10 04:09:03 +00:00
historic_bruno 174f636fd2 Fixes tests 
This was SVN commit r14126.
 2013-11-10 03:24:29 +00:00
leper 37cedb8133 Make filters work and add a skirmish map filter. 
This was SVN commit r14125.
 2013-11-10 00:45:19 +00:00
leper 4fb6896fd8 Fix warning when the hosted game is a random rms. 
This was SVN commit r14124.
 2013-11-09 23:57:31 +00:00
Ykkrosh d7ec8c47a6 Fix Unicode support in lobby. 
Fix EncryptPassword being called with the wrong argument order, and
encrypting username instead of password. (This will break all existing
lobby accounts.)

Fix EncryptPassword not using all of salt_base.

This was SVN commit r14123.
 2013-11-09 23:26:17 +00:00
Ykkrosh 35d48d2fe8 ...and increase HDATA_USER_SIZE so OglTex actually fits 
This was SVN commit r14122.
 2013-11-09 18:49:35 +00:00
Ykkrosh 1ad9d5424a Fix error at startup on 64-bit builds. 
OglTex had a size_t added, which pushed it over HDATA_USER_SIZE.
Use u32 instead to minimise the difference between platforms.

This was SVN commit r14121.
 2013-11-09 18:39:45 +00:00
Spahbod dcb3c0ad7a Increasing the generation speed of the maps: Continent 
This was SVN commit r14120.
 2013-11-09 16:00:01 +00:00
Mythos_Ruler d3fade285b Basic Nubian archer textures. 
Map preview for Corsica and Sardinia.

This was SVN commit r14119.
 2013-11-09 14:42:32 +00:00
sanderd17 2d2853dd6f Fix problems with EndGameManager in Atlas by waiting for the first turn 
This was SVN commit r14118.
 2013-11-09 10:09:28 +00:00
historic_bruno 9cc172b164 Fixes --without-lobby for MSVC and clang, refs #2249. 
Cleans up some whitespace.
Removes obsolete PCH files.

This was SVN commit r14117.
 2013-11-09 02:57:10 +00:00
Ykkrosh 3c47b12cbe Display texture memory usage in profiler's renderer stats 
This was SVN commit r14116.
 2013-11-09 01:03:23 +00:00
mimo 3a278df3f7 Move ship to shoreline when tasking units to garrison inside, fixes #1391 
This was SVN commit r14115.
 2013-11-08 23:22:59 +00:00
leper 5dfc3746e3 Remove old and unused archive stats. 
This was SVN commit r14114.
 2013-11-08 17:27:21 +00:00
leper 81cf02cc13 Fix building with --without-lobby. Fixes #2249. 
This was SVN commit r14113.
 2013-11-08 15:28:44 +00:00
leper 0f8d3e23db ; 
This was SVN commit r14112.
 2013-11-08 15:28:38 +00:00
RedFox 1a32a10f52 Updated premake to support VS2013. Also changed platform toolsets to vc110_xp and vc120_xp for VS2012 and VS2013 respectively. This way the builds will also work on WinXP. 
This was SVN commit r14111.
 2013-11-08 14:08:16 +00:00
sanderd17 da6abe630a Fix error message on starting game due to missing global variable. 
This was SVN commit r14110.
 2013-11-08 09:52:48 +00:00
Spahbod 7547dae0e2 Fixing the revert by the previous commit. 
This was SVN commit r14109.
 2013-11-08 08:04:35 +00:00
Spahbod f88b5be079 Increasing the generation speed of the maps: Islands, Lake. 
This was SVN commit r14108.
 2013-11-08 08:02:32 +00:00
JoshuaJB bb28e0eb70 Fix some system message/spam filter bugs in the lobby. 
This was SVN commit r14107.
 2013-11-08 00:57:58 +00:00
Ykkrosh 1138419017 Remove broken build script 
This was SVN commit r14106.
 2013-11-07 22:20:38 +00:00
JoshuaJB 62b92af925 Fix lobby registration errors. 
This was SVN commit r14105.
 2013-11-07 22:07:26 +00:00
Ykkrosh f53bd8974c Add autobuilder support for glooxwrapper 
This was SVN commit r14103.
 2013-11-07 21:45:59 +00:00
Yves 93cffe9deb Remove the old and no longer used archive builder that rebuilt the archive while the game is running. 
This approach isn't used anymore. Now we start the archive building with
parameters to pyrogeneis.

Refs #2241 (the code used g_ScriptingHost which is going to be removed)

This was SVN commit r14102.
 2013-11-07 21:06:18 +00:00
JoshuaJB 87e9c5694e Change the LOGWARNING when a config setting doesn't exist to a LOGMESSAGE. 
This was SVN commit r14101.
 2013-11-07 21:02:22 +00:00
JoshuaJB 8d5d66e57b Fix error that slipped into the lobby commit. 
This was SVN commit r14099.
 2013-11-07 20:10:59 +00:00
JoshuaJB bffe917914 Multiplayer lobby based on the XmPP protocol. Special thanks to Philip, alpha123, scythetwirler, and anyone else who has helped build, debug or test the lobby. 
This was SVN commit r14098.
 2013-11-07 20:07:24 +00:00
JoshuaJB d7121f4f55 glooxwrapper by Philip to support building gloox on Windows. 
This was SVN commit r14097.
 2013-11-07 19:38:09 +00:00
JoshuaJB 10e23c173d Add gloox library files. 
This was SVN commit r14096.
 2013-11-07 19:04:30 +00:00
Spahbod fe0510c079 Again increasing the generation speed of Islands random map by using the new chain placer. As a side effect, the map is more beautiful. 
This was SVN commit r14095.
 2013-11-07 19:02:09 +00:00
JoshuaJB b416de9b7c Remove the unused crypto++ library files. 
This was SVN commit r14094.
 2013-11-07 18:50:52 +00:00
JoshuaJB 3298dce158 Remove the unused crypto++ library. 
This was SVN commit r14093.
 2013-11-07 18:49:43 +00:00
sanderd17 3743e58f9a allow enabling the game clock as a persistent setting 
This was SVN commit r14092.
 2013-11-07 18:06:52 +00:00
Spahbod 6d62b3bf40 Added a new "placer" function for the rmgen library. 
This new placer generates terrain features that are less "predictable".
It also increases the map generation time considerably.

Currently it is only implemented on Persian Highlands random map.

This was SVN commit r14091.
 2013-11-07 14:50:16 +00:00
Spahbod b7751a277c Cleanup 
This was SVN commit r14090.
 2013-11-07 12:38:41 +00:00
Spahbod 5ec4962184 Decreasing the generation time of Islands random map to about 2/3 of the original. 
This was SVN commit r14089.
 2013-11-07 12:00:04 +00:00
mimo 9b98585275 Remember the last market for back-to-order trading, fixes #2248 
This was SVN commit r14088.
 2013-11-06 21:07:19 +00:00
sanderd17 9ffe235b2f Clean up EndGameManager. Fixes #2130 
This was SVN commit r14087.
 2013-11-05 19:40:50 +00:00
sanderd17 68fa9f4631 Fix building contstruction, but still don't allow positive regenrate for unhealable entities 
This was SVN commit r14086.
 2013-11-05 17:45:39 +00:00
Mythos_Ruler 24bc451852 Corsica and Sardinia skirmish map. Needs Iberian circuit wall. 
This was SVN commit r14085.
 2013-11-05 16:12:58 +00:00
sanderd17 8540740b35 disallow healing of unhealable entities via all ways 
This was SVN commit r14084.
 2013-11-05 07:07:10 +00:00
mimo 6fae05b5f6 fix 
This was SVN commit r14083.
 2013-11-03 17:41:59 +00:00
mimo 0362453035 test some components before use, adresses #2206 
This was SVN commit r14082.
 2013-11-03 17:18:43 +00:00
Mythos_Ruler 53a270347a Map preview for Zagros Mtns. 
Changed preview for Greek acrpolis.

Fixed quote attribution. Thanks anfialro.

This was SVN commit r14081.
 2013-11-03 16:39:28 +00:00
Mythos_Ruler f1100f10c1 Standardized Cav Spearmen animations. 
This was SVN commit r14080.
 2013-11-03 14:17:33 +00:00
sanderd17 c62cc3ee44 rename technology modifier 'multiplier' to 'multiply' for consistency with auras, and it looks better next to the existing 'add' 
This was SVN commit r14079.
 2013-11-03 14:09:32 +00:00
Mythos_Ruler e4f2ddb738 Renamed a bunch of maps. 
This was SVN commit r14078.
 2013-11-03 14:06:49 +00:00
Mythos_Ruler 5dc553bf91 More shield changes. 
Tweaked number of 5-pop houses on Sicilia skirmish map.

New "Sahel" Skirmish map.

This was SVN commit r14077.
 2013-11-03 14:01:45 +00:00
Mythos_Ruler 34e09220a4 Normal and spec maps for a bunch of shields. 
This was SVN commit r14076.
 2013-11-03 13:36:16 +00:00
sanderd17 e0161bd355 small code style fix 
This was SVN commit r14075.
 2013-11-03 13:15:44 +00:00
sanderd17 6dca6910c3 Recursively count garrisoned units to avoid overcapacity 
This was SVN commit r14074.
 2013-11-03 13:13:30 +00:00
Ykkrosh 72e11a2dea Fix VS2013 build errors, warnings 
This was SVN commit r14073.
 2013-11-03 12:46:07 +00:00
Mythos_Ruler 37f5aa5351 Standardized animations for cavalry swordsmen. Will do the same for cavalry spearmen. This is to help the player differentiate the unit types better. 
This was SVN commit r14072.
 2013-11-03 10:31:57 +00:00
Mythos_Ruler 768c821f13 Acropolis 7 scenario renamed to "Acropolis Night." 
Cycladic Archipelago 06 and Deccan Plateau 01 scenarios deleted.

Gambia River skirmish map (still needs 2 out of 3 Iberian wall
circuits).

This was SVN commit r14071.
 2013-11-03 10:14:43 +00:00
Mythos_Ruler 096fc43f9e Three new skirmish maps. 2 need Iberians walls though. 
Deleted a couple of scenarios.

This was SVN commit r14070.
 2013-11-03 09:51:16 +00:00
Mythos_Ruler f4bd08427c Trader speed tech! 
This was SVN commit r14069.
 2013-11-03 05:40:43 +00:00
Ykkrosh 29e4b1a17c Update Android support 
This was SVN commit r14068.
 2013-11-02 23:05:38 +00:00
Ykkrosh 8aa6485d78 Fix shader errors with OpenGL ES 
This was SVN commit r14067.
 2013-11-02 22:58:38 +00:00
Mythos_Ruler ba5b572ccc Iberian walls for Caspian Sea skirmish map. 
Rubble for these houses.

This was SVN commit r14066.
 2013-11-02 16:54:15 +00:00
Mythos_Ruler c1c45bd7c8 Caspian Sea skirmish map. 
Clouds.

This was SVN commit r14065.
 2013-11-02 15:28:33 +00:00
Ykkrosh 1fa2fc9739 CClientArea parsing test 
This was SVN commit r14064.
 2013-11-02 14:39:08 +00:00
mimo ce7c97b79f Improve back to work behaviour (queues taken into account), fix #2206, patch from Itms 
This was SVN commit r14063.
 2013-11-01 22:00:06 +00:00
mimo 358e8f5992 Remove ResourceGatherer for animals 
This was SVN commit r14062.
 2013-10-31 19:37:42 +00:00
Mythos_Ruler 552a4527ca Iberian walls for Deccan Plateau skirmish map. 
Specific Name for Mauryan maiden guards (Visha Kanya).

Clarified the Iberian json a bit.

Some tooltip tweaking.

This was SVN commit r14060.
 2013-10-31 17:21:10 +00:00
sanderd17 543ec3a8c7 Fix launching skirmish maps without selecting a civ 
This was SVN commit r14059.
 2013-10-30 17:01:11 +00:00
sanderd17 60fb5ed1c3 - Fix garisson and formation aura types 
- Implement tech mods for UnitMotion speeds, Fixes #1958, based on patch
by wraitii
- Implement athen_hero_themistocles ship speed aura as a test

This was SVN commit r14058.
 2013-10-30 16:12:53 +00:00
Ykkrosh 2d1be3d47e Improve correctness of hotkeys at low framerates. 
SDL queues up all the input events received in a frame. When the hotkey
system saw a key up/down event, it immediately updated its
HotkeyIsPressed state and then pushed a hotkey event onto the end of the
queue.

If the initial queue was e.g. [key-down shift, key-press Z, key-up
shift], the hotkey event triggered by Z would be processed after the
key-up shift had updated the HotkeyIsPressed state, so the handler of
the Z hotkey would not think the shift hotkey was pressed.

If the initial queue was e.g. [key-press Z, mouse-click], the hotkey
triggered by Z would be processed after the mouse-click event, so it
could apply to the wrong building selection.

Fix by pushing the hotkey events onto a special queue that gets
processed before any subsequent SDL input events.

Also update the HotkeyIsPressed status when the HOTKEYDOWN/HOTKEYUP
events are processed, not when they are generated, to guarantee they are
consistent with the DOWN/UP events.

Fixes #1869.

This was SVN commit r14057.
 2013-10-30 01:38:32 +00:00
Gallaecio 11c7c44a0b Fixed typos reported in Transifex by qwertz and Loki. 
This was SVN commit r14056.
 2013-10-29 23:22:09 +00:00
Gallaecio b67c411b33 Fix typos in template files. Refs #2185. 
This was SVN commit r14055.
 2013-10-28 20:26:35 +00:00
Gallaecio 15f09f7005 Fix typos in civilization files. Refs #2185. 
This was SVN commit r14054.
 2013-10-28 20:21:27 +00:00
Gallaecio 538c250d67 Fix typos in descriptions of random maps. Refs #2185. 
This was SVN commit r14053.
 2013-10-28 20:19:09 +00:00
Gallaecio dd7445262c Typo: enemey → enemy. 
This was SVN commit r14052.
 2013-10-28 20:01:51 +00:00
leper fcde137b30 Viriato. 
This was SVN commit r14051.
 2013-10-28 14:35:25 +00:00
JoshuaJB e2f475b86a Make the *nix ARM support a little sturdier, Fixes #2121 
This was SVN commit r14050.
 2013-10-27 21:06:15 +00:00
leper 3173722099 Copy this.entites in GarrisonHolder before passing and modifying it. Patch by mimo. Fixes #2238. 
This was SVN commit r14049.
 2013-10-27 16:37:51 +00:00
Mythos_Ruler 31e79e6709 Reorders the game setup drop list for maps. 
This was SVN commit r14048.
 2013-10-26 15:20:13 +00:00
Mythos_Ruler 30af350e31 New Neareastern Badlands skirmish map and it's awesome with Whizbang Graphics (WBG) enabled. 
Tweaked some stuff on a few maps.

Fixed Iberian Walls for Nile River skirmish.

Changed names for Ptolemaic warships.

A couple of technology portraits for Advanced and Elite upgrades (these
techs are not implemented, but planned).

This was SVN commit r14047.
 2013-10-26 15:10:15 +00:00
OmriLahav 597da2ff9d Alpha 14 remake 
This was SVN commit r14045.
 2013-10-26 11:10:21 +00:00
Mythos_Ruler a45b074b07 Renamed the Arabian Oasis maps to Libyan Oasis, because the Egyptian eye candy assets insinuate the Libyan Desert instead of the Arabian Desert. 
Changed Nile River maps to "naval" maps because the AI gets stuck trying
to cross the river.

Renamed the "ptol" statue ruins to "egyptian" statue ruins. Makes them
more generically "Egyptian".

Ensured siege engines can only be built in City Phase.

This was SVN commit r14044.
 2013-10-26 10:31:52 +00:00
Mythos_Ruler 64dc783a18 Simplified the Spartan population penalty. 
Changed costs on a few units.

New tooltips and hero auras for Carthaginian heroes Hannibal, Hamilcar,
and Maharbal. (see: wiki civ profile)

Fixed specificname for some Carthaginian units.

Added a field entity for "skirmish" maps.

This was SVN commit r14043.
 2013-10-26 09:40:21 +00:00
Mythos_Ruler fe6d508a82 Punjab skirmish map. 
Some map tweaks.

This was SVN commit r14042.
 2013-10-26 03:07:03 +00:00
Mythos_Ruler 1ee4c52779 All 4 players on Nile River skirmish map now have Iberian walls. 
This was SVN commit r14041.
 2013-10-25 09:00:46 +00:00
Mythos_Ruler 10ddc2aed6 Fixed starting unit for Ptolemies. 
Nile River skirmish map (still needs Iberian walls for 2 of the
players).

New map preview for Arabian Oasis.

Moved Civic Center back to Town Phase, but made it take twice as long to
build.

Fixed elephant template.

Fixed up Persian Highlands skirmish map based on some notes from
Alpha123.

This was SVN commit r14040.
 2013-10-25 08:02:55 +00:00
OmriLahav 14166af0ac This was SVN commit r14038. 2013-10-24 09:46:26 +00:00
leper 4e86b00a05 Remove inconsistencies in the manual. Refs #2185. 
Fix player name.
Make log messages when saving games use quotes around paths.

This was SVN commit r14037.
 2013-10-23 22:18:40 +00:00
Yves 20ed5b118c Unify script conversions and remove JSInterface_Vector3D. 
Because it was historically grown, we have some duplicated code for
converting script types to native types.
This patch removes the file JSConversions.cpp and moves some code to
ScriptConversions.cpp.
The places using JSConversions.cpp are changed to use the
ScriptInterface's conversion functions in ScriptConversions.cpp.
I also removed JSInterface_Vector3D because it had additional
requirements to the conversion code that no other code has and because
it's currently not used. I think it doesn't make sense to maintain code
just because it could possibly be used again later.

Closes #2213
Refs #1886

This was SVN commit r14036.
 2013-10-20 17:13:53 +00:00
Ykkrosh a4cd90ddfc Avoid non-ASCII characters in source code, since tools don't decode them consistently. 
Fixes #2198.

This was SVN commit r14035.
 2013-10-20 09:27:44 +00:00
leper d6f6d2b145 Remove useless error messages. 
This was SVN commit r14034.
 2013-10-20 01:47:16 +00:00
Mythos_Ruler 2117f77812 Fixed some resource placement. 
This was SVN commit r14033.
 2013-10-20 01:18:59 +00:00
Mythos_Ruler 50a2bddf77 Fixed some goats. 
This was SVN commit r14032.
 2013-10-20 01:10:02 +00:00
Mythos_Ruler 34d927f25c These two skirmish maps are now complete with walls for Iberians. 
This was SVN commit r14031.
 2013-10-19 23:52:28 +00:00
Mythos_Ruler 15f565f316 Corinthian Isthmus and Persian Highlands skirmish maps (wip). 
This was SVN commit r14030.
 2013-10-19 20:54:41 +00:00
leper 742c489353 Fix typos, remove BOMs and add newlines before EOF. Refs #2185. Patch by Gallaecio. 
This was SVN commit r14029.
 2013-10-19 20:13:48 +00:00
leper 71a41ba401 Line endings. Refs #2185. 
This was SVN commit r14028.
 2013-10-19 20:07:20 +00:00
Mythos_Ruler 45d4e92782 Fixed building requirements for Town Phase. 
Changed Brit Wonder to the new Stonehenge model. :)

Trying out some new hunting changes from sanderd. Might just be
temporary. Refs #2092

This was SVN commit r14027.
 2013-10-19 18:20:25 +00:00
Yves b9892bc73a Remove ScriptableObject/CJSObject 
Since all remaining uses of ScriptableObject/CJSObject have been
removed, the related files can now also be removed.
Closes #2212
Refs #2126
Refs #2137
Refs #1886

This was SVN commit r14026.
 2013-10-19 10:14:08 +00:00
Ykkrosh 024dd82209 Fix non-PCH build 
This was SVN commit r14024.
 2013-10-19 01:11:20 +00:00
Ykkrosh ac335f37c8 Fix some Clang warnings about unused private members 
This was SVN commit r14023.
 2013-10-19 00:53:58 +00:00
leper c0b628bcac Fix some typos. Patches by Swyter (Spanish translator). Fixes #2210, #2211. 
This was SVN commit r14022.
 2013-10-18 20:33:08 +00:00
Ykkrosh 701508922f Use CStrIntern for font names to reduce lookup cost 
This was SVN commit r14020.
 2013-10-18 16:15:42 +00:00
Ykkrosh 91169c82c7 Optimise rendering of scrollable text boxes by clipping 
Add optional clipping rectangle to CTextRenderer. Strings that are
printed
outside the vertical extent of the clipping rectangle will be
immediately
skipped. This greatly reduces the cost of large scrollable text boxes.

This was SVN commit r14019.
 2013-10-18 16:05:02 +00:00
Ykkrosh 751558d894 Optimise text rendering by batching 
When CTextRenderer is given multiple strings with no differences other
than position, render them in a single glDrawElements call to reduce
driver overhead.

Also avoid some unnecessary copies of std::wstrings.

This helps performance a bit with large GUI text boxes.

This was SVN commit r14018.
 2013-10-18 16:02:48 +00:00
Ykkrosh b6c7c0d799 Optimise glyph lookup in text renderer 
std::map lookup was a major cost when rendering large amounts of text.
Replace it with a more efficient 2-level array.

This was SVN commit r14017.
 2013-10-18 15:56:12 +00:00
Ykkrosh 5778484a77 Refactor text renderer 
Replace unifont with CFont and CFontManager, since the h_mgr interface
was
needlessly inconvenient.

Load the font textures through CTextureManager, to support dynamic
reloading (e.g. when resetting GL state - see #741).

Add CFontMetrics as a convenient wrapper for code that just wants to
measure text.

Fixes #1117.

This was SVN commit r14016.
 2013-10-18 15:53:07 +00:00
Ykkrosh 8799bd98b0 Support 8bpp textures 
When textures.xml specifies format="alpha", the input is expected to be
an
8-bit greyscale PNG, and the output will be an 8-bit uncompressed
alpha-only DDS.

Add format override to CTextureProperties, to select between e.g.
GL_ALPHA
and GL_LUMINANCE for 8-bit textures.

This is needed so fonts can use the new texture system.

This was SVN commit r14015.
 2013-10-18 15:36:31 +00:00
leper 6a2fac7a58 Add hotkeys for JSDebugger commands. Patch by sathyam. Fixes #2208. 
This was SVN commit r14014.
 2013-10-18 14:41:08 +00:00
Enrique 9802adf92f celt_stonehenge with normal and spec maps. Fixes #2053 
This was SVN commit r14013.
 2013-10-18 14:29:10 +00:00
sanderd17 f3968c0d4c fix some flaws in the preferred classes. Patch by Jammus, Fixes #1985 
This was SVN commit r14011.
 2013-10-16 19:08:01 +00:00
sanderd17 e6d9094c98 Remove InitSavedGame, but keep the rallypoint problem it solved. Fixes #1762, Patch by mimo. 
This was SVN commit r14010.
 2013-10-16 17:58:12 +00:00
OmriLahav 6c3c6cfd3a This was SVN commit r14009. 2013-10-16 14:08:47 +00:00
Ykkrosh a2f836c393 Prevent bogus -Wmaybe-uninitialized warnings in GCC 
This was SVN commit r14008.
 2013-10-16 12:22:50 +00:00
Mythos_Ruler eb33d0fd61 New unit for Romans: "Italian Allied Cavalry" which can help counter archers. 
Persians and Mauryans still have uber archers, but must first pay for
them by researching "Archery Tradition" at the Barracks for 200F 300W.
This technology adds +10 meters to the range of all bow-using units,
plus makes archer units train faster (but have less health).

This was SVN commit r14007.
 2013-10-16 01:04:55 +00:00
Mythos_Ruler 8456d50015 Found a couple more. (removing stonewall attack restriction). 
This was SVN commit r14006.
 2013-10-15 22:43:59 +00:00
Mythos_Ruler 8053cbd474 Remove the attack restriction for units against stone walls. May add it back for ranged units like archers and javelinists, after some discussion. I also feel it would be kind of weird to "charge" a stone wall (except for battering rams and elephants). So, we'll have to talk about it some more. But for now, let's test this out. 
This was SVN commit r14005.
 2013-10-15 22:43:06 +00:00
Enrique 40db79df33 greek docks do not show warships in the foundation until construction is finished. 
Different actor variations of the building can be displayed while
construction naming their variation to "scaffold"

This was SVN commit r14004.
 2013-10-15 21:24:20 +00:00
sanderd17 2bbbcff811 fix tests, breaking caused by renaming files. 
This was SVN commit r14003.
 2013-10-15 16:10:06 +00:00
sanderd17 5f5eedc513 Rename technology related files, methods and messages so their names represent the shared data flow between technologies and auras (and maybe future components). Implement the C++ part of auras through these generalised files. Fixes #2154 
This was SVN commit r14001.
 2013-10-15 10:05:08 +00:00
sanderd17 a4ce8dac34 fix technologies broken by 379a7b208f 
This was SVN commit r14000.
 2013-10-14 20:36:57 +00:00
sanderd17 379a7b208f Implement the js side of auras. Refs #2048. Patch with the help of Alpha123. Only the temple aura is added as example, all other aura components are removed from the templates to be created from scratch again. 
This was SVN commit r13998.
 2013-10-14 15:51:21 +00:00
Mythos_Ruler 57d47f23c9 This was SVN commit r13997. 2013-10-13 18:11:54 +00:00
Enrique 417e2455a0 Added ptolemaic ptolemaic storehouse and Lordgood's new cart temple and ptolemaic defense tower with little fixes. 
This was SVN commit r13996.
 2013-10-13 15:26:43 +00:00
Ykkrosh ce5c43fe03 Fix typo 
This was SVN commit r13995.
 2013-10-13 11:41:30 +00:00
historic_bruno 3a28caed03 Rebuilt premake4.exe with VC++ 2008 to avoid VC++ 2012 issues targeting XP 
This was SVN commit r13994.
 2013-10-12 23:47:09 +00:00
Enrique 41de5440e0 Added and applied normal and spec maps for ptolemaic struct, paintings and statues, added ptolemaic temple and farmstead. Fixed ptolemaic CC footprint + little fixes 
This was SVN commit r13993.
 2013-10-12 21:33:21 +00:00
Mythos_Ruler 7335c32c7e Some updated sounds from LAVS. 
This was SVN commit r13992.
 2013-10-12 01:27:10 +00:00
leper 9b8667a9aa Really add special starting unit. 
This was SVN commit r13991.
 2013-10-11 23:37:04 +00:00
leper 4f03550adf Create a special starting unit entity for skimish maps. 
This was SVN commit r13990.
 2013-10-11 23:36:02 +00:00
leper 396bd844dd Remove duplication between getActionInfo and determineAction. Allow setting rally points if not all selected buildings can do so. Patch by mimo. Fixes #2189. 
This was SVN commit r13989.
 2013-10-11 22:43:22 +00:00
leper 801cac87dd Properly queue rally points when setting them via the minimap. Patch by mimo. Fixes #2203. 
This was SVN commit r13988.
 2013-10-11 21:50:45 +00:00
sanderd17 c5669e2c4e Add a back to work button. Patch by Itms. Fixes #799 
This was SVN commit r13987.
 2013-10-11 19:11:07 +00:00
Ykkrosh e2d28c8894 Add AppData file, for use by some Linux package installers. 
Fixes #2202.

This was SVN commit r13986.
 2013-10-11 18:55:46 +00:00
OmriLahav 7791c4c61d This was SVN commit r13985. 2013-10-11 11:01:55 +00:00
OmriLahav f22e47a743 This was SVN commit r13984. 2013-10-11 11:01:06 +00:00
historic_bruno 644135b9f3 Fixes variable name conflict in session UI, patch by Itms, fixes #2199 
This was SVN commit r13982.
 2013-10-11 00:22:27 +00:00
historic_bruno f5eeed9cf7 Clears selections when loading saved game, patch by RefinedCode (fixes buggy selection behavior when using quicksave/quickload), fixes #2178 
This was SVN commit r13981.
 2013-10-10 23:58:29 +00:00
historic_bruno a00e57df72 Fixes hypothetical mem leak in network code (and an error in Cppcheck), patch by Riemer, fixes #2122 
This was SVN commit r13980.
 2013-10-10 23:46:42 +00:00
alpha123 f6c9db33d6 Focus on the building a hero is garrisoned in when the hero button is double-clicked. Patch by mimo. Fixes #2131 
This was SVN commit r13978.
 2013-10-10 21:23:19 +00:00
Mythos_Ruler c7e3c1499f Fixed typo. 
This was SVN commit r13977.
 2013-10-09 20:07:36 +00:00
Mythos_Ruler cd5a2aa527 Ptolemy IV. 
Ptolemaic heroes added to Ptolemaic Fortress.

Seleucid Romanized Infantry Champion.

This was SVN commit r13976.
 2013-10-09 13:42:34 +00:00
sanderd17 5c3ff86219 add different skirmish structures + skirmish demo map containing all skirmish templates so far 
This was SVN commit r13975.
 2013-10-08 18:02:35 +00:00
sanderd17 f3d83e0616 add skirmish defense tower and houses 
This was SVN commit r13974.
 2013-10-08 09:13:55 +00:00
historic_bruno f3d088dd5c Fixes JS debugger, fixes VS 2013 build error, re-fixes #2127, #2175 
This was SVN commit r13973.
 2013-10-07 22:55:30 +00:00
RedFox 8464777759 Fixed premake4 build incorrectly ignoring vs2010 action. 
fixes #2191

This was SVN commit r13972.
 2013-10-07 22:45:08 +00:00
RedFox a97cd73cf8 Adds EnableSSE2 for Visual Studio builds on windows. 
Adds optional "--with-c++11" flag for GCC/ICC builds. For possible
future C++11 migration.
refs #2191

This was SVN commit r13971.
 2013-10-07 22:39:13 +00:00
RedFox 055ea57468 ref #2191 
Adds VS2012 support for premake4. Also adds
update-workspace-with-atlas.bat for VS2012 builds that need to compile
AtlasUI.dll, too.

This was SVN commit r13970.
 2013-10-07 22:10:16 +00:00
Mythos_Ruler 79af6fb17f Newly updated Ptolemaic champion cavalry. 
This was SVN commit r13969.
 2013-10-07 20:47:06 +00:00
historic_bruno b9268fbdcd Fixes error logging in the JS debugger, based on patch by RefinedCode. Fixes #2175 
This was SVN commit r13967.
 2013-10-07 02:10:41 +00:00
historic_bruno d3e0fb4f84 Fixes crannóc spelling, thanks to GunChleoc 
This was SVN commit r13966.
 2013-10-07 00:46:58 +00:00
historic_bruno 1408a0be83 This was SVN commit r13965. 2013-10-06 23:29:03 +00:00
historic_bruno 74216a5825 Reverts field limits from f4abcd2ef9 until we can fix AI and UI problems, refs #2187 
This was SVN commit r13964.
 2013-10-06 23:25:55 +00:00
historic_bruno 6d67957db2 Prevents buildings from getting attack-move orders and implements attack-move rally points, patch by mimo. Fixes #2171 
This was SVN commit r13963.
 2013-10-06 22:50:30 +00:00
historic_bruno 35fa527814 Adds attacking player's name to attack notification messages. 
Cleans up some duplicate username/color code in messages.js

This was SVN commit r13962.
 2013-10-06 22:07:55 +00:00
Mythos_Ruler 7d92b3459b Turns on Attack notification text. 
This was SVN commit r13961.
 2013-10-06 21:17:56 +00:00
Mythos_Ruler 573215dad8 Fixed the player names on this map. 
This was SVN commit r13960.
 2013-10-06 20:51:30 +00:00
Mythos_Ruler 4cfee05c31 New skirmish templates for Brit war dog and Maur Worker Elephant. Added to current Skirmish maps. 
This was SVN commit r13959.
 2013-10-06 20:23:21 +00:00
Mythos_Ruler efc84a9cce Adjusting time costs for these Ptol buildings. 
This was SVN commit r13958.
 2013-10-06 19:13:20 +00:00
Mythos_Ruler 5fc888fdcf Some more player names for Carthage. 
Player names for Seleucids.

Fixed names for Celtic docks and merchant ships.

Fixed cavalry health for a few units.

Name stuff for ships, specifically Carthage. Fixes #2106.

Started work on some Ptolemaic units, specifically the Cav Spearman.

Added LordGood's Sacred Band Cavalry portrait.

This was SVN commit r13957.
 2013-10-06 18:28:10 +00:00
Mythos_Ruler b9b923be11 Fixes #2149 
This was SVN commit r13956.
 2013-10-06 14:58:26 +00:00
Mythos_Ruler 14b51afc39 Fixes #2152 
This was SVN commit r13955.
 2013-10-06 06:57:50 +00:00
Mythos_Ruler f4e4247f06 Fixed Gallic Outpost name. Fixes #2167. 
Fix Ptol civ center footprint.

This was SVN commit r13954.
 2013-10-06 06:53:32 +00:00
historic_bruno 50782c1c1c Fixes non-PCH build 
This was SVN commit r13953.
 2013-10-06 05:15:54 +00:00
historic_bruno 754e794f9b Implements attack notifications based on patch by madmax and zoot, fixes #1719 
This was SVN commit r13951.
 2013-10-06 04:49:38 +00:00
historic_bruno 2418ae190d Fixes some erroneous documentation in EntityLimits. 
Removes previously implemented LimitsPerCivCentre from AI states.
Removes hardcoded categories from TrainingRestrictions

This was SVN commit r13950.
 2013-10-06 03:13:46 +00:00
Mythos_Ruler c21953b434 Added some Iberian walls to a couple of skirmish maps. 
Rethought the naming scheme of the skirmish maps.

This was SVN commit r13949.
 2013-10-05 21:58:42 +00:00
Spahbod a1ceda4012 Polishing the Random Maps: The last batch... 
This was SVN commit r13948.
 2013-10-05 18:29:44 +00:00
leper fecfda29f6 Remove civ code hardcoding from SkirmishReplacer component. Refs #1198. 
This was SVN commit r13947.
 2013-10-05 17:54:41 +00:00
leper 3624c591bd Fix compilation failure without PCH. 
This was SVN commit r13946.
 2013-10-05 16:22:51 +00:00
leper 85253ca3c8 Let corpses cast shadows again. Refs #1771. 
This was SVN commit r13945.
 2013-10-05 16:22:46 +00:00
alpha123 ff6b80305c Rearrange hotkeys a bit. Queue the 8th unit is now Comma, and select idle warrior is forward slash (replacing camera-follows-mouse, which is available by holding middle mouse anyway). Fix #2181. 
This was SVN commit r13944.
 2013-10-04 23:31:24 +00:00
alpha123 433b29d6dc Fix description of Belgian Bog skirmish map. 
This was SVN commit r13943.
 2013-10-04 23:14:52 +00:00
Mythos_Ruler 76d9893123 New skirmish maps. 
Fixed some things.

This was SVN commit r13942.
 2013-10-04 18:11:13 +00:00
Mythos_Ruler 2283aedc3c The first Skirmish maps. 
Temporary selection and complete sounds for Theater, Elephant Stables,
Cavalry Stables, Blacksmith, and Wonder. Sounds by LAVS. He is working
on improving them.

This was SVN commit r13941.
 2013-10-04 13:17:21 +00:00
alpha123 939898c47d Nerf Iberian champion cavalry a bit. 
This was SVN commit r13940.
 2013-10-04 04:01:58 +00:00
historic_bruno 7901ed51d4 Implements skirmish maps, based on patch by sanderd17, fixes #1198. Skirmish maps are like scenarios, except the player can choose their civ during match setup. To create a skirmish map: place some skirmish entities for each player in Atlas (see templates/skirmish/* for examples), uncheck the player's civ in Atlas' player panel if desired, and save in the maps/skirmishes directory. The map will appear in match setup under the "Skirmish" match type. 
Implements custom, VFS-based map load/save dialogs for Atlas (replaces
broken native file dialogs), fixes #631, #889.
Fixes map loading/saving to handle arbitrary subdirectories for better
organization.
Adds default settings to Atlas player panel, fixes #1872. Each setting
now has a checkbox to choose whether it should be saved with the map
(avoids writing lots of useless default data for each map).
Adds map preview setting to Atlas, refs #1745.
Cleans up and simplifies some duplicate code.
Fixes optional serialization performance test.

This was SVN commit r13938.
 2013-10-04 02:29:16 +00:00
historic_bruno 5c35690309 Fixes broken statue ruins template and replaces old statue treasures with ruins 
This was SVN commit r13937.
 2013-10-04 01:15:16 +00:00
historic_bruno 6a97bbd4c3 Fixes dropdowns opening with empty list, caused assertion failure about vector subscript range in MSVC debug build 
This was SVN commit r13936.
 2013-10-04 00:31:36 +00:00
Enrique b0e2f6b368 Added obelisks to ptol_cc 
This was SVN commit r13935.
 2013-10-03 18:41:07 +00:00
Ykkrosh e700937fd3 Fix non-SSE x86 builds 
This was SVN commit r13934.
 2013-10-03 18:22:10 +00:00
Enrique 398a32a6ff Added ptolemiac civic centre with ao and custom decal dirt_7x5 
This was SVN commit r13933.
 2013-10-03 17:18:57 +00:00
Enrique 739ed00b5e Added ptolemaic fortress with ao. Updated ptolemaic struct texture 
This was SVN commit r13932.
 2013-10-02 21:29:44 +00:00
Mythos_Ruler e382967e34 Updated a bunch of things. 
New waypoint and garrison flags for Ptolemies. New texture for Ptolemies
woman. Fixed footprint for statues ruin. etc.

This was SVN commit r13931.
 2013-10-02 18:51:49 +00:00
Mythos_Ruler bb78b4c931 Replacing these statue "treasures" with "ruins." Instead of getting the resources immediately, ruins allow the player to "mine" the resources at a fast rate. 
This was SVN commit r13930.
 2013-10-02 16:54:13 +00:00
Enrique e0d50b6137 added seleucid thureos texture by request 
This was SVN commit r13929.
 2013-10-02 14:53:59 +00:00
Enrique 60200f8dbb fixed ptolemaic statues base. 
This was SVN commit r13928.
 2013-10-02 13:41:53 +00:00
Enrique 2e24c9f2b7 ptolemaic houses and statues with ao. Added ptolemaic struct texture and 4 ptolemaic round shields variations 
This was SVN commit r13927.
 2013-10-02 12:18:10 +00:00
Enrique 26af70ec7b Fixed ptolemaic thureos mesh shape 
This was SVN commit r13926.
 2013-10-01 15:15:39 +00:00
Ykkrosh 9f5635085e Fix #1833: animals spin around needlessly while roaming. 
Patch from mimo.

This was SVN commit r13924.
 2013-09-30 23:52:22 +00:00
Ykkrosh e449364408 Recompute system shader defines immediately when the relevant inputs change, instead of delaying until ReloadShaders. 
This fixes an error with autostart and smoothlos=true, where the system
defines were being accessed before the first rendered frame.

This was SVN commit r13923.
 2013-09-30 22:39:06 +00:00
historic_bruno 8cf5f61885 Avoids ugly layering of GUI pages when entering match setup 
This was SVN commit r13922.
 2013-09-30 20:51:19 +00:00
Enrique cbe103bdfe ptolemaic galatian shields for basic, advanced and elite with specular maps. 
This was SVN commit r13921.
 2013-09-30 19:03:09 +00:00
Enrique 1f032b7c59 Added Lordgood's new britons barracks and defense tower with minimal tweaking 
This was SVN commit r13917.
 2013-09-30 08:14:10 +00:00
historic_bruno e24ce51029 Adds DynamicArena allocator that grows by fixed chunk size, fixes #2142. 
Changes fixed size arenas to new dynamic arenas with reasonable chunk
sizes (may require tuning), refs #1842

This was SVN commit r13916.
 2013-09-30 01:22:44 +00:00
historic_bruno fbee618ac8 Fixes memory leak in sound manager 
This was SVN commit r13915.
 2013-09-30 01:09:16 +00:00
Yves 238b7f84d8 Changes the ConfigDB to expose global functions to scripts instead of properties and custom objects. 
Fixes #2172
Refs #1886

This was SVN commit r13914.
 2013-09-29 18:56:50 +00:00
Mythos_Ruler 2ea0620abb Reduce the health drain of the Nubian Archer. 
Fixed the Lighthouse to not have the Library special tech.

Ptol Military Settlement has better sounds and a different portrait.

Increased defense tower limit since they now have a min distance limit.

Tweaked Ptolemies demo map.

This was SVN commit r13913.
 2013-09-29 16:29:38 +00:00
leper 022393a0c6 Spelling fixes from the translation work by Gallaecio and Loki72. Fixes #2150, #2170. 
This was SVN commit r13912.
 2013-09-29 16:14:40 +00:00
Ykkrosh c2583e42da Reduce memory allocations in the renderer 
Use an arena allocator in ShaderModelRenderer::Render, to reduce
the allocation cost in STL containers.

Avoid unnecessary copying of std::vectors.

This was SVN commit r13911.
 2013-09-29 14:48:11 +00:00
Ykkrosh 6b0a0e83eb Fix profiler malloc count in debug mode on Windows 
wdbg_heap_NumberOfAllocations doesn't work without the wdbg_heap
leak detector, which is disabled since it's slow and broken.
Use a simple hook via _CrtSetAllocHook instead to count allocations.

This was SVN commit r13910.
 2013-09-29 14:43:14 +00:00
Mythos_Ruler f4abcd2ef9 Gauls get: Tavern and Naked Fanatic. 
Britons get: Rotary Mill.

So, now all Celts get Rotary Mill, but also a unique unit-producing
building.

Britons now have a better demo "sandbox" map.

Ptolemies now play like they are intended. Just need tons of new
artwork. ;) Try them out on the demo map: Sandbox - The Ptolemaic
Egyptians.

Some highlights: Their Nubian Archers train very fast, but have a finite
life. The Lighthouse can be built on the shoreline (but looks like a
library). Their Military Settlement works as intended (can be built in
neutral territory, but min distance of 80 meters).

Testing out: Farm field limits (+8 per Farmstead, +2 per civ center).

This was SVN commit r13909.
 2013-09-29 14:37:26 +00:00
Ykkrosh eceae8be5c Fix crash when setting rally point 
This was SVN commit r13908.
 2013-09-29 14:02:47 +00:00
wraitii d663dae2d8 New version of Aegis. Huge rewrite for WIP naval support (still very, very buggy at this point.) Features a few bugfixes and might be more efficient than the former version. 
NEEDS TESTING.

This was SVN commit r13907.
 2013-09-29 13:32:52 +00:00
Ykkrosh 994ebd9836 Add a list of statically-constructed CStrIntern strings 
Switch all the constant strings in graphics code to use the new
variables.
This avoids the cost of instantiating CStrInterns at runtime every
frame.

This was SVN commit r13906.
 2013-09-29 13:19:52 +00:00
Mythos_Ruler 08f431fa0d Ptolemaic entity templates for Enrique. 
This was SVN commit r13905.
 2013-09-29 03:08:59 +00:00
Ykkrosh 4e9570cd0f Fix unnecessary CShaderConditionalDefines copy, and inline some functions 
This was SVN commit r13904.
 2013-09-29 02:05:02 +00:00
Ykkrosh f075571502 Fix slightly expensive GetSystemShaderDefines() 
Only recompute when any relevant parameters have changed, then return
the cached value.

This was SVN commit r13903.
 2013-09-29 01:00:11 +00:00
Ykkrosh 555deea136 Fix conditional defines to not construct new CShaderDefines frequently 
CShaderDefines is designed to be efficient to copy and compare, but not
to construct. Conditional defines were constructing new CShaderDefines
for many models every frame.

Precompute all the possible conditional combinations of CShaderDefines
when a material is first loaded, so they can be looked up at no cost
when rendering.

This was SVN commit r13902.
 2013-09-29 00:30:58 +00:00
Ykkrosh 22f0f2b232 Set _NO_DEBUG_HEAP=1 in VS2010 projects 
The debug heap has a high performance cost, even in release mode,
when running inside a debugger, which is surprising to people trying
to measure performance. It doesn't seem very useful at finding bugs
either.

Add a NoDebugHeap flag to Premake, to set that environment variable
when running in the VS2010 debugger.

This was SVN commit r13901.
 2013-09-28 14:35:28 +00:00
Mythos_Ruler 2d1b7914a6 This was SVN commit r13900. 2013-09-28 11:58:05 +00:00
Mythos_Ruler b8a5acfd9e Preview image for The Gauls demo map. 
This was SVN commit r13899.
 2013-09-26 18:44:45 +00:00
RedFox 28ce5f3458 It might be better to issue a LOGWARNING when Spatial queries are too large. Opening the crash window seems a bit too much for something that can be recovered from. 
This was SVN commit r13898.
 2013-09-24 21:50:46 +00:00
sanderd17 e370af8d4e Fix rally point rendering on saved games. Fixes #1762. Patch by mimo 
This was SVN commit r13897.
 2013-09-24 20:27:18 +00:00
Mythos_Ruler 6880fd214f Fixed name of this map. 
This was SVN commit r13896.
 2013-09-24 18:41:19 +00:00
Enrique 895f927ff0 Celts corral props missing fix 
This was SVN commit r13895.
 2013-09-24 16:26:26 +00:00
Mythos_Ruler 59c8e9e6dc Big gameplay experiment: Moved Civic Centers from Town Phase to City Phase to see what it does to multiplayer match ups. 
New "sandbox" demo map for the Gauls.

Renamed "Night's Watch" to "Sentries."

This was SVN commit r13894.
 2013-09-24 15:55:35 +00:00
historic_bruno cd51540725 This was SVN commit r13892. 2013-09-22 18:13:19 +00:00
historic_bruno 2a613f8236 Removes mostly useless video memory detection, fixes another crash with Nvidia Optimus on Windows, fixes #2145, #2138 
This was SVN commit r13891.
 2013-09-22 18:07:33 +00:00
Mythos_Ruler e488ed09f5 This was SVN commit r13890. 2013-09-22 11:30:24 +00:00
Mythos_Ruler ae4ccfe050 3D farm fields for all factions. 
Fixed tooltips for a bunch of units.

Increases pierce armor for elephants.

This was SVN commit r13889.
 2013-09-22 08:07:29 +00:00
RedFox 5287af8967 Increased SpatialQueryArray max results from 1024 to 2048. This is a temporary fix until the Search and Prune solution is implemented. 
This was SVN commit r13888.
 2013-09-22 04:37:46 +00:00
sanderd17 5afb18dda4 fix units ejecting on destroying structure 
This was SVN commit r13887.
 2013-09-21 19:41:13 +00:00
sanderd17 4f6ddfe894 fix theatron build limit 
This was SVN commit r13886.
 2013-09-21 19:05:59 +00:00
Enrique 636f09053b celt tavern update 
This was SVN commit r13885.
 2013-09-21 15:24:56 +00:00
Yves 9781b67cf4 Changes the Console to expose global functions to scripts instead of properties. 
Fixes #2140
Refs #1886

This was SVN commit r13884.
 2013-09-21 14:48:19 +00:00
Mythos_Ruler bb506fb578 Spec maps and new player color texture for Greek females. 
This was SVN commit r13883.
 2013-09-21 12:41:05 +00:00
Mythos_Ruler 21639ce5ea Normal map and Specular map for warship sails. 
Fixed Cav Sword tooltip.

Updated the product logo a little bit.

This was SVN commit r13881.
 2013-09-21 11:50:04 +00:00
Mythos_Ruler 0233bb4877 Temporary Ptolemies emblem. 
This was SVN commit r13880.
 2013-09-21 09:23:21 +00:00
Mythos_Ruler ccc873d9d5 Tech complete sound slightly louder. 
This was SVN commit r13879.
 2013-09-21 09:22:31 +00:00
Mythos_Ruler ec66e59150 Fixed some civ json stuff. Fixed Ptolemaic json. 
This was SVN commit r13878.
 2013-09-21 09:21:48 +00:00
Yves 12e2428495 Changes the Renderer to expose global functions to scripts instead of using CJSObject. 
Fixes #2137
Refs #1886

This was SVN commit r13877.
 2013-09-21 08:24:45 +00:00
Mythos_Ruler c0b84fb41f Added build limits for Theater, Council Chamber, and Library. 
Added Ptolemies civ json file. I am getting a javascript error in-game
though. Need help trouble shooting it.

This was SVN commit r13876.
 2013-09-21 07:33:22 +00:00
Mythos_Ruler 9d2f59e80a Tweaking the Athenian field. 
Tweaking 0 A.D. logo.

Fixed tooltip for Slinger.

Fixed name for Carthaginian wonder.

This was SVN commit r13874.
 2013-09-21 03:58:54 +00:00
Ykkrosh d252e245ef Optimise fixed multiplies on MSVC x86 
On MSVC, casting i32 to i64 then multiplying gets compiled into a call
to __allmul, which is slow. Use the __emul intrinsic instead.

GCC 4.6+ appears optimise this case automatically and doesn't need any
special handling.

This reduces the cost of ComputeShortPath by about 50% (testing AI vs AI
on Oasis 01).

This was SVN commit r13873.
 2013-09-20 20:17:54 +00:00
Enrique 5a8cfb738b Commited experimental field for athenians (propped farm field) 
This was SVN commit r13872.
 2013-09-19 15:29:01 +00:00
Enrique 4b7c1a915d Celtic corral upgraded. Added more playercolor to gaullic civic centre. 
This was SVN commit r13871.
 2013-09-19 13:58:48 +00:00
historic_bruno bfe0b79b91 Better fix of Grid memory leak, refs #1842 
This was SVN commit r13869.
 2013-09-18 01:21:36 +00:00
alpha123 e10c4ebaae Amend 553875ea83: Forgot to include new hotkey in the config. 
This was SVN commit r13868.
 2013-09-17 00:31:18 +00:00
alpha123 553875ea83 Allow the use of Enter in addition to the OK button in the Join Game dialog. 
This was SVN commit r13867.
 2013-09-17 00:30:11 +00:00
historic_bruno 9f2a850a95 Fixes buggy operators and memory leak in Grid class, refs #1842 
This was SVN commit r13866.
 2013-09-17 00:28:22 +00:00
RedFox 5d9b2b95b0 Ticket #2127 - Performance and style improvements in scriptinterface. 
No real behavior changes, only code maintenance.

Fixed signed/unsigned mismatch in EntityMap.h

This was SVN commit r13865.
 2013-09-16 19:10:06 +00:00
historic_bruno 97912dd545 This was SVN commit r13864. 2013-09-16 16:56:26 +00:00
Enrique 16b615db79 Celt walls upgraded 
This was SVN commit r13863.
 2013-09-16 12:25:03 +00:00
sanderd17 a770ad9467 small code style fixes 
This was SVN commit r13862.
 2013-09-16 09:14:16 +00:00
RedFox 1b6a5fa802 This was SVN commit r13861. 2013-09-15 21:37:05 +00:00
RedFox 2a5ec404d1 Further reverted RangeManager sorting to stable_sort, since possibly with different STL implementations, the order of entities might change and cause OOS. 
Overflowing elements in SpatialQueryArray are now reported with
debug_warn, but can be ignored and the program will continue working,
but further entities will be truncated.

This was SVN commit r13860.
 2013-09-15 21:11:20 +00:00
Enrique bb799bdd53 upgraded gaul defense towers and celtic storehouse 
This was SVN commit r13859.
 2013-09-15 21:11:14 +00:00
Enrique 5fe43a0f21 removed non-used duplicated meshes 
This was SVN commit r13858.
 2013-09-15 19:56:13 +00:00
sanderd17 9eedd22b9a fix garrisoned units count for some special cases. Refs #2096. Patch by mimo 
This was SVN commit r13857.
 2013-09-15 16:47:40 +00:00
Enrique 65bddb7fa5 Celtic docks, kennel, farmstead and temple upgrades 
This was SVN commit r13856.
 2013-09-15 16:09:23 +00:00
Enrique bdeb358c44 Upgraded britons market and added new gaul market 
This was SVN commit r13855.
 2013-09-15 14:09:25 +00:00
RedFox 9694eec8b8 As per ticket #1707. Some minor improvements to spatial subdivision. Makes way for future changes in RangeManager. 
Right now merely improves memory usage.

This was SVN commit r13854.
 2013-09-15 14:03:53 +00:00
sanderd17 6644f224cd remove warn messages. Now really fixes #2102 
This was SVN commit r13853.
 2013-09-15 09:33:45 +00:00
sanderd17 b16b52492d change build distance restrictions to work with classes. Fixes #2012. 
This was SVN commit r13852.
 2013-09-15 09:29:16 +00:00
Mythos_Ruler 3016765766 All new techs for the blacksmith. 
This was SVN commit r13851.
 2013-09-15 08:55:28 +00:00
sanderd17 f213761912 let entities change entity limits. Fixes #2076 
This was SVN commit r13850.
 2013-09-15 08:19:50 +00:00
Mythos_Ruler de68973191 Changed the phase up sound. 
Added a new "tech complete" sound for ALL techs.

Added some new armor techs for infantry and spearmen.

This was SVN commit r13849.
 2013-09-15 07:53:01 +00:00
Mythos_Ruler 466900b898 Minor template stuff. 
This was SVN commit r13848.
 2013-09-15 05:55:16 +00:00
Mythos_Ruler db39fd059c Some tooltip tweaks. 
Further attempts to balance archers. (ongoing)

This was SVN commit r13847.
 2013-09-15 04:57:58 +00:00
Mythos_Ruler 08849ae6f6 Balance changes after playtesting with Alpha123. 
This was SVN commit r13846.
 2013-09-15 00:28:07 +00:00
Mythos_Ruler 4f138eaa12 Made the time icon slightly smaller. 
Archers have less attack and cost slightly more.

Defense Towers now have a minimum build distance and are weaker.

This was SVN commit r13845.
 2013-09-14 23:19:36 +00:00
historic_bruno 729e744c2f Removes yucky hard-coded categories from BuildRestrictions 
This was SVN commit r13844.
 2013-09-14 22:31:41 +00:00
Ykkrosh dd60c3a3e2 Restore textures.xml to make grid_subdiv terrain less ugly 
This was SVN commit r13843.
 2013-09-14 18:36:40 +00:00
Enrique a9cb79b108 celtic fortresses actor and barracks actor errors fixing reported by Sanderd 
This was SVN commit r13842.
 2013-09-14 13:59:43 +00:00
Ykkrosh 126e550d68 Delete bogus file 
This was SVN commit r13841.
 2013-09-14 12:19:22 +00:00
historic_bruno ea75cda095 Special case getEntityNamesFormatted to avoid messing with getEntityNames 
This was SVN commit r13838.
 2013-09-14 00:32:50 +00:00
alpha123 e7fa9a58de Remove the Costs: prefix from tooltips entirely. 
This was SVN commit r13837.
 2013-09-14 00:07:08 +00:00
alpha123 e646cf19bf Fix bug due to some technologies not having separate generic/specific names. 
This was SVN commit r13836.
 2013-09-14 00:00:47 +00:00
alpha123 c28151c1c1 Put tooltips on a diet. 
This was SVN commit r13835.
 2013-09-13 23:49:46 +00:00
Enrique 04b4e6af4b gaul fortress fix 
This was SVN commit r13834.
 2013-09-13 21:44:49 +00:00
Enrique 014acac9ed Upgraded britons and gaullic fortresses. 
This was SVN commit r13833.
 2013-09-13 21:41:24 +00:00
Enrique 532c9dce3e brit_civic_centre, celt_barracks and brit_crannog upgrade 
added non-transparency with AO material and non-transparency-parallax-ao
material

This was SVN commit r13832.
 2013-09-13 18:46:33 +00:00
Enrique 5023ff449e Gaul_civic_centre updated. 
This was SVN commit r13831.
 2013-09-13 14:18:27 +00:00
Enrique 8b9a0e3919 Added gaul houses, fixed brit houses and added a new variation. New effects applied. 
Added Ludo's new stonehenge model.

This was SVN commit r13830.
 2013-09-13 13:50:19 +00:00
Mythos_Ruler 77ca745637 Updated the logo. 
Updated some Roman words.

This was SVN commit r13829.
 2013-09-13 12:07:39 +00:00
historic_bruno 82fb0ce6be Improve game setup GUI performance by switching from main menu instead of pushing the page on top of the stsck 
This was SVN commit r13828.
 2013-09-12 15:12:08 +00:00
Mythos_Ruler 176cc55547 Fixing some Roman names. Thanks Robbob (on the forum). 
Added Organic "preferredClass" to Fortresses, Wall Towers, and Defense
Towers, so that they prefer to shoot at enemy units rather than enemy
structures.

This was SVN commit r13827.
 2013-09-12 13:53:00 +00:00
Yves 5304bc9d6a Changes GameView to expose global functions to scripts instead of using CJSObject. 
Fixes #2126
Refs #1886

This was SVN commit r13826.
 2013-09-12 12:40:05 +00:00
Ykkrosh 05422ad545 Avoid slightly-expensive QueryInterface() calls 
Add CEntityHandle which wraps an entity_id_t and also has a pointer to a
per-entity array of IComponents. QueryInterface/CmpPtr on a handle just
involve a couple of pointer dereferences instead of a map lookup.

This requires sizeof(void*) per registered interface type per entity,
which is currently ~0.5KB per entity, which shouldn't be a problem.

This was SVN commit r13825.
 2013-09-11 20:41:53 +00:00
sanderd17 87753bf3fd forgot to commit extra change for 508cc0d4c7 
This was SVN commit r13824.
 2013-09-11 18:59:51 +00:00
sanderd17 508cc0d4c7 Add preferred classes to BuildingAI. Patch by jammus. Fixes #1985 
This was SVN commit r13823.
 2013-09-11 17:50:49 +00:00
Mythos_Ruler 43df87e56f This was SVN commit r13822. 2013-09-10 22:05:12 +00:00
stwf b1bd61938e add file notification to Mac ticket 514, also change name of class FileInfo to CFileInfo to ease Mac development 
This was SVN commit r13821.
 2013-09-10 14:17:04 +00:00
sanderd17 d037d97d55 disable querying of local entities with a component. Avoids OOS problems. Patch thanks to historicbruno. Fixes #2119 
This was SVN commit r13820.
 2013-09-10 12:27:59 +00:00
sanderd17 d51217f718 Fix gazelle in deep water starting position on Oasis 9. Fixes #2123 
This was SVN commit r13819.
 2013-09-10 09:36:27 +00:00
leper 04ed87bf28 Display error messages instead of breaking into the debugger when we don't have rights to save a map in Atlas. Fixes #1941. 
This was SVN commit r13818.
 2013-09-09 23:31:22 +00:00
Ykkrosh b2862f14da Avoid continual libxml2 memory leak in simulation-test mode 
This was SVN commit r13817.
 2013-09-09 20:22:42 +00:00
Mythos_Ruler 3c29c2dccf Tweaked farm decal color. 
This was SVN commit r13816.
 2013-09-09 18:46:45 +00:00
sanderd17 c3f7a929e0 better garrison flag handling. Refs #2096. 
This was SVN commit r13815.
 2013-09-09 18:27:20 +00:00
sanderd17 e7ccc28cbc Enable sound notifications with technology upgrades. Based on patch by mpmoreti. Fixes #2021 
This was SVN commit r13814.
 2013-09-09 12:50:05 +00:00
sanderd17 a406863e0e fix bridge edge obstruction size and rotation of hele bridge edge 
This was SVN commit r13813.
 2013-09-09 12:11:34 +00:00
sanderd17 f051426a76 fix garrisonHolder flags when units are ejected 
This was SVN commit r13812.
 2013-09-08 19:51:16 +00:00
sanderd17 08514f68be small clean up of GarrisonHolder code 
This was SVN commit r13811.
 2013-09-08 18:46:29 +00:00
sanderd17 d1a376fd06 fix ejection of garrisoned units on resign. Fix ejection or killing on ownership and deplomacy changes. Patch by mimo. Fixes #2096 
This was SVN commit r13810.
 2013-09-08 16:02:41 +00:00
sanderd17 bc40534777 fix spread technology modifications. Fixes #2110 
This was SVN commit r13809.
 2013-09-08 15:20:54 +00:00
historic_bruno 7a0e91ab23 Fixes undefined behavior in Atlas error display, fixes #2115 
This was SVN commit r13808.
 2013-09-08 03:35:05 +00:00
leper ca1665dde1 Fix some typos in the civ json files. Patch by Gallaecio. 
This was SVN commit r13807.
 2013-09-07 17:40:50 +00:00
sanderd17 f588181004 use better technology script in guiInterface 
This was SVN commit r13805.
 2013-09-07 15:23:03 +00:00
sanderd17 24a4ceb89a fix carthagian technology. Fixes #2107 
This was SVN commit r13804.
 2013-09-07 09:26:56 +00:00
leper 819a1e7823 Save initial herd position and update the last known position of the hunted animal when hunting. Patch by mimo. Fixes #2047. 
This was SVN commit r13803.
 2013-09-06 19:47:48 +00:00
Ykkrosh 16c9724c24 Fix release build scripts 
Exclude dev.cfg from the Windows installer.
Use the correct filename for the Windows installer.
Update some paths to match the new EC2 build process.

This was SVN commit r13802.
 2013-09-06 19:43:45 +00:00
Mythos_Ruler 63f28f1a43 Increased build limit of Embassies to 2. This means you can build 2 of the same entity or 2 different out of the 3 available. 
This was SVN commit r13801.
 2013-09-06 19:26:49 +00:00
Mythos_Ruler d6ec0f6dbd Updated installer image. 
This was SVN commit r13800.
 2013-09-06 19:16:33 +00:00
stwf e19b470a42 fix music glitchyness when game loses focus trac #2090 
This was SVN commit r13799.
 2013-09-06 02:46:13 +00:00
Mythos_Ruler a7132dc66a Updated Macedonians sandbox demo map. 
Fixed Carthaginians special tech "Colonization."

Fixed Carthage json file.

This was SVN commit r13797.
 2013-09-02 16:26:19 +00:00
3882 changed files with 232314 additions and 88057 deletions
Expand all files Collapse all files
LICENSE.txt
+8
View File
@@ -51,12 +51,20 @@ in particular, let us know and we can try to clarify it.
/source/lib
MIT
/source/third_party/encryption
GPL version 2 (or later)
ISC (pkcs5_pbkdf2.cpp)
MIT (pkcs5_pbkdf2.h)
/source/third_party/mikktspace
zlib
/source/third_party/mongoose
MIT
/source/third_party/tinygettext
GPL version 2 (or later) - see license_gpl-2.0.txt
/source/tools
Various - see LICENSE.txt within that directory
binaries/data/config/default.cfg
+32 -6
View File
@@ -21,7 +21,9 @@
windowed = false
; Enable/disable the splashscreen
splashscreenenable = true
splashscreendisable = false
; Splashscreen version (date of last modification). By default, 0 to force splashscreen to appear at first launch.
splashscreenversion = 0
; Pause the game on window focus loss (Only applicable to single player mode)
pauseonfocusloss = true
@@ -43,6 +45,9 @@ bpp = 0
; System settings:
; if false, actors won't be rendered but anything entity will be.
renderactors = true
waternormals = true
waterrealdepth = true
waterfoam = false
@@ -163,6 +168,7 @@ camerajump.threshold = 40
; > SYSTEM SETTINGS
hotkey.exit = "Alt+F4", "Ctrl+Break", "Super+Q" ; Exit to desktop
hotkey.leave = Escape ; End current game or Exit
hotkey.confirm = Return ; Confirm the current command.
hotkey.pause = Pause ; Pause/unpause game
hotkey.screenshot = F2 ; Take PNG screenshot
hotkey.bigscreenshot = "Shift+F2" ; Take large BMP screenshot
@@ -185,7 +191,7 @@ hotkey.camera.rotate.cw = "Ctrl+LeftArrow", "Ctrl+A", Q ; Rotate camera cloc
hotkey.camera.rotate.ccw = "Ctrl+RightArrow", "Ctrl+D", E ; Rotate camera anticlockwise around terrain
hotkey.camera.rotate.wheel.cw = "Shift+WheelUp", MouseX1 ; Rotate camera clockwise around terrain (stepped control)
hotkey.camera.rotate.wheel.ccw = "Shift+WheelDown", MouseX2 ; Rotate camera anticlockwise around terrain (stepped control)
hotkey.camera.pan = MouseMiddle, ForwardSlash ; Enable scrolling by moving mouse
hotkey.camera.pan = MouseMiddle ; Enable scrolling by moving mouse
hotkey.camera.left = A, LeftArrow ; Scroll or rotate left
hotkey.camera.right = D, RightArrow ; Scroll or rotate right
hotkey.camera.up = W, UpArrow ; Scroll or rotate up/forwards
@@ -231,7 +237,7 @@ hotkey.selection.milonly = Alt ; Add only military units to selecti
hotkey.selection.remove = Ctrl ; Remove units from selection
hotkey.selection.cancel = Esc ; Un-select all units and cancel building placement
hotkey.selection.idleworker = Period ; Select next idle worker
hotkey.selection.idlewarrior = Comma ; Select next idle warrior
hotkey.selection.idlewarrior = ForwardSlash ; Select next idle warrior
hotkey.selection.offscreen = Alt ; Include offscreen units in selection
hotkey.selection.group.select.0 = 0
hotkey.selection.group.save.0 = "Ctrl+0"
@@ -268,8 +274,10 @@ hotkey.selection.group.add.9 = "Shift+9"
hotkey.session.kill = Delete ; Destroy selected units
hotkey.session.stop = "H" ; Stop the current action
hotkey.session.attack = "Ctrl+Alt" ; Modifier to force attack instead of another action
hotkey.session.garrison = Ctrl ; Modifier to garrison when clicking on building
hotkey.session.attackmove = Ctrl ; Modifier to attackmove when clicking on a point
hotkey.session.garrison = Ctrl ; Modifier to garrison when clicking on building
hotkey.session.autorallypoint = Ctrl ; Modifier to set the rally point on the building itself
hotkey.session.guard = "G" ; Modifier to escort/guard when clicking on unit/building
hotkey.session.queue = Shift ; Modifier to queue unit orders instead of replacing
hotkey.session.batchtrain = Shift ; Modifier to train units in batches
hotkey.session.massbarter = Shift ; Modifier to barter bunch of resources
@@ -289,6 +297,7 @@ hotkey.session.queueunit.4 = "V" ; add fourth unit type to queue
hotkey.session.queueunit.5 = "B" ; add fivth unit type to queue
hotkey.session.queueunit.6 = "N" ; add sixth unit type to queue
hotkey.session.queueunit.7 = "M" ; add seventh unit type to queue
hotkey.session.queueunit.8 = Comma ; add eighth unit type to queue
; > OVERLAY KEYS
hotkey.fps.toggle = "Alt+F" ; Toggle frame counter
@@ -297,6 +306,8 @@ hotkey.session.gui.toggle = "Alt+G" ; Toggle visibility of session GUI
hotkey.menu.toggle = "F10" ; Toggle in-game menu
hotkey.timeelapsedcounter.toggle = "F12" ; Toggle time elapsed counter
hotkey.session.showstatusbars = Tab ; Toggle display of status bars
hotkey.session.highlightguarding = PgDn ; Toggle highlight of guarding units
hotkey.session.highlightguarded = PgUp ; Toggle highlight of guarded units
; > HOTKEYS ONLY
hotkey.chat = Return ; Toggle chat window
@@ -320,8 +331,10 @@ profiler2.gpu.arb.enable = true ; Allow GL_ARB_timer_query timing mo
profiler2.gpu.ext.enable = true ; Allow GL_EXT_timer_query timing mode when available
profiler2.gpu.intel.enable = true ; Allow GL_INTEL_performance_queries timing mode when available
; > JS DEBUGGER
jsdebugger.enable = false ; Enable Javascript debugging (default off for security/performance)
; Developer options
jsdebugger.enable = false ; Enable Javascript debugging. The Debugger is currently broken and can't be enabled until the SpiderMonkey upgrade is done and the debugger is updated for the new API.
tinygettext.debug = false ; Enable Tinygettext debugging information. If true, Tinygettext prints error messages each time that a translation for an English string is not found.
developeroverlay.enable = false ; Enable in-game Developer Overlay.
; > QUICKSAVE
hotkey.quicksave = "Shift+F5"
@@ -337,5 +350,18 @@ joystick.camera.rotate.y = 2
joystick.camera.zoom.in = 5
joystick.camera.zoom.out = 4
; SESSION GUI SETTINGS
gui.session.timeelapsedcounter = false ; Show the game duration in the top right corner
gui.session.attacknotificationmessage = true ; Show attack notification messages
gui.session.minimap.pingduration = 50.0 ; The duration for which an entity will be pinged after an attack notification
gui.session.minimap.blinkduration = 1.7 ; The blink duration while pinging
; GENERAL GUI SETTINGS
gui.cursorblinkrate = 0.5 ; Cursor blink rate in seconds (0.0 to disable blinking)
; Multiplayer lobby preferences
lobby.server = "lobby.wildfiregames.com" ; Address of lobby server
lobby.xpartamupp = "wfgbot16" ; Name of the server-side xmpp client that manage games
lobby.chattimestamp = false ; Show time chat message was posted
lobby.room = "arena16" ; Default MUC room to join
lobby.history = 0 ; Number of past messages to display on join
binaries/data/l10n/.tx/config
+8
View File
@@ -0,0 +1,8 @@
[main]
host = https://www.transifex.com
[0ad.engine]
file_filter = <lang>.engine.po
source_file = engine.pot
source_lang = en
binaries/data/l10n/messages.json
+30
View File
@@ -0,0 +1,30 @@
[
{
"output": "engine.pot",
"inputRoot": "../../../source",
"project": "Pyrogenesis",
"copyrightHolder": "Wildfire Games",
"rules": [
{
"extractor": "cpp",
"filemasks": {
"includeMasks": ["**.cpp"],
"excludeMasks": ["third_party/**", "tools/**"]
},
"options": {
"keywords": {
"Translate": [1],
"TranslatePlural": [1, 2],
"TranslateWithContext": [[1], 2],
"TranslatePluralWithContext": [[1], 2, 3],
"MarkForTranslation": [1],
"MarkForTranslationWithContext": [[1], 2]
},
"commentTags": [
"Translation:"
]
}
}
]
}
]
binaries/data/mods/public/art/actors/fauna/crocodile.xml
+26 -3
View File
@@ -2,9 +2,32 @@
<actor version="1">
<castshadow/>
<group>
<variant name="crocodile">
<mesh>skeletal/crocodile.dae</mesh>
<textures><texture file="null_gray.dds" name="baseTex"/></textures>
<variant frequency="1" name="crocodile male">
<animations>
<animation file="quadraped/Croc_idle1.dae" name="idle" speed="11"/>
<animation file="quadraped/Croc_idle2.dae" name="idle" speed="11"/>
<animation file="quadraped/Croc_idle3.dae" name="idle" speed="25"/>
<animation file="quadraped/Croc_idle3.dae" name="idle" speed="20"/>
<animation file="quadraped/Croc_walk.dae" name="Walk" speed="20"/>
<animation file="quadraped/Croc_run.dae" name="Run" speed="15"/>
<animation event="0.47" file="quadraped/Croc_attack.dae" name="attack_melee" speed="80"/>
<animation file="quadraped/Croc_death.dae" name="Death" speed="120"/>
</animations>
<mesh>skeletal/Croc.dae</mesh>
<textures>
<texture file="skeletal/animal_crocodile.png" name="baseTex"/>
<texture file="skeletal/animal_crocodile_norm.png" name="normTex"/>
<texture file="skeletal/animal_crocodile_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="1" name="Idle"/>
<variant name="death">
<props>
<prop actor="props/units/blood_01.xml" attachpoint="root"/>
</props>
</variant>
</group>
<material>basic_trans_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/fauna/elephant_african_bush.xml
+14
View File
@@ -3,6 +3,20 @@
<castshadow/>
<group>
<variant frequency="1" name="elephant_african_bush [adult]">
<animations>
<animation file="quadraped/elephant_african_bush_idle_01.dae" name="Idle" speed="25"/>
<animation file="quadraped/elephant_african_bush_idle_01.dae" name="Idle" speed="25"/>
<animation file="quadraped/elephant_african_bush_idle_01.dae" name="Idle" speed="25"/>
<animation file="quadraped/elephant_african_bush_idle_01.dae" name="Idle" speed="25"/>
<animation file="quadraped/elephant_african_bush_idle_02.dae" name="Idle" speed="85"/>
<animation file="quadraped/elephant_african_bush_idle_03.dae" name="Idle" speed="50"/>
<animation file="quadraped/elephant_african_bush_idle_03.dae" name="Idle" speed="75"/>
<animation file="quadraped/elephant_african_bush_idle_03.dae" name="Idle" speed="150"/>
<animation file="quadraped/elephant_african_bush_walk.dae" name="Walk" speed="30"/>
<animation file="quadraped/elephant_african_bush_walk.dae" name="Run" speed="35"/>
<animation file="quadraped/elephant_african_bush_attack.dae" name="attack_melee" speed="100"/>
<animation file="quadraped/elephant_african_bush_death.dae" name="Death" speed="100"/>
</animations>
<mesh>skeletal/elephant_african_bush.dae</mesh>
<textures>
<texture file="skeletal/animal-elephant-base.dds" name="baseTex"/>
binaries/data/mods/public/art/actors/fauna/elephant_asian.xml
+14 -1
View File
@@ -3,10 +3,23 @@
<castshadow/>
<group>
<variant frequency="1" name="elephant_asian [adult male]">
<animations>
<animation file="quadraped/elephant_asian_idle_01.dae" name="Idle" speed="25"/>
<animation file="quadraped/elephant_asian_idle_01.dae" name="Idle" speed="25"/>
<animation file="quadraped/elephant_asian_idle_01.dae" name="Idle" speed="25"/>
<animation file="quadraped/elephant_asian_idle_02.dae" name="Idle" speed="85"/>
<animation file="quadraped/elephant_asian_idle_03.dae" name="Idle" speed="75"/>
<animation file="quadraped/elephant_asian_idle_03.dae" name="Idle" speed="75"/>
<animation file="quadraped/elephant_asian_walk.dae" name="Walk" speed="20"/>
<animation file="quadraped/elephant_asian_walk.dae" name="Run" speed="20"/>
<animation file="quadraped/elephant_asian_attack.dae" name="attack_melee" speed="75"/>
<animation file="quadraped/elephant_asian_death.dae" name="Death" speed="75"/>
</animations>
<mesh>skeletal/elephant_asian_male.dae</mesh>
<textures>
<texture file="skeletal/animal-elephant-asian-base.png" name="baseTex"/>
<texture file="skeletal/animal-elephant-asian-spec.png" name="specTex"/>
<texture file="skeletal/animal-elephant-asian-norm.png" name="normTex"/>
</textures>
</variant>
</group>
@@ -23,5 +36,5 @@
</props>
</variant>
</group>
<material>basic_specmap.xml</material>
<material>basic_trans_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/fauna/hawk.xml
+11 -5
View File
@@ -1,20 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant>
<animations>
<animation file="other/hawk_flight.dae" name="Walk" speed="10"/>
<animation file="other/hawk_flight.dae" name="Idle" speed="40"/>
</animations>
<mesh>skeletal/hawk.dae</mesh>
</variant>
</group>
<group>
<variant name="hawk a">
<textures><texture file="skeletal/animal_falcon_a.dds" name="baseTex"/></textures>
<textures>
<texture file="skeletal/animal_hawk.png" name="baseTex"/>
</textures>
</variant>
<variant name="hawk b">
<textures><texture file="skeletal/animal_falcon_b.dds" name="baseTex"/></textures>
</variant>
<variant name="hawk c">
<textures><texture file="skeletal/animal_falcon_c.dds" name="baseTex"/></textures>
<textures>
<texture file="skeletal/animal_hawk2.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
binaries/data/mods/public/art/actors/fauna/shark.xml
+4 -2
View File
@@ -5,9 +5,11 @@
<group>
<variant frequency="1" name="shark_great_white">
<animations>
<animation file="quadraped/shark_walk.dae" name="walk" speed="10"/>
<animation file="other/shark_idle.dae" name="idle" speed="10"/>
<animation file="other/shark_walk.dae" name="walk" speed="10"/>
<animation file="other/shark_run.dae" name="run" speed="12"/>
</animations>
<mesh>skeletal/shark_a.dae</mesh>
<mesh>skeletal/shark.dae</mesh>
</variant>
</group>
<group>
binaries/data/mods/public/art/actors/fauna/tiger.xml
+26 -2
View File
@@ -3,20 +3,44 @@
<castshadow/>
<group>
<variant frequency="100" name="Mesh">
<animations>
<animation file="quadraped/feline_idle_01.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_01.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_01.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_02.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_02.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_02.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_03.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_03.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_03.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_04.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_attack.dae" name="attack_melee" speed="100"/>
<animation file="quadraped/feline_attack_02.dae" name="attack_melee" speed="100"/>
<animation file="quadraped/feline_walk.dae" name="walk" speed="40"/>
<animation file="quadraped/feline_run.dae" name="run" speed="20"/>
<animation file="quadraped/feline_death.dae" name="Death" speed="100"/>
</animations>
<mesh>skeletal/tiger.dae</mesh>
</variant>
</group>
<group>
<variant frequency="100" name="texture">
<textures><texture file="null_orange.dds" name="baseTex"/></textures>
<textures><texture file="skeletal/animal_tiger.png" name="baseTex"/></textures>
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="death">
<variant name="Run">
<props>
<prop actor="particle/dust_cav.xml" attachpoint="root"/>
</props>
</variant>
<variant name="Death">
<props>
<prop actor="props/units/blood_01.xml" attachpoint="root"/>
</props>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
binaries/data/mods/public/art/actors/fauna/wolf.xml
+16 -4
View File
@@ -4,14 +4,25 @@
<group>
<variant frequency="100" name="Mesh">
<mesh>skeletal/wolf.dae</mesh>
<animations>
<animation file="quadraped/wolf_walk.dae" name="Walk" speed="75"/>
<animation file="quadraped/wolf_run.dae" name="Run" speed="10"/>
<animation file="quadraped/wolf_attack_01.dae" name="attack_melee" speed="165"/>
<animation file="quadraped/wolf_attack_02.dae" name="attack_melee" speed="165"/>
<animation file="quadraped/wolf_idle_01.dae" name="Idle" speed="100"/>
<animation file="quadraped/wolf_idle_02.dae" name="Idle" speed="100"/>
<animation file="quadraped/wolf_idle_03.dae" name="Idle" speed="100"/>
<animation file="quadraped/wolf_death_01.dae" name="death" speed="100"/>
<animation file="quadraped/wolf_death_02.dae" name="death" speed="100"/>
</animations>
</variant>
</group>
<group>
<variant frequency="1" name="fur-black">
<textures><texture file="skeletal/animal_wolf_black.dds" name="baseTex"/></textures>
<variant frequency="1" name="fur-brown">
<textures><texture file="skeletal/animal_wolf.png" name="baseTex"/></textures>
</variant>
<variant frequency="4" name="fur-brown">
<textures><texture file="skeletal/animal_wolf_brown.dds" name="baseTex"/></textures>
<variant frequency="4" name="fur-grey">
<textures><texture file="skeletal/animal_wolf_grey.png" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -22,4 +33,5 @@
</props>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/olive.xml
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="olive_1">
<mesh>gaia/tree_olive_01.dae</mesh>
<props>
<prop actor="props/flora/olive_decal.xml" attachpoint="root"/>
</props>
<textures>
<texture file="gaia/tree_olive.png" name="baseTex"/>
</textures>
</variant>
<variant frequency="1" name="olive_2">
<mesh>gaia/tree_olive_02.dae</mesh>
<props>
<prop actor="props/flora/olive_decal.xml" attachpoint="root"/>
</props>
<textures>
<texture file="gaia/tree_olive.png" name="baseTex"/>
</textures>
</variant>
<variant frequency="1" name="olive_3">
<mesh>gaia/tree_olive_03.dae</mesh>
<props>
<prop actor="props/flora/olive_decal.xml" attachpoint="root"/>
</props>
<textures>
<texture file="gaia/tree_olive.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
binaries/data/mods/public/art/actors/particle/cloud.xml
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<float/>
<group>
<variant name="Base">
<particles file="cloud.xml"/>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
binaries/data/mods/public/art/actors/particle/dust_storm.xml
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant name="Base">
<particles file="dust_storm.xml"/>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
binaries/data/mods/public/art/actors/particle/seeds.xml
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant name="seeds">
<particles file="seeds.xml"/>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/flora/farming_barley_harvest_a.xml
+6 -8
View File
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="a">
<mesh>gaia/cross_large_short.dae</mesh>
@@ -11,13 +9,13 @@
<mesh>gaia/cross_angledfromtop.dae</mesh>
</variant>
</group>
<group>
<variant>
<textures><texture file="gaia/farming_barley_harvest_a.dds" name="baseTex"/></textures>
<textures>
<texture file="gaia/farming_barley_harvest_a.png" name="baseTex"/>
<texture file="props/yellow.png" name="specTex"/>
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_glow.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/flora/farming_barley_harvest_b.xml
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant name="Barley">
<mesh>gaia/wrld_barley.dae</mesh>
<textures>
<texture file="gaia/farming_barley_harvest_a.png" name="baseTex"/>
<texture file="props/yellow.png" name="specTex"/>
</textures>
</variant>
</group>
<material>basic_glow.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/flora/farming_wheat_harvest_a.xml
+6 -8
View File
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="a">
<mesh>gaia/cross_large_short.dae</mesh>
@@ -11,13 +9,13 @@
<mesh>gaia/cross_angledfromtop.dae</mesh>
</variant>
</group>
<group>
<variant>
<textures><texture file="gaia/farming_wheat_harvest_a.dds" name="baseTex"/></textures>
<textures>
<texture file="gaia/farming_wheat_harvest_a.png" name="baseTex"/>
<texture file="props/yellow.png" name="specTex"/>
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_glow.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/flora/farming_wheat_harvest_b.xml
+6 -9
View File
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="a">
<mesh>gaia/grass_la_tall_a.dae</mesh>
@@ -11,13 +8,13 @@
<mesh>gaia/grass_la_tall_b.dae</mesh>
</variant>
</group>
<group>
<variant>
<textures><texture file="gaia/farming_wheat_harvest_a.dds" name="baseTex"/></textures>
<textures>
<texture file="gaia/farming_wheat_harvest_a.png" name="baseTex"/>
<texture file="props/yellow.png" name="specTex"/>
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_glow.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/flora/foliagebush.xml
+3 -1
View File
@@ -8,7 +8,9 @@
</group>
<group>
<variant name="red">
<textures><texture file="gaia/wrld_dankleberrybush_red.dds" name="baseTex"/></textures>
<textures>
<texture file="gaia/wrld_dankleberrybush_blue.dds" name="baseTex"/>
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
binaries/data/mods/public/art/actors/props/flora/grass_savanna_field_tall.xml
+4 -2
View File
@@ -7,8 +7,10 @@
</group>
<group>
<variant frequency="1" name="texture">
<textures><texture file="gaia/grass_savanna_a.png" name="baseTex"/></textures>
<textures>
<texture file="gaia/grass_savanna_a.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>alphatest.xml</material>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/flora/olive_decal.xml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant name="decal_palms_3x3">
<decal width="15" depth="15" angle="0" offsetx="0" offsetz="0"/>
<textures><texture file="gaia/tree_olive_decal.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>terrain_base.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/special/common/aura_60_common.xml
+31
View File
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="field_foliagebush">
<mesh>props/special/aura_60.dae</mesh>
<props>
<prop actor="fauna/elephant_african_baby.xml" attachpoint="patch" maxheight="90" minheight="-90"/>
<prop actor="fauna/elephant_african_baby.xml" attachpoint="patch_001" maxheight="90" minheight="-90"/>
<prop actor="fauna/elephant_african_baby.xml" attachpoint="patch_002" maxheight="90" minheight="-90"/>
<prop actor="fauna/elephant_african_baby.xml" attachpoint="patch_003" maxheight="90" minheight="-90"/>
<prop actor="fauna/elephant_african_baby.xml" attachpoint="patch_004" maxheight="90" minheight="-90"/>
<prop actor="fauna/elephant_african_baby.xml" attachpoint="patch_005" maxheight="90" minheight="-90"/>
<prop actor="fauna/elephant_african_baby.xml" attachpoint="patch_006" maxheight="90" minheight="-90"/>
<prop actor="fauna/elephant_african_baby.xml" attachpoint="patch_007" maxheight="90" minheight="-90"/>
<prop actor="fauna/elephant_african_baby.xml" attachpoint="patch_008" maxheight="90" minheight="-90"/>
<prop actor="fauna/elephant_african_baby.xml" attachpoint="patch_009" maxheight="90" minheight="-90"/>
<prop actor="fauna/elephant_african_baby.xml" attachpoint="patch_010" maxheight="90" minheight="-90"/>
<prop actor="fauna/elephant_african_baby.xml" attachpoint="patch_011" maxheight="90" minheight="-90"/>
<prop actor="fauna/elephant_african_baby.xml" attachpoint="patch_012" maxheight="90" minheight="-90"/>
<prop actor="fauna/elephant_african_baby.xml" attachpoint="patch_013" maxheight="90" minheight="-90"/>
<prop actor="fauna/elephant_african_baby.xml" attachpoint="patch_014" maxheight="90" minheight="-90"/>
<prop actor="fauna/elephant_african_baby.xml" attachpoint="patch_015" maxheight="90" minheight="-90"/>
</props>
<textures>
<texture file="gaia/decal_farmland.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/special/common/aura_60_green_rays.xml
+30
View File
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant frequency="1" name="field_foliagebush">
<mesh>props/special/aura_60.dae</mesh>
<props>
<prop actor="props/special/common/green_rays.xml" attachpoint="patch" maxheight="90" minheight="-90"/>
<prop actor="props/special/common/green_rays.xml" attachpoint="patch_001" maxheight="90" minheight="-90"/>
<prop actor="props/special/common/green_rays.xml" attachpoint="patch_002" maxheight="90" minheight="-90"/>
<prop actor="props/special/common/green_rays.xml" attachpoint="patch_003" maxheight="90" minheight="-90"/>
<prop actor="props/special/common/green_rays.xml" attachpoint="patch_004" maxheight="90" minheight="-90"/>
<prop actor="props/special/common/green_rays.xml" attachpoint="patch_005" maxheight="90" minheight="-90"/>
<prop actor="props/special/common/green_rays.xml" attachpoint="patch_006" maxheight="90" minheight="-90"/>
<prop actor="props/special/common/green_rays.xml" attachpoint="patch_007" maxheight="90" minheight="-90"/>
<prop actor="props/special/common/green_rays.xml" attachpoint="patch_008" maxheight="90" minheight="-90"/>
<prop actor="props/special/common/green_rays.xml" attachpoint="patch_009" maxheight="90" minheight="-90"/>
<prop actor="props/special/common/green_rays.xml" attachpoint="patch_010" maxheight="90" minheight="-90"/>
<prop actor="props/special/common/green_rays.xml" attachpoint="patch_011" maxheight="90" minheight="-90"/>
<prop actor="props/special/common/green_rays.xml" attachpoint="patch_012" maxheight="90" minheight="-90"/>
<prop actor="props/special/common/green_rays.xml" attachpoint="patch_013" maxheight="90" minheight="-90"/>
<prop actor="props/special/common/green_rays.xml" attachpoint="patch_014" maxheight="90" minheight="-90"/>
<prop actor="props/special/common/green_rays.xml" attachpoint="patch_015" maxheight="90" minheight="-90"/>
</props>
<textures>
<texture file="gaia/decal_farmland.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>aura.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/special/common/field_grain.xml
+3 -2
View File
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/field_grain.dae</mesh>
<textures><texture file="structural/field_01.dds" name="baseTex"/></textures>
<textures>
<texture file="structural/field_01.dds" name="baseTex"/>
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
binaries/data/mods/public/art/actors/props/special/common/garrison_flag_ptol.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="ptol flag 1">
<animations>
<animation file="mechanical/garrison_flag_idle.dae" name="Idle" speed="30"/>
</animations>
<mesh>props/garrison_flag.dae</mesh>
<textures>
<texture file="props/garrison_ptol_1.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/special/common/garrison_flag_seleucids.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="seleucid flag 1">
<animations>
<animation file="mechanical/garrison_flag_idle.dae" name="Idle" speed="30"/>
</animations>
<mesh>props/garrison_flag.dae</mesh>
<textures>
<texture file="props/garrison_sele_1.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/special/common/green_rays.xml
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant>
<mesh>props/special/aura_rays.dae</mesh>
<textures>
<texture file="temp/aura_heal_test.png" name="baseTex"/>
<texture file="temp/aura_heal_test.png" name="specTex"/>
</textures>
</variant>
</group>
<material>aura.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/special/common/waypoint_flag.xml
+46 -12
View File
@@ -12,40 +12,74 @@
</group>
<group>
<variant name="hele">
<textures><texture file="props/banner_greek.png" name="baseTex"/></textures>
<textures>
<texture file="props/banner_greek.png" name="baseTex"/>
</textures>
</variant>
<variant name="pers">
<textures><texture file="props/banner_persian.png" name="baseTex"/></textures>
<textures>
<texture file="props/banner_persian.png" name="baseTex"/>
</textures>
</variant>
<variant name="celt">
<textures><texture file="props/banner_celt.png" name="baseTex"/></textures>
<textures>
<texture file="props/banner_celt.png" name="baseTex"/>
</textures>
</variant>
<variant name="cart">
<textures><texture file="props/banner_carthage.png" name="baseTex"/></textures>
<textures>
<texture file="props/banner_carthage.png" name="baseTex"/>
</textures>
</variant>
<variant name="iber">
<textures><texture file="props/banner_iberians.png" name="baseTex"/></textures>
<textures>
<texture file="props/banner_iberians.png" name="baseTex"/>
</textures>
</variant>
<variant name="rome">
<textures><texture file="props/banner_romans.png" name="baseTex"/></textures>
<textures>
<texture file="props/banner_romans.png" name="baseTex"/>
</textures>
</variant>
<variant name="spart">
<textures><texture file="props/banner_spartans.png" name="baseTex"/></textures>
<textures>
<texture file="props/banner_spartans.png" name="baseTex"/>
</textures>
</variant>
<variant name="mace">
<textures><texture file="props/banner_macedonians.png" name="baseTex"/></textures>
<textures>
<texture file="props/banner_macedonians.png" name="baseTex"/>
</textures>
</variant>
<variant name="athen">
<textures><texture file="props/banner_greek.png" name="baseTex"/></textures>
<textures>
<texture file="props/banner_greek.png" name="baseTex"/>
</textures>
</variant>
<variant name="brit">
<textures><texture file="props/banner_celt.png" name="baseTex"/></textures>
<textures>
<texture file="props/banner_celt.png" name="baseTex"/>
</textures>
</variant>
<variant name="gaul">
<textures><texture file="props/banner_celt.png" name="baseTex"/></textures>
<textures>
<texture file="props/banner_celt.png" name="baseTex"/>
</textures>
</variant>
<variant name="maur">
<textures><texture file="props/banner_mauryans.png" name="baseTex"/></textures>
<textures>
<texture file="props/banner_mauryans.png" name="baseTex"/>
</textures>
</variant>
<variant name="ptol">
<textures>
<texture file="props/banner_ptolemies.png" name="baseTex"/>
</textures>
</variant>
<variant name="sele">
<textures>
<texture file="props/banner_seleucids.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
binaries/data/mods/public/art/actors/props/special/eyecandy/ptol_statues_dog_base.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Ptolemaic Statue 1">
<mesh>structural/ptol_statue_dog_base.dae</mesh>
<textures>
<texture file="structural/ptol_struct.png" name="baseTex"/>
<texture file="structural/ptol_struct_norm.png" name="normTex"/>
<texture file="structural/ptol_struct_spec.png" name="specTex"/>
<texture file="structural/ao/ptol_statue_dog.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/special/eyecandy/ptol_statues_sit_female_base.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Ptolemaic Statue 1">
<mesh>structural/ptol_statue_sit_female_base.dae</mesh>
<textures>
<texture file="structural/ptol_struct.png" name="baseTex"/>
<texture file="structural/ptol_struct_norm.png" name="normTex"/>
<texture file="structural/ptol_struct_spec.png" name="specTex"/>
<texture file="structural/ao/ptol_statue_sit_female.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/special/eyecandy/ptol_statues_sit_male_base.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Ptolemaic Statue 1">
<mesh>structural/ptol_statue_sit_male_base.dae</mesh>
<textures>
<texture file="structural/ptol_struct.png" name="baseTex"/>
<texture file="structural/ptol_struct_norm.png" name="normTex"/>
<texture file="structural/ptol_struct_spec.png" name="specTex"/>
<texture file="structural/ao/ptol_statue_sit_male.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/special/eyecandy/ptol_statues_sphynx_base.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Ptolemaic Statue 1">
<mesh>structural/ptol_statue_sphynx_base.dae</mesh>
<textures>
<texture file="structural/ptol_struct.png" name="baseTex"/>
<texture file="structural/ptol_struct_norm.png" name="normTex"/>
<texture file="structural/ptol_struct_spec.png" name="specTex"/>
<texture file="structural/ao/ptol_statue_sphynx.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/special/eyecandy/ptol_statues_standing_male_base.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Roman Statue 1">
<mesh>structural/ptol_statue_standing_male_base.dae</mesh>
<textures>
<texture file="structural/ptol_struct.png" name="baseTex"/>
<texture file="structural/ptol_struct_norm.png" name="normTex"/>
<texture file="structural/ptol_struct_spec.png" name="specTex"/>
<texture file="structural/ao/ptol_statue_standing_male.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/special/eyecandy/ptol_statues_walking_female_base.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Ptolemaic Statue 1">
<mesh>structural/ptol_statue_walking_female_base.dae</mesh>
<textures>
<texture file="structural/ptol_struct.png" name="baseTex"/>
<texture file="structural/ptol_struct_norm.png" name="normTex"/>
<texture file="structural/ptol_struct_spec.png" name="specTex"/>
<texture file="structural/ao/ptol_statue_walking_female.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/special/eyecandy/ptol_statues_walking_male_base.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Ptolemaic Statue 1">
<mesh>structural/ptol_statue_walking_male_base.dae</mesh>
<textures>
<texture file="structural/ptol_struct.png" name="baseTex"/>
<texture file="structural/ptol_struct_norm.png" name="normTex"/>
<texture file="structural/ptol_struct_spec.png" name="specTex"/>
<texture file="structural/ao/ptol_statue_walking_male.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/special/eyecandy/road_temperate_intersect_x.xml
+7 -3
View File
@@ -3,9 +3,13 @@
<castshadow/>
<group>
<variant name="road temperate intersect X">
<decal width="20" depth="20" angle="0" offsetx="0" offsetz="0"/>
<textures><texture file="props/road_temperate_intersect_X.dds" name="baseTex"/></textures>
<decal angle="0" depth="20" offsetx="0" offsetz="0" width="20"/>
<textures>
<texture file="props/road_temperate_intersect_X.dds" name="baseTex"/>
<texture file="props/road_temperate_intersect_X_norm.png" name="normTex"/>
<texture file="props/road_temperate_intersect_X_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<material>terrain_base.xml</material>
<material>terrain_norm_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/special/eyecandy/shipwreck_ram_bow.xml
+28
View File
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="1" name="shipwreck ram bow">
<mesh>props/special/shipwreck_ram_bow.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="texture">
<textures>
<texture file="props/wooden_shipwreck.png" name="baseTex"/>
<texture file="props/ao/shipwreck_ram_bow_ao.png" name="aoTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="1" name="normal">
<props>
<prop actor="props/structures/hellenes/blacksmith_barrel.xml" attachpoint="inside1"/>
<prop actor="props/structures/hellenes/blacksmith_barrel.xml" attachpoint="inside2"/>
<prop actor="props/structures/hellenes/blacksmith_barrel.xml" attachpoint="outside1"/>
</props>
</variant>
</group>
<material>basic_trans_ao.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/special/eyecandy/shipwreck_ram_side.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="1" name="shipwreck ram side">
<mesh>props/special/shipwreck_ram_side.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="texture">
<textures>
<texture file="props/wooden_shipwreck.png" name="baseTex"/>
<texture file="props/ao/shipwreck_ram_side_ao.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>basic_trans_ao.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/special/eyecandy/shipwreck_sail_boat.xml
+53
View File
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="1" name="shipwreck sail boat">
<mesh>props/special/shipwreck_sail_boat.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="texture">
<textures>
<texture file="props/wooden_shipwreck.png" name="baseTex"/>
<texture file="props/ao/shipwreck_sail_boat_ao.png" name="aoTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="1" name="baskets">
<props>
<prop actor="props/special/eyecandy/basket_rome_a.xml" attachpoint="placea"/>
<prop actor="props/special/eyecandy/basket_iber_a.xml" attachpoint="placeb"/>
<prop actor="props/special/eyecandy/basket_rome_a.xml" attachpoint="placec"/>
<prop actor="props/special/eyecandy/basket_iber_a.xml" attachpoint="placed"/>
<prop actor="props/special/eyecandy/basket_iber_a.xml" attachpoint="placee" minheight="-10" maxheight="10"/>
<prop actor="props/special/eyecandy/basket_rome_a.xml" attachpoint="placef" minheight="-10" maxheight="10"/>
<prop actor="props/special/eyecandy/basket_iber_a.xml" attachpoint="placeg" minheight="-10" maxheight="10"/>
</props>
</variant>
<variant frequency="1" name="crate">
<props>
<prop actor="props/special/eyecandy/skeleton_propped.xml" attachpoint="placea"/>
<prop actor="props/special/eyecandy/basket_iber_a.xml" attachpoint="placeb"/>
<prop actor="props/special/eyecandy/basket_rome_a.xml" attachpoint="placec"/>
<prop actor="props/special/eyecandy/basket_iber_a.xml" attachpoint="placed"/>
<prop actor="props/special/eyecandy/basket_iber_a.xml" attachpoint="placee" minheight="-10" maxheight="10"/>
<prop actor="props/special/eyecandy/basket_rome_a.xml" attachpoint="placef" minheight="-10" maxheight="10"/>
</props>
</variant>
<variant frequency="1" name="barrel">
<props>
<prop actor="props/special/eyecandy/wood_sm_pile_b.xml" attachpoint="placea"/>
<prop actor="props/special/eyecandy/basket_iber_a.xml" attachpoint="placeb"/>
<prop actor="props/special/eyecandy/basket_rome_a.xml" attachpoint="placec"/>
<prop actor="props/special/eyecandy/basket_iber_a.xml" attachpoint="placed"/>
<prop actor="props/structures/hellenes/blacksmith_barrel.xml" attachpoint="placee" minheight="-10" maxheight="10"/>
<prop actor="props/special/eyecandy/basket_rome_a.xml" attachpoint="placef" minheight="-10" maxheight="10"/>
<prop actor="props/structures/hellenes/blacksmith_barrel.xml" attachpoint="placeg" minheight="-10" maxheight="10"/>
</props>
</variant>
</group>
<material>basic_trans_ao.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/special/eyecandy/shipwreck_sail_boat_cut.xml
+30
View File
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="1" name="shipwreck sail boat cut">
<mesh>props/special/shipwreck_sail_boat_cut.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="texture">
<textures>
<texture file="props/wooden_shipwreck.png" name="baseTex"/>
<texture file="props/ao/shipwreck_sail_boat_cut_ao.png" name="aoTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="1" name="normal">
<props>
<prop actor="props/structures/hellenes/blacksmith_barrel.xml" attachpoint="place1"/>
<prop actor="props/structures/hellenes/blacksmith_barrel.xml" attachpoint="place2"/>
<prop actor="props/structures/hellenes/blacksmith_barrel.xml" attachpoint="place3"/>
<prop actor="props/special/eyecandy/basket_iber_a.xml" attachpoint="place4" minheight="-5" maxheight="5"/>
<prop actor="props/structures/hellenes/blacksmith_barrel.xml" attachpoint="place5" minheight="-10" maxheight="10"/>
</props>
</variant>
</group>
<material>basic_trans_ao.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/special/eyecandy/statues_ptol.xml
+91
View File
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="ptolemaic Statue 1">
<mesh>structural/ptol_statue_standing_male.dae</mesh>
<props>
<prop actor="props/special/eyecandy/ptol_statues_standing_male_base.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/ptol_statues_male.png" name="baseTex"/>
<texture file="structural/ptol_statues_male_norm.png" name="normTex"/>
<texture file="structural/ptol_statues_male_spec.png" name="specTex"/>
<texture file="structural/ao/ptol_statue_standing_male.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="ptolemaic Statue 2">
<mesh>structural/ptol_statue_walking_male.dae</mesh>
<props>
<prop actor="props/special/eyecandy/ptol_statues_walking_male_base.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/ptol_statues_male.png" name="baseTex"/>
<texture file="structural/ptol_statues_male_norm.png" name="normTex"/>
<texture file="structural/ptol_statues_male_spec.png" name="specTex"/>
<texture file="structural/ao/ptol_statue_walking_male.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="ptolemaic Statue 3">
<mesh>structural/ptol_statue_walking_female.dae</mesh>
<props>
<prop actor="props/special/eyecandy/ptol_statues_walking_female_base.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/ptol_statues_female.png" name="baseTex"/>
<texture file="structural/ptol_statues_female_norm.png" name="normTex"/>
<texture file="structural/ptol_statues_female_spec.png" name="specTex"/>
<texture file="structural/ao/ptol_statue_walking_female.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="ptolemaic Statue 4">
<mesh>structural/ptol_statue_sit_male.dae</mesh>
<props>
<prop actor="props/special/eyecandy/ptol_statues_sit_male_base.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/ptol_statues_male.png" name="baseTex"/>
<texture file="structural/ptol_statues_male_norm.png" name="normTex"/>
<texture file="structural/ptol_statues_male_spec.png" name="specTex"/>
<texture file="structural/ao/ptol_statue_sit_male.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="ptolemaic Statue 5">
<mesh>structural/ptol_statue_sit_female.dae</mesh>
<props>
<prop actor="props/special/eyecandy/ptol_statues_sit_female_base.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/ptol_statues_female.png" name="baseTex"/>
<texture file="structural/ptol_statues_female_norm.png" name="normTex"/>
<texture file="structural/ptol_statues_female_spec.png" name="specTex"/>
<texture file="structural/ao/ptol_statue_sit_female.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="ptolemaic Statue 6">
<mesh>structural/ptol_statue_sphynx.dae</mesh>
<props>
<prop actor="props/special/eyecandy/ptol_statues_sphynx_base.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/ptol_statues_sphynx.png" name="baseTex"/>
<texture file="structural/ptol_statues_sphynx_norm.png" name="normTex"/>
<texture file="structural/ptol_statues_sphynx_spec.png" name="specTex"/>
<texture file="structural/ao/ptol_statue_sphynx.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="ptolemaic Statue 7">
<mesh>structural/ptol_statue_dog.dae</mesh>
<props>
<prop actor="props/special/eyecandy/ptol_statues_dog_base.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/ptol_statues_dog.png" name="baseTex"/>
<texture file="structural/ptol_statues_dog_norm.png" name="normTex"/>
<texture file="structural/ptol_statues_dog_spec.png" name="specTex"/>
<texture file="structural/ao/ptol_statue_dog.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/barracks_palisade.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/brit_barracks_palisade.dae</mesh>
<textures>
<texture file="props/palisade_main.png" name="baseTex"/>
<texture file="props/palisade_main_norm.png" name="normTex"/>
<texture file="props/palisade_main_spec.png" name="specTex"/>
<texture file="structural/ao/brit_barracks.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/barracks_props_1.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/brit_barracks_props1.dae</mesh>
<textures>
<texture file="props/celt_prop_1.png" name="baseTex"/>
<texture file="props/celt_prop_1_norm.png" name="normTex"/>
<texture file="props/celt_prop_1_spec.png" name="specTex"/>
<texture file="structural/ao/brit_barracks.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/barracks_props_new.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/brit_barracks_props_new.dae</mesh>
<textures>
<texture file="props/celt_props_new.dds" name="baseTex"/>
<texture file="props/celt_props_new_norm.png" name="normTex"/>
<texture file="props/celt_props_new_spec.png" name="specTex"/>
<texture file="structural/ao/brit_barracks.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/fortress_a2.xml → binaries/data/mods/public/art/actors/props/structures/britons/barracks_struct1.xml
+3 -2
View File
@@ -3,13 +3,14 @@
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/celt_fortress_struct.dae</mesh>
<mesh>props/brit_barracks_struct1.dae</mesh>
<textures>
<texture file="structural/celt_struct_1.dds" name="baseTex"/>
<texture file="structural/celt_struct_1_norm.png" name="normTex"/>
<texture file="structural/celt_struct_1_spec.png" name="specTex"/>
<texture file="structural/ao/brit_barracks.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/barracks_weapons.xml
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/brit_barracks_weapons.dae</mesh>
<textures>
<texture file="props/prop_weap.dds" name="baseTex"/>
<texture file="structural/ao/brit_barracks.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/civic_centre_props_1.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="brit civic centre props">
<mesh>props/brit_civic_centre_props_1.dae</mesh>
<textures>
<texture file="props/celt_prop_1.png" name="baseTex"/>
<texture file="props/celt_prop_1_norm.png" name="normTex"/>
<texture file="props/celt_prop_1_spec.png" name="specTex"/>
<texture file="structural/ao/brit_civic_centre.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/civic_centre_props_new.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="brit civic centre props new">
<mesh>props/brit_civic_centre_props_new.dae</mesh>
<textures>
<texture file="props/celt_props_new.dds" name="baseTex"/>
<texture file="props/celt_props_new_norm.png" name="normTex"/>
<texture file="props/celt_props_new_spec.png" name="specTex"/>
<texture file="structural/ao/brit_civic_centre.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/civic_centre_roof.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/brit_civic_centre_roof.dae</mesh>
<textures>
<texture file="structural/celt_roof_round.png" name="baseTex"/>
<texture file="structural/celt_roof_round_norm.png" name="normTex"/>
<texture file="structural/celt_roof_round_spec.png" name="specTex"/>
<texture file="structural/ao/brit_civic_centre.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/civic_centre_wood_c.xml
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="brit civic centre wood c">
<mesh>props/brit_civic_centre_wood_c.dae</mesh>
<textures>
<texture file="props/wood_c.png" name="baseTex"/>
<texture file="structural/ao/brit_civic_centre.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>basic_trans_ao.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/crannog_dirt.xml
+15
View File
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="broch top">
<mesh>props/brit_crannog_dirt.dae</mesh>
<textures>
<texture file="props/celt_barracks_decal.png" name="baseTex"/>
<texture file="props/celt_barracks_decal_norm.png" name="normTex"/>
<texture file="structural/ao/brit_crannog.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>no_trans_parallax_ao.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/crannog_props.xml → binaries/data/mods/public/art/actors/props/structures/britons/crannog_props.xml
+3 -2
View File
@@ -3,13 +3,14 @@
<castshadow/>
<group>
<variant name="broch top">
<mesh>structural/celt_crannog_props.dae</mesh>
<mesh>props/brit_crannog_props_1.dae</mesh>
<textures>
<texture file="props/celt_prop_1.png" name="baseTex"/>
<texture file="props/celt_prop_1_norm.png" name="normTex"/>
<texture file="props/celt_prop_1_spec.png" name="specTex"/>
<texture file="structural/ao/brit_crannog.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/crannog_rocks.xml → binaries/data/mods/public/art/actors/props/structures/britons/crannog_rocks.xml
View File
binaries/data/mods/public/art/actors/props/structures/celts/crannog_wall.xml → binaries/data/mods/public/art/actors/props/structures/britons/crannog_wall.xml
+3 -2
View File
@@ -3,13 +3,14 @@
<castshadow/>
<group>
<variant name="broch top">
<mesh>structural/celt_crannog_wall.dae</mesh>
<mesh>props/brit_crannog_wall.dae</mesh>
<textures>
<texture file="structural/celt_murus.png" name="baseTex"/>
<texture file="structural/celt_murus_norm.png" name="normTex"/>
<texture file="structural/celt_murus_spec.png" name="specTex"/>
<texture file="structural/ao/brit_crannog.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/fortress_props_1.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="broch top">
<mesh>props/brit_fortress_props_1.dae</mesh>
<textures>
<texture file="props/celt_prop_1.png" name="baseTex"/>
<texture file="props/celt_prop_1_norm.png" name="normTex"/>
<texture file="props/celt_prop_1_spec.png" name="specTex"/>
<texture file="structural/ao/brit_fortress.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/fortress_props_new.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="broch top">
<mesh>props/brit_fortress_props_new.dae</mesh>
<textures>
<texture file="props/celt_props_new.dds" name="baseTex"/>
<texture file="props/celt_props_new_norm.png" name="normTex"/>
<texture file="props/celt_props_new_spec.png" name="specTex"/>
<texture file="structural/ao/brit_fortress.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/fortress_tower.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="broch top">
<mesh>props/brit_fortress_tower.dae</mesh>
<textures>
<texture file="structural/celt_broch.dds" name="baseTex"/>
<texture file="structural/celt_broch_norm.png" name="normTex"/>
<texture file="structural/celt_broch_spec.png" name="specTex"/>
<texture file="structural/ao/brit_fortress.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/broch_wall.xml → binaries/data/mods/public/art/actors/props/structures/britons/fortress_wall.xml
+3 -2
View File
@@ -3,13 +3,14 @@
<castshadow/>
<group>
<variant name="broch top">
<mesh>structural/celt_broch_wall.dae</mesh>
<mesh>props/brit_fortress_wall.dae</mesh>
<textures>
<texture file="structural/celt_murus.png" name="baseTex"/>
<texture file="structural/celt_murus_norm.png" name="normTex"/>
<texture file="structural/celt_murus_spec.png" name="specTex"/>
<texture file="structural/ao/brit_fortress.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/house_a_props_1.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="celt house a door">
<mesh>props/brit_house_a_props_1.dae</mesh>
<textures>
<texture file="props/celt_prop_1.png" name="baseTex"/>
<texture file="props/celt_prop_1_norm.png" name="normTex"/>
<texture file="props/celt_prop_1_spec.png" name="specTex"/>
<texture file="structural/ao/brit_house_a.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/house_a_props_new.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="celt house a door">
<mesh>props/brit_house_a_props_new.dae</mesh>
<textures>
<texture file="props/celt_props_new.dds" name="baseTex"/>
<texture file="props/celt_props_new_norm.png" name="normTex"/>
<texture file="props/celt_props_new_spec.png" name="specTex"/>
<texture file="structural/ao/brit_house_a.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/house_b_props_1.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="celt house a door">
<mesh>props/brit_house_b_props_1.dae</mesh>
<textures>
<texture file="props/celt_prop_1.png" name="baseTex"/>
<texture file="props/celt_prop_1_norm.png" name="normTex"/>
<texture file="props/celt_prop_1_spec.png" name="specTex"/>
<texture file="structural/ao/brit_house_b.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/house_b_props_new.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="celt house a door">
<mesh>props/brit_house_b_props_new.dae</mesh>
<textures>
<texture file="props/celt_props_new.dds" name="baseTex"/>
<texture file="props/celt_props_new_norm.png" name="normTex"/>
<texture file="props/celt_props_new_spec.png" name="specTex"/>
<texture file="structural/ao/brit_house_b.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/house_c_props_1.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="celt house a door">
<mesh>props/brit_house_c_props_1.dae</mesh>
<textures>
<texture file="props/celt_prop_1.png" name="baseTex"/>
<texture file="props/celt_prop_1_norm.png" name="normTex"/>
<texture file="props/celt_prop_1_spec.png" name="specTex"/>
<texture file="structural/ao/brit_house_c.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/house_c_props_new.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="celt house a door">
<mesh>props/brit_house_c_props_new.dae</mesh>
<textures>
<texture file="props/celt_props_new.dds" name="baseTex"/>
<texture file="props/celt_props_new_norm.png" name="normTex"/>
<texture file="props/celt_props_new_spec.png" name="specTex"/>
<texture file="structural/ao/brit_house_c.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/house_d_props_1.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="celt house a door">
<mesh>props/brit_house_d_props_1.dae</mesh>
<textures>
<texture file="props/celt_prop_1.png" name="baseTex"/>
<texture file="props/celt_prop_1_norm.png" name="normTex"/>
<texture file="props/celt_prop_1_spec.png" name="specTex"/>
<texture file="structural/ao/brit_house_d.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/house_d_props_new.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="celt house a door">
<mesh>props/brit_house_d_props_new.dae</mesh>
<textures>
<texture file="props/celt_props_new.dds" name="baseTex"/>
<texture file="props/celt_props_new_norm.png" name="normTex"/>
<texture file="props/celt_props_new_spec.png" name="specTex"/>
<texture file="structural/ao/brit_house_d.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/market_props_1.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="brit market props">
<mesh>props/brit_market_props_1.dae</mesh>
<textures>
<texture file="props/celt_prop_1.png" name="baseTex"/>
<texture file="props/celt_prop_1_norm.png" name="normTex"/>
<texture file="props/celt_prop_1_spec.png" name="specTex"/>
<texture file="structural/ao/brit_market.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/market_props_new.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="brit market props new">
<mesh>props/brit_market_props_new.dae</mesh>
<textures>
<texture file="props/celt_props_new.dds" name="baseTex"/>
<texture file="props/celt_props_new_norm.png" name="normTex"/>
<texture file="props/celt_props_new_spec.png" name="specTex"/>
<texture file="structural/ao/brit_market.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/market_wood_c.xml
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="brit market wood c">
<mesh>props/brit_market_wood_c.dae</mesh>
<textures>
<texture file="props/wood_c.png" name="baseTex"/>
<texture file="structural/ao/brit_market.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>basic_trans_ao.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/outpost_palisade.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/brit_scout_tower_palisade.dae</mesh>
<textures>
<texture file="props/palisade_main.png" name="baseTex"/>
<texture file="props/palisade_main_norm.png" name="normTex"/>
<texture file="props/palisade_main_spec.png" name="specTex"/>
<texture file="structural/ao/brit_scout_tower.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/britons/outpost_props_new.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/brit_scout_tower_props_new.dae</mesh>
<textures>
<texture file="props/celt_props_new.dds" name="baseTex"/>
<texture file="props/celt_props_new_norm.png" name="normTex"/>
<texture file="props/celt_props_new_spec.png" name="specTex"/>
<texture file="structural/ao/brit_scout_tower.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/carthaginians/bireme_sail.xml
+16 -4
View File
@@ -9,14 +9,26 @@
</group>
<group>
<variant frequency="1" name="Tree">
<textures><texture file="props/kart_sail_1.dds" name="baseTex"/></textures>
<textures>
<texture file="props/kart_sail_1.dds" name="baseTex"/>
<texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>
</variant>
<variant frequency="1" name="tanit">
<textures><texture file="props/kart_sail_2.dds" name="baseTex"/></textures>
<textures>
<texture file="props/kart_sail_2.dds" name="baseTex"/>
<texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>
</variant>
<variant frequency="1" name="other">
<textures><texture file="props/kart_sail_3.dds" name="baseTex"/></textures>
<textures>
<texture file="props/kart_sail_3.dds" name="baseTex"/>
<texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/carthaginians/quin_foresail.xml
+3 -2
View File
@@ -5,8 +5,9 @@
<group>
<variant frequency="100" name="Base">
<mesh>props/kart_quin_foresail.dae</mesh>
<textures><texture file="props/sail_blank_netting.png" name="baseTex"/></textures>
<textures><texture file="props/sail_blank_netting.png" name="baseTex"/> <texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/carthaginians/quin_mainsail.xml
+16 -4
View File
@@ -9,14 +9,26 @@
</group>
<group>
<variant frequency="1" name="Tree">
<textures><texture file="props/kart_sail_1.dds" name="baseTex"/></textures>
<textures>
<texture file="props/kart_sail_1.dds" name="baseTex"/>
<texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>
</variant>
<variant frequency="1" name="tanit">
<textures><texture file="props/kart_sail_2.dds" name="baseTex"/></textures>
<textures>
<texture file="props/kart_sail_2.dds" name="baseTex"/>
<texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>
</variant>
<variant frequency="1" name="other">
<textures><texture file="props/kart_sail_3.dds" name="baseTex"/></textures>
<textures>
<texture file="props/kart_sail_3.dds" name="baseTex"/>
<texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/carthaginians/temple_b_decor.xml
+15
View File
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant frequency="1" name="temple b decor">
<mesh>props/kart_temple_b_decor.dae</mesh>
<textures>
<texture file="structural/kart_struct.dds" name="baseTex"/>
<texture file="structural/kart_struct_norm.png" name="normTex"/>
<texture file="structural/kart_struct_spec.png" name="specTex"/>
<texture file="structural/ao/kart_temple_b.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>basic_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/carthaginians/trireme_mainsail.xml
+7 -4
View File
@@ -9,14 +9,17 @@
</group>
<group>
<variant frequency="1" name="Tree">
<textures><texture file="props/kart_sail_1.dds" name="baseTex"/></textures>
<textures><texture file="props/kart_sail_1.dds" name="baseTex"/> <texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/></textures>
</variant>
<variant frequency="1" name="tanit">
<textures><texture file="props/kart_sail_2.dds" name="baseTex"/></textures>
<textures><texture file="props/kart_sail_2.dds" name="baseTex"/> <texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/></textures>
</variant>
<variant frequency="1" name="other">
<textures><texture file="props/kart_sail_3.dds" name="baseTex"/></textures>
<textures><texture file="props/kart_sail_3.dds" name="baseTex"/> <texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/carthaginians/wonder_decals.xml
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant frequency="100">
<mesh>structural/kart_wonder_decals.dae</mesh>
<textures>
<texture file="structural/kart_struct.dds" name="baseTex"/>
<texture file="structural/kart_struct_norm.png" name="normTex"/>
<texture file="structural/kart_struct_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<material>basic_trans_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/carthaginians/wonder_dirt.xml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant name="floor">
<mesh>structural/kart_wonder_dirt.dae</mesh>
<textures>
<texture file="gaia/stonequarry_tropic.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/barracks_props_1.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/celt_barracks_props_1.dae</mesh>
<textures>
<texture file="props/celt_prop_1.png" name="baseTex"/>
<texture file="props/celt_prop_1_norm.png" name="normTex"/>
<texture file="props/celt_prop_1_spec.png" name="specTex"/>
<texture file="structural/ao/celt_barracks.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/barracks_props_new.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/celt_barracks_props_new.dae</mesh>
<textures>
<texture file="props/celt_props_new.dds" name="baseTex"/>
<texture file="props/celt_props_new_norm.png" name="normTex"/>
<texture file="props/celt_props_new_spec.png" name="specTex"/>
<texture file="structural/ao/celt_barracks.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/barracks_weapons.xml
+5 -1
View File
@@ -4,7 +4,11 @@
<group>
<variant>
<mesh>props/celt_barracks_weapons.dae</mesh>
<textures><texture file="props/prop_weap.dds" name="baseTex"/></textures>
<textures>
<texture file="props/prop_weap.dds" name="baseTex"/>
<texture file="structural/ao/celt_barracks.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_props_new.xml
+6 -4
View File
@@ -5,10 +5,12 @@
<variant frequency="1" name="barrels">
<mesh>props/celt_blacksmith_props_new.dae</mesh>
<textures>
<texture file="props/celt_props_new.dds" name="baseTex"/>
<texture file="structural/ao/celt_blacksmith.png" name="aoTex"/>
</textures>
<texture file="props/celt_props_new.dds" name="baseTex"/>
<texture file="props/celt_props_new_norm.png" name="normTex"/>
<texture file="props/celt_props_new_spec.png" name="specTex"/>
<texture file="structural/ao/celt_blacksmith.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/broch_top.xml
-11
View File
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="broch top">
<mesh>structural/celt_broch_top.dae</mesh>
<textures><texture file="structural/celt_struct_1.dds" name="baseTex"/><texture file="structural/celt_struct_1_norm.png" name="normTex"/></textures>
</variant>
</group>
<material>player_trans_parallax.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/barracks_props1.xml → binaries/data/mods/public/art/actors/props/structures/celts/corral_food.xml
+3 -2
View File
@@ -3,13 +3,14 @@
<castshadow/>
<group>
<variant>
<mesh>props/celt_barracks_props1.dae</mesh>
<mesh>props/celt_corral_food.dae</mesh>
<textures>
<texture file="props/celt_prop_1.png" name="baseTex"/>
<texture file="props/celt_prop_1_norm.png" name="normTex"/>
<texture file="props/celt_prop_1_spec.png" name="specTex"/>
<texture file="structural/ao/celt_corral.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/corral_props_1.xml
+2 -1
View File
@@ -8,8 +8,9 @@
<texture file="props/celt_prop_1.png" name="baseTex"/>
<texture file="props/celt_prop_1_norm.png" name="normTex"/>
<texture file="props/celt_prop_1_spec.png" name="specTex"/>
<texture file="structural/ao/celt_corral.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/corral_props_new.xml
+7 -2
View File
@@ -4,8 +4,13 @@
<group>
<variant>
<mesh>structural/celt_corral_props_new.dae</mesh>
<textures><texture file="props/celt_props_new.dds" name="baseTex"/></textures>
<textures>
<texture file="props/celt_props_new.dds" name="baseTex"/>
<texture file="props/celt_props_new_norm.png" name="normTex"/>
<texture file="props/celt_props_new_spec.png" name="specTex"/>
<texture file="structural/ao/celt_corral.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/crannog_dirt.xml
-10
View File
@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="broch top">
<mesh>structural/celt_crannog_dirt.dae</mesh>
<textures><texture file="props/celt_barracks_decal.png" name="baseTex"/></textures>
</variant>
</group>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/dock_props.xml
+2 -1
View File
@@ -8,8 +8,9 @@
<texture file="props/celt_prop_1.png" name="baseTex"/>
<texture file="props/celt_prop_1_norm.png" name="normTex"/>
<texture file="props/celt_prop_1_spec.png" name="specTex"/>
<texture file="structural/ao/celt_dock.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/dock_shields.xml
+7 -2
View File
@@ -4,8 +4,13 @@
<group>
<variant>
<mesh>props/celt_dock_shields.dae</mesh>
<textures><texture file="props/celt_props_new.dds" name="baseTex"/></textures>
<textures>
<texture file="props/celt_props_new.dds" name="baseTex"/>
<texture file="props/celt_props_new_norm.png" name="normTex"/>
<texture file="props/celt_props_new_spec.png" name="specTex"/>
<texture file="structural/ao/celt_dock.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/farmstead.xml
+2 -1
View File
@@ -8,8 +8,9 @@
<texture file="props/celt_prop_1.png" name="baseTex"/>
<texture file="props/celt_prop_1_norm.png" name="normTex"/>
<texture file="props/celt_prop_1_spec.png" name="specTex"/>
<texture file="structural/ao/celt_farmstead.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/farmstead_hoe.xml
+5 -1
View File
@@ -4,7 +4,11 @@
<group>
<variant frequency="100" name="Base">
<mesh>props/celt_farmstead_hoe.dae</mesh>
<textures><texture file="props/prop_weap.dds" name="baseTex"/></textures>
<textures>
<texture file="props/prop_weap.dds" name="baseTex"/>
<texture file="structural/ao/celt_farmstead.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/farmstead_shield.xml
+7 -2
View File
@@ -4,8 +4,13 @@
<group>
<variant frequency="100" name="Base">
<mesh>props/celt_farmstead_shield.dae</mesh>
<textures><texture file="props/celt_props_new.dds" name="baseTex"/></textures>
<textures>
<texture file="props/celt_props_new.dds" name="baseTex"/>
<texture file="props/celt_props_new_norm.png" name="normTex"/>
<texture file="props/celt_props_new_spec.png" name="specTex"/>
<texture file="structural/ao/celt_farmstead.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/fortress_a1.xml
-10
View File
@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/celt_fortress_studs.dae</mesh>
<textures><texture file="props/celt_wall_stump.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/fortress_a4.xml
-15
View File
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/celt_fortress_props_1.dae</mesh>
<textures>
<texture file="props/celt_prop_1.dds" name="baseTex"/>
<texture file="props/celt_prop_1_norm.png" name="normTex"/>
<texture file="props/celt_prop_1_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/fortress_a5.xml
-10
View File
@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/celt_fortress_weapons.dae</mesh>
<textures><texture file="props/prop_weap.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/fortress_shields.xml
-11
View File
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/celt_fortress_props_new.dae</mesh>
<textures><texture file="props/celt_props_new.dds" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/kennel_beef.xml
+6 -2
View File
@@ -3,8 +3,12 @@
<castshadow/>
<group>
<variant>
<mesh>structural/celt_kennel_props_beef.dae</mesh>
<textures><texture file="props/beefslab.png" name="baseTex"/></textures>
<mesh>props/celt_kennel_props_beef.dae</mesh>
<textures>
<texture file="props/beefslab.png" name="baseTex"/>
<texture file="structural/ao/celt_kennel.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/kennel_props_1.xml
+3 -2
View File
@@ -3,13 +3,14 @@
<castshadow/>
<group>
<variant>
<mesh>structural/celt_kennel_props_1.dae</mesh>
<mesh>props/celt_kennel_props_1.dae</mesh>
<textures>
<texture file="props/celt_prop_1.png" name="baseTex"/>
<texture file="props/celt_prop_1_norm.png" name="normTex"/>
<texture file="props/celt_prop_1_spec.png" name="specTex"/>
<texture file="structural/ao/celt_kennel.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/structures/celts/kennel_props_new.xml
+8 -3
View File
@@ -3,9 +3,14 @@
<castshadow/>
<group>
<variant>
<mesh>structural/celt_kennel_props_new.dae</mesh>
<textures><texture file="props/celt_props_new.dds" name="baseTex"/></textures>
<mesh>props/celt_kennel_props_new.dae</mesh>
<textures>
<texture file="props/celt_props_new.dds" name="baseTex"/>
<texture file="props/celt_props_new_norm.png" name="normTex"/>
<texture file="props/celt_props_new_spec.png" name="specTex"/>
<texture file="structural/ao/celt_kennel.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>

Some files were not shown because too many files have changed in this diff Show More