Commit Graph

14665 Commits

Author SHA1 Message Date
aa1512a662 code cleaning in petra
This was SVN commit r16750.
2015-06-11 20:11:08 +00:00
1442b7e913 Petra: fix some capture cases not handled by 61f3d80ab0
This was SVN commit r16749.
2015-06-11 19:20:52 +00:00
fd3d697edf Make it easier to add different backgrounds
This was SVN commit r16747.
2015-06-11 09:08:46 +00:00
61f3d80ab0 Petra: the AI now destroy captured buildings it can't keep
This was SVN commit r16746.
2015-06-10 18:16:03 +00:00
12d4209eed fix typo
This was SVN commit r16745.
2015-06-10 16:41:34 +00:00
1395b441e0 Clean up advanced and elite templates by defining the modifications as technologies. This will not alter gameplay for now, as the advanced and elite units are disabled in game. Fixes #2620
This was SVN commit r16744.
2015-06-10 14:41:00 +00:00
1811323f95 Petra: small fixes in trade and attack
This was SVN commit r16743.
2015-06-09 19:06:59 +00:00
752aac16ee Fix Seleucid actor file to be valid under the actor RNG
This was SVN commit r16742.
2015-06-09 15:24:46 +00:00
950d361c15 Fix the material Relax NG files.
This was SVN commit r16741.
2015-06-09 15:15:19 +00:00
fe0bb4ab4e Fix Iberian tower and barracks to be valid under the actor RNG
This was SVN commit r16740.
2015-06-09 13:33:40 +00:00
fe71300e07 Move some fish to the sea. Fixes #3289
This was SVN commit r16739.
2015-06-09 13:18:24 +00:00
40f2762170 Fix healer support template
This was SVN commit r16738.
2015-06-08 14:50:16 +00:00
558461a792 Fix female support template
This was SVN commit r16737.
2015-06-08 14:44:20 +00:00
a964e83c79 Fixes button order consistency in a few places: resign confirmation, manual, splashscreen, fixes #2837. NOTE: the convention is Cancel/Back button on the left, other action buttons are to the right. Please report any you find that don't match that!
Adds hotkey.cancel mapped to the Escape key, which is now used for
closing/canceling in-game dialogs, fixes #2636, #3200. Please report any
dialogs where Esc doesn't work!

This was SVN commit r16736.
2015-06-08 03:07:45 +00:00
7cac7cd65e Add RNC to RNG conversion script that uses trang. Fixes #245.
Also fix the material.rnc.

This was SVN commit r16734.
2015-06-07 23:52:52 +00:00
a18fbd12ec XML validation. Based on patch by historic_bruno. Refs #245.
This was SVN commit r16733.
2015-06-07 21:56:52 +00:00
f260e75499 improve display of timing options, patch by Vladislav, fixes #2894
This was SVN commit r16732.
2015-06-07 20:58:51 +00:00
6a1ee7137c fix starting techs
This was SVN commit r16731.
2015-06-07 12:13:40 +00:00
2457b69fb3 Fix const attribute for some function parameters.
This was SVN commit r16730.
2015-06-07 09:24:19 +00:00
ce19d55176 AIs: remove the hardcoded athen phases
This was SVN commit r16729.
2015-06-06 15:41:04 +00:00
be93b31411 Visual replay of command files, patch by elexis.
Works with the command line argument
"-replay-visual=/path/to/commands.txt". It is not integrated to the main
menu GUI yet.

Refs #9.

