|
1d7b394752
|
Fix male death. Refs #3220
This was SVN commit r16685.
|
2015-05-26 16:04:26 +00:00 |
|
|
e638af5422
|
Clean up some unused variables and assignments.
This was SVN commit r16684.
|
2015-05-26 15:40:07 +00:00 |
|
|
4ccc9130ba
|
Add missing include.
This was SVN commit r16683.
|
2015-05-26 15:40:04 +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 |
|
|
c93c1c92eb
|
Replace std::auto_ptr uses by std::unique_ptr since the former is deprecated.
This was SVN commit r16674.
|
2015-05-25 01:23:27 +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 |
|
|
8b4b8431e3
|
Small cleanup, based on a change from one of Philip's old patches
This was SVN commit r16653.
|
2015-05-16 09:39:27 +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 |
|
|
a39aa76e62
|
These temporary roots aren't needed anymore with SpiderMonkey 31
This was SVN commit r16647.
|
2015-05-10 09:01:39 +00:00 |
|
|
ae34c4a079
|
petra: let units avoid attacking palisades when a better target is possible
This was SVN commit r16644.
|
2015-05-09 19:05:24 +00:00 |
|
|
bbe4a30a56
|
improve the fix of b30e7ca26b for lag when failed ejection of lots of units
This was SVN commit r16643.
|
2015-05-09 18:16:41 +00:00 |
|
|
5a6a848eb2
|
some code cleaning in petra
This was SVN commit r16642.
|
2015-05-09 17:53:24 +00:00 |
|
|
552c3ede69
|
petra: add protection when no boarding point found, fix #3232
This was SVN commit r16641.
|
2015-05-09 17:23:57 +00:00 |
|
|
707a89dc5e
|
Add hotkey to select idle units only to manual. See 347ffabaeb .
This was SVN commit r16640.
|
2015-05-09 17:09:06 +00:00 |
|
|
1155bf589b
|
petra: fix bug in garrisoning following capture adaptation
This was SVN commit r16639.
|
2015-05-08 18:48:51 +00:00 |
|
|
c8e964f0e9
|
fix wrong test from d21c0026ec
This was SVN commit r16638.
|
2015-05-08 17:48:40 +00:00 |
|
|
074408b114
|
fixes #3101, patch by elexis
This was SVN commit r16637.
|
2015-05-08 15:21:09 +00:00 |
|
|
b30e7ca26b
|
fix lag when a garrisoned ship is destroyed in the middle of water
This was SVN commit r16636.
|
2015-05-08 15:11:32 +00:00 |
|
|
d664fadc38
|
Seleucid Fortress commit
This was SVN commit r16635.
|
2015-05-08 04:12:58 +00:00 |
|
|
e4a5d5b4dd
|
Added Conquest Strutures and Conquest Units in victory modes, fixes #2976, refs #1649
This was SVN commit r16634.
|
2015-05-08 03:06:14 +00:00 |
|
|
399daeddbf
|
prevent loading of templates in AIManager when no AIs, fixes #3101
This was SVN commit r16633.
|
2015-05-07 19:09:39 +00:00 |
|
|
3aad4d8e30
|
Revert 2b7ba4ff0b by adding a way to specify globally disabled templates.
Refs #3174
This was SVN commit r16632.
|
2015-05-06 20:43:49 +00:00 |
|
|
8e44687ae3
|
Properly fix #3223.
The previous commit destroyed the context while it was still in use.
This was SVN commit r16631.
|
2015-05-06 20:28:28 +00:00 |
|
|
2b7ba4ff0b
|
Disable the Ptolemaic lighthouse on some maps with a lot of little water spots.
Refs #3174.
This was SVN commit r16629.
|
2015-05-06 18:48:13 +00:00 |
|
|
642500b49e
|
Make the Ptolemaic lighthouse reveal the shore on the entire map.
Fixes #3174
This was SVN commit r16628.
|
2015-05-06 18:47:02 +00:00 |
|