Commit Graph

9046 Commits

Author SHA1 Message Date
06916dde43 Yet another fix for the gamesetup persistent settings.
Patch by elexis, fixes #3165

This was SVN commit r16545.
2015-04-15 21:22:39 +00:00
120ff2c60c Fix the structure tree a second time, this should also work on Windows.
This was SVN commit r16542.
2015-04-15 09:10:05 +00:00
a0340efab8 fix an unfortunate typo affecting the AIs
This was SVN commit r16539.
2015-04-14 20:23:42 +00:00
1ea1755ee7 Petra: follow-up on changes to deal with capture
This was SVN commit r16538.
2015-04-14 20:14:39 +00:00
a980d8fdfc Fix structure tree by allowing undefined templates in the productionqueue
This was SVN commit r16537.
2015-04-14 18:45:02 +00:00
03506a0eec fix typo creating 71fb9ef162
This was SVN commit r16536.
2015-04-13 21:04:49 +00:00
71fb9ef162 Add AI safety guard. I had a game with an undefined template, but that shouldn't happen at that point.
This was SVN commit r16535.
2015-04-13 10:10:38 +00:00
d139a75de3 new button in diplomacy to request an attack to allies, works also for AIs, fix #3157
This was SVN commit r16533.
2015-04-11 18:46:05 +00:00
7fbab6dd10 Petra: update the target of an attack when it has been captured
This was SVN commit r16532.
2015-04-11 18:26:47 +00:00
528dc9179a Fix mace and ptol skirmish replacements
This was SVN commit r16529.
2015-04-10 11:58:12 +00:00
41550ea849 add a missing protection following changes for capture
This was SVN commit r16528.
2015-04-09 19:53:03 +00:00
d41fb4612f Fix athen archer selection
This was SVN commit r16527.
2015-04-09 17:36:27 +00:00
27601c5b8b Adapt naval manager to deal with structures from different civs. Similar to 107185d7dd
This was SVN commit r16526.
2015-04-09 12:27:03 +00:00
eb9e7ee84d Make all champion, hero and siege producing buildings ready for capture. Fixes #2614 (hopefully)
This was SVN commit r16525.
2015-04-09 09:44:24 +00:00
2700f74dd3 Make docks ready to capture. Refs #2614
This was SVN commit r16524.
2015-04-09 08:22:29 +00:00
bdfedb1c49 Rename Seleucid mercenary units to reflect their mercenary state
This was SVN commit r16523.
2015-04-09 08:08:20 +00:00
b92fac170a Rename ptolemaic mercenary units to reflect their mercenary state
This was SVN commit r16522.
2015-04-09 07:44:16 +00:00
6250990bfd Make barracks ready to capture. Refs #2614
This was SVN commit r16521.
2015-04-09 07:15:50 +00:00
107185d7dd adapt the AI API to deal with structures from different civs for capture
This was SVN commit r16519.
2015-04-08 16:23:39 +00:00
19692c0acc Fix entity names in map files.
This was SVN commit r16518.
2015-04-08 08:15:47 +00:00
358b1c06d8 Petra: start changes needed to support capture
This was SVN commit r16514.
2015-04-07 20:23:12 +00:00
1dcfd75e62 Fix typo
This was SVN commit r16513.
2015-04-07 13:34:26 +00:00
b0c74699b0 Use Maps instead of Objects in the Auramanager to improve performance. Also remove the IonMonkey v24 workaround. Refs #2684
This was SVN commit r16512.
2015-04-07 09:52:06 +00:00
481cf0f754 Modify ProductionQueue of Civil Centres in preparation of capturing. Refs #2614
This was SVN commit r16511.
2015-04-07 07:37:25 +00:00
b4cbc14490 Style fixes
This was SVN commit r16510.
2015-04-07 07:15:59 +00:00
abe6347554 Some cheat code cleanup.
This was SVN commit r16509.
2015-04-06 22:43:54 +00:00
f2c76cc75d Fix a number of issues related to historical messages and initial join in the multiplayer lobby. Fixes #3156
This was SVN commit r16507.
2015-04-06 19:33:37 +00:00
71a84682ad Fix the productionQueue for capturing. Needs the AI to be fixed in a similar way, and still needs template changes to see the full effect. Refs #2614
This was SVN commit r16506.
2015-04-06 15:02:37 +00:00
c8401bd737 Rename cart mercenary units to distinguish them from regular units
This was SVN commit r16505.
2015-04-06 12:47:12 +00:00
165bebb00e Rename some _2_ templates to regular names. This is possible since the pikemen were renamed too
This was SVN commit r16504.
2015-04-06 12:08:45 +00:00
97ef1c542d Rename spearmen with pikes into pikemen. This avoids problems with civs that have both pikemen and spearmen.
This was SVN commit r16503.
2015-04-06 11:49:23 +00:00
8eebb5d118 Rename Athen marine archer as a special unit should have a non-standard name
This was SVN commit r16502.
2015-04-06 11:23:02 +00:00
2b57410021 Better tested summary screen update. Also make modern tooltip style more consistant with the general light on dark theme.
This was SVN commit r16501.
2015-04-06 06:17:09 +00:00
18ff57c316 Update version in mod.json.
This was SVN commit r16500.
2015-04-05 17:14:47 +00:00
43508ce3a0 some petra code reshuffling
This was SVN commit r16496.
2015-04-04 15:38:53 +00:00
c735f9a579 Revert wrong commit 14b7e7568c
This was SVN commit r16495.
2015-04-04 09:11:05 +00:00
14b7e7568c Rename athen archer, as it's not a default unit. Naming it as a default unit makes any capture code more difficult.
This was SVN commit r16494.
2015-04-04 08:56:14 +00:00
0131f2e4d5 Fix gamesetup options for lobby games
This was SVN commit r16493.
2015-04-03 09:40:50 +00:00
dfd7978cb2 fix typo (particate → participate)
This was SVN commit r16492.
2015-04-03 07:39:25 +00:00
8d3d9616a2 be more generic with starting entities of nomad maps
This was SVN commit r16491.
2015-04-02 21:01:19 +00:00
afbf6e8e40 cleanings of AIInterface
This was SVN commit r16490.
2015-04-02 20:28:02 +00:00
1482a84875 replace some slow (foreach in) loops
This was SVN commit r16489.
2015-04-02 20:22:33 +00:00
4e763ef26e Move civ JSON files to simulation/data. Patch by MattDoerksen. Fixes #2562.
This was SVN commit r16485.
2015-04-01 23:48:33 +00:00
7695d2fcb9 Refine checks for invalid player ids for mirages. Patch by elexis. Fixes #3149.
This was SVN commit r16484.
2015-04-01 23:48:26 +00:00
aa808baabf Fix the stumped maps in Alpine Mountains
This was SVN commit r16481.
2015-03-31 17:30:59 +00:00
7ed45213a9 Allow heightmaps to be 8 times as high by lessening precisions. Includes conversion script and modified standard maps. Bump the map version number. Fixes #3112
This was SVN commit r16478.
2015-03-31 16:48:31 +00:00
a84765fc75 Add all non-structure starting entities to Unknown Nomad. Patch by elexis. Fixes #3153.
This was SVN commit r16477.
2015-03-30 23:44:48 +00:00
072afdcede Fix line endings for random maps.
This was SVN commit r16476.
2015-03-30 23:41:12 +00:00
b5593bf1a9 petra changes in the choice of player to be attacked
This was SVN commit r16475.
2015-03-30 20:21:46 +00:00
ec9a49562b Remove debug warning + fix typo
This was SVN commit r16474.
2015-03-30 18:49:54 +00:00