This was SVN commit r16727.
2015-06-06 08:45:49 +00:00
e9c27d4066 Fix wrong technology application as discovered by wowgetoffyourcellphone and niektb
This was SVN commit r16726.
2015-06-05 10:39:10 +00:00
a839adc615 Fix Carthagian healer voices. Patch by karamel. Fixes #3220
This was SVN commit r16725.
2015-06-05 09:12:26 +00:00
4a7994a595 improve indentation in previous tag
This was SVN commit r16724.
2015-06-04 21:26:01 +00:00
f1f8479ffe fix entityLimits with replaced tech
This was SVN commit r16723.
2015-06-04 21:24:34 +00:00
06e71f56ca Petra: units now have less dead time before getting their orders
This was SVN commit r16722.
2015-06-04 19:35:56 +00:00
3c139b1022 make the unitai idle propriety consistent with its state at unit creation
This was SVN commit r16721.
2015-06-04 19:00:42 +00:00
abab4a71af Add loading-screen tip about territory decay, and update other tips to the current state of the game.
This was SVN commit r16720.
2015-06-04 17:24:31 +00:00
fcc992feae Fix math
This was SVN commit r16719.
2015-06-04 16:06:37 +00:00
cdbc775531 Fix code style
This was SVN commit r16718.
2015-06-04 15:36:34 +00:00
79d2af3e26 Split up different status bars for even easier moddability + add a capture bar (thanks again to Vladislav for making this possible). Refs #3233
This was SVN commit r16716.
2015-06-04 13:55:45 +00:00
14bfbbf9d4 Allow sprites to have color multiplication, which allows player-colored bars. Patch by Vladislav. Fixes #3233
This was SVN commit r16715.
2015-06-04 12:16:52 +00:00
f6f4f83784 Fixes instant multiplayer crash on OS X Lion (10.7). libc++ had a bug where it set eofbit on reading the last character in a stringstream, we compare gcount with the expected length as a workaround to detect real eofs. Fixes #3109.
This was SVN commit r16714.
2015-06-04 05:11:47 +00:00
6506bc20cb Fixes #3238, SetGlobal 'TriggerHelper' called multiple times
This was SVN commit r16713.
2015-06-03 20:34:59 +00:00
65e442eea5 this varying ceaseFireTimeRemaining was disturbing when ceasefire was inactive and display selection state activated
This was SVN commit r16712.
2015-06-03 17:16:11 +00:00
aa41651fda remove a useless splice
This was SVN commit r16711.
2015-06-02 20:58:18 +00:00
a286091470 mostly some cleanings of AI code + a petra fix when a player is defeated
This was SVN commit r16710.
2015-06-02 20:52:12 +00:00
ffdacbb612 Fix issues with technologies and pop bonus/cost. Patch by Vladislav. Fixes #3236
This was SVN commit r16709.
2015-06-02 14:33:21 +00:00
2092ed4396 Removes use of 'register' storage class, deprecated in C++11. Fixes -Wdeprecated-register build warnings in clang, fixes #3068.
This was SVN commit r16708.
2015-06-02 03:20:04 +00:00
040bdd14db fix some selectionGroups
This was SVN commit r16707.
2015-06-01 21:04:31 +00:00
c3b8923ff7 Update tinygettext.
Updates tinygettext to upstream commit
0e34a55e514763a48f8abe7812405ffe722a31f4.
No actual code changes from the previously bundled version, but it was
relicensed to zlib.
Keeps the addition of precompiled.h and win32 dirent.

This was SVN commit r16705.
2015-06-01 01:09:19 +00:00
f71be3c764 Use iterators for XMBAttributeList and XMBElementList. Fixes #3269.
This was SVN commit r16704.
2015-06-01 00:29:35 +00:00
d3da00dc99 Fix some issues found by static analysis.
Actually abort in case of recursive includes again. Refs #2622.

This was SVN commit r16703.
2015-06-01 00:29:23 +00:00
9854d04794 Petra: react to PlayerDefeated events for target choice
This was SVN commit r16701.
2015-05-31 19:53:23 +00:00
f009b52c0f Fix null-reference
This was SVN commit r16700.
2015-05-31 12:23:08 +00:00
b5e22a22ea Fix error message missed in f680caa14f. Refs #3118.
This was SVN commit r16699.
2015-05-30 22:25:54 +00:00
c1594c4bc8 Petra: add missing changes in previous commit
This was SVN commit r16698.
2015-05-30 19:15:36 +00:00
9408860acc Petra: some code reshuffling + small bug fixes
This was SVN commit r16697.
2015-05-30 19:12:01 +00:00
b738772d65 Fix typo
This was SVN commit r16696.
2015-05-29 19:51:48 +00:00
2ae17391ae Fix AI to use the same bitmask as set in e68ef21334
This was SVN commit r16695.
2015-05-29 18:28:46 +00:00