Commit Graph

8912 Commits

Author SHA1 Message Date
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
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
040bdd14db fix some selectionGroups
This was SVN commit r16707.
2015-06-01 21:04:31 +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
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
f1445b16c6 IsAlly -> IsMutualAlly, and move the divide-by-zero check
This was SVN commit r16693.
2015-05-29 07:16:54 +00:00
e68ef21334 Don't decay when connected to connected allied territory, and also allow the decay script to determine which parts of the territory should blink
This was SVN commit r16692.
2015-05-29 07:02:16 +00:00
f4432330e1 cleaning
This was SVN commit r16691.
2015-05-28 20:42:01 +00:00
f200815de4 AI: avoid creating some unused maps and cleanings
This was SVN commit r16690.
2015-05-28 20:35:05 +00:00
37357326f7 Petra: improve storehouse placement and fix some inconsistencies with new pathFinder refs #2960
This was SVN commit r16687.
2015-05-26 21:45:04 +00:00
57407172e8 Plural translations.
This was SVN commit r16686.
2015-05-26 16:29:22 +00:00
1d7b394752 Fix male death. Refs #3220
This was SVN commit r16685.
2015-05-26 16:04:26 +00:00
60f784900a Fix the territory influence weight to fit into an u16 number. (no idea why the buildings have so many different weights though).
This was SVN commit r16682.
2015-05-26 14:25:23 +00:00
2424604329 Add some structure to the voice files. Use the structure in the templates to enable parameters. Resample the voices to be mono/positional. Patch by karamel. Fixes #3220
This was SVN commit r16681.
2015-05-26 12:25:10 +00:00
b65c232e51 Allow setting rallypoint on enemy entities. Patch by maveric, fixes #1046
This was SVN commit r16680.
2015-05-26 10:59:09 +00:00
84ba6c0719 Include string fixes from Itms again
This was SVN commit r16679.
2015-05-25 16:06:53 +00:00
6752389c98 Let technologies replace other technologies, and use this for the town and city phase. Main implementation by niektb, structree fix by s0600204. Fixes #3208
This was SVN commit r16678.
2015-05-25 15:52:02 +00:00
0054486dba Implement methods to find the neighbour of a certain territory, and use it for territory decay. Fixes #3204
This was SVN commit r16676.
2015-05-25 14:17:45 +00:00
5b2e9c95e7 More encoding fixes and EOL changes, fixes #3262
This was SVN commit r16672.
2015-05-24 19:07:05 +00:00
3b106c352d Upload back the reviewed technologies, two of them were badly encoded. See ce31be2055 and 04e7c99b1b.
This was SVN commit r16671.
2015-05-24 17:53:59 +00:00
bbf3422f01 Enhance the alert buttons by moving them to the garrisoning panel. Also add a new icon for the maximum level of alert.
Suggestion and testing by rogue-spectre, fixes #2474.

This was SVN commit r16670.
2015-05-24 13:51:02 +00:00
b2e2e47205 Update some old templates in the Combat demo map.
This was SVN commit r16669.
2015-05-24 13:05:40 +00:00
04e7c99b1b Temporarily revert ce31be2055 for technologies, refs #3262.
Also add a forgotten change for the Athenian wonder.

This was SVN commit r16668.
2015-05-24 11:37:10 +00:00
599a2daa85 Amend previous commit, reported by qwertz
This was SVN commit r16667.
2015-05-24 09:37:31 +00:00
ce31be2055 General review of Greek specific names. I didn't bother to go through Seleucids, who might be modified, and I ignored the history section most of the time because we don't use it anywhere anymore AFAIK.
My reference was the "Abrégé du dictionnaire Grec - Français" by A.
Bailly.

This was SVN commit r16666.
2015-05-24 09:11:57 +00:00
57afd0091b petra cleanings and tweaks
This was SVN commit r16664.
2015-05-21 20:23:21 +00:00
f98a1cf9ac Show a different notification if livestock is attacked. Patch by fcxSanya. Fixes #3176.
This was SVN commit r16663.
2015-05-20 22:40:10 +00:00
f64538b6ee Actually handle multiple notifications instead of one per turn. Patch by elexis. Fixes #3222.
This was SVN commit r16662.
2015-05-20 22:09:59 +00:00
ec4d0183ad Use the actual player name in MP. Patch by elexis. Refs #3252.
This was SVN commit r16661.
2015-05-20 15:02:20 +00:00
7ca255c3fa Clarify time elapsed in summary screen. Patch by qwertz. Fixes #3128
This was SVN commit r16660.
2015-05-20 09:08:07 +00:00
a7b6e44717 Fix player names in trade tooltips. Patch by elexis. Fixes #3252
This was SVN commit r16659.
2015-05-20 08:30:19 +00:00
122155bb65 Allow observers to see the wonder victory message. Patch by elexis. Fixes #3226
This was SVN commit r16658.
2015-05-20 08:11:03 +00:00
1723fbcca8 Cleanup some ceasefire code. Patch by elexis. Fixes #2749
This was SVN commit r16657.
2015-05-20 07:25:25 +00:00
6dcf636d7c fix attackable players in unitai, refs #2749
This was SVN commit r16656.
2015-05-19 20:10:19 +00:00
4947818c52 petra tweak
This was SVN commit r16655.
2015-05-19 17:11:09 +00:00
07351999fd Fixes #3248, patch by elexis
This was SVN commit r16654.
2015-05-17 22:11:41 +00:00
ce558ddf56 petra now try to regain capture points of its own structure, plus some bug fixes
This was SVN commit r16652.
2015-05-14 20:09:45 +00:00
4b9e11eedd a few fixes and tweaks for petra
This was SVN commit r16651.
2015-05-13 15:37:49 +00:00
d41671044a petra: additional bugfixes and tweaks
This was SVN commit r16649.
2015-05-10 20:21:00 +00:00
20877632ce Fix 1vs1 Game, Fix Resign double message
This was SVN commit r16648.
2015-05-10 16:12:55 +00:00