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
3ecbb7667b
Restrict set of translations included in releases
...
This was SVN commit r15147.
2014-05-11 17:43:36 +00:00
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
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
056d740e7f
Fixes #2542
...
This was SVN commit r15143.
2014-05-10 23:40:53 +00:00
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
b2ec4e0e2a
Portrait for Roman bireme.
...
Modern button from red to yellow.
This was SVN commit r15141.
2014-05-10 21:33:46 +00:00
f287a7da12
Elephants can transport aboard Medium and Heavy warships.
...
This was SVN commit r15140.
2014-05-10 16:15:26 +00:00
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
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
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
a5708873db
set the right civ for mace dock
...
This was SVN commit r15136.
2014-05-08 23:15:01 +00:00
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
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
955e6e788a
Fix counting foundations as concuestCritical.
...
This was SVN commit r15133.
2014-05-08 11:27:09 +00:00
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
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
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
c37a8cafc3
Fixes a few building warnings and convention issues from 19ca1e3ebf
...
This was SVN commit r15128.
2014-05-07 23:33:21 +00:00
db0376fdc2
Temporarily disable the Spidermonkey warnings for release
...
This was SVN commit r15127.
2014-05-07 19:42:12 +00:00
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
cbeb40a14b
Fix foundations changing entity limits. Fixes #2536
...
This was SVN commit r15123.
2014-05-07 08:24:31 +00:00
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
c5b184744c
stop failed attack in aegis, see #2486
...
This was SVN commit r15121.
2014-05-07 07:03:21 +00:00
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
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
34a9b8c260
New song by Omri to the Celtic civs.
...
This was SVN commit r15118.
2014-05-06 12:28:25 +00:00
93cfdce090
This was SVN commit r15116.
2014-05-06 08:19:45 +00:00
f181a89c34
fixes wrong test
...
This was SVN commit r15115.
2014-05-05 19:22:54 +00:00
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
bb43a71460
Updates checkrefs.pl to support skirmish maps
...
This was SVN commit r15112.
2014-05-05 01:09:53 +00:00
48bb533895
temporarily disable trader formation, see #2528
...
This was SVN commit r15111.
2014-05-04 21:38:31 +00:00
06685a3f9b
Fix small issue
...
This was SVN commit r15110.
2014-05-04 20:22:31 +00:00
44b40a85bb
Fixes some broken actor references
...
This was SVN commit r15109.
2014-05-04 08:08:48 +00:00
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
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
9b136a45fc
Fixes a couple dialog buttons
...
This was SVN commit r15106.
2014-05-04 02:44:14 +00:00
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
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
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
575cdd7979
A spearman isn't ranged
...
This was SVN commit r15101.
2014-05-03 13:04:08 +00:00
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
542bc1b273
Further fix switched buttons
...
This was SVN commit r15099.
2014-05-03 09:07:31 +00:00
c1d5f6882c
Also switch the button name to disable the correct one.
...
4e0a588456
2014-05-03 08:59:31 +00:00
12ec51783d
Fix in-game manual display
...
This was SVN commit r15097.
2014-05-03 08:53:06 +00:00
4e0a588456
Switch more buttons, see 911be4e860
...
This was SVN commit r15096.
2014-05-03 08:45:19 +00:00
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
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
99486ed7ab
Add camera to the second player, somehow avoids strange errors.
...
This was SVN commit r15093.
2014-05-02 20:08:48 +00:00
b8e9bae75e
fixes Petra trying to keep going with a canceled attack
...
This was SVN commit r15092.
2014-05-02 11:03:24 +00:00
15f56cd984
Fix armour and attack display of heroes
...
This was SVN commit r15091.
2014-05-02 10:32:21 +00:00
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
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
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
5658bb391b
fix delete selection no more working after #15074
...
This was SVN commit r15087.
2014-05-01 21:06:43 +00:00
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
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
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
47fc05d696
String freeze? Who said that?
...
Fix typo: avalible → available.
This was SVN commit r15082.
2014-05-01 01:22:59 +00:00
d51f2a0c35
Version bump and regeneration of translation templates accordingly.
...
This was SVN commit r15081.
2014-05-01 00:44:47 +00:00
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
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
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
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
db6c3f86f2
Missing file
...
This was SVN commit r15075.
2014-04-30 06:29:42 +00:00
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
90581f366c
This was SVN commit r15073.
2014-04-30 05:36:50 +00:00
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
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
748ebdfdb0
Various GUI fixes and cleanup.
...
This was SVN commit r15070.
2014-04-30 04:38:53 +00:00
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
15e9ffa21b
Converts the save dialog to the modern UI. Refs #2507 .
...
This was SVN commit r15068.
2014-04-29 21:45:00 +00:00
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
b246017f9f
Explore_d_ map.
...
This was SVN commit r15065.
2014-04-29 13:10:56 +00:00
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
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
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
683170ea19
Enable/disable GenTangents when enabling/disabling PreferGLSL. Fixes #2505 .
...
This was SVN commit r15061.
2014-04-28 22:30:27 +00:00
876d0e4e66
Forgot to fix some strings
...
This was SVN commit r15060.
2014-04-28 20:19:32 +00:00
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
64d3d0b4b2
Remove falsely attributed quote.
...
This was SVN commit r15058.
2014-04-28 17:59:02 +00:00
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
f26a2917d3
Translate map name in the summary page
...
This was SVN commit r15056.
2014-04-28 15:54:47 +00:00
b8245da606
Improve disabled technology tooltip. Fixes #2497
...
This was SVN commit r15055.
2014-04-28 15:17:26 +00:00
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
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
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
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
3014df2280
Disable wireframe mode in ranked games. Fixes #2401 .
...
This was SVN commit r15050.
2014-04-28 05:02:20 +00:00
da7526dbd4
Tweaked button.
...
This was SVN commit r15049.
2014-04-27 23:48:15 +00:00
e6ec0b2fc9
Add the limit back to provisionality in the rating system.
...
This was SVN commit r15048.
2014-04-27 23:42:56 +00:00
fde558b4b2
Implements a (hopefully) better rating system with an inflation test.
...
This was SVN commit r15047.
2014-04-27 23:13:29 +00:00
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
b3acb5657f
Fix moderater prefixes in the lobby.
...
This was SVN commit r15045.
2014-04-27 19:26:12 +00:00
251372a062
Missing var statement.
...
This was SVN commit r15044.
2014-04-27 19:10:28 +00:00
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
8f53ddd6b9
Unifies some translatable strings on the gamesetup screen.
...
This was SVN commit r15042.
2014-04-27 19:03:15 +00:00
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
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
a163ac1c11
Reverts a rogue copy-paste in the last commit.
...
This was SVN commit r15039.
2014-04-27 18:23:15 +00:00
b8d3ef71f7
Fixes the updated dropdowns for multiplayer clients broken in 65f4c8b0e8
...
This was SVN commit r15038.
2014-04-27 18:18:05 +00:00
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
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
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
60334f05c8
Fix error introduced in 95b0a8d9bf while fixing a warning
...
This was SVN commit r15034.
2014-04-27 15:56:10 +00:00
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
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
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
60e1ff59f5
Fix warning about msg.guid not being defined
...
This was SVN commit r15029.
2014-04-27 13:38:17 +00:00
341bcb1cf9
Fix unfinished change in accidental commit d4109916a3
...
This was SVN commit r15028.
2014-04-27 13:37:26 +00:00
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
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
e344225b72
Tweaked this description.
...
This was SVN commit r15025.
2014-04-27 13:11:50 +00:00
ad5fb85de3
A bunch of tech tweaks.
...
Tweaked Belgian Bog environment.
This was SVN commit r15024.
2014-04-27 13:10:38 +00:00
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
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
0db4cc690e
Check for hero attack before querying it. Fixes #2490
...
This was SVN commit r15020.
2014-04-27 08:03:15 +00:00
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
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
fe490df93a
Revert an unnecessary part of the last commit ( bc9b7f9af3).
...
This was SVN commit r15017.
2014-04-27 03:26:45 +00:00
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
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
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
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
aaf5ad1a63
Cosmetic cleanup - Delete full stop and make scrollbar a circle
...
This was SVN commit r15012.
2014-04-26 22:45:48 +00:00
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
2ae1e16628
Fix translation of some game setup elements in multiplayer games
...
This was SVN commit r15009.
2014-04-26 19:52:16 +00:00
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
d1d7afe46c
Implements ready status into gamesetup. Fixes #2447 .
...
This was SVN commit r15006.
2014-04-26 18:34:34 +00:00
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
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
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
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
baf04bad53
Added support for message extraction from INI files
...
Refs #2487
This was SVN commit r15001.
2014-04-26 14:06:00 +00:00
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
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
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
d6e37321d5
Removed an obsolete TODO comment in the L10n class implementation
...
This was SVN commit r14997.
2014-04-26 12:11:08 +00:00
fc793609eb
Added API documentation to ‘source/i18n/’
...
This was SVN commit r14996.
2014-04-26 12:10:15 +00:00
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
49fc88ff81
Fixed typos on the English strings of the tutorial AI
...
This was SVN commit r14994.
2014-04-25 19:47:41 +00:00
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
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
7afe0afbca
Internationalized the messages of the tutorial AI
...
This was SVN commit r14991.
2014-04-25 03:41:01 +00:00
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
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
c1c10667df
Improved the internationalization of the construction “Insufficient resources” message
...
This was SVN commit r14988.
2014-04-25 02:45:19 +00:00
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
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
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
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
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
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
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
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
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
92f2a16a88
Suppresses MSVC warning C4005 'macro redefinition' from SpiderMonkey upgrade
...
This was SVN commit r14975.
2014-04-23 21:12:28 +00:00
0d33f6412d
Fixes #2482
...
This was SVN commit r14974.
2014-04-23 08:22:55 +00:00
311acea712
Fit UI for longer translations
...
This was SVN commit r14973.
2014-04-23 07:47:46 +00:00
3b571406f8
Enlarge tooltip size to fit all locales
...
This was SVN commit r14972.
2014-04-22 17:51:56 +00:00
9b9a96382c
Fix boolean type
...
This was SVN commit r14971.
2014-04-22 12:52:49 +00:00
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
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
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
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
46d7d5eb23
Removed trailing spaces detected in translatable strings
...
This was SVN commit r14965.
2014-04-21 14:35:33 +00:00
21cb76b9f9
centre → center
...
This was SVN commit r14964.
2014-04-21 14:32:52 +00:00
e82a9f1a4d
Removed a line break to make more space for translations
...
This was SVN commit r14963.
2014-04-21 14:27:02 +00:00
510ad15e6c
Adds missing libs, fixes some svn properties and a build-problem on Windows.
...
In 1b3261b8f4
2014-04-20 23:47:52 +00:00
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
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
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
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
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
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
2014-04-20 20:03:57 +00:00
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
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
52c0a9b908
Changes to English strings after reports in Transifex by translators
...
This was SVN commit r14950.
2014-04-20 19:00:37 +00:00
130a394e27
a few fixes and some tweaks to petra
...
This was SVN commit r14949.
2014-04-20 17:19:56 +00:00
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
f27640de9b
Minor tweaks to some maps.
...
This was SVN commit r14947.
2014-04-20 14:38:24 +00:00
dde91b8c66
The attack notification should be less frequent.
...
This was SVN commit r14946.
2014-04-20 14:35:02 +00:00
2336f97ead
Spartans get Oxybeles (but no Lithobolos).
...
This was SVN commit r14945.
2014-04-20 12:50:59 +00:00
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
0bbf43dc5f
upgraded sarissa's models
...
This was SVN commit r14943.
2014-04-20 00:34:48 +00:00
cf04dc9601
Missing units to use the new pikemen attack animation
...
This was SVN commit r14942.
2014-04-20 00:09:40 +00:00
78f8afd912
Changed some formation spacing.
...
This was SVN commit r14941.
2014-04-20 00:01:50 +00:00
4f4455ec3a
Added new attack animation for pikemen
...
This was SVN commit r14940.
2014-04-19 23:56:05 +00:00
b387458e33
Syntagma formation animations added to all hellenic pikemen.
...
This was SVN commit r14939.
2014-04-19 23:35:25 +00:00
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
831d3ae69f
This was SVN commit r14937.
2014-04-16 16:32:15 +00:00
fe4f17fd73
Only send game report if ranking is enabled.
...
This was SVN commit r14936.
2014-04-16 14:00:09 +00:00
a9b34da617
Fix some merge conflicts 9e2d0b9506 missed.
...
This was SVN commit r14935.
2014-04-16 13:58:56 +00:00
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
47a516df34
Fix some JS warnings. Refs #2372 .
...
This was SVN commit r14933.
2014-04-15 01:12:48 +00:00
e1488fee56
Add an 'explore map' option to the game setup.
...
This was SVN commit r14931.
2014-04-14 19:52:49 +00:00
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
bb71823aee
Make the actor tech-modifiable. Fixes #2243
...
This was SVN commit r14928.
2014-04-14 15:00:49 +00:00
1073382e3b
Sorts the lobby player list, ignoring case
...
This was SVN commit r14927.
2014-04-13 18:29:32 +00:00
b08e364e81
New shipwreck models
...
This was SVN commit r14926.
2014-04-13 11:16:30 +00:00
106638a9b8
This was SVN commit r14925.
2014-04-13 09:42:55 +00:00
01decbcd90
Train time changes.
...
Unlock champions tech more expensive.
This was SVN commit r14924.
2014-04-13 09:05:02 +00:00
40e2a1e065
Fixes some javascript warnings in the lobby.
...
This was SVN commit r14923.
2014-04-13 01:48:24 +00:00
180aa5c60d
Makes the moderator prefix visible in the chatbox.
...
This was SVN commit r14922.
2014-04-12 23:40:36 +00:00
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
f02a8a4c59
Some population techs.
...
Tweaking some training techs.
This was SVN commit r14920.
2014-04-12 13:39:19 +00:00
5740e22cd5
Fix health for these cavalry spearmen.
...
This was SVN commit r14919.
2014-04-12 11:52:39 +00:00
c2d1aece02
Fixed female citizen selections.
...
This was SVN commit r14918.
2014-04-12 10:36:37 +00:00
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
ad36c0eb7b
Parse entity ids to numbers again
...
This was SVN commit r14916.
2014-04-11 12:35:50 +00:00
41b8d06e27
remove forgotten debug printouts
...
This was SVN commit r14915.
2014-04-10 21:00:40 +00:00
f41c51359f
Mauryan trader actor missing
...
This was SVN commit r14914.
2014-04-10 20:56:12 +00:00
bb8e14fae1
some minor tweaks to petra ai
...
This was SVN commit r14913.
2014-04-10 20:25:02 +00:00
7840fd3049
fix capitalisation
...
This was SVN commit r14912.
2014-04-10 14:00:44 +00:00
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
ff2979ca68
Save formation rotation when loading a new formation
...
This was SVN commit r14910.
2014-04-09 18:01:12 +00:00
1f63325ede
Rotate entities to the right angle when forming a formation
...
This was SVN commit r14909.
2014-04-09 11:15:00 +00:00
4ddf1ac4dc
Added rowing, gathering, 3Idles and death animations for ptolemaic fisherman.
...
This was SVN commit r14908.
2014-04-06 21:06:17 +00:00
d27dffa31d
Now really fix the issue with promoting and formation animations
...
This was SVN commit r14906.
2014-04-06 18:43:06 +00:00
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
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
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
fd4cd56224
fixed petra map management when not circular
...
This was SVN commit r14901.
2014-04-05 12:18:37 +00:00
c5e59d02e1
Fix formation animations with promoted units
...
This was SVN commit r14900.
2014-04-05 09:48:57 +00:00
1908723188
Testudo for a few more Roman units.
...
This was SVN commit r14899.
2014-04-05 08:47:29 +00:00
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
776a098a1c
Tetsudo formation test animation. Front and middle stances.
...
This was SVN commit r14897.
2014-04-04 10:17:15 +00:00
d04f035f9a
numerous fixes and improvments to petra ai
...
This was SVN commit r14896.
2014-04-03 20:48:54 +00:00
ac9aaaa369
supplement the ai common-api
...
This was SVN commit r14895.
2014-04-03 20:31:59 +00:00
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
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
b8b3542d25
Fix tests.
...
This was SVN commit r14892.
2014-04-02 23:09:59 +00:00
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
2f12068a8f
Ptolemaic merchant ship commit.
...
Model by Stanislas69 with some fixes.
This was SVN commit r14890.
2014-04-01 20:35:49 +00:00
55bb33dec8
Particle tweaks.
...
Mediterranean Cove skirmish map.
This was SVN commit r14888.
2014-03-30 01:56:35 +00:00
84016df11c
Map tweaks and map preview changes.
...
This was SVN commit r14887.
2014-03-30 01:38:20 +00:00
e715c60942
Cleaning up the scenarios folder.
...
This was SVN commit r14886.
2014-03-30 00:10:07 +00:00
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
22867fa9a3
Further complete the definitition of the entity state
...
This was SVN commit r14884.
2014-03-29 13:56:03 +00:00
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
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
120f71d944
a couple a bugfixes
...
This was SVN commit r14881.
2014-03-29 08:51:09 +00:00
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
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
6f6b841af3
Upgraded ptoemaic quinquereme textures and made the model narrower.
...
This was SVN commit r14875.
2014-03-28 16:03:32 +00:00
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
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
0a32b2d687
Ptolemaic trireme commit.
...
Fixed some texture stretching in the bireme.
This was SVN commit r14872.
2014-03-27 18:13:07 +00:00
bc428e1649
some fixes (i.e.building placement) and cleanings of petra
...
This was SVN commit r14871.
2014-03-26 21:07:47 +00:00
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
7c0c294814
Move some resources to passable terrain
...
This was SVN commit r14869.
2014-03-26 18:28:00 +00:00
d5ff29d181
fix a flaw in UnitAI trade management
...
This was SVN commit r14868.
2014-03-26 09:11:06 +00:00
3dfa858229
remove some leftover warnings in petra
...
This was SVN commit r14867.
2014-03-25 19:26:45 +00:00
5de3b30742
fix previous tag
...
This was SVN commit r14866.
2014-03-24 22:51:15 +00:00
97afd25171
commit first version of new ai bot (named Petra)
...
This was SVN commit r14865.
2014-03-24 22:33:50 +00:00
b03e3644ac
add a few usefull functions in ai/common-api
...
This was SVN commit r14864.
2014-03-24 22:15:40 +00:00
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
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
3fb46640cc
Fix civ for Ptol Military Colony.
...
This was SVN commit r14861.
2014-03-21 22:51:47 +00:00
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
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
6eaad6cbb6
new tech portraits
...
This was SVN commit r14858.
2014-03-20 00:58:54 +00:00
1c81a96a50
fix bug in AI
...
This was SVN commit r14857.
2014-03-18 21:34:23 +00:00
63248bdc33
Fix issue with GUI reveal map status display.
...
This was SVN commit r14856.
2014-03-18 01:13:02 +00:00
209799aa4c
fix 94c02ec33c for AI
...
This was SVN commit r14855.
2014-03-17 21:23:40 +00:00
5c4282a21c
Fixes a small memory leak in the profiler shutdown code.
...
This was SVN commit r14854.
2014-03-17 21:16:38 +00:00
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
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
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
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
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
19724f7f41
"Syria" skirmish map.
...
This was SVN commit r14846.
2014-03-15 23:10:06 +00:00
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
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
722ad7264d
Some updated maps. Acropolis Bay especially.
...
This was SVN commit r14842.
2014-03-15 19:56:51 +00:00
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
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
b18a899287
Added Ptolemaic healer body and head textures. Fixes #2234
...
This was SVN commit r14839.
2014-03-13 19:46:15 +00:00
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
e17dd1ac12
Applying the new improvements: Gulf of Bothnia.
...
This was SVN commit r14837.
2014-03-13 09:45:09 +00:00
ef888367aa
Cleanup tex_codec, fixes #2456 , patch by IronNerd.
...
This was SVN commit r14836.
2014-03-13 04:16:20 +00:00
a5639631ee
Texture system refactoring and cleanup, fixes #2455 , patch by IronNerd.
...
This was SVN commit r14835.
2014-03-13 02:37:05 +00:00
a068935789
Ptolemaic dock upgrade. Fixes #2217
...
This was SVN commit r14834.
2014-03-12 18:38:16 +00:00
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
6274c7ffe8
Added ptolemaic quinquereme. Fixes #2232
...
This was SVN commit r14830.
2014-03-10 13:37:18 +00:00
9f1bcc2475
fix AI error
...
This was SVN commit r14829.
2014-03-09 22:26:41 +00:00
0e0cd65134
Some GUI alignment/sizing improvements.
...
This was SVN commit r14828.
2014-03-09 19:24:17 +00:00
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
8959e63a53
Add back unintentionally removed idle workers button tooltip.
...
This was SVN commit r14826.
2014-03-09 02:42:42 +00:00
e6f7ef78dc
Removes legacy "technologies" folder.
...
This was SVN commit r14824.
2014-03-09 00:10:41 +00:00
7698e75962
Pyrrhus template.
...
This was SVN commit r14823.
2014-03-09 00:08:25 +00:00
0603392f03
Acropolis Bay.
...
This was SVN commit r14822.
2014-03-09 00:08:00 +00:00
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
d214d8f61c
Some map changes.
...
This was SVN commit r14820.
2014-03-09 00:02:33 +00:00
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
c8bdd993c0
Upgrades cxxtest.
...
Switches to the already committed new cxxtest sources and deletes the
old sources.
Applies the changes from 6374080b604a57fed5a7Fixes #2450
This was SVN commit r14818.
2014-03-07 20:58:17 +00:00
a9368a4463
Updated tooltip to reflect the new max gatherer limit
...
This was SVN commit r14816.
2014-03-07 12:09:39 +00:00
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
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
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
abbd6efef1
Updates outdated/incorrect hotkeys.
...
This was SVN commit r14812.
2014-03-06 23:57:02 +00:00
8a98bca9b2
Fixes the last z order (hopefully) and a style inconsistency.
...
This was SVN commit r14811.
2014-03-06 22:45:13 +00:00
ec26f1de83
Reduces z order to fix ai dialog.
...
This was SVN commit r14810.
2014-03-06 22:34:15 +00:00
8f30e722ab
Some inconsequential style adjustments.
...
This was SVN commit r14809.
2014-03-06 02:24:06 +00:00
ef76d24e66
Fixes z order and a capitalization error.
...
This was SVN commit r14808.
2014-03-06 02:00:12 +00:00
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
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
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
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
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
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
df43e32a59
Second try fixing the eol-styles
...
This was SVN commit r14801.
2014-03-03 21:36:24 +00:00
234f2003a3
Fix inconsistent line endings and add svn:eol-style property
...
This was SVN commit r14800.
2014-03-03 21:13:36 +00:00
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
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
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
05225a66ac
Horned helmet to Thracian cavalry.
...
This was SVN commit r14794.
2014-03-01 10:37:45 +00:00
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
4e5eeba27b
Fix the skybox.
...
This was SVN commit r14792.
2014-02-28 18:23:24 +00:00
999490bbf5
Added playercolor to ptolemaic romanized crest helmet.
...
This was SVN commit r14791.
2014-02-28 11:46:23 +00:00
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
02860690eb
fix unused parameter warning.
...
This was SVN commit r14789.
2014-02-26 19:16:44 +00:00
3f78042f45
Fix tests and C++11 build.
...
This was SVN commit r14788.
2014-02-26 19:08:03 +00:00
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
6b94ae9f59
Added two ptolemaic howdah variations for the champion elephant.
...
This was SVN commit r14786.
2014-02-26 13:53:36 +00:00
d8903c0c6f
fix AI error
...
This was SVN commit r14785.
2014-02-25 22:43:03 +00:00
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
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
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
50d93b4332
Was messed up by b3201acd93
...
This was SVN commit r14778.
2014-02-24 12:10:38 +00:00
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
3eaa9ac4d3
fix AI error
...
This was SVN commit r14776.
2014-02-23 09:51:07 +00:00
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
e38fc5f861
Increased Fanatic armor.
...
This was SVN commit r14774.
2014-02-22 13:10:54 +00:00
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
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
8c21ec4dfd
Quilted helms for Egyptian pikemen, based on work by Enrique.
...
This was SVN commit r14771.
2014-02-21 14:38:09 +00:00
42d31da1bb
ptolemaic quilted helmet commit.
...
This was SVN commit r14770.
2014-02-21 14:13:46 +00:00
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
0ea3b7b7dd
Adds the moderator prefix to the playerlist in the lobby.
...
This was SVN commit r14767.
2014-02-20 23:26:36 +00:00
a725266337
Slightly better options menu.
...
This was SVN commit r14766.
2014-02-20 22:45:43 +00:00
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
facf119241
Farm fields back to 5 workers.
...
This was SVN commit r14763.
2014-02-19 17:54:34 +00:00
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
a4ec034bb5
fixes some AI errors
...
This was SVN commit r14761.
2014-02-18 18:19:33 +00:00
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
b5c8faa367
Aura tooltip for Ptolemaic heroes. Auras themselves are not complete.
...
This was SVN commit r14759.
2014-02-17 15:54:17 +00:00
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
c3dd79aa22
Ptolemaic mercenary camp commit.
...
This was SVN commit r14757.
2014-02-17 13:13:25 +00:00
322d78b9a5
remove debug warning
...
This was SVN commit r14755.
2014-02-16 15:23:50 +00:00
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
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
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
ab9a6b6303
Stanislas69' iberian tower modification commit.
...
This was SVN commit r14751.
2014-02-14 21:46:37 +00:00
05bfe7dca0
Ptolemaic market commit
...
This was SVN commit r14750.
2014-02-14 17:18:29 +00:00
35f3dd03d9
improve ship behaviour when picking units
...
This was SVN commit r14749.
2014-02-13 20:21:27 +00:00
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
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
14a7e60bd5
Elite Egyptian Pikeman.
...
This was SVN commit r14746.
2014-02-11 17:51:01 +00:00
e49b1e1ceb
fix AI error
...
This was SVN commit r14745.
2014-02-09 19:54:50 +00:00
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
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
9780d7177d
Adds some missing vars.
...
This was SVN commit r14742.
2014-02-09 16:04:30 +00:00
dea18ed318
4-player Greek Acropolis skirmish map
...
This was SVN commit r14741.
2014-02-09 13:07:33 +00:00
c5beeb7a02
rename Median Oasis maps, fixes #2425
...
This was SVN commit r14740.
2014-02-09 09:48:14 +00:00
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
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
05f13bb1d8
fix ai bug
...
This was SVN commit r14737.
2014-02-07 18:00:41 +00:00
563768363b
clean useless formations
...
This was SVN commit r14736.
2014-02-07 17:01:01 +00:00
a0b0b6d74e
Applying the new improvements: Gear, Guadalquivir River.
...
This was SVN commit r14735.
2014-02-07 09:23:14 +00:00
7277385891
fix typo
...
This was SVN commit r14734.
2014-02-07 07:52:10 +00:00
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
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
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
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
91be7d9bd1
New history blurb for Skiritai by forum contributor Thorfinn.
...
This was SVN commit r14729.
2014-02-03 16:25:08 +00:00
e408ac46b1
2 player skirmish Median Oasis.
...
This was SVN commit r14728.
2014-02-03 16:16:31 +00:00
e329a93978
Ghost commit for fields
...
This was SVN commit r14727.
2014-02-03 05:12:36 +00:00
9971e3cfab
Add formation check
...
This was SVN commit r14726.
2014-02-02 09:15:34 +00:00
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
f25edfd8f1
Removes ValueCloner.
...
Fixes #2416
Refs #2415
Refs #1886
This was SVN commit r14724.
2014-02-01 20:37:33 +00:00
c9aeaa1612
Fix a "big typo" in the attack plans, thanks mimo.
...
This was SVN commit r14723.
2014-02-01 18:34:24 +00:00
ddf9d948cf
Fix some more debug in the AI.
...
This was SVN commit r14722.
2014-02-01 18:05:39 +00:00
5b506ceee3
prevent AI to try to attack its allies, fix #2393
...
This was SVN commit r14721.
2014-02-01 17:59:29 +00:00
e21f052803
prevent error when an animal changes ownership
...
This was SVN commit r14720.
2014-02-01 17:55:27 +00:00
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
1f1a2ead44
Adding the missing cheats from [14712]. Refs #2072
...
This was SVN commit r14718.
2014-02-01 09:11:38 +00:00
e4e32c8cd7
Fixes a typo from 1d3ac14d35.
...
This was SVN commit r14717.
2014-02-01 03:55:24 +00:00
e6cf2f23c5
Fix AI debug mode.
...
This was SVN commit r14716.
2014-02-01 03:29:55 +00:00
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
12aa170c58
Trying different territory weights.
...
This was SVN commit r14713.
2014-01-31 18:47:08 +00:00
60619dbf3f
Add technologies cheat. Fixes #2072 . Patch by boeseRaupe
...
This was SVN commit r14712.
2014-01-31 15:30:16 +00:00
1fad924411
Checking if cmpPlayer is valid.
...
This was SVN commit r14711.
2014-01-31 14:47:23 +00:00
9fe465884d
Implements resource trickle. Allows decimal player resources. Fixes #2413 .
...
This was SVN commit r14710.
2014-01-31 12:01:49 +00:00
0157e640cc
Make my last commit C++98 compatible.
...
This was SVN commit r14709.
2014-01-31 01:26:08 +00:00
c3d9769622
Fixed iberian corral cloth ao texture assigned
...
This was SVN commit r14708.
2014-01-30 19:36:38 +00:00
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
ff4ed09b6f
Backend for special formatting of moderaters in the lobby userlist.
...
This was SVN commit r14706.
2014-01-30 15:46:19 +00:00
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
b9eea330d0
Strip some whitespace and fix a warning in session.js
...
This was SVN commit r14704.
2014-01-29 19:00:47 +00:00
1d3ac14d35
Better summary screen. Fixes #686 . Patch by Bajter and Kabzerek
...
This was SVN commit r14703.
2014-01-29 18:30:56 +00:00
459f13e72b
Clean up the colorfade code. Patch by boeseRaupe, fixes #2395
...
This was SVN commit r14702.
2014-01-29 14:49:36 +00:00
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
639b583d31
Fix scatter formation
...
This was SVN commit r14700.
2014-01-29 14:01:21 +00:00
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
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
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
23777ba736
fix cbc1c9f0ab
...
This was SVN commit r14696.
2014-01-27 19:25:38 +00:00
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
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
7bcdb9f46d
Remove two un-needed string initilizations from my earlier changes.
...
This was SVN commit r14692.
2014-01-27 05:46:21 +00:00
78ff9a8480
Fix compilation failures with wxWidgets 3.0. Fixes #2375 .
...
This was SVN commit r14691.
2014-01-27 00:02:03 +00:00
0406c89908
Implements GetMonitorSize for OS X, patch by Echelon9, fixes #2390
...
This was SVN commit r14690.
2014-01-26 23:03:45 +00:00
cbc1c9f0ab
fixes remaining town bell defects, closes #2353 , patch by Itms
...
This was SVN commit r14689.
2014-01-26 20:37:39 +00:00
c61badb04c
Fix typo.
...
This was SVN commit r14688.
2014-01-26 19:29:21 +00:00
2a1240008c
Make my previous changes < C++11 compatible.
...
This was SVN commit r14687.
2014-01-26 19:23:50 +00:00
5e70bd3628
Fix and cleanup my recent changes.
...
This was SVN commit r14686.
2014-01-26 19:01:21 +00:00
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
3e1fc74add
improve alert tooltip, see #2353
...
This was SVN commit r14684.
2014-01-26 18:17:13 +00:00
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
09a2729503
fix a fix
...
This was SVN commit r14682.
2014-01-26 09:40:54 +00:00
f1ab9b8e57
Check isInWorld before asking position
...
This was SVN commit r14681.
2014-01-26 09:24:32 +00:00
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
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
a8fbe4eedc
Centralizes centering rating into one function.
...
This was SVN commit r14678.
2014-01-26 05:27:00 +00:00
041c6ab1b3
More lobby cleanup.
...
This was SVN commit r14677.
2014-01-26 04:25:35 +00:00
58a44bfbcb
Adds missing comment in build-osx-libs.sh
...
This was SVN commit r14676.
2014-01-26 03:40:54 +00:00
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
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
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
851c05a038
Cleanup and spam blocker redesign in lobby.js.
...
This was SVN commit r14671.
2014-01-25 20:51:01 +00:00
41a7c78e62
Fix some stuff in XmppClient.cpp on leper's recommendation.
...
This was SVN commit r14670.
2014-01-25 20:49:48 +00:00
28a707f98f
small cleaning
...
This was SVN commit r14669.
2014-01-25 19:58:59 +00:00
69991cd110
Deletes extra whitespace from last commit.
...
This was SVN commit r14668.
2014-01-25 19:00:22 +00:00
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
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
9eb26c2622
Fix infinite loop when attacking a formation without valid targets
...
This was SVN commit r14665.
2014-01-25 16:27:55 +00:00
0f5e5fddd6
This was SVN commit r14664.
2014-01-25 14:45:58 +00:00
12a691edc2
Make my previous changes support < C++11 and Windows.
...
This was SVN commit r14661.
2014-01-24 20:31:39 +00:00
3f00d0cc9c
Fix some broken maps. Delete some others.
...
This was SVN commit r14660.
2014-01-24 20:23:11 +00:00
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
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
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
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
dd274113bc
Fix #2403
...
This was SVN commit r14655.
2014-01-24 18:15:42 +00:00
d5609e33a6
Fixed elephant african bush actor and mesh
...
This was SVN commit r14654.
2014-01-24 15:04:58 +00:00
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
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
53900c082b
Added some criteria for rated games. Fixes #2402 .
...
This was SVN commit r14651.
2014-01-24 00:22:50 +00:00
e5e634f768
Displays ratings in the userlist. Fixes #2371 .
...
This was SVN commit r14650.
2014-01-23 23:13:13 +00:00
d82282e358
Added animations for african bush elephant.
...
This was SVN commit r14649.
2014-01-23 21:41:58 +00:00
cf851a7789
A bunch of naming stuff.
...
This was SVN commit r14648.
2014-01-23 18:32:21 +00:00
35517f2cd6
commited basic_glow.xml material for self-illumination objects.
...
This was SVN commit r14647.
2014-01-23 17:50:00 +00:00
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
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
df0cdf8561
Fix typo in the Lake random map script.
...
This was SVN commit r14643.
2014-01-23 04:48:52 +00:00
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
ef79e8305b
An addition to bd3f5a8085, also refs #1964
...
This was SVN commit r14641.
2014-01-22 20:56:14 +00:00
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
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
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
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
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
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
32844e9a16
Fix tests + improve behaviour of attacking when not in formation
...
This was SVN commit r14634.
2014-01-22 15:13:07 +00:00
04aba0e41a
Let certain formations stay in formation while attacking
...
This was SVN commit r14633.
2014-01-22 13:20:55 +00:00
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
df3bdcf8ca
add back some lines removed unintentionally by previous tag
...
This was SVN commit r14631.
2014-01-21 22:59:21 +00:00
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
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
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
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
453bd6c8a0
Fix typo (Cepio -> Caepio), reported by qwertz.
...
This was SVN commit r14626.
2014-01-21 00:41:17 +00:00
3955447b5b
Applying the new improvements: Alpine Lakes, Anatolian Plateau
...
This was SVN commit r14625.
2014-01-20 15:44:28 +00:00
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
72ad5467e8
Applying the new improvements: Aegean Sea, Lake, Rivers
...
This was SVN commit r14623.
2014-01-19 15:38:02 +00:00
8b2037e5ee
Some naming stuff.
...
Reduced the size of a spec map.
This was SVN commit r14622.
2014-01-19 12:58:18 +00:00
6036b48c1d
WIP: Completing the unified random map syntax.
...
This was SVN commit r14621.
2014-01-19 11:58:24 +00:00
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
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
7a520adbf3
Improve the wording of attack tooltips.
...
This was SVN commit r14618.
2014-01-19 02:01:21 +00:00
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
f2f0307a25
fix typo.
...
This was SVN commit r14616.
2014-01-18 21:05:53 +00:00
c2d43b009c
Fix asking for non-existing templates of killed units
...
This was SVN commit r14614.
2014-01-18 20:56:21 +00:00
3cde5632ff
Fix StoneCrossBox sizing.
...
This was SVN commit r14613.
2014-01-18 20:29:21 +00:00
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
76451a297e
This was SVN commit r14611.
2014-01-18 20:21:06 +00:00
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
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
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
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
c02dafec74
Move simulation Vector math to globalscripts/Math.js. Refs #2032 .
...
This was SVN commit r14606.
2014-01-18 15:27:30 +00:00
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
061c5f8ced
Fixing pop cost for advanced Persian chariot.
...
This was SVN commit r14604.
2014-01-18 15:03:08 +00:00
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
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
8c971c4a10
Trying to make elephant attack sounds not so crazy. Unsuccessful.
...
This was SVN commit r14601.
2014-01-18 12:35:55 +00:00
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
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
82ab190c5d
Do what my previous commit was supposed to do.
...
This was SVN commit r14598.
2014-01-18 00:37:00 +00:00
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
94822b791f
Remove automatically generated test .cpp files.
...
This was SVN commit r14596.
2014-01-17 20:17:56 +00:00
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
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
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
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
c39b541714
Fixes some typoes in the bot README
...
This was SVN commit r14590.
2014-01-16 23:22:14 +00:00
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
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
4b828ae6bf
Fix gaul fortress death variation. Fixes #2374
...
This was SVN commit r14587.
2014-01-16 19:26:39 +00:00
4a133264f5
Fix unit tests
...
This was SVN commit r14586.
2014-01-15 13:36:33 +00:00
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
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
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
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
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
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
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
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
0521d936a1
reduce a GuiInterface call for displaying formation tooltip
...
This was SVN commit r14577.
2014-01-12 18:39:47 +00:00
34949b0943
Fixes some AI errors and missing VARs.
...
This was SVN commit r14576.
2014-01-12 17:34:18 +00:00
6c3bd4db1e
Fix previous AI commit.
...
This was SVN commit r14575.
2014-01-12 02:40:42 +00:00
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
8195e767ef
Fixes an occasional crash when hotloading GUI files.
...
Refs #2241
This was SVN commit r14573.
2014-01-11 20:53:01 +00:00
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
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
0e0b4e3057
make population bonus technology modifiable
...
This was SVN commit r14570.
2014-01-11 14:55:22 +00:00
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
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
eee6ed65dc
still another fix to the gatherer count
...
This was SVN commit r14567.
2014-01-10 22:50:13 +00:00
82fa27bad4
http://i.imgur.com/iAwfubL.gif
...
This was SVN commit r14566.
2014-01-10 20:33:47 +00:00
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
7606230158
Vars and style fixes.
...
This was SVN commit r14564.
2014-01-10 20:04:37 +00:00
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
11430cf927
Remove scripting directory from premake4.lua
...
(I forgot that in cbc0650a79
2014-01-10 19:52:57 +00:00
cbc0650a79
Removes some unused files
...
This was SVN commit r14561.
2014-01-10 19:38:34 +00:00
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
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
f9a2c30a17
fix tests
...
This was SVN commit r14557.
2014-01-10 16:36:04 +00:00
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
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
72c2853563
Update the tutorial AI (somewhat untested and hacky).
...
This was SVN commit r14554.
2014-01-10 02:08:59 +00:00
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
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
22a85b0eb4
add dummy setspeed method to UnitMotionFlying
...
This was SVN commit r14551.
2014-01-09 12:53:28 +00:00
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
2d806f81f0
If at first you don't succeed…
...
Refs #2359
This was SVN commit r14549.
2014-01-08 18:18:52 +00:00
641c65b1dd
Give some explanation to my change in 0c336649e6
...
This was SVN commit r14548.
2014-01-08 17:57:12 +00:00
0c336649e6
fix repairing buildings
...
This was SVN commit r14547.
2014-01-08 15:39:32 +00:00
774d56af7e
Carthaginian farmstead remake
...
This was SVN commit r14546.
2014-01-08 15:19:35 +00:00
9229cea9cc
allow repairing of moving objects
...
This was SVN commit r14545.
2014-01-08 13:39:33 +00:00
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
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
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
bec7cfd520
Another attempt to fix the lobby disconnects.
...
This was SVN commit r14541.
2014-01-08 04:22:34 +00:00
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
0482038af2
Another go at #2359
...
This was SVN commit r14539.
2014-01-08 00:06:26 +00:00
ad6ed949ee
Fixes unreferenced formal parameter warning in MSVC
...
This was SVN commit r14538.
2014-01-07 23:10:06 +00:00
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
ff2a7d6bad
fix spelling mistakes
...
This was SVN commit r14536.
2014-01-07 19:43:32 +00:00
83c5d40cfb
fix compiling problem caused by 8226d75715
...
This was SVN commit r14535.
2014-01-07 14:37:02 +00:00
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
94907897a7
Fix tests + fix classes Ashoka. Fixes #2362
...
This was SVN commit r14533.
2014-01-07 09:23:59 +00:00
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
729a795a44
of course, 7a3b1fe47e can be simplified
...
This was SVN commit r14531.
2014-01-06 23:23:18 +00:00
7a3b1fe47e
Improve speed of territory computation, fixes #2360
...
This was SVN commit r14530.
2014-01-06 22:49:57 +00:00
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
baf6925b66
Tactical varfare.
...
This was SVN commit r14528.
2014-01-06 20:55:22 +00:00
8cc1ddf6de
Small code style fix
...
This was SVN commit r14527.
2014-01-06 20:13:55 +00:00
b4fa090435
fix losRangeQuery broken in e096df0070
...
This was SVN commit r14526.
2014-01-06 19:35:51 +00:00
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
f19a8d6b41
Take the box formation out of the special case formations
...
This was SVN commit r14524.
2014-01-06 13:32:48 +00:00
5cde6f7046
small rome tower edit
...
This was SVN commit r14523.
2014-01-06 12:50:50 +00:00
9989359c46
Small code cleanup + fixed default formation orientation
...
This was SVN commit r14522.
2014-01-06 10:16:28 +00:00
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
9ccaa42a54
Fixes MSVC warning C4706: assignment within conditional expression
...
This was SVN commit r14519.
2014-01-06 02:16:09 +00:00
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
f814510b2e
revise the chase and flee
...
This was SVN commit r14517.
2014-01-05 18:29:38 +00:00
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
aa0d485d72
Fix improper disabling of waves.
...
This was SVN commit r14515.
2014-01-05 16:41:50 +00:00
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
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
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
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
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
d4f35f1061
Revised roman tower
...
This was SVN commit r14509.
2014-01-05 02:11:00 +00:00
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
4b65f77438
Fixes an occasional crash introduced in #2241 (hopefully).
...
Refs #2241
This was SVN commit r14507.
2014-01-04 21:36:12 +00:00
7d516e7e7a
Disables the JS debugger.
...
It's completely broken since 4b1297b328Closes #2348
Refs #2241
Refs #1886
This was SVN commit r14506.
2014-01-04 20:47:56 +00:00
da1a2eaba6
This was SVN commit r14505.
2014-01-04 20:42:34 +00:00
d8e839daec
Reduced armor for Roman siege walls.
...
This was SVN commit r14504.
2014-01-04 16:53:01 +00:00
58dd223018
Now really fix the temple aura. See d4b2c1285c
...
This was SVN commit r14503.
2014-01-04 15:43:05 +00:00
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
1e33dd1d5e
fix targetPosition != null check
...
This was SVN commit r14501.
2014-01-04 13:15:44 +00:00
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#2241
This was SVN commit r14499.
2014-01-04 11:48:28 +00:00
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#2241
This was SVN commit r14498.
2014-01-04 11:29:35 +00:00
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
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
743644f5ce
Roman tower remake
...
This was SVN commit r14495.
2014-01-04 04:14:29 +00:00
e096df0070
fix units attacking harmless gaia buildings
...
This was SVN commit r14494.
2014-01-03 20:24:02 +00:00
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
28f022993a
Fix template typos and inconsistaint whitespace.
...
This was SVN commit r14492.
2014-01-03 19:55:29 +00:00
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
9a41c588fe
prevent traders to cycle between two adjacent markets
...
This was SVN commit r14490.
2014-01-03 14:03:12 +00:00
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
f634a8db3e
fix units fleeing too far
...
This was SVN commit r14488.
2014-01-03 12:49:04 +00:00
6e4adcba52
add missing rallypoint to garrisonholder wonders
...
This was SVN commit r14487.
2014-01-03 11:24:23 +00:00
1c3da82869
New Carthaginian wonder commit
...
This was SVN commit r14486.
2014-01-03 03:17:53 +00:00
f7c1b73a01
Some more tweaks for the Seleucids.
...
Updated portraits.
This was SVN commit r14485.
2014-01-02 23:24:18 +00:00
66de76e026
fixes #2340 , patch by itms
...
This was SVN commit r14484.
2014-01-02 23:11:18 +00:00
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
8b98e2d513
Fix osx libraries build script for WXwidgets and libiconv.
...
This was SVN commit r14482.
2014-01-02 17:24:48 +00:00
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
dd86995f77
Fix some newlines.
...
This was SVN commit r14480.
2014-01-02 16:22:03 +00:00
b3d799d950
Replace inconsistent separators in quotes. Fixes #2247 . Patch by boeseRaupe.
...
This was SVN commit r14479.
2014-01-02 14:46:47 +00:00
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
5b2cb0e72f
small code fix
...
This was SVN commit r14477.
2014-01-02 08:40:51 +00:00
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
d8e8f613cd
small code cleanup
...
This was SVN commit r14475.
2014-01-01 19:56:27 +00:00
59525414ee
fix automatically attacking buildings caused by 66770feed6
...
This was SVN commit r14474.
2014-01-01 19:54:15 +00:00
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
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
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
2197b80747
fix oos problem mentioned by Yves on IRC
...
This was SVN commit r14470.
2014-01-01 16:15:26 +00:00
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
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
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
9d9361ae44
Why you should test your code before committing, exhibit A.
...
This was SVN commit r14466.
2013-12-31 21:45:11 +00:00
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
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
d7f18c10de
Add visual indicator when unsetting rally-points, closes #2117
...
This was SVN commit r14462.
2013-12-31 13:21:06 +00:00
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
c0472f0de5
Fix trivial comment typo caught by wraitii.
...
This was SVN commit r14460.
2013-12-31 11:06:00 +00:00
f8ca47913d
fix division by zero for zero-time technologies. Fixes #2334
...
This was SVN commit r14459.
2013-12-31 09:02:58 +00:00
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
b3a74e8f72
Add message to help new users register for the lobby.
...
This was SVN commit r14457.
2013-12-31 01:14:09 +00:00
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
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
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
1c9965999b
Use another muc room for svn/a16.
...
This was SVN commit r14453.
2013-12-30 19:44:42 +00:00
dddc9bab7f
Fix tests.
...
This was SVN commit r14452.
2013-12-30 18:55:37 +00:00
4776d85301
use UnitMotionFlying for the hawks
...
This was SVN commit r14451.
2013-12-30 18:03:01 +00:00
298115f4c5
Fix units chasing each other. Fixes #1537
...
This was SVN commit r14449.
2013-12-30 16:07:19 +00:00
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
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
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
5febe42aa9
Fix [14444]
...
This was SVN commit r14445.
2013-12-30 12:50:06 +00:00
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
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
533f908f15
Some missing changes in #2322 .
...
Refs #2322
This was SVN commit r14442.
2013-12-30 10:25:50 +00:00
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
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
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
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
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
92fba32c5e
Some more C++ GUI cleanup.
...
This was SVN commit r14436.
2013-12-29 20:46:02 +00:00
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
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
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
3746690f82
Define GLX_MESA_query_renderer functions unconditionally. Fixes #2325 .
...
This was SVN commit r14432.
2013-12-29 17:13:55 +00:00
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
2146fa27c8
forgot to rename reference
...
This was SVN commit r14429.
2013-12-29 12:40:34 +00:00
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
10e8fb9105
remove debug message
...
This was SVN commit r14427.
2013-12-29 10:09:58 +00:00
cd125a94e2
fix tests + code style cleanup
...
This was SVN commit r14426.
2013-12-29 10:01:39 +00:00
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
04d0f424df
added wonder placeholders for generic hellenes and celts
...
This was SVN commit r14424.
2013-12-28 17:13:24 +00:00
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
0029103153
Ptolemy fishing boat (along with props). fixes #2237
...
This was SVN commit r14422.
2013-12-28 15:59:08 +00:00
15b42f0be5
Added wonder placeholders for civs without wonder.
...
This was SVN commit r14421.
2013-12-28 15:21:11 +00:00
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
bf58f04511
add wonder victory condition. Refs #1649
...
This was SVN commit r14418.
2013-12-28 13:40:39 +00:00
749c4d5270
change the way to manage trade, closes #2311
...
This was SVN commit r14417.
2013-12-28 10:44:59 +00:00
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
f254478d1b
Revert accidentily committed changes.
...
This was SVN commit r14415.
2013-12-28 03:34:40 +00:00
177a7cd99d
Make uninitilized players not show in the lobby leaderboard.
...
This was SVN commit r14414.
2013-12-28 03:32:31 +00:00
121345bd6a
Name stuff.
...
This was SVN commit r14413.
2013-12-28 02:35:19 +00:00
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
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
02d38ceecd
Fixed elephant stables class element.
...
This was SVN commit r14410.
2013-12-27 15:21:15 +00:00
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
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
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
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
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
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
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
f42bf782bb
Bactria map updated.
...
This was SVN commit r14402.
2013-12-27 00:47:26 +00:00
c9b48c6e53
Updated a couple African maps with the new crocodiles.
...
This was SVN commit r14401.
2013-12-26 22:55:48 +00:00
60bcebf5b6
Fixed crocodile actor.
...
This was SVN commit r14400.
2013-12-26 22:45:04 +00:00
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
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
4ac5aacc87
Strip some trailing spaces in the lobby bot.
...
This was SVN commit r14397.
2013-12-26 19:52:07 +00:00
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
0780becb8a
fix attack-move not working for packed units
...
This was SVN commit r14395.
2013-12-26 16:09:32 +00:00
e9a269c01c
Remove attack from Military Settlement for now.
...
This was SVN commit r14394.
2013-12-26 16:04:04 +00:00
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
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
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
1de1e2d5ba
Fix typo.
...
This was SVN commit r14390.
2013-12-26 01:05:35 +00:00
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
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
f7e68a4d4c
Bot optimizations by scythetwirler.
...
This was SVN commit r14387.
2013-12-25 15:13:58 +00:00
40d407e8c6
use ptol fortress in random maps with the wall builder
...
This was SVN commit r14385.
2013-12-18 18:32:25 +00:00
42bc5165ab
Add compile time flag to disable use of miniupnpc.
...
This was SVN commit r14384.
2013-12-18 16:08:56 +00:00
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
eb7215ecaf
This was SVN commit r14381.
2013-12-18 14:14:37 +00:00
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
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
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
6bc5e3f3a5
Ptolemies corral draft commit
...
This was SVN commit r14377.
2013-12-18 05:29:54 +00:00
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
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
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
c6d454ff2d
Make ConfigDB threadsafe.
...
This was SVN commit r14373.
2013-12-17 19:58:39 +00:00
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
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
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
60bbb50625
Ptolemaic dock draft commit
...
This was SVN commit r14369.
2013-12-17 03:17:35 +00:00
fa03aadaa5
Updated fixed unit icons
...
This was SVN commit r14368.
2013-12-16 04:09:35 +00:00
8c5f583845
Ptolemaic blacksmith draft commit
...
This was SVN commit r14367.
2013-12-16 02:05:43 +00:00
678d338670
Change bot name.
...
This was SVN commit r14366.
2013-12-15 21:02:58 +00:00
2cdef4023c
Fixes OS X libs build script
...
This was SVN commit r14365.
2013-12-15 20:56:58 +00:00
d2e671392b
Fix bug in ipstamp module.
...
Sync with server. Refs #2307 .
This was SVN commit r14363.
2013-12-15 18:33:01 +00:00
79252043ae
fix the fish gatherer from b91ec9b449
...
This was SVN commit r14362.
2013-12-15 17:32:20 +00:00
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
542861ba36
This was SVN commit r14359.
2013-12-15 14:14:22 +00:00
bcba922893
fix switching between column and other formations
...
This was SVN commit r14358.
2013-12-15 09:51:13 +00:00
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
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
99f44ff7a0
Reorganizes extern libs in alphabetical order
...
This was SVN commit r14355.
2013-12-15 01:34:16 +00:00
99f90dd6de
Adds MiniUPnPc to build-osx-libs.sh
...
This was SVN commit r14354.
2013-12-15 01:26:55 +00:00
c2c2177be4
forgot the death particles
...
This was SVN commit r14353.
2013-12-15 01:10:39 +00:00
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
b1a73d3c0e
Ptolemaic market draft commit
...
This was SVN commit r14351.
2013-12-14 22:14:24 +00:00
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
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
5876ec38d1
Make sure we properly free some UPnP-related variables.
...
This was SVN commit r14348.
2013-12-14 03:21:21 +00:00
551eb3919d
Change UPnP lease duration to 0 (permanent) and update comments.
...
This was SVN commit r14347.
2013-12-14 03:03:22 +00:00
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
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
685d37ddfa
New Roman emblem.
...
This was SVN commit r14342.
2013-12-13 14:18:46 +00:00
fd47e6caee
Name.
...
This was SVN commit r14341.
2013-12-13 13:30:59 +00:00
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
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
8dab478691
Bundle miniUPnPc with 0AD.
...
This was SVN commit r14333.
2013-12-13 02:59:35 +00:00
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
b508fe848a
Fixed celtic embassy textures in its actor
...
This was SVN commit r14331.
2013-12-12 10:09:14 +00:00
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
1c890d64ee
Fixed persian gate messed up in previous commit
...
This was SVN commit r14328.
2013-12-11 15:59:11 +00:00
c6cf074e7a
Fix unitAI warning when member left the formation
...
This was SVN commit r14327.
2013-12-11 15:17:43 +00:00
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
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
c661bb01c3
Temp fix for Nubian archer.
...
This was SVN commit r14324.
2013-12-10 01:27:09 +00:00
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
683349333b
tune the guard behaviour
...
This was SVN commit r14321.
2013-12-09 18:15:24 +00:00
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
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
c3ef9b3685
Forgot I had renamed a file…
...
This was SVN commit r14318.
2013-12-09 14:23:56 +00:00
f9bee5d3ec
Slight de-obfuscation of the AI code.
...
This was SVN commit r14317.
2013-12-09 14:20:11 +00:00
9339e658a5
Two new head models for ptolemaic support females. Fixes #2235
...
This was SVN commit r14316.
2013-12-09 12:38:46 +00:00
8351e794fa
Added different textures for each ptolemaic camel rank
...
This was SVN commit r14315.
2013-12-09 02:01:21 +00:00
a04dfcf836
Camel rider tweaking
...
This was SVN commit r14314.
2013-12-09 00:33:33 +00:00
3c70f25ca4
Final edfu temple normal and spec.
...
Ptolemaic camel rider fix
This was SVN commit r14313.
2013-12-09 00:21:45 +00:00
208200db28
fix querying unitAI of non-existing members
...
This was SVN commit r14312.
2013-12-08 19:57:34 +00:00
966f7c7145
Removes some duplicated code.
...
This was SVN commit r14311.
2013-12-08 19:23:09 +00:00
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
ad157ad325
fix test broken by #14306
...
This was SVN commit r14309.
2013-12-08 13:01:59 +00:00
71d378b7a5
A bunch of stuff.
...
This was SVN commit r14308.
2013-12-08 13:01:14 +00:00
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
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
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
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
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
ca3f697f9d
add iberian monument aura
...
This was SVN commit r14301.
2013-12-06 18:14:22 +00:00
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
b1c081e36d
Set svn:eol-style=native, fix some inconsistent line endings
...
This was SVN commit r14299.
2013-12-06 00:42:50 +00:00
8d56504778
fix switching between line and column formation
...
This was SVN commit r14298.
2013-12-05 20:26:51 +00:00
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
9678cf547a
cache quantities depending only on the selection, adresses #2179
...
This was SVN commit r14296.
2013-12-05 18:50:29 +00:00
2f3ce82dc3
Fix Aegis no longer building dropsites after the skirmish fix.
...
This was SVN commit r14295.
2013-12-05 17:34:24 +00:00
56c805ae93
Texture stuff.
...
This was SVN commit r14294.
2013-12-05 13:23:22 +00:00
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
03d9db0bb7
fix comment
...
This was SVN commit r14291.
2013-12-05 10:44:39 +00:00
7a1dbca390
make the movement of formations and ships more natural
...
This was SVN commit r14290.
2013-12-05 10:38:39 +00:00
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
4062e2011f
fix tests
...
This was SVN commit r14288.
2013-12-05 08:53:40 +00:00
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
5f8b6be833
Some additions to the particle system:
...
This was SVN commit r14286.
2013-12-04 17:21:59 +00:00
189ef85538
Fix AI errors on skirmish maps.
...
This was SVN commit r14285.
2013-12-04 16:52:44 +00:00
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
367614343b
add two files that were deleted by accident in 3afd8e9d9e
...
This was SVN commit r14282.
2013-12-04 13:15:43 +00:00
3afd8e9d9e
better formation place assignments (units run around less)
...
This was SVN commit r14281.
2013-12-04 13:14:31 +00:00
3c6045308a
Fixing some cursor issues.
...
This was SVN commit r14280.
2013-12-04 01:56:40 +00:00
a549d5a08b
Fixed aura rays actor
...
This was SVN commit r14279.
2013-12-04 00:38:09 +00:00
cd32fafd63
Fixed shader in aura material
...
This was SVN commit r14278.
2013-12-04 00:35:05 +00:00
e268c059e5
Healing aura effect placeholder, applied only in athenian temple
...
This was SVN commit r14277.
2013-12-04 00:25:03 +00:00
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
a96a333b47
Small cleanup.
...
This was SVN commit r14274.
2013-12-03 01:01:12 +00:00
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
f09d56fb28
This was SVN commit r14271.
2013-12-02 20:46:25 +00:00
7c3c78f6c9
make sure target has health before taking damage
...
This was SVN commit r14270.
2013-12-01 20:55:54 +00:00
3fea8d7c1e
Some tips tweaks and new tips.
...
This was SVN commit r14269.
2013-12-01 18:22:28 +00:00
168f92e1e9
"Equine Transports" tech for the Persians.
...
Updated tip images.
This was SVN commit r14268.
2013-12-01 02:49:26 +00:00
d2fccef696
New 4-player skirmish map for Scythetwirler: Watering Holes.
...
This was SVN commit r14267.
2013-11-30 22:49:54 +00:00
cb7a4fe39c
Minor things.
...
This was SVN commit r14266.
2013-11-30 21:53:56 +00:00
c134108154
remove duplicated code
...
This was SVN commit r14264.
2013-11-30 18:23:32 +00:00
e88d05e0e4
allow units to guard/escort buildings or units, fixes #2034
...
This was SVN commit r14263.
2013-11-30 17:30:08 +00:00
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
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
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
61c9df2847
Increased ptolemaic barracks size
...
This was SVN commit r14259.
2013-11-30 01:34:15 +00:00
44c134e03f
Cavalry Archer templates for Seleucids.
...
This was SVN commit r14258.
2013-11-29 22:24:11 +00:00
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
2e2b1b04ff
Fix #2285 by using the original design with additional checks.
...
This was SVN commit r14256.
2013-11-29 20:34:56 +00:00
5ce3880d53
Some more Seleucid units.
...
Tweaked maps.
This was SVN commit r14255.
2013-11-29 19:04:07 +00:00
860875c835
Triage #2285 . Not the most efficiant, but it works.
...
This was SVN commit r14254.
2013-11-29 17:46:24 +00:00
25b92ec652
implement spart auras + female boost for males
...
This was SVN commit r14253.
2013-11-29 13:06:58 +00:00
d18444344c
implement pers auras
...
This was SVN commit r14252.
2013-11-29 12:56:44 +00:00
7bab5421c6
implement mace auras
...
This was SVN commit r14251.
2013-11-29 12:47:39 +00:00
bb5515a9ee
implement hele auras + fix vircengetorix (part 2)
...
This was SVN commit r14250.
2013-11-29 12:36:18 +00:00
53f376cdc2
implement hele auras + fix vircengetorix
...
This was SVN commit r14249.
2013-11-29 12:35:58 +00:00
b0f00d4836
Improved Ptolemaic flag emblem with retouched LionKranzen's eagle
...
This was SVN commit r14248.
2013-11-29 12:16:15 +00:00
d672c6cf7d
make loot tech aware + implement celt and gaul hero auras
...
This was SVN commit r14247.
2013-11-29 12:13:37 +00:00
ca9944b09c
brit + cart hero auras + small code fixes
...
This was SVN commit r14246.
2013-11-29 10:57:44 +00:00
d403545620
implement all athen auras + add missing files from previous commit
...
This was SVN commit r14245.
2013-11-29 09:02:41 +00:00
1784e6b9b1
fix some aura typos + implement iphicrates aura
...
This was SVN commit r14244.
2013-11-29 08:37:15 +00:00
6c81f23cc8
This was SVN commit r14243.
2013-11-29 04:10:57 +00:00
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
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
351468dbe5
fix initialisation of developper overlay for saved games
...
This was SVN commit r14240.
2013-11-28 18:08:41 +00:00
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
a6ec62c85d
fix ptol cav archer upgrade. Fixes #2282
...
This was SVN commit r14238.
2013-11-28 12:54:28 +00:00
64c9f84f10
Tweaked Alpine Valleys.
...
This was SVN commit r14237.
2013-11-28 01:30:18 +00:00
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
8b0f1c3f1f
cleaning
...
This was SVN commit r14234.
2013-11-27 16:30:14 +00:00
43c2219b22
Fix my fix.
...
This was SVN commit r14233.
2013-11-26 21:38:48 +00:00
10b9ace654
Add missing line.
...
This was SVN commit r14232.
2013-11-26 20:01:09 +00:00
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
7345d27c84
Summon planes back from the emptyness
...
This was SVN commit r14230.
2013-11-26 15:12:16 +00:00
433b32bdcd
Various XpartaMuPP cleanup.
...
This was SVN commit r14229.
2013-11-25 04:05:41 +00:00
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
d6a9489ccb
Ptolemaic walls commit
...
This was SVN commit r14227.
2013-11-25 00:34:31 +00:00
2db4f3fe40
A few new portraits from Pureon.
...
This was SVN commit r14226.
2013-11-24 23:53:29 +00:00
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
b08b478403
tweaked tiger animations ratio
...
This was SVN commit r14224.
2013-11-24 23:07:11 +00:00
dc8cea3fa4
New tiger mesh, texture and animations
...
This was SVN commit r14223.
2013-11-24 21:38:36 +00:00
9fc30533d4
This was SVN commit r14222.
2013-11-24 15:29:23 +00:00
7109c34297
Observer Hack attempt.
...
Tweaks to Alpine Valleys and Greek Acropolis.
This was SVN commit r14221.
2013-11-24 15:27:03 +00:00
6a58044cc6
add missing protection to previous fix, fixes #1052
...
This was SVN commit r14220.
2013-11-24 10:37:23 +00:00
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
d930244f02
update RallyPoint targets when renamed, fixes #1052
...
This was SVN commit r14218.
2013-11-23 19:32:59 +00:00
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
3d75d4e69c
do not show carrying resources animation in attack-move
...
This was SVN commit r14216.
2013-11-22 17:43:26 +00:00
5da63764e0
Fix compilation with wxWidgets 3.0.
...
This was SVN commit r14215.
2013-11-20 19:29:10 +00:00
09d5507ecb
clean some useless code
...
This was SVN commit r14214.
2013-11-19 21:27:23 +00:00
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
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
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
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
c1609697d7
camel armature rider fix.
...
This was SVN commit r14209.
2013-11-17 22:48:03 +00:00
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
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
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
0d876adc13
add some var
...
This was SVN commit r14204.
2013-11-17 12:28:26 +00:00
294aa142d8
Fixes compiling with the flag "--without-lobby".
...
Refs #2267
This was SVN commit r14203.
2013-11-17 11:52:11 +00:00
7595ea4534
2 player Badlands skirmish.
...
This was SVN commit r14202.
2013-11-17 01:40:39 +00:00
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
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
451e801f6a
Minor things.
...
This was SVN commit r14198.
2013-11-16 18:36:35 +00:00
1f677c17b1
Fixed deccan plateau.
...
This was SVN commit r14197.
2013-11-16 17:37:13 +00:00
30c2abd529
Hannibal now rides an Asian elephant.
...
This was SVN commit r14196.
2013-11-16 17:26:30 +00:00
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
bde9d19b7a
Adding wbg to more maps.
...
This was SVN commit r14194.
2013-11-16 16:11:43 +00:00
d7ef47959d
Sahel random map.
...
This was SVN commit r14193.
2013-11-16 15:17:18 +00:00
7ab15cb721
Building animation for mauryan support elephant
...
This was SVN commit r14192.
2013-11-16 15:05:55 +00:00
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
19bd71af5d
fixed unecessary prop point
...
This was SVN commit r14190.
2013-11-15 23:52:28 +00:00
51b1de2dee
Carthaginian Fortress commit!
...
This was SVN commit r14189.
2013-11-15 23:44:02 +00:00
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
54fcb3b4ca
Updated (and completed) Sahel skirmish map.
...
This was SVN commit r14187.
2013-11-15 16:41:05 +00:00
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
9dbd8dbb26
Fixing the broken water on gulf of bothnia.
...
This was SVN commit r14185.
2013-11-15 14:42:18 +00:00
5dc7d8dc9f
missing lighthouse files
...
This was SVN commit r14184.
2013-11-15 13:52:57 +00:00
ca0575e422
Increasing thIncreasing the generation speed of the maps: Phoenician Levant
...
This was SVN commit r14183.
2013-11-15 08:57:32 +00:00
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
47b26e56d3
Remove unused VideoRecorder from Atlas.
...
This was SVN commit r14181.
2013-11-14 23:05:07 +00:00
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
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
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
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
cfba68f8d2
Increase Advanced Siege tech from +3 crush to +5 crush.
...
This was SVN commit r14176.
2013-11-14 20:36:05 +00:00
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
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
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
b4174664c6
hellenic walltower door fixed
...
This was SVN commit r14171.
2013-11-14 16:26:46 +00:00
0170db4a53
Adding advanced graphical features into random maps. Fixes #2262 .
...
This was SVN commit r14170.
2013-11-14 14:33:55 +00:00
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
321e61617b
Improve MoveToTarget when the target is moving, fixes #2253
...
This was SVN commit r14168.
2013-11-14 07:25:56 +00:00
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
4c395f4bf2
Remove Trigger and Cinematic sections from Atlas.
...
This was SVN commit r14166.
2013-11-14 00:10:04 +00:00
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
e58fa107cc
Fix skeleton caching.
...
This was SVN commit r14163.
2013-11-13 20:05:57 +00:00
49721cff33
Increasing the generation speed of the maps: Unknown Land
...
This was SVN commit r14162.
2013-11-13 14:30:27 +00:00
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
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
5dac329c78
Increasing the generation speed of the maps: Aegean Sea
...
This was SVN commit r14159.
2013-11-13 10:20:22 +00:00
65bd13ac1e
Increasing the generation speed of the maps: Syria
...
This was SVN commit r14158.
2013-11-13 08:07:05 +00:00
4acbf86ffb
Trying to fix crazy elephant armature
...
This was SVN commit r14157.
2013-11-12 21:30:25 +00:00
2f0d6ee1e8
Upgraded asian elephant animations.
...
This was SVN commit r14156.
2013-11-12 19:13:45 +00:00
17fdb515f4
fix error when selecting multiple elephants
...
This was SVN commit r14155.
2013-11-12 19:03:12 +00:00
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
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
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
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
5771bee032
First pass at fixing GLES build - more to come
...
This was SVN commit r14149.
2013-11-12 01:17:16 +00:00
0682c23fe3
Replaces BGRA textures with RGBA textures supported by GLES
...
This was SVN commit r14148.
2013-11-12 01:11:08 +00:00
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
df1d5d2260
fix tag 2102648f7c which had unwanted changes
...
This was SVN commit r14146.
2013-11-11 16:29:44 +00:00
0e74e3a521
Removed Ostorius.
...
This was SVN commit r14145.
2013-11-11 16:09:00 +00:00
2102648f7c
Allows autogarrison of newly trained units, fixes #1044
...
This was SVN commit r14144.
2013-11-11 15:37:16 +00:00
fad8f7fce0
adds some needed protection
...
This was SVN commit r14143.
2013-11-11 15:03:22 +00:00
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
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
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
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
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
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
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
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
2811d4c367
Fixed this map.
...
This was SVN commit r14134.
2013-11-10 19:22:24 +00:00
912e485a64
Elephant changes and tweaks.
...
This was SVN commit r14133.
2013-11-10 19:08:38 +00:00
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
a2477f9d40
Increasing the generation speed of the maps: Alpine Lakes
...
This was SVN commit r14131.
2013-11-10 17:29:40 +00:00
a96ed190a5
Add GLX_MESA_query_renderer support to hwdetect
...
This was SVN commit r14130.
2013-11-10 16:24:03 +00:00
d178f32698
Fix Unicode in JS print() on Linux
...
This was SVN commit r14129.
2013-11-10 16:13:40 +00:00
c27c663697
Print a traceback after an exception in the bot.
...
This was SVN commit r14128.
2013-11-10 04:28:18 +00:00
59da5fad2a
Fix some spidermonkey lobby complaints when run in strict mode.
...
This was SVN commit r14127.
2013-11-10 04:09:03 +00:00
174f636fd2
Fixes tests
...
This was SVN commit r14126.
2013-11-10 03:24:29 +00:00
37cedb8133
Make filters work and add a skirmish map filter.
...
This was SVN commit r14125.
2013-11-10 00:45:19 +00:00
4fb6896fd8
Fix warning when the hosted game is a random rms.
...
This was SVN commit r14124.
2013-11-09 23:57:31 +00:00
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
35d48d2fe8
...and increase HDATA_USER_SIZE so OglTex actually fits
...
This was SVN commit r14122.
2013-11-09 18:49:35 +00:00
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
dcb3c0ad7a
Increasing the generation speed of the maps: Continent
...
This was SVN commit r14120.
2013-11-09 16:00:01 +00:00
d3fade285b
Basic Nubian archer textures.
...
Map preview for Corsica and Sardinia.
This was SVN commit r14119.
2013-11-09 14:42:32 +00:00
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
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
3c47b12cbe
Display texture memory usage in profiler's renderer stats
...
This was SVN commit r14116.
2013-11-09 01:03:23 +00:00
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
5dfc3746e3
Remove old and unused archive stats.
...
This was SVN commit r14114.
2013-11-08 17:27:21 +00:00
81cf02cc13
Fix building with --without-lobby. Fixes #2249 .
...
This was SVN commit r14113.
2013-11-08 15:28:44 +00:00
0f8d3e23db
;
...
This was SVN commit r14112.
2013-11-08 15:28:38 +00:00
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
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
7547dae0e2
Fixing the revert by the previous commit.
...
This was SVN commit r14109.
2013-11-08 08:04:35 +00:00
f88b5be079
Increasing the generation speed of the maps: Islands, Lake.
...
This was SVN commit r14108.
2013-11-08 08:02:32 +00:00
bb28e0eb70
Fix some system message/spam filter bugs in the lobby.
...
This was SVN commit r14107.
2013-11-08 00:57:58 +00:00
1138419017
Remove broken build script
...
This was SVN commit r14106.
2013-11-07 22:20:38 +00:00
62b92af925
Fix lobby registration errors.
...
This was SVN commit r14105.
2013-11-07 22:07:26 +00:00
f53bd8974c
Add autobuilder support for glooxwrapper
...
This was SVN commit r14103.
2013-11-07 21:45:59 +00:00
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
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
8d5d66e57b
Fix error that slipped into the lobby commit.
...
This was SVN commit r14099.
2013-11-07 20:10:59 +00:00
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
d7121f4f55
glooxwrapper by Philip to support building gloox on Windows.
...
This was SVN commit r14097.
2013-11-07 19:38:09 +00:00
10e23c173d
Add gloox library files.
...
This was SVN commit r14096.
2013-11-07 19:04:30 +00:00
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
b416de9b7c
Remove the unused crypto++ library files.
...
This was SVN commit r14094.
2013-11-07 18:50:52 +00:00
3298dce158
Remove the unused crypto++ library.
...
This was SVN commit r14093.
2013-11-07 18:49:43 +00:00
3743e58f9a
allow enabling the game clock as a persistent setting
...
This was SVN commit r14092.
2013-11-07 18:06:52 +00:00
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
b7751a277c
Cleanup
...
This was SVN commit r14090.
2013-11-07 12:38:41 +00:00
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
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
9ffe235b2f
Clean up EndGameManager. Fixes #2130
...
This was SVN commit r14087.
2013-11-05 19:40:50 +00:00
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
24bc451852
Corsica and Sardinia skirmish map. Needs Iberian circuit wall.
...
This was SVN commit r14085.
2013-11-05 16:12:58 +00:00
8540740b35
disallow healing of unhealable entities via all ways
...
This was SVN commit r14084.
2013-11-05 07:07:10 +00:00
6fae05b5f6
fix
...
This was SVN commit r14083.
2013-11-03 17:41:59 +00:00
0362453035
test some components before use, adresses #2206
...
This was SVN commit r14082.
2013-11-03 17:18:43 +00:00
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
f1100f10c1
Standardized Cav Spearmen animations.
...
This was SVN commit r14080.
2013-11-03 14:17:33 +00:00
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
e4f2ddb738
Renamed a bunch of maps.
...
This was SVN commit r14078.
2013-11-03 14:06:49 +00:00
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
34e09220a4
Normal and spec maps for a bunch of shields.
...
This was SVN commit r14076.
2013-11-03 13:36:16 +00:00
e0161bd355
small code style fix
...
This was SVN commit r14075.
2013-11-03 13:15:44 +00:00
6dca6910c3
Recursively count garrisoned units to avoid overcapacity
...
This was SVN commit r14074.
2013-11-03 13:13:30 +00:00
72e11a2dea
Fix VS2013 build errors, warnings
...
This was SVN commit r14073.
2013-11-03 12:46:07 +00:00
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
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
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
f4bd08427c
Trader speed tech!
...
This was SVN commit r14069.
2013-11-03 05:40:43 +00:00
29e4b1a17c
Update Android support
...
This was SVN commit r14068.
2013-11-02 23:05:38 +00:00
8aa6485d78
Fix shader errors with OpenGL ES
...
This was SVN commit r14067.
2013-11-02 22:58:38 +00:00
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
c1c45bd7c8
Caspian Sea skirmish map.
...
Clouds.
This was SVN commit r14065.
2013-11-02 15:28:33 +00:00
1fa2fc9739
CClientArea parsing test
...
This was SVN commit r14064.
2013-11-02 14:39:08 +00:00
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
358e8f5992
Remove ResourceGatherer for animals
...
This was SVN commit r14062.
2013-10-31 19:37:42 +00:00
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
543ec3a8c7
Fix launching skirmish maps without selecting a civ
...
This was SVN commit r14059.
2013-10-30 17:01:11 +00:00
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
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
11c7c44a0b
Fixed typos reported in Transifex by qwertz and Loki.
...
This was SVN commit r14056.
2013-10-29 23:22:09 +00:00
b67c411b33
Fix typos in template files. Refs #2185 .
...
This was SVN commit r14055.
2013-10-28 20:26:35 +00:00
15f09f7005
Fix typos in civilization files. Refs #2185 .
...
This was SVN commit r14054.
2013-10-28 20:21:27 +00:00
538c250d67
Fix typos in descriptions of random maps. Refs #2185 .
...
This was SVN commit r14053.
2013-10-28 20:19:09 +00:00
dd7445262c
Typo: enemey → enemy.
...
This was SVN commit r14052.
2013-10-28 20:01:51 +00:00
fcde137b30
Viriato.
...
This was SVN commit r14051.
2013-10-28 14:35:25 +00:00
e2f475b86a
Make the *nix ARM support a little sturdier, Fixes #2121
...
This was SVN commit r14050.
2013-10-27 21:06:15 +00:00
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
31e79e6709
Reorders the game setup drop list for maps.
...
This was SVN commit r14048.
2013-10-26 15:20:13 +00:00
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
597da2ff9d
Alpha 14 remake
...
This was SVN commit r14045.
2013-10-26 11:10:21 +00:00
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
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
fe6d508a82
Punjab skirmish map.
...
Some map tweaks.
This was SVN commit r14042.
2013-10-26 03:07:03 +00:00
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
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
14166af0ac
This was SVN commit r14038.
2013-10-24 09:46:26 +00:00
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
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
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
d6f6d2b145
Remove useless error messages.
...
This was SVN commit r14034.
2013-10-20 01:47:16 +00:00
2117f77812
Fixed some resource placement.
...
This was SVN commit r14033.
2013-10-20 01:18:59 +00:00
50a2bddf77
Fixed some goats.
...
This was SVN commit r14032.
2013-10-20 01:10:02 +00:00
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
15f565f316
Corinthian Isthmus and Persian Highlands skirmish maps (wip).
...
This was SVN commit r14030.
2013-10-19 20:54:41 +00:00
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
71a41ba401
Line endings. Refs #2185 .
...
This was SVN commit r14028.
2013-10-19 20:07:20 +00:00
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
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
024dd82209
Fix non-PCH build
...
This was SVN commit r14024.
2013-10-19 01:11:20 +00:00
ac335f37c8
Fix some Clang warnings about unused private members
...
This was SVN commit r14023.
2013-10-19 00:53:58 +00:00
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
701508922f
Use CStrIntern for font names to reduce lookup cost
...
This was SVN commit r14020.
2013-10-18 16:15:42 +00:00
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
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
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
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
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
6a2fac7a58
Add hotkeys for JSDebugger commands. Patch by sathyam. Fixes #2208 .
...
This was SVN commit r14014.
2013-10-18 14:41:08 +00:00
9802adf92f
celt_stonehenge with normal and spec maps. Fixes #2053
...
This was SVN commit r14013.
2013-10-18 14:29:10 +00:00
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
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
6c3c6cfd3a
This was SVN commit r14009.
2013-10-16 14:08:47 +00:00
a2f836c393
Prevent bogus -Wmaybe-uninitialized warnings in GCC
...
This was SVN commit r14008.
2013-10-16 12:22:50 +00:00
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
8456d50015
Found a couple more. (removing stonewall attack restriction).
...
This was SVN commit r14006.
2013-10-15 22:43:59 +00:00
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
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
2bbbcff811
fix tests, breaking caused by renaming files.
...
This was SVN commit r14003.
2013-10-15 16:10:06 +00:00
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
a4ce8dac34
fix technologies broken by 379a7b208f
...
This was SVN commit r14000.
2013-10-14 20:36:57 +00:00
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
57d47f23c9
This was SVN commit r13997.
2013-10-13 18:11:54 +00:00
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
ce5c43fe03
Fix typo
...
This was SVN commit r13995.
2013-10-13 11:41:30 +00:00
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
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
7335c32c7e
Some updated sounds from LAVS.
...
This was SVN commit r13992.
2013-10-12 01:27:10 +00:00
9b8667a9aa
Really add special starting unit.
...
This was SVN commit r13991.
2013-10-11 23:37:04 +00:00
4f03550adf
Create a special starting unit entity for skimish maps.
...
This was SVN commit r13990.
2013-10-11 23:36:02 +00:00
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
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
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
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
7791c4c61d
This was SVN commit r13985.
2013-10-11 11:01:55 +00:00
f22e47a743
This was SVN commit r13984.
2013-10-11 11:01:06 +00:00
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
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
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
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
c7e3c1499f
Fixed typo.
...
This was SVN commit r13977.
2013-10-09 20:07:36 +00:00
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
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
f3d83e0616
add skirmish defense tower and houses
...
This was SVN commit r13974.
2013-10-08 09:13:55 +00:00
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
8464777759
Fixed premake4 build incorrectly ignoring vs2010 action.
...
fixes #2191
This was SVN commit r13972.
2013-10-07 22:45:08 +00:00
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
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
79af6fb17f
Newly updated Ptolemaic champion cavalry.
...
This was SVN commit r13969.
2013-10-07 20:47:06 +00:00
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
d3e0fb4f84
Fixes crannóc spelling, thanks to GunChleoc
...
This was SVN commit r13966.
2013-10-07 00:46:58 +00:00
1408a0be83
This was SVN commit r13965.
2013-10-06 23:29:03 +00:00
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
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
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
7d92b3459b
Turns on Attack notification text.
...
This was SVN commit r13961.
2013-10-06 21:17:56 +00:00
573215dad8
Fixed the player names on this map.
...
This was SVN commit r13960.
2013-10-06 20:51:30 +00:00
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
efc84a9cce
Adjusting time costs for these Ptol buildings.
...
This was SVN commit r13958.
2013-10-06 19:13:20 +00:00
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
b9b923be11
Fixes #2149
...
This was SVN commit r13956.
2013-10-06 14:58:26 +00:00
14b51afc39
Fixes #2152
...
This was SVN commit r13955.
2013-10-06 06:57:50 +00:00
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
50782c1c1c
Fixes non-PCH build
...
This was SVN commit r13953.
2013-10-06 05:15:54 +00:00
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
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
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
a1ceda4012
Polishing the Random Maps: The last batch...
...
This was SVN commit r13948.
2013-10-05 18:29:44 +00:00
fecfda29f6
Remove civ code hardcoding from SkirmishReplacer component. Refs #1198 .
...
This was SVN commit r13947.
2013-10-05 17:54:41 +00:00
3624c591bd
Fix compilation failure without PCH.
...
This was SVN commit r13946.
2013-10-05 16:22:51 +00:00
85253ca3c8
Let corpses cast shadows again. Refs #1771 .
...
This was SVN commit r13945.
2013-10-05 16:22:46 +00:00
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
433b29d6dc
Fix description of Belgian Bog skirmish map.
...
This was SVN commit r13943.
2013-10-04 23:14:52 +00:00
76d9893123
New skirmish maps.
...
Fixed some things.
This was SVN commit r13942.
2013-10-04 18:11:13 +00:00
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
939898c47d
Nerf Iberian champion cavalry a bit.
...
This was SVN commit r13940.
2013-10-04 04:01:58 +00:00
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
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
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
b0e2f6b368
Added obelisks to ptol_cc
...
This was SVN commit r13935.
2013-10-03 18:41:07 +00:00
e700937fd3
Fix non-SSE x86 builds
...
This was SVN commit r13934.
2013-10-03 18:22:10 +00:00
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
739ed00b5e
Added ptolemaic fortress with ao. Updated ptolemaic struct texture
...
This was SVN commit r13932.
2013-10-02 21:29:44 +00:00
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
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
e0d50b6137
added seleucid thureos texture by request
...
This was SVN commit r13929.
2013-10-02 14:53:59 +00:00
60200f8dbb
fixed ptolemaic statues base.
...
This was SVN commit r13928.
2013-10-02 13:41:53 +00:00
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
26af70ec7b
Fixed ptolemaic thureos mesh shape
...
This was SVN commit r13926.
2013-10-01 15:15:39 +00:00
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
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
8cf5f61885
Avoids ugly layering of GUI pages when entering match setup
...
This was SVN commit r13922.
2013-09-30 20:51:19 +00:00
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
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
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
fbee618ac8
Fixes memory leak in sound manager
...
This was SVN commit r13915.
2013-09-30 01:09:16 +00:00
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
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
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
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
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
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
eceae8be5c
Fix crash when setting rally point
...
This was SVN commit r13908.
2013-09-29 14:02:47 +00:00
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
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
08f431fa0d
Ptolemaic entity templates for Enrique.
...
This was SVN commit r13905.
2013-09-29 03:08:59 +00:00
4e9570cd0f
Fix unnecessary CShaderConditionalDefines copy, and inline some functions
...
This was SVN commit r13904.
2013-09-29 02:05:02 +00:00
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
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
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
2d1b7914a6
This was SVN commit r13900.
2013-09-28 11:58:05 +00:00
b8a5acfd9e
Preview image for The Gauls demo map.
...
This was SVN commit r13899.
2013-09-26 18:44:45 +00:00
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
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
6880fd214f
Fixed name of this map.
...
This was SVN commit r13896.
2013-09-24 18:41:19 +00:00
895f927ff0
Celts corral props missing fix
...
This was SVN commit r13895.
2013-09-24 16:26:26 +00:00
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
cd51540725
This was SVN commit r13892.
2013-09-22 18:13:19 +00:00
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
e488ed09f5
This was SVN commit r13890.
2013-09-22 11:30:24 +00:00
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
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
5afb18dda4
fix units ejecting on destroying structure
...
This was SVN commit r13887.
2013-09-21 19:41:13 +00:00
4f6ddfe894
fix theatron build limit
...
This was SVN commit r13886.
2013-09-21 19:05:59 +00:00
636f09053b
celt tavern update
...
This was SVN commit r13885.
2013-09-21 15:24:56 +00:00
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
bb506fb578
Spec maps and new player color texture for Greek females.
...
This was SVN commit r13883.
2013-09-21 12:41:05 +00:00
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
0233bb4877
Temporary Ptolemies emblem.
...
This was SVN commit r13880.
2013-09-21 09:23:21 +00:00
ccc873d9d5
Tech complete sound slightly louder.
...
This was SVN commit r13879.
2013-09-21 09:22:31 +00:00
ec66e59150
Fixed some civ json stuff. Fixed Ptolemaic json.
...
This was SVN commit r13878.
2013-09-21 09:21:48 +00:00
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
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
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
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
5a8cfb738b
Commited experimental field for athenians (propped farm field)
...
This was SVN commit r13872.
2013-09-19 15:29:01 +00:00
4b7c1a915d
Celtic corral upgraded. Added more playercolor to gaullic civic centre.
...
This was SVN commit r13871.
2013-09-19 13:58:48 +00:00
bfe0b79b91
Better fix of Grid memory leak, refs #1842
...
This was SVN commit r13869.
2013-09-18 01:21:36 +00:00
e10c4ebaae
Amend 553875ea83: Forgot to include new hotkey in the config.
...
This was SVN commit r13868.
2013-09-17 00:31:18 +00:00
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
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
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
97912dd545
This was SVN commit r13864.
2013-09-16 16:56:26 +00:00
16b615db79
Celt walls upgraded
...
This was SVN commit r13863.
2013-09-16 12:25:03 +00:00
a770ad9467
small code style fixes
...
This was SVN commit r13862.
2013-09-16 09:14:16 +00:00
1b6a5fa802
This was SVN commit r13861.
2013-09-15 21:37:05 +00:00
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
bb799bdd53
upgraded gaul defense towers and celtic storehouse
...
This was SVN commit r13859.
2013-09-15 21:11:14 +00:00
5fe43a0f21
removed non-used duplicated meshes
...
This was SVN commit r13858.
2013-09-15 19:56:13 +00:00
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
65bddb7fa5
Celtic docks, kennel, farmstead and temple upgrades
...
This was SVN commit r13856.
2013-09-15 16:09:23 +00:00
bdeb358c44
Upgraded britons market and added new gaul market
...
This was SVN commit r13855.
2013-09-15 14:09:25 +00:00
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
6644f224cd
remove warn messages. Now really fixes #2102
...
This was SVN commit r13853.
2013-09-15 09:33:45 +00:00
b16b52492d
change build distance restrictions to work with classes. Fixes #2012 .
...
This was SVN commit r13852.
2013-09-15 09:29:16 +00:00
3016765766
All new techs for the blacksmith.
...
This was SVN commit r13851.
2013-09-15 08:55:28 +00:00
f213761912
let entities change entity limits. Fixes #2076
...
This was SVN commit r13850.
2013-09-15 08:19:50 +00:00
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
466900b898
Minor template stuff.
...
This was SVN commit r13848.
2013-09-15 05:55:16 +00:00
db39fd059c
Some tooltip tweaks.
...
Further attempts to balance archers. (ongoing)
This was SVN commit r13847.
2013-09-15 04:57:58 +00:00
08849ae6f6
Balance changes after playtesting with Alpha123.
...
This was SVN commit r13846.
2013-09-15 00:28:07 +00:00
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
729e744c2f
Removes yucky hard-coded categories from BuildRestrictions
...
This was SVN commit r13844.
2013-09-14 22:31:41 +00:00
dd60c3a3e2
Restore textures.xml to make grid_subdiv terrain less ugly
...
This was SVN commit r13843.
2013-09-14 18:36:40 +00:00
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
126e550d68
Delete bogus file
...
This was SVN commit r13841.
2013-09-14 12:19:22 +00:00
ea75cda095
Special case getEntityNamesFormatted to avoid messing with getEntityNames
...
This was SVN commit r13838.
2013-09-14 00:32:50 +00:00
e7fa9a58de
Remove the Costs: prefix from tooltips entirely.
...
This was SVN commit r13837.
2013-09-14 00:07:08 +00:00
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
c28151c1c1
Put tooltips on a diet.
...
This was SVN commit r13835.
2013-09-13 23:49:46 +00:00
04b4e6af4b
gaul fortress fix
...
This was SVN commit r13834.
2013-09-13 21:44:49 +00:00
014acac9ed
Upgraded britons and gaullic fortresses.
...
This was SVN commit r13833.
2013-09-13 21:41:24 +00:00
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
5023ff449e
Gaul_civic_centre updated.
...
This was SVN commit r13831.
2013-09-13 14:18:27 +00:00
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
77ca745637
Updated the logo.
...
Updated some Roman words.
This was SVN commit r13829.
2013-09-13 12:07:39 +00:00
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
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
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
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
87753bf3fd
forgot to commit extra change for 508cc0d4c7
...
This was SVN commit r13824.
2013-09-11 18:59:51 +00:00
508cc0d4c7
Add preferred classes to BuildingAI. Patch by jammus. Fixes #1985
...
This was SVN commit r13823.
2013-09-11 17:50:49 +00:00
43df87e56f
This was SVN commit r13822.
2013-09-10 22:05:12 +00:00
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
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
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
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
b2862f14da
Avoid continual libxml2 memory leak in simulation-test mode
...
This was SVN commit r13817.
2013-09-09 20:22:42 +00:00
3c29c2dccf
Tweaked farm decal color.
...
This was SVN commit r13816.
2013-09-09 18:46:45 +00:00
c3f7a929e0
better garrison flag handling. Refs #2096 .
...
This was SVN commit r13815.
2013-09-09 18:27:20 +00:00
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
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
f051426a76
fix garrisonHolder flags when units are ejected
...
This was SVN commit r13812.
2013-09-08 19:51:16 +00:00
08514f68be
small clean up of GarrisonHolder code
...
This was SVN commit r13811.
2013-09-08 18:46:29 +00:00
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
bc40534777
fix spread technology modifications. Fixes #2110
...
This was SVN commit r13809.
2013-09-08 15:20:54 +00:00
7a0e91ab23
Fixes undefined behavior in Atlas error display, fixes #2115
...
This was SVN commit r13808.
2013-09-08 03:35:05 +00:00
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
f588181004
use better technology script in guiInterface
...
This was SVN commit r13805.
2013-09-07 15:23:03 +00:00
24a4ceb89a
fix carthagian technology. Fixes #2107
...
This was SVN commit r13804.
2013-09-07 09:26:56 +00:00
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
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
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
d6ec0f6dbd
Updated installer image.
...
This was SVN commit r13800.
2013-09-06 19:16:33 +00:00
e19b470a42
fix music glitchyness when game loses focus trac #2090
...
This was SVN commit r13799.
2013-09-06 02:46:13 +00:00
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
4c9cd2921d
Replaces splash screen with fundraiser message
...
This was SVN commit r13796.
2013-09-01 23:56:50 +00:00
53a5781c66
Increase simulation script runtime size again. Refs #1436 , #1966 and #2035 .
...
This was SVN commit r13794.
2013-09-01 23:29:21 +00:00
6070cd01fa
Reduced "grazing" time for whales.
...
This was SVN commit r13793.
2013-09-01 22:06:23 +00:00
c3dcde7e34
Alpha version number.
...
This was SVN commit r13792.
2013-09-01 20:47:02 +00:00
3774b2051d
This was SVN commit r13790.
2013-09-01 04:22:28 +00:00
4ac19dff05
fixed maur_struct
...
This was SVN commit r13789.
2013-08-31 22:08:48 +00:00
4dd1397e15
Mauryans and Britons now start with a cav skirm in addition to their special starting unit (Worker Elephant and War Dog respectively).
...
Fixed a unit availability thing for Macedonians.
This was SVN commit r13788.
2013-08-31 19:27:37 +00:00
cc08c81faf
Tweaks to barracks and blacksmith tips.
...
This was SVN commit r13787.
2013-08-31 19:23:16 +00:00
0bd22649f0
Tweaked Army Camp tip text.
...
Adjusted max gatherers for pyramid ruins.
New 'Blacksmith' loading tip.
This was SVN commit r13786.
2013-08-31 12:26:17 +00:00
66ab19086a
Updated Stoa tip image.
...
Updated Persian Architecture tip text.
Adjusted upward the number of max gatherers for small mines and the
unfinished Greek temple ruin.
Tweaked Cycladic Archipelago 6 (fixed fish and treasure positions).
Tweaked Gold Oasis 1 (made it possible to build a civic center in the
middle of the "Gold Patches."
Adjusted the Spartan House history entry, based on text by contributor
Thorfinn the Shallow Minded.
This was SVN commit r13785.
2013-08-30 22:35:15 +00:00
df190cbbd1
fix issues with menu mode and playlist, harden code and clear out ambient noises at game end, fixes #2066
...
This was SVN commit r13784.
2013-08-29 13:20:55 +00:00
3047470858
Reduced volume for fishing boat movement sound and construction hammering sounds.
...
This was SVN commit r13783.
2013-08-29 12:46:48 +00:00
de85408e3b
Fix fishing boats not being able to gather from whales. Reported on the forums by Gildas.
...
This was SVN commit r13782.
2013-08-29 11:26:02 +00:00
24ff1371b8
Upgraded greek temples an assigned one variation per civ.
...
This was SVN commit r13780.
2013-08-27 23:48:22 +00:00
15586778bb
Disables frame-pointer omission in VC++ 2008 projects, fixes stack dump in release build, fixes #2078
...
This was SVN commit r13779.
2013-08-27 02:42:56 +00:00
56d535b7c5
Effects added to hellenic stoas. Only temples to go yay!
...
This was SVN commit r13778.
2013-08-27 00:04:05 +00:00
c6d361a76f
added effects and upgraded greek docks for each greek civ
...
This was SVN commit r13777.
2013-08-26 23:19:35 +00:00
89e69af987
let maurian elephant corpse sink fast, temporary fix until there is a real corpse
...
This was SVN commit r13776.
2013-08-26 17:42:09 +00:00
e79c2aa953
make all Iberian buildings available in the sandbox map (add walls, blacksmith and fire ship)
...
This was SVN commit r13775.
2013-08-26 11:38:41 +00:00
0b670f88af
Updated spart syssiton, mace lybrary and helenic market with effects and little fixes
...
This was SVN commit r13774.
2013-08-26 08:29:18 +00:00
89430de468
Okay, do what f5ab6255d0 was supposed to do.
...
This was SVN commit r13773.
2013-08-26 04:17:26 +00:00
b10a01645f
Revert f5ab6255d0. I accidentally somehow committed my whole working tree on this computer....
...
This was SVN commit r13772.
2013-08-26 04:15:36 +00:00
f5ab6255d0
General scrollbar improvements. Patch by Josh. Fixes #2080 .
...
- Don't show the scrollbar when the contents aren't overflowing the
visible area.
- Fix bugs in minimum bar sizing.
- Add capability to set a maximum bar size.
- Correct outdated/incorrect comments.
This was SVN commit r13771.
2013-08-26 03:06:08 +00:00
2dc0c40ff0
Fix some errors.
...
This was SVN commit r13770.
2013-08-26 01:26:35 +00:00
e75765faae
Fixed some Greek corral prop problems.
...
Fixed Storehouses tip.
Fixed the names for ALL Iberian units and buildings.
Added a build restriction for the Iberian Monument.
This was SVN commit r13769.
2013-08-25 22:20:09 +00:00
ff6b3e5725
Properly fix #2079 .
...
This was SVN commit r13768.
2013-08-25 22:05:41 +00:00
7a96a3161b
fix whale altitude (no floating whales). See aa95f3420d.
...
This was SVN commit r13767.
2013-08-25 18:59:36 +00:00
035d33dc33
'Crop Rotation' tech for the Gallic Rotary Mill.
...
This was SVN commit r13766.
2013-08-25 17:57:20 +00:00
7c0dfc0d82
Fixed a couple tips.
...
This was SVN commit r13765.
2013-08-25 17:36:55 +00:00
acf899bb47
Fixed some Corral errors.
...
Fixed some Persian building stuff.
This was SVN commit r13764.
2013-08-25 17:36:34 +00:00
292ce925c6
Cast Shadow flag enabled on this actor.
...
This was SVN commit r13763.
2013-08-25 11:04:14 +00:00
2c66383461
Added effects to athen_prytaneion
...
This was SVN commit r13762.
2013-08-25 10:24:34 +00:00
52f947fd77
Check that we still have build orders for our attack plan. Temporarily fixes #2082 for A14.
...
This was SVN commit r13761.
2013-08-25 08:20:40 +00:00
589e8d2ae8
Updated and added effects to greek gymnasion, storehouse, corral and epic temple (athenian wonder parthenon)
...
This was SVN commit r13760.
2013-08-25 01:02:22 +00:00
ce9432bf3d
Proper selection ring for whales.
...
Edited Mauryan civ info.
Added preview image for Cycladic Archipelago 6.
This was SVN commit r13759.
2013-08-24 22:30:28 +00:00
d49476ac8d
Increased armor for promoted Skirmish Cavalry. Previously this was neglected or missed.
...
This was SVN commit r13758.
2013-08-24 21:11:59 +00:00
247e45a6b5
fix quinquereme splash damage
...
This was SVN commit r13757.
2013-08-24 16:07:03 +00:00
11f663d761
fix history description to match with in-game numbers. Reported by scythetwirerler. Part 2
...
This was SVN commit r13756.
2013-08-24 15:33:59 +00:00
087e5f9c3e
fix history description to match with in-game numbers. Reported by scythetwirerler
...
This was SVN commit r13755.
2013-08-24 15:30:52 +00:00
14a73204dd
Disable distance-sorting for most transparent objects
...
Distance-sorting of the alpha-blend pass of objects like trees and grass
is quite expensive (partly the cost of sorting, partly the cost of being
unable to batch efficiently), and the effect on visual quality is
typically very hard to see (the alpha-test pass does most of the work
for
objects that aren't fully translucent). That's not a good tradeoff, so
turn it off.
Leave distance sorting enabled for e.g. waterfalls since it might make a
more noticeable difference for them.
This was SVN commit r13753.
2013-08-24 14:48:02 +00:00
f106d7714a
Fix a swap between reflections and refractions in config.cfg . Disabling "Render Reflections" now reverts to the skybox for better results.
...
Allows to oversaturate in Atlas' HDR settings.
This was SVN commit r13752.
2013-08-24 14:44:38 +00:00
9d933087b3
Fix #2079 .
...
This was SVN commit r13751.
2013-08-24 14:24:37 +00:00
957c51727b
Improve on-water shadows. Fix an issue with foam looking static. Add anisotropic filtering (x4) to the water normal texture for testing.
...
This was SVN commit r13750.
2013-08-24 14:12:39 +00:00
aa95f3420d
Cleaned up and fixed the whale templates. Still need a custom selection ring.
...
Made Carthaginian Sacred Band Infantry and Cavalry cost metal instead of
wood.
Updated Cycladic Archipelago 6.
This was SVN commit r13749.
2013-08-24 13:31:25 +00:00
40af0917ca
let gaul and brit healers upgrade to their local templates instead of the generic celtic templates. Fix double-click to select all healers after one of the healers upgraded.
...
This was SVN commit r13748.
2013-08-24 13:09:53 +00:00
630301918c
Fix the command line -autostart-aidiff to default to 2 (new medium)
...
This was SVN commit r13746.
2013-08-24 09:55:06 +00:00
ced59bcfa1
Updated hellenic defense tower with new effects.
...
This was SVN commit r13745.
2013-08-24 00:19:52 +00:00
6963f8c067
Adjust cavaly swordsmen advanced and elite stats. Change attack from 21 -> 12 and 22 -> 14 (since the basic rank's attack is 10), and change armor from 4 -> 6 and 6 -> 7 (since the basic rank's armor is 5).
...
This was SVN commit r13744.
2013-08-23 18:46:18 +00:00
1544bad62a
Updated greek theatron for all greek civs. (AO + normal + spec)
...
This was SVN commit r13743.
2013-08-23 18:05:56 +00:00
efda9d5e33
Updated greek farmstead
...
This was SVN commit r13742.
2013-08-23 12:36:04 +00:00
c1dcbe4176
update TLB table
...
refs #2074
This was SVN commit r13741.
2013-08-23 06:42:48 +00:00
e19bffa88f
hele fortress gate textures
...
This was SVN commit r13740.
2013-08-22 14:57:14 +00:00
5050dcf261
Upgraded and cleaned up hellenic fortress. Shield props now displays depending on faction. (AO + normal + spec)
...
This was SVN commit r13739.
2013-08-22 14:56:11 +00:00
18c0b17126
Fixes #2069 .
...
This was SVN commit r13738.
2013-08-22 13:10:38 +00:00
0a0bd83cf0
Adds L4 cache detection for some new Haswell CPUs, fixes #2074
...
This was SVN commit r13736.
2013-08-21 23:18:35 +00:00
3174d16256
Updated greek civs barracks, added ao, spec and normals
...
This was SVN commit r13735.
2013-08-21 22:58:31 +00:00
deb64d36fc
Fix rendering artifacts with novbo=true gentangents=true
...
glDrawRangeElements needs to know the range of vertexs that are used
by the index array. With VBOs it doesn't really matter if the range
is wrong (all the vertexes are in GPU memory anyway), but with CPU
vertex arrays the driver has to memcpy the given range of data, so
incorrect bounds will result in garbage data being rendered.
With gentangents, the rendered mesh can have more vertexes than the
original CModelDef, but was rendered with the CModelDef's vertex count.
Use the correct vertex count instead.
Refs #2050 .
This was SVN commit r13734.
2013-08-21 21:01:32 +00:00
9c4801e107
add splash damage to quinquereme
...
This was SVN commit r13733.
2013-08-21 19:52:50 +00:00
73773e61d0
Spart CC small fix
...
This was SVN commit r13732.
2013-08-21 17:48:59 +00:00
827ec20b1f
Made the Cart trade ship avail in Village phase as a kind of "sea trade" bonus for them.
...
This was SVN commit r13731.
2013-08-21 17:27:28 +00:00
d94e1d8ed3
Spartan CC modified. Doric columns adjusted
...
This was SVN commit r13730.
2013-08-21 17:03:47 +00:00
70dfd1f803
Cavalry Swordsmen stats rebalanced.
...
This was SVN commit r13729.
2013-08-21 15:55:13 +00:00
081707039a
Updated Cycladic Archipelago 6. Both sides now playable.
...
This was SVN commit r13728.
2013-08-21 15:20:27 +00:00
035542e76c
revert wrong changes to support and female_citizen template
...
This was SVN commit r13727.
2013-08-21 09:55:42 +00:00
605852fccf
Fix function that decides which units can have which formations, and remove formations for animals and the maurian worker elephant
...
This was SVN commit r13726.
2013-08-21 09:53:59 +00:00
52d6a8036d
This was SVN commit r13725.
2013-08-21 05:37:28 +00:00
f947fa6afe
Fixes stack overflow in stack dump logic, by special-casing boost::unordered types, fixes #1813 .
...
Adds INIT_HAVE_DISPLAY_ERROR init flag to correctly override
ah_display_error in Atlas (InitVfs was overriding it again), but don't
use it because it's ugly and broken, refs #1729
This was SVN commit r13724.
2013-08-20 21:07:42 +00:00
3843ae6bb0
Greek houses upgrade. (eyecandy, ao, normal, spec)
...
This was SVN commit r13723.
2013-08-20 16:41:10 +00:00
c5296b9246
Fix maurian elephants being unable to build stuff. Caused by enlarging the elephant obstruction radius.
...
This was SVN commit r13721.
2013-08-20 09:39:01 +00:00
ee877a46c7
Switch X and Z loops in the foam generation, possible speed improvement.
...
This was SVN commit r13720.
2013-08-20 08:55:33 +00:00
e3b9f17c19
Removes useless "old maps" filter from match setup, refs #2071
...
This was SVN commit r13719.
2013-08-20 02:28:49 +00:00
68822e3418
Adds more information to construction command debugging
...
This was SVN commit r13717.
2013-08-19 23:18:18 +00:00
54bbbb9797
Boost 1.54 deprecates Boost.Signal. Use Boost.Signal2 for >= 1.54.
...
This was SVN commit r13716.
2013-08-19 22:11:54 +00:00
0b4fe2ef94
Tweaks game speed dropdown more, refs #2046
...
This was SVN commit r13715.
2013-08-19 20:00:26 +00:00
1739a381c1
Fix crash when editing terrain near map edges.
...
The values in CMessageTerrainChanged can be overestimates that exceed
the normal map boundaries, and should be clamped before looping over
them.
This was SVN commit r13714.
2013-08-19 19:19:34 +00:00
0ca841b92b
Suppress unused local typedef warnings when including SpiderMonkey headers.
...
This was SVN commit r13713.
2013-08-19 18:26:44 +00:00
4d9b81f40e
This was SVN commit r13712.
2013-08-19 18:09:09 +00:00
30c194a804
Starting units re-adjusted.
...
This was SVN commit r13711.
2013-08-19 15:42:46 +00:00
3783d0e14c
Fix flying unit not crashing in water when they should. Patch by scythewirler. refs #2067
...
This was SVN commit r13710.
2013-08-19 14:44:15 +00:00
0c16980408
Fix tests.
...
This was SVN commit r13709.
2013-08-19 10:55:35 +00:00
03bf727d9a
Fix deactivation of HQ waviness causing the specular effect to go crazy.
...
This was SVN commit r13708.
2013-08-19 10:19:21 +00:00
b770c41f0b
Removes shadow casting and receiving on preview entities, patch started by ericb, fixes #1771
...
This was SVN commit r13706.
2013-08-18 22:17:57 +00:00
63a0b4ae98
projectile point for mauryan elephant archer
...
This was SVN commit r13705.
2013-08-18 20:42:42 +00:00
2637540ce2
Spart CC centre upgrade with doric capitels +AO and effects
...
This was SVN commit r13704.
2013-08-18 18:02:18 +00:00
ab6d15c414
Macedonian CC mesh and AO fix
...
This was SVN commit r13703.
2013-08-18 16:16:53 +00:00
0888cf6c23
Fix Linux build
...
This was SVN commit r13701.
2013-08-18 11:28:52 +00:00
bf7cd1fcbd
Undo-d the commit due to general panic about GLSL.
...
This was SVN commit r13700.
2013-08-18 11:15:29 +00:00
29b5021f97
Fix my previous commit because obviously I had forgotten something.
...
This was SVN commit r13699.
2013-08-18 09:42:02 +00:00
a4707bcc16
Change the water manager so incremental updates to the water information is possible. Streamline a few things (and removes a not-really-used calculation to speed things up further). Fixes #2063 , refs #1743 .
...
This was SVN commit r13698.
2013-08-18 09:27:11 +00:00
557c1fc067
fix (dis)allowing of garrisoning by other components. Refs #2067
...
This was SVN commit r13697.
2013-08-18 08:23:36 +00:00
92f4391f51
Adds tech template support to checkrefs.pl
...
This was SVN commit r13696.
2013-08-18 02:52:05 +00:00
791d392797
Fixes and improves terrain scanning of checkrefs.pl.
...
Removes some useless old actors.
This was SVN commit r13695.
2013-08-18 01:57:37 +00:00
a18262e7b1
Make planes about 20% cooler. Fixes #2067 .
...
This was SVN commit r13694.
2013-08-17 22:55:16 +00:00
abce308281
Renames confusing grass1_spring.png terrain texture, used for fancy grass effect, refs #2069
...
This was SVN commit r13693.
2013-08-17 22:16:01 +00:00
f25bbda672
fix typo for garrisoned archer classes. Reported by scythetwirler.
...
This was SVN commit r13692.
2013-08-17 20:34:28 +00:00
90b75c95ea
Macedonians CC upgraded with corinthian capitel + AO and normals
...
This was SVN commit r13691.
2013-08-17 18:32:41 +00:00
a6c28ae461
Altered footprint of some elephant units.
...
This was SVN commit r13690.
2013-08-17 16:16:37 +00:00
fdc1f3a043
increased mauryan blacksmith size
...
This was SVN commit r13689.
2013-08-17 14:47:44 +00:00
3a2eec841c
Adjusted max gatherers for these trees.
...
This was SVN commit r13688.
2013-08-17 14:26:43 +00:00
998dc21676
Removed old Aegis folder.
...
This was SVN commit r13687.
2013-08-17 14:12:25 +00:00
42d77129cc
rome blacksmith fix
...
This was SVN commit r13686.
2013-08-17 14:07:48 +00:00
9763b9076c
Upgraded roman blacksmith
...
This was SVN commit r13685.
2013-08-17 14:04:08 +00:00
a9c71e39a4
make new elevation tool more drastic + add RMB action
...
This was SVN commit r13684.
2013-08-17 14:02:18 +00:00
bcf7115b5c
Fix Aegis to work properly for A14, also rename the folder from "qbot-wc" to "aegis" (thus apparent huge number of changes). Adds a "sandbox" difficulty setting that will never attack, collect resources 50% slower, and is pop-capped at 70 for beginners.
...
This was SVN commit r13683.
2013-08-17 13:59:53 +00:00
38b52f9ff0
Fixed a broken texture link.
...
This was SVN commit r13682.
2013-08-17 12:51:11 +00:00
723a3ec8b5
Fixed kart_embassy_italiote.dae
...
This was SVN commit r13681.
2013-08-17 12:41:37 +00:00
2d4c3d72c6
Removed the old dds file from these actors.
...
This was SVN commit r13680.
2013-08-17 12:18:50 +00:00
cdd2c74d44
Superfluous textures deleted.
...
This was SVN commit r13679.
2013-08-17 11:38:49 +00:00
960615aa53
PreferGLSL = true as long as GenTangents = true.
...
This is for GLSL migration in the long run.
This was SVN commit r13678.
2013-08-17 11:13:36 +00:00
b818a54b06
Tweaked some maps.
...
Updated some "tips" images.
Tweaked civ center radius and town phase radius boost.
Added some clarification language to the Farm Field tooltip.
This was SVN commit r13677.
2013-08-17 10:15:38 +00:00
b5888f4e45
generalise kill vs eject garrisoned entities on death of garrisonHolder
...
This was SVN commit r13676.
2013-08-17 09:26:17 +00:00
d37d3be5d0
Fixes Attack component schema
...
This was SVN commit r13674.
2013-08-17 06:02:31 +00:00
b820f6e6ae
Add a pike elevation tool to make sharp pointed mountains. Fixes #2059
...
This was SVN commit r13672.
2013-08-16 14:46:54 +00:00
fe0ec1c720
fix coding style for buildingAI. Refs #2010
...
This was SVN commit r13671.
2013-08-16 12:17:18 +00:00
fd2245c53c
Improved building AI. Refs #2010
...
This was SVN commit r13670.
2013-08-16 11:17:36 +00:00
cc0ba8e246
Missing maur blacksmith struct_b
...
This was SVN commit r13669.
2013-08-16 04:50:44 +00:00
d66edf5958
fix a bug that ignored resetting XZ rotation to zero, reported by sythetwirler
...
This was SVN commit r13668.
2013-08-15 22:16:51 +00:00
81b29bf18d
fix line wrapping when big number of gatherers on one resource
...
This was SVN commit r13667.
2013-08-15 20:00:55 +00:00
675b3c40be
fix bouncing projectiles, patch by Markus. Fixes #769
...
This was SVN commit r13664.
2013-08-15 19:01:10 +00:00
7ff167e7de
Removes more unused variables, based on patch by Markus, refs #1852 .
...
Adds TODOs to use POT textures in fancy water rendering.
This was SVN commit r13663.
2013-08-15 18:25:32 +00:00
6d3901faf7
Added mauryan blacksmith with AO. Updated mauryan struct textures
...
This was SVN commit r13662.
2013-08-15 17:17:25 +00:00
6b316f6ce1
fix tests breaking caused by 4421787281. Refs #2062
...
This was SVN commit r13661.
2013-08-15 08:56:14 +00:00
4421787281
interpollate y offset for smooth climbing and landing of flying objects. refs #2062
...
This was SVN commit r13660.
2013-08-15 08:44:06 +00:00
1712b0f42d
Increases simulation script runtime to 32 MB to reduce OOM errors, refs #1436 , #1966 , #2035
...
This was SVN commit r13659.
2013-08-15 05:15:54 +00:00
4e709f2c9c
Implement landing and go-around for UnitMotionFlying. Patch by scythetwirler. Fixes #2062 .
...
This was SVN commit r13658.
2013-08-15 03:10:04 +00:00
b6fe589ae3
fix health regeneration for negative values (reported by Mythos_Ruler)
...
This was SVN commit r13657.
2013-08-14 08:33:29 +00:00
2307509088
Remove the old diminishing returns formula (I accidentally left it as a comment). Also, I forgot to credit scythetwirler (who came up with the new formula) in the previous commit.
...
This was SVN commit r13656.
2013-08-14 05:16:09 +00:00
cc02eabdd0
Change the formula for diminishing returns to something less flawed. Also add a lot of comments explaining how it works.
...
This was SVN commit r13655.
2013-08-14 05:14:20 +00:00
598c05e056
clean UnitAI move to attack range code + fix possible bug
...
This was SVN commit r13654.
2013-08-13 15:11:17 +00:00
ba244b509c
Fixed the portrait for this tech.
...
Adjusted water a little bit for these scenarios.
This was SVN commit r13653.
2013-08-13 00:55:47 +00:00
c709105355
Clarifies control group HotKeys
...
This was SVN commit r13652.
2013-08-12 23:50:18 +00:00
6925d493fe
This was SVN commit r13651.
2013-08-12 23:40:24 +00:00
d74ed3f1ae
Increase farming speed by 46% for females and 42% for males. Combined with diminishing returns it was waaay too slow prior to this commit.
...
This was SVN commit r13650.
2013-08-12 23:17:30 +00:00
3d1e693148
Enable diminishing returns for farms.
...
(Yeah yeah, somehow I forgot this when I committed the actual
functionality.)
This was SVN commit r13649.
2013-08-12 23:11:39 +00:00
c44efe6c8c
Spartan tech "Agoge" altered. Moved to Syssiton from Civ Center.
...
Unit tooltips cleaned up a bit. Made to look neater in-game.
This was SVN commit r13648.
2013-08-12 21:53:53 +00:00
1aaca7e6e3
health regeneration
...
This was SVN commit r13647.
2013-08-12 17:45:18 +00:00
96cef624e3
Fix compiling tests on ARM. Patch by Josh.
...
This was SVN commit r13646.
2013-08-12 03:12:57 +00:00
1ffb74b336
Adjusts session game speed dropdown, fixes #2046
...
This was SVN commit r13645.
2013-08-11 20:49:41 +00:00
066c542e36
Template tweaks to palace
...
This was SVN commit r13644.
2013-08-11 12:09:10 +00:00
a552a3cb8b
Persian Palace structure
...
This was SVN commit r13643.
2013-08-11 12:02:36 +00:00
b8fb2e1697
Added helle_struct_b parallax/normal map and specular. Applied on greek blacksmith. Improved helle_struct specular map
...
This was SVN commit r13642.
2013-08-11 08:49:15 +00:00
46f091a154
Added the Athenian civ bonus "Silver Owls" which gives them +10% metal gathering rates when upgrading phases.
...
Made "Delian League" (faster building ships) a team bonus. Need some new
code to make it apply to allies too.
Made farming slower.
This was SVN commit r13641.
2013-08-09 22:37:05 +00:00
3f0354943f
Polishing thePolishing the Random Maps: Archipelago, English Channel, Islands, Lake, Lorraine Plain, Migration, Neareastern Badlands, Northern Lights, Oasis, Persian Highlands.
...
This was SVN commit r13640.
2013-08-09 12:30:59 +00:00
c8b8dd24e6
This was SVN commit r13639.
2013-08-09 00:03:51 +00:00
b0ceef39b9
Hellenic building bonus deleted from templates and moved to a tech.
...
Some updated portraits.
This was SVN commit r13638.
2013-08-08 23:55:13 +00:00
93abbae435
Fix build issues on ARM. Patch by Josh. Fixes #2049 .
...
This was SVN commit r13634.
2013-08-07 05:00:46 +00:00
dc722d76f3
Fix tests. Refs #1960 .
...
This was SVN commit r13632.
2013-08-06 22:32:46 +00:00
bff070c6cb
Polishing the Random Maps: Gulf of Bothnia, Hyrcanian Shores, Islands, Kerala, Lake, Latium.
...
This was SVN commit r13630.
2013-08-04 12:31:43 +00:00
4a805fb05c
Updates keys.txt with new keynames, refs #2043
...
This was SVN commit r13628.
2013-08-03 20:39:15 +00:00
5a1ddd7cf9
Improves hotkey support for non-QWERTY keyboards, patch by lsdh, fixes #2043
...
This was SVN commit r13627.
2013-08-03 20:09:29 +00:00
8c74df2acd
Give an elevation advantage to ranged units. Patch by sanderd17. Fix #1960 .
...
This was SVN commit r13626.
2013-08-03 19:20:20 +00:00
3b294d3ad4
Revised Persian names.
...
This was SVN commit r13625.
2013-08-03 16:14:17 +00:00
4f7ba84fd6
Modified athens CC to have Ionic columns and AO map.
...
Added normal and spec maps for several greek struct and props textures.
This was SVN commit r13624.
2013-08-02 23:03:55 +00:00
c8830ea769
Specific Name for Mauryan blacksmith.
...
This was SVN commit r13623.
2013-08-01 22:00:20 +00:00
17fd4fab94
Polishing the Random Maps: Fortress, Gear, Guadalquivir River
...
This was SVN commit r13622.
2013-08-01 17:58:51 +00:00
70d072577b
;
...
This was SVN commit r13621.
2013-07-31 22:25:24 +00:00
f6e0c4c5a4
Split up cheats into multiple files. Patch by lsdh/ldsh. Fixes #2019 .
...
Replace buggy hasAllies with the inlined check if we have a team at all.
Fix setting of starting resources (broken in 58fa0c7c58
2013-07-31 22:22:12 +00:00
c438a1eb82
Polishing the Random Maps: Alpine Valley, Archipelago, Cantabrian Highlands, Canyon, Continent, Corinthian Isthmus, English Channel
...
This was SVN commit r13619.
2013-07-31 10:05:48 +00:00
f3823847b0
Polishing the Random Maps: Archipelago, Ardennes Forest, Atlas Mountains, Cantabrian Highlands
...
This was SVN commit r13618.
2013-07-30 11:09:40 +00:00
477855fbf5
Polishing the Random Maps: Alpine Valley, Anatolian Plateau, Archipelago
...
This was SVN commit r13617.
2013-07-30 07:56:09 +00:00
344a149a66
Infinite farms with diminishing returns (but no farmland). Refs #1318 .
...
This was SVN commit r13616.
2013-07-30 06:04:53 +00:00
857ae2dd3e
- Fix a bug from 20e7d2224a where the player ID would always be set to 1.
...
- Make the developer overlay a tad taller.
This was SVN commit r13614.
2013-07-29 20:01:09 +00:00
70e67af87f
Polishing the Random Maps: Alpine Valley
...
This was SVN commit r13613.
2013-07-29 14:22:54 +00:00
4dfe1d6df9
Polishing the Random Maps: Alpine Valley
...
This was SVN commit r13612.
2013-07-29 13:50:20 +00:00
992a8ee0b8
Polishing the Random Maps: Aegean Sea and Alpine Valley
...
This was SVN commit r13611.
2013-07-29 12:52:31 +00:00
629492625f
Some touching up.
...
This was SVN commit r13610.
2013-07-29 12:35:05 +00:00
f3b0417aac
Don't try to interpret Enter as a mouse click in message boxes (makes it really annoying to chat at the end of a game).
...
This was SVN commit r13608.
2013-07-29 05:04:28 +00:00
e3c42a204e
Fixing a bug
...
This was SVN commit r13607.
2013-07-29 04:30:03 +00:00
20e7d2224a
Implement a developer overlay command to change the current player ID (very useful for AI development).
...
This was SVN commit r13606.
2013-07-29 00:53:44 +00:00
53074c7715
Polishing the random maps: Aegean Sea, Alpine Lakes
...
This was SVN commit r13605.
2013-07-28 16:58:09 +00:00
63f766bb2a
Nerfed Hellenization a bit.
...
Changed the portraits of the Cart merc techs.
This was SVN commit r13604.
2013-07-28 16:21:43 +00:00
0774730e2f
-Made starting units start at Elite rank (just for fun and testing).
...
-Some new tech portraits for Divine Offerings and Agoge.
-Fertility Festival technology increased cost.
-New special technology for all Hellenic factions: Hellenization,
researched at the Theatron, increases territory influence for all
buildings +50%. This is a temporary technology until the real
Hellenization effect can be implemented.
-New special technology for the Mauryan and Iberian blacksmiths: Woot
Steel and Toledo Steel respectively.
This was SVN commit r13603.
2013-07-28 13:38:04 +00:00
28db824982
iberian, hellene, roman and celtic blacksmiths with AO maps added.
...
This was SVN commit r13602.
2013-07-28 13:14:42 +00:00
f0310cce58
Reduced Food cost of cavalry from 100 to 80.
...
Reduced Food cost of elephants from 200 to 150.
Reduced Metal cost of elephants from 200 to 150.
Reduced Stone cost of Mauryan elephant stables from 300 to 200.
Reduced Metal cost of Persian chariot archers from 100 to 0.
This was SVN commit r13601.
2013-07-28 10:20:07 +00:00
a146a8ad3b
Fixed some things.
...
This was SVN commit r13600.
2013-07-27 18:52:28 +00:00
fd428cf45b
Fix bug when randomly picking a unit to attack for AI's. Fix from bmwiedemann.
...
This was SVN commit r13599.
2013-07-27 15:08:45 +00:00
0263f17bcc
Polishing the random maps: Aegean Sea
...
This was SVN commit r13598.
2013-07-27 12:13:46 +00:00
a684f7646b
Fixes crash when hotloading main menu while splash screen shown (don't alter GUI page stack in init functions), refs #2042
...
This was SVN commit r13597.
2013-07-26 01:35:01 +00:00
db5c54c7c6
Persian dock update
...
This was SVN commit r13596.
2013-07-25 23:02:51 +00:00
70a3c6c8b4
Supremely blue water on Cycladic Archipelago 2. Enable high graphics and take a look at the depth rendering and specular effect.
...
This was SVN commit r13595.
2013-07-25 17:45:40 +00:00
5bfff54bcb
Unit promotion animation and invulnerability reduced from 4 seconds to 2.8 seconds.
...
This was SVN commit r13594.
2013-07-25 13:57:54 +00:00
e5a9b0eab4
And of course I forgot a file.
...
This was SVN commit r13593.
2013-07-25 08:58:15 +00:00
1f55280fa2
AI-related changes to the AI interface and Command.js, to facilitate debugging of upcoming new version of Aegis.
...
This was SVN commit r13592.
2013-07-25 08:57:07 +00:00
0d8b9b15e1
All animals now visible in Fog of War (FOW). Should help a lot with hunting.
...
Hack armor increased for most buildings.
This was SVN commit r13591.
2013-07-24 18:11:03 +00:00
697b88562c
Game Speeds adjusted.
...
This was SVN commit r13590.
2013-07-24 13:08:45 +00:00
6ed814354e
Fix the fix of the fix. Refs #1914 .
...
This was SVN commit r13589.
2013-07-23 18:48:25 +00:00
9681606d05
Non civ center units that are available at the village phase barracks are now not available until Town phase.
...
House-trained females take 30 seconds to train now.
This was SVN commit r13588.
2013-07-23 15:39:24 +00:00
efc1a678ed
Change my fix from revision [13586] to use something faster. Still Refs #1914
...
This was SVN commit r13587.
2013-07-23 10:37:43 +00:00
dc3c39fd93
Fix a rare issue where units could get stuck in Individual.Gather.Gathering state forever because of worker limits. Refs #1914 (might even fix it).
...
This was SVN commit r13586.
2013-07-23 09:46:49 +00:00
d01d58f70f
Fake randomization of the ship sinking animation to make it look better with ship formations. Refs #1921
...
This was SVN commit r13584.
2013-07-22 10:17:00 +00:00
86a8dd7e6f
Small cleanup.
...
This was SVN commit r13583.
2013-07-21 23:25:15 +00:00
bff7c53a14
Some new hero portraits.
...
This was SVN commit r13582.
2013-07-21 05:53:53 +00:00
3aa9e2f6e0
Technology research time tweaks, and fixes.
...
This was SVN commit r13581.
2013-07-21 02:16:45 +00:00
e0ea53a8ee
Adds saved game descriptions and in-game save dialog, based on patch by Crynux, fixes #2030
...
This was SVN commit r13579.
2013-07-21 00:23:57 +00:00
311403d5ef
Barracks buildable in Village Phase.
...
Fish can now be seen through the fog of war (but not in shroud of
darkness, of course).
This was SVN commit r13578.
2013-07-20 12:01:56 +00:00
9f7a0348bd
New portraiture by LordGood.
...
This was SVN commit r13577.
2013-07-20 07:35:54 +00:00
f5e60157bf
Optimizes GetPercentMapExplored by caching explored vertices per player, patch by scroogie, fixes #2012
...
This was SVN commit r13576.
2013-07-20 00:50:40 +00:00
fc9b19ab47
Pers corral and storehouse updates
...
This was SVN commit r13575.
2013-07-18 22:59:14 +00:00
439603e3fd
Persion civic ao update
...
This was SVN commit r13574.
2013-07-17 23:45:24 +00:00
1a20d47cfb
Updates to the Persian civ centre model
...
This was SVN commit r13573.
2013-07-17 23:26:40 +00:00
38cdc38bba
Fixes a build error with SDL2, refs #2041
...
This was SVN commit r13572.
2013-07-17 06:33:11 +00:00
39c0498811
Changes terrain anchoring to use faster CalcExactNormal instead of CalcNormalFixed, refs #1988 , #2039
...
This was SVN commit r13571.
2013-07-17 05:42:16 +00:00
1cca648b6d
Persian blacksmith building
...
This was SVN commit r13570.
2013-07-16 21:57:49 +00:00
2ea7fb18ea
Backport c011875c5a to the older APIs and allow for empty buildable entites token list.
...
This was SVN commit r13569.
2013-07-16 21:22:05 +00:00
df2458aa39
Allow setting of prop min/max height in the actor Edit. By sanderd17.
...
This was SVN commit r13568.
2013-07-16 13:13:41 +00:00
da4d1916dc
Implements shared trade gain with allies, patch by mimo, fixes #1691
...
This was SVN commit r13567.
2013-07-16 05:59:48 +00:00
f302faf8e4
Implements entity terrain anchoring as a visual effect, based on patch by sanderd17, fixes #1988 .
...
Sets cavalry and quadrupedal animals to 'pitch' anchoring. Cleans up
mine templates.
This was SVN commit r13565.
2013-07-16 03:46:30 +00:00
9a0ab14cf3
Carthaginian blacksmith building
...
This was SVN commit r13564.
2013-07-16 00:00:57 +00:00
c011875c5a
Fixes an issue with Aegis and the iberians
...
This was SVN commit r13563.
2013-07-15 19:47:59 +00:00
de5b584cbf
Fixes #2037
...
This was SVN commit r13562.
2013-07-15 05:54:46 +00:00
047992e61a
Fixes possible memory leaks by only allocating wave vertex buffers once and only when needed, and releasing them before re-allocating (in case CreateSuperfancyInfo is called multiple times).
...
Checks if wave vertex buffers were allocated before rendering, fixes
#2017
This was SVN commit r13561.
2013-07-15 03:26:48 +00:00
6d284e4e56
Applying stwf's sound attribute to ballista + pers fortress decals added
...
This was SVN commit r13560.
2013-07-14 15:41:49 +00:00
c9193b0302
Fix a few templates and techs.
...
This was SVN commit r13559.
2013-07-14 15:01:22 +00:00
5eb670ef82
Med Cove and Persian sandbox map tweaks
...
This was SVN commit r13558.
2013-07-14 13:58:36 +00:00
595c964d77
Make water specular more visible and fixes a few cases where it would actually hardly appear when it should.
...
Adds the ability to access an element in a dropdown box by typing the
first letters (Refs #1532 ).
This was SVN commit r13556.
2013-07-14 12:17:07 +00:00
408c30e061
Probably fixes #2021 . Optimization for foam generation while I'm at it (it's faster now, but there's a new temporary array of the size of the map)
...
This was SVN commit r13555.
2013-07-14 08:06:07 +00:00
071c976693
Sahel. wide open 2v2 scenario.
...
This was SVN commit r13554.
2013-07-13 01:50:46 +00:00
63c19af5dc
Fixes assignment operator warning on MSVC by making CObjectEntry NONCOPYABLE, refs #2033
...
This was SVN commit r13552.
2013-07-12 03:46:40 +00:00
5fb89ac6bc
Fixes prop bugs due to uninitialized variables on MSVC build, refs #2033
...
This was SVN commit r13551.
2013-07-12 03:32:14 +00:00
91effd1ad1
...
...
This was SVN commit r13550.
2013-07-11 23:58:54 +00:00
d5897854be
Allow terrain aligned props. Patch by sanderd17. Fixes #2033 .
...
This was SVN commit r13549.
2013-07-11 22:53:31 +00:00
6cffdacb40
Small cleanup.
...
This was SVN commit r13547.
2013-07-10 00:08:05 +00:00
d1af7ea0ef
Include mod path in the cache path.
...
This was SVN commit r13546.
2013-07-10 00:08:01 +00:00
fb0c1e6cc6
Update to the Carthaginian wonder/mausoleum
...
This was SVN commit r13545.
2013-07-09 23:51:23 +00:00
27086be9c3
Split skeleton definitions into multiple files, adds hotloading support for skeleton files. Fixes #190 .
...
This was SVN commit r13544.
2013-07-08 20:25:06 +00:00
041855e547
Allow building walls along the shore. Patch by sanderd17. Fix #1610 .
...
This was SVN commit r13542.
2013-07-07 22:44:47 +00:00
d479f373aa
Display current/max gatherers or builders when a resource or foundation is selected. Based on a patch by mimo. Fix #1871 .
...
This was SVN commit r13541.
2013-07-07 22:13:58 +00:00
ed3afce81e
- Round attack numbers in the GUI. Patch by scythetwirler. Fix #1997 .
...
- Adjust the siege attack tech to add an integer instead of multiply by
a percentage.
- Fix the siege armor tech so the tooltip and the added value match up.
This was SVN commit r13540.
2013-07-07 21:04:36 +00:00
93e8ccda64
Fix crash in VC++11 debug builds. Fixes #2028 . Patch by RedFox.
...
This was SVN commit r13539.
2013-07-07 20:02:20 +00:00
efc6263cc4
Tech icon tweaks
...
This was SVN commit r13538.
2013-07-07 15:55:35 +00:00
41f1485997
Fixing some missing texture links caused by 80b0106502
...
This was SVN commit r13537.
2013-07-07 15:36:27 +00:00
8aa016a884
Changes graphics card name detection on Windows to use OpenGL, as a workaround for certain WMI related crashes on Nvidia Optimus and netbook systems. Fixes #1952 , #1575
...
This was SVN commit r13536.
2013-07-06 18:30:29 +00:00
30f8d6dae2
Tweaks to some templates and tech portraits.
...
This was SVN commit r13534.
2013-07-06 03:35:03 +00:00
3824b3f89d
Silver shield tech icon
...
This was SVN commit r13533.
2013-07-05 22:26:34 +00:00
4ab38f81f7
Remove player owned sheep when committing the foundation.
...
This was SVN commit r13531.
2013-07-05 15:33:39 +00:00
453389b53a
Generic shield icons
...
This was SVN commit r13530.
2013-07-04 22:40:02 +00:00
485bd75abe
apply patch from ticket 1944 added sound attribute to animations to optionally differentiate sound starting point
...
This was SVN commit r13529.
2013-07-02 11:44:46 +00:00
377cae15f8
Technology to unlock female training at the house.
...
Sacred Band infantry is now a spearman instead of pikeman.
This was SVN commit r13528.
2013-07-02 07:11:01 +00:00
cd7b56faa4
Updated the name of "Porus" on Punjab 1.
...
Updated some Blacksmith templates with histories.
Made a new "pikeman" template to use with pike units. Made pikemen have
extra high armor, but pretty low attack. Basically they'd be used as the
ultimate meat-shield.
Cleaned up some stuff.
Made us of Pureon's new technology portraits.
This was SVN commit r13527.
2013-07-02 00:04:05 +00:00
24b6fb7c3e
Clean up cheat handling a bit. Use setter and getter for cheatTimeMultiplier.
...
This was SVN commit r13526.
2013-07-01 23:46:03 +00:00
78d4a24fba
Hero tech icon
...
This was SVN commit r13525.
2013-07-01 23:42:51 +00:00
40660606aa
Corinthian crest helmet tech icon
...
This was SVN commit r13524.
2013-07-01 21:46:24 +00:00
9565c60a14
Adds UI sounds for buttons, dropdowns, lists, and checkboxes, fixes #948
...
This was SVN commit r13521.
2013-07-01 04:15:09 +00:00
ef66f73a84
Recalculate trader gain when garrisoned entities change. Patch by mimo. Fixes #2018 .
...
This was SVN commit r13520.
2013-06-30 22:19:41 +00:00
c04f887676
Mauryan civ uses Omri's track. Cart sandbox map update
...
This was SVN commit r13519.
2013-06-30 11:06:35 +00:00
2a2daf84e0
Small boats move around quieter than large ships
...
This was SVN commit r13518.
2013-06-30 10:40:59 +00:00
d213f2ba91
This was SVN commit r13516.
2013-06-30 09:24:43 +00:00
0933925d49
Adds JS implementations of Math.pow, exp, and log, by sanderd17, refs #1193 .
...
Fixes #1990 (OOS caused by Math.pow).
Adds tests and documentation for Math functions.
This was SVN commit r13515.
2013-06-30 05:16:20 +00:00
d79ba004da
Fixes OS X build failing to find Boost libs, refs #1938
...
This was SVN commit r13514.
2013-06-30 00:48:34 +00:00
8bccecdb8d
Updates Premake Windows binary
...
This was SVN commit r13513.
2013-06-29 23:36:56 +00:00
bbcfa93dc4
Use os.findlib to find boost. Patch by Markus. Fixes #1938 . Refs #1518 .
...
This was SVN commit r13512.
2013-06-29 22:25:50 +00:00
c6348538ea
Show combined costs in the gate conversion tooltip. Based on patch by Jgwman. Fixes #1591 .
...
This was SVN commit r13511.
2013-06-29 20:55:53 +00:00
123d08eb82
This was SVN commit r13510.
2013-06-29 04:12:17 +00:00
4c22d4631a
Carthaginians can now only build 1 embassy at a time.
...
Each embassy comes with new technology pairs. Metal Costs vs. Training
Time.
Structure pierce armor adjusted upward.
This was SVN commit r13509.
2013-06-29 02:17:33 +00:00
2b02f983a6
Replace decimal with nonNegativeDecimal. Refs #1633
...
This was SVN commit r13508.
2013-06-29 01:59:46 +00:00
37c8e77d8e
Use floats for health. Fix #1633
...
This was SVN commit r13507.
2013-06-29 00:43:08 +00:00
4b3f4c0a1d
This was SVN commit r13506.
2013-06-27 12:00:23 +00:00
623f5d9a9f
Small garrison code clean-up
...
This was SVN commit r13505.
2013-06-26 19:24:56 +00:00
6cbdc13e08
Clarify usage of CheckPlacement. Check if the losRangeQuery exists before disabling it.
...
This was SVN commit r13504.
2013-06-26 18:41:06 +00:00
5e289f51c2
Make attack type a property of the order.
...
This was SVN commit r13503.
2013-06-26 14:15:03 +00:00
d5e081d55f
Fix inconsitency between AttackEntityInZone and ShouldAbandonChase for units in defensive stance. Patch by mimo. Fixes #1866 .
...
This was SVN commit r13502.
2013-06-26 13:24:03 +00:00
2fcd52b657
Let states execute their leave handlers on OnDestroy. Fixes #1999 . Patch by mimo.
...
This was SVN commit r13501.
2013-06-25 21:49:54 +00:00
49b3b0ee9a
Reverts interpolation changes from a7bc7ab50c, 71ae5a19d8, 1778e685ac, c6043779f6, 8777f68aa0, 21f13f9683. Refs #1846 , #1858 , #1865 , #1906
...
This was SVN commit r13500.
2013-06-25 01:09:43 +00:00
699d5c5d79
Fixes possible overflow in terrain position/normal calculation, based on patch by sanderd17. Fixes #1986
...
This was SVN commit r13499.
2013-06-25 00:57:42 +00:00
a981890ab9
Fixes PSA converter to detect broken animations/skeletons.xml slightly better, based on patch by Markus. Fixes #1478
...
This was SVN commit r13498.
2013-06-23 22:58:17 +00:00
ce8457e195
Fixes map name in pathfinder performance test
...
This was SVN commit r13497.
2013-06-23 00:50:24 +00:00
4fc15a9b08
Renames mill to storehouse
...
This was SVN commit r13496.
2013-06-22 02:28:54 +00:00
e5c35beefe
Blacksmith smoke.
...
Persian and Carth blacksmith actors.
This was SVN commit r13495.
2013-06-21 00:16:52 +00:00
5f78bb7318
For most civs, made it so that Champions are unlocked by default in the Fortress at City Phase, but then also available for training at the Barracks, but after they are unlocked with a tech.
...
Removed the minrange for all ranged units until minimum range bugs are
fixed. To fix it will require a multi-pronged approach that will need
discussed and Trac tickets created.
This was SVN commit r13494.
2013-06-21 00:14:00 +00:00
14990ea390
Fixes another possible NaN when invulnerable units are attacked, refs #1881
...
This was SVN commit r13493.
2013-06-18 20:20:37 +00:00
fca1f4c3a7
Persians and Carthaginians receive blacksmiths.
...
This was SVN commit r13492.
2013-06-18 14:20:15 +00:00
1a5d5eb808
Sets remaining unit trained and building completed sounds to HeardBy owner only, refs #1965
...
This was SVN commit r13490.
2013-06-18 05:06:22 +00:00
a7bc7ab50c
Fixes units not rotating correctly during e.g. attacks, patch by sbte, fixes #1906
...
This was SVN commit r13489.
2013-06-18 03:42:06 +00:00
95b51188fa
Fixes possible undefined value returned by CmpHealth, leading to a NaN and serialization test failure. Refs #1881
...
This was SVN commit r13488.
2013-06-18 03:26:08 +00:00
00e21a9898
change 'restricted' flag to 'heardby' in SoundGroup xml files
...
This was SVN commit r13487.
2013-06-17 15:46:28 +00:00
36dec0e789
add restricted flag to SoundGroup xml for sounds thatonly the owning player should hear
...
This was SVN commit r13486.
2013-06-17 02:30:40 +00:00
02b98f3acd
Fixes build with x11 and SDL2
...
This was SVN commit r13485.
2013-06-17 01:43:57 +00:00
f918c9b074
Prevent formation controllers from showing up in range queries. Fixes #1796 .
...
This was SVN commit r13484.
2013-06-16 23:10:01 +00:00
5f90371a1c
Cleans up some float constants and math from #1921
...
This was SVN commit r13482.
2013-06-15 00:42:07 +00:00
9d27cccbcd
Fix Visual Studio build issues.
...
This was SVN commit r13481.
2013-06-15 00:20:40 +00:00
e75877b52f
Adds comment about xorg-x11's glXGetProcAddress not returning NULL for unsupported functions, closes #171
...
This was SVN commit r13480.
2013-06-14 23:49:20 +00:00
c01c8fb2fc
Stop generating VS2005 project files. Refs #1951 .
...
This was SVN commit r13479.
2013-06-14 23:46:12 +00:00
98cac1a10f
Improve ship sinking. Patch by wraitii. Fix #1921
...
This was SVN commit r13478.
2013-06-14 19:19:13 +00:00
9ea830c855
Handle empty token list gracefully.
...
This was SVN commit r13477.
2013-06-14 16:13:59 +00:00
bcf99e2a13
make sound code return faster, code cleaner
...
This was SVN commit r13476.
2013-06-14 16:05:57 +00:00
da17e4329b
cleanup SOundManaer component
...
This was SVN commit r13475.
2013-06-14 00:24:51 +00:00
26dbac8d57
fixes to SoundManager external interface, clean up ifdef situation, and SoundGroup playin
...
This was SVN commit r13474.
2013-06-13 12:12:44 +00:00
b3653cfe16
Updates bundled Valgrind headers to 3.8.1 and fixes test build, patch by Markus, fixes #1971
...
This was SVN commit r13473.
2013-06-12 03:38:37 +00:00
2567fee329
Write mod data correctly. Fixes #1940 .
...
This was SVN commit r13472.
2013-06-11 20:50:09 +00:00
15e75cdfbd
Updated some building tooltips.
...
Removed wall techs from Iberians for balance.
This was SVN commit r13471.
2013-06-11 16:28:42 +00:00
facd447d0f
Hopefully fixes GCC warning about narrowing conversion in C++11, fixes #1851
...
This was SVN commit r13470.
2013-06-11 02:40:49 +00:00
b3391ebe39
Fix build warnings. Patch by Markus. Refs #1851 .
...
This was SVN commit r13469.
2013-06-11 00:05:57 +00:00
2ed10ec033
Changed names and histories for Roman civ center and market.
...
Fixed elephant heroes.
This was SVN commit r13468.
2013-06-10 15:33:18 +00:00
ada7702bec
add UI sound channel, clean up external interface and javascript calls
...
This was SVN commit r13467.
2013-06-10 13:58:43 +00:00
29549561e1
Add flag to VisualActor for entities that should only be visible in Atlas. Patch by KareemErgawy. Fixes #1411 .
...
This was SVN commit r13465.
2013-06-09 23:18:21 +00:00
5246e9a576
Update description of ESC key in the manual. Refs #1928 .
...
This was SVN commit r13464.
2013-06-09 20:38:57 +00:00
6f3a0e1378
Implement location hotkeys. Fix #1882 .
...
This was SVN commit r13463.
2013-06-09 20:21:19 +00:00
356adb1216
Nicer looking particles for Roman Temple. Fixes #1498 .
...
More shield and helmet stuff.
This was SVN commit r13462.
2013-06-09 17:28:46 +00:00
80b0106502
Brand new Macedonian/Ptolemaic shield patterns by Enrique.
...
This was SVN commit r13461.
2013-06-09 15:57:29 +00:00
b40a738c87
Adds Omnipresent flag to more alarm sounds
...
This was SVN commit r13460.
2013-06-08 22:46:26 +00:00
d151a6a304
Fixed war elephants. They can attack walls now.
...
This was SVN commit r13459.
2013-06-08 13:42:49 +00:00
8eae65be2b
Fixed elephants. Can now attack walls.
...
This was SVN commit r13458.
2013-06-08 12:51:15 +00:00
633eab6080
Median Oasis 6 & 7.
...
Updated blowing sand texture.
This was SVN commit r13457.
2013-06-06 14:47:50 +00:00
71b25d5bd4
big SoundManager checkin,futureproof javascript interface, isolate external calls to remove OpenAL references
...
This was SVN commit r13455.
2013-06-06 11:13:57 +00:00
1341b88468
Adds VBO support to minimap entity rendering to improve performance, patch by kuranes. Refs #1923
...
This was SVN commit r13454.
2013-06-06 00:10:58 +00:00
d20849d1c4
Add some checks for the sound manager. Fixes the segfault when using -quickstart.
...
This was SVN commit r13453.
2013-06-05 22:10:11 +00:00
5b1f5dd2c1
Display expected trading gain (GainMultiplier = 1) for market foundations when setting rally points. Fixes #1963 .
...
This was SVN commit r13452.
2013-06-05 21:35:31 +00:00
b2f6a1260e
Sets Distanceless flag on most selection sound groups.
...
Adds new sound groups for gates.
This was SVN commit r13451.
2013-06-04 03:17:46 +00:00
43d2c8be8c
Converts a bunch of stereo sound effects to mono, to fix sounds ignoring entity position, fixes #1956 , refs #1929 .
...
Will require sound group XML updates in some cases.
This was SVN commit r13450.
2013-06-03 21:42:48 +00:00
4d5187bf40
Building completion and unit training sounds are now ubiquitous, meaning you'll hear them even if they are off-screen.
...
This was SVN commit r13449.
2013-06-03 02:50:10 +00:00
8026685a06
Don't display the rally point tooltip for trading for enemy markets.
...
This was SVN commit r13448.
2013-06-02 20:17:44 +00:00
2ef6ec3f73
Rounds trader gain to avoid fractions with garrisoned traders in a merchant ship, patch by Markus, fixes #1954
...
This was SVN commit r13447.
2013-06-01 21:28:31 +00:00
eebe7972df
Lighting tweaks to Mauryan emblem
...
This was SVN commit r13446.
2013-06-01 12:09:34 +00:00
5af503405f
last bunch of ogg files not converted from wav correctly
...
This was SVN commit r13445.
2013-06-01 02:56:31 +00:00
b6e0661b8f
New BRASIDAS Spartan hero.
...
"The Agoge" tech for Spartans.
Fixed Leonidas' selection ring.
This was SVN commit r13444.
2013-06-01 02:33:58 +00:00
67b42210aa
mono ogg sounds rendered from original wav files recommitted
...
This was SVN commit r13443.
2013-06-01 02:30:05 +00:00
004eaf9e75
log warning when stereo sounds are played at position
...
This was SVN commit r13442.
2013-06-01 01:52:05 +00:00
4882aac409
New techs for Carthage: Mercenary Captains, reduce metal costs for merc units, based on ethnicity.
...
Melee cav more starting pierce armor.
This was SVN commit r13441.
2013-05-31 02:52:06 +00:00
690619ce5e
many fauna sounds in stereo converted to mono so the OpenAL can locate them
...
This was SVN commit r13440.
2013-05-31 02:50:47 +00:00
b21de66e40
address issue 1929 Ubiquitous Sound Effects, fixes a bug in determining which units are onscreen, also plays distant items softly if at all
...
This was SVN commit r13439.
2013-05-31 01:03:07 +00:00
d3e40792ff
Added a "wooden structures" civ bonus for the Celtic civs. Their buildings are 20% weaker, but they construct 20% faster than other cultures.
...
Fixed health for "Greek" walls.
Adjusted "preferredclasses" stuff on some templates.
This was SVN commit r13438.
2013-05-30 00:58:07 +00:00
085e9c620d
Tweaked armor stats for battering ram and siege tower.
...
Fixed "rollover" tag to "history".
This was SVN commit r13437.
2013-05-29 23:39:13 +00:00
7a8c8e439b
Fixes warning in VC2012 build (C4706: assignment within conditional expression)
...
This was SVN commit r13434.
2013-05-28 01:23:43 +00:00
d2b0d25457
Fixes macro redefinition of FACILITY_VISUALCPP in VC2012 (it's defined in winerror.h).
...
Removes obsolete hack for old Boost and VC2005 (broke VC2005 build with
modern Boost).
This was SVN commit r13433.
2013-05-28 01:14:41 +00:00
4a8c7e72b5
Lowered crush armor for these buildings.
...
This was SVN commit r13431.
2013-05-27 18:21:57 +00:00
93d0084266
incorporate patch from ticket 1937, fix memory leak in SoundManager
...
This was SVN commit r13430.
2013-05-27 13:36:17 +00:00
88c4e5bdd0
Extends binary serializer to support some standard JS classes: Number, String, Boolean. Fixes #406 .
...
Extends binary serializer to support typed arrays.
Extends binary serializer to support custom JS prototype objects in AIs,
fixes #407 .
Allows full serialization of AIs (not yet implemented). Refs #1089 ,
#1886
Increases binary serializer script backref arena from 8 MB to 16 MB,
refs #1842
This was SVN commit r13429.
2013-05-26 21:57:24 +00:00
e58fe92892
Tweaked Walls stats and costs.
...
Carthaginians' 'Triple Walls' civ bonus moved from wall templates to
auto-researching (free) tech. It just cleans things up quite a bit.
Changed sound groups for "special buildings."
This was SVN commit r13428.
2013-05-25 23:10:16 +00:00
97b28e7343
Some sound file changes to hopefully add more aural variation.
...
Cavalry blacksmith techs moved from City to Town.
Trying to give the female citizen the order_build soundgroup, but it
doesn't seem to work. The game seems to use order_repair for both
repairing and building. These are two different actions so should
support two different sound groups.
This was SVN commit r13427.
2013-05-25 18:07:29 +00:00
2c52099ddd
Fix previous commit because of course there was test code in there. Make Aegis build more farms because of recent changes.
...
This was SVN commit r13426.
2013-05-25 16:24:05 +00:00
f372f9184c
Fix Aegis breaking the profiler after some time ( Fixes #1945 . Fix typo ( Fixes #1947 ). Patches by Markus.
...
Also one other fix for something attack related (probably, code is old
and I can't recall).
This was SVN commit r13425.
2013-05-25 15:56:11 +00:00
17bb997e0e
Fixes memory leak in CVertexBuffer::Release, patch by Markus, fixes #1933
...
This was SVN commit r13423.
2013-05-23 23:16:36 +00:00
bc8d461b81
Display rally point lines when setting rally points using the minimap. Patch by TrinityDeath. Fixes #1848 .
...
This was SVN commit r13422.
2013-05-23 20:34:15 +00:00
a8a968d32c
Catch exceptions by reference (by convention), based on patch from Markus, refs #1852
...
This was SVN commit r13421.
2013-05-22 22:27:53 +00:00
72a8b88b7d
Fixes some unconventional assignment operators, patch by Markus, refs #1852 .
...
Fixes typo in test_ShaderManager
This was SVN commit r13420.
2013-05-22 22:04:58 +00:00
94c57085e9
Makes some classes NONCOPYABLE, based on patch by Markus, refs #1852
...
This was SVN commit r13419.
2013-05-22 21:40:56 +00:00
d7dcd3b26c
Use prefix increment operator for iterators (for consistency), refs #1852 , #1064
...
This was SVN commit r13418.
2013-05-22 18:41:13 +00:00
3ce14e3f4b
fix memory leak in SoundManager, patch taken from ticket #1934
...
This was SVN commit r13417.
2013-05-22 12:13:21 +00:00
56a4d6417c
Small cleanup.
...
This was SVN commit r13416.
2013-05-21 23:50:42 +00:00
e5523754b3
Check if a building is already at full health when trying to repair it. Fixes #1930 .
...
This was SVN commit r13415.
2013-05-21 23:45:20 +00:00
4356badfa9
Pause production if the producing entity is garrisoned. Fixes #1931 .
...
This was SVN commit r13414.
2013-05-21 23:01:53 +00:00
3f00d4d997
Change some size() > 0 to Based on patches by kuranes and Markus. Refs #1852 , #1923 .
...
This was SVN commit r13413.
2013-05-21 22:11:47 +00:00
013fc9558a
Fix typo. Fixes #1935 .
...
This was SVN commit r13412.
2013-05-21 22:11:15 +00:00
136f1891c1
Fixes a fix about a fix on the waterManager. Fixes #1891
...
This was SVN commit r13411.
2013-05-21 08:55:49 +00:00
346df43a43
Persian Apadana build limit.
...
This was SVN commit r13410.
2013-05-19 08:24:36 +00:00
67d072108b
Bloody dead camel.
...
New wall technologies (research at Wall Tower, since for now techs can't
be researched at wall segments).
Adjusted default BatchTrainModifier from 0.7 to 0.8 in all buildings
since the new training techs were making unit batches train insanely
fast.
Added 'Naval Architects' batch training tech to the Dock (and Carth
Super Dock).
Attempting to add "Apadana" build limit, with no success. Need help
here. I thought BuildRestrictions.js and EntityLimits.js were the files
I needed to change, but it's not working (there should be a build limit
of 1 for the Persian Apadana).
Tweaked the levy techs.
Fixed Hero elephant unit RequiredTechnology.
This was SVN commit r13409.
2013-05-19 08:19:16 +00:00
09108e6a97
Some more vars
...
This was SVN commit r13408.
2013-05-16 16:17:37 +00:00
1ea0bac280
New train time techs. For most factions, you choose either faster training infantry or faster training cavalry (either one unlocks Conscription, which boosts batch training considerably). For Persians, you get to research both at the barracks and stables, which unlocks conscription techs for both buildings. For Persians, I also moved the champion unlock tech to their Palace (Apadana), which now unlocks the "Immortals" technology (the tech that makes the Anusiya train twice as fast).
...
This was SVN commit r13407.
2013-05-15 08:11:20 +00:00
ccb4ecc9f2
Renamed this tech.
...
This was SVN commit r13406.
2013-05-15 04:07:07 +00:00
9ceab639f3
Bloody dead sheep.
...
Unlocking tech for champions.
Champions trainable in barracks (after unlocking tech).
Farm Field yield increased from 2000 food to 5000 food. Max gatherers: 5
per field.
This was SVN commit r13405.
2013-05-14 09:48:37 +00:00
de5d4491ab
var-fare
...
This was SVN commit r13404.
2013-05-12 22:28:02 +00:00
f5f0bc701a
Completely changed the "Stockbreeding" tech.
...
Fixed the 'Conscription' tech. It should work as advertised now.
Added some classes to the structures.
Reduced archer bonus vs. cav spears by 50%.
Moves Iphicratean Reforms from the Athenian Trireme to the Athenian
Dock.
This was SVN commit r13403.
2013-05-12 21:30:01 +00:00
2aa3ab8b03
conscription tech fix
...
This was SVN commit r13402.
2013-05-12 16:59:54 +00:00
3bec6ced85
Fix hero button for heroes without attack
...
This was SVN commit r13401.
2013-05-12 16:02:53 +00:00
daf572eb43
Temporary Blacksmith structures for prototyping and playtesting.
...
Lots of new techs. Healing techs. Vision for outpost. "Conscription"
tech boosts batch training speed. Implemented Macedonian "Hellenistic
Metropolis" special tech.
Testing placing Champions in the barracks (unlocked with a tech). Try
this out with the Macedonians.
Reduced archer attack damage. Reduced cost of healer.
Lots of other stuff.
This was SVN commit r13400.
2013-05-12 07:23:05 +00:00
209d8c4fd4
Made death screams slightly quieter. We actually need new male death/battle sounds.
...
This was SVN commit r13399.
2013-05-09 16:36:49 +00:00
eae28bad5a
Gold Oasis 3. Iberians vs. Mauryans.
...
This was SVN commit r13398.
2013-05-06 00:40:40 +00:00
57644fba50
Some art stuff: Scaffolds to other foundations, tweaking some Mauryan animations, new turban for maiden guards, etc.
...
This was SVN commit r13397.
2013-05-05 21:07:40 +00:00
d49cc6fc8b
Some armor changes. Also adds hero training restriction to hero elephant template. Fixes #1927 .
...
This was SVN commit r13396.
2013-05-05 19:25:33 +00:00
47e9431d29
Check if one of the technologies in a pair is already in progress. Fixes #1820 .
...
This was SVN commit r13395.
2013-05-05 13:54:00 +00:00
cb7964a1db
Make some gather techs work.
...
This was SVN commit r13394.
2013-05-05 13:13:38 +00:00
56fa123718
Fix error when constructing with the first selected entity being a building.
...
This was SVN commit r13392.
2013-05-04 21:44:32 +00:00
fc5e2d27c7
Cancel building placement or reset selection on Esc. Patch by Josh. Fixes #1928 .
...
This was SVN commit r13391.
2013-05-04 21:02:11 +00:00
0d09f290d9
Allow setting rally points for foundations. Patch by Josh. Fixes #902 .
...
This was SVN commit r13390.
2013-05-02 20:29:22 +00:00
bf959e1c46
fix build when using --without-audio
...
This was SVN commit r13389.
2013-05-02 13:58:28 +00:00
683f22cdb1
Display entity limits for buildings. Patch by Josh. Fixes #1924 .
...
This was SVN commit r13388.
2013-05-01 19:25:55 +00:00
f42b77919d
Future-proof the code for civ specific non-peace tracks.
...
This was SVN commit r13387.
2013-05-01 16:48:55 +00:00
9a0749f3c9
Make sure to actually prevent Atlas from trying to render coastal waves. Fixes #1925
...
This was SVN commit r13386.
2013-05-01 06:47:49 +00:00
ac3e9d8bc7
clear peace tracks before reloading music from civ files
...
This was SVN commit r13385.
2013-05-01 01:51:30 +00:00
67ff52a07f
More armor adjustments.
...
This was SVN commit r13384.
2013-04-30 08:36:47 +00:00
181db44ab5
Enforce technology restrictions when training units.
...
This was SVN commit r13383.
2013-04-29 21:51:14 +00:00
35daf00336
Snuck through without armor changes. Fixed now.
...
This was SVN commit r13382.
2013-04-29 18:33:03 +00:00
e0a2e5790d
Exponential Armor patch by Alpha123, with new updated armor values.
...
Needs a ton of testing.
This was SVN commit r13381.
2013-04-29 07:51:51 +00:00
4493f2986f
Wonder support for civs currently with Wonders.
...
This was SVN commit r13380.
2013-04-29 02:46:13 +00:00
0686c6a553
Resetting 'default' maps.
...
This was SVN commit r13379.
2013-04-29 02:36:57 +00:00
5a88f0fce0
Fix entity limits for buildings.
...
This was SVN commit r13378.
2013-04-29 00:36:21 +00:00
f4e0007733
Cavalry are a bit faster.
...
Attempting to add Wonders, but no success (need help). Adding files here
to see if someone can fix what I've started.
This was SVN commit r13377.
2013-04-28 22:51:08 +00:00
d9540ad7f6
Fixes MSVC build error and warning
...
This was SVN commit r13375.
2013-04-27 22:43:22 +00:00
4233acfa36
Slight clean up of the water code. Uses vertex data instead of a texture for foam. Should be faster to generate and render. Still no Atlas support.
...
This was SVN commit r13374.
2013-04-27 12:20:42 +00:00
092108b304
Must notify sound manager sources are now available
...
This was SVN commit r13372.
2013-04-26 23:13:11 +00:00
c30f7a40e0
no need to check errors after destroying context, clean up some OpenAL interface calls
...
This was SVN commit r13371.
2013-04-25 10:48:34 +00:00
8324e0f665
add missing music list files
...
This was SVN commit r13369.
2013-04-24 19:27:16 +00:00
71486bd57d
SoundManager supports playlists
...
This was SVN commit r13368.
2013-04-24 12:03:42 +00:00
6115c3fc13
Remove some duplication from ProcessCommand.
...
This was SVN commit r13367.
2013-04-22 17:50:25 +00:00
62f24af68d
Some new portraits by LordGood.
...
This was SVN commit r13366.
2013-04-21 18:47:11 +00:00
3758b64916
Remove hardcoding of path from desktop file and launcher script. Patch by vincent. Fixes #1424 .
...
This was SVN commit r13365.
2013-04-21 16:47:36 +00:00
75f332ce20
Stop hotkey. Patch by alpha123. Fixes #1870 .
...
This was SVN commit r13364.
2013-04-18 19:20:29 +00:00
cd6a76bcaa
Gates now handle allies made using diplomacy.
...
This was SVN commit r13363.
2013-04-18 18:18:34 +00:00
18a2b7d093
Fix roman merchant ship trading distance. Fixes #1874 .
...
This was SVN commit r13362.
2013-04-18 18:18:31 +00:00
dc9889c190
Display number of garrisoned units when trying to garrison. Patch by mimo. Fixes #1915 .
...
This was SVN commit r13361.
2013-04-18 18:18:29 +00:00
a362b41029
Fix grouping of garrisoned units. Patch by mimo. Fixes #1918 .
...
This was SVN commit r13360.
2013-04-18 18:18:24 +00:00
503b481468
handle initialization errors cleanly, clean stuff up
...
This was SVN commit r13359.
2013-04-18 03:24:20 +00:00
b22320a85f
Fix tests. Refs #1807 .
...
This was SVN commit r13358.
2013-04-14 00:52:00 +00:00
d0a695f7fb
Allow mutual allies to garrison in each others buildings. Patch by mimo. Fixes #1807 .
...
This was SVN commit r13357.
2013-04-14 00:34:14 +00:00
2a3f1cb412
eliminate most warnings produced by Cppcheck
...
This was SVN commit r13356.
2013-04-12 03:10:54 +00:00
7562c79e89
Change target for all orders on EntityRenamed. Patch by mimo. Fixes #1903 .
...
This was SVN commit r13355.
2013-04-10 22:48:02 +00:00
95a10e7f42
Reduce duplicate GuiInterfaceCalls some more. Patch by sbte. Fixes #1878 .
...
This was SVN commit r13354.
2013-04-10 21:05:46 +00:00
0cad19ecec
double check that the sound manager has been created before using
...
This was SVN commit r13353.
2013-04-10 12:03:17 +00:00
b301d5c84d
fades music in and out when switching to background, also honors g_PauseOnFocusLoss
...
This was SVN commit r13352.
2013-04-10 11:51:42 +00:00
19ce9657bc
This was SVN commit r13351.
2013-04-10 09:11:08 +00:00
3074b930cc
Tech.
...
This was SVN commit r13350.
2013-04-08 08:27:30 +00:00
789991c5d2
New food gathering tech for village phase.
...
Adjusted some food gather rates.
Adjusted some tech costs.
This was SVN commit r13349.
2013-04-08 07:59:57 +00:00
5429052b06
Lots of normal maps and spec maps. Ongoing project.
...
Added camel death scream (lol) to camel units.
Added sheep sounds to sheep.
Changed over the Mauryan elephant unit actors.
This was SVN commit r13348.
2013-04-07 22:28:36 +00:00
c9a5d5cee5
pause music and ambient sounds when game pauses
...
This was SVN commit r13347.
2013-04-07 04:13:15 +00:00
555f06acbe
Fix errors when the hero is garrisoned. Patch by alpha123. Refs #1802 .
...
This was SVN commit r13346.
2013-04-06 19:32:07 +00:00
c71ddae359
Adds forgotten OpenLogsFolder.vbs to Windows uninstaller
...
This was SVN commit r13345.
2013-04-05 21:40:49 +00:00
2af37c3590
Adds player color to rubble entities, thanks to ericb for the patch, fixes #1887
...
This was SVN commit r13344.
2013-04-05 02:52:01 +00:00
161d6c1ba7
Improves SDL 2.0 support
...
This was SVN commit r13343.
2013-04-05 02:39:30 +00:00
7f9b486a48
This was SVN commit r13341.
2013-04-03 23:28:29 +00:00
16de5c75ac
Adds game speed option to match setup, adds in-game control for single player games, fixes #785 .
...
Refactors some GUI utility functions.
This was SVN commit r13340.
2013-04-03 23:24:22 +00:00
62dc594a71
Hero button. Based on patch by Malcom and edits to that by alpha123. Fixes 1802.
...
This was SVN commit r13339.
2013-04-03 17:27:55 +00:00
f2da77ff72
"Oh myyyyy" -- George Takei. Lots of stuff:
...
- Town Phase cost increased to 1000 Food, 1000 Wood (from 500 of each).
This makes Village Phase longer and more interesting. Still need to
test.
- Lots of new normal maps and spec maps (for a bunch of desert terrains
and cretan date palms). This is an ongoing project.
- Fixed some spec maps for being too 'bright.'
- Changed the attack of melee spear units from a combo of pierce and
hack to just hack. Per discussion with Quantumstate. Needs testing.
- Changed the Median Oasis 1 scenario to include Mauryans and
Carthaginians.
This was SVN commit r13338.
2013-04-03 06:48:38 +00:00
a317cd9cba
Fixes memory leak and removes unused code in WaterManager, fixes #1891 , refs #1852
...
This was SVN commit r13337.
2013-04-03 03:30:10 +00:00
f82adf3ef3
Don't call GetSimulationState too often. Patch by sbte. Fixes #1878 .
...
This was SVN commit r13336.
2013-04-02 21:06:20 +00:00
3c693245bd
Portraits for the Mauryan healer and Chanakya.
...
This was SVN commit r13335.
2013-04-02 17:06:15 +00:00
edea5d04e7
Portraits for Mauryan healer and Chanakya.
...
This was SVN commit r13334.
2013-04-02 17:05:51 +00:00
74df28f952
Fix --without-pch build
...
This was SVN commit r13333.
2013-04-02 15:44:42 +00:00
Yves
