4d1dee171e
Explicitely add the UnitAI target to the BuildingAI target list to circumvent the range mismatch. Refs #1731
...
This was SVN commit r16577.
2015-04-25 12:54:34 +00:00
9a8c03093b
Fix line endings of some template files, and add the native line endings svn prop
...
This was SVN commit r16576.
2015-04-25 09:33:42 +00:00
d7960fa775
Try out some replacement animations for capturing on athenian infantry
...
This was SVN commit r16575.
2015-04-25 08:16:55 +00:00
9b5560b383
fix rounding when returning resources from aborted foundation, patch by elexis, fixes #3132
...
This was SVN commit r16574.
2015-04-24 17:51:27 +00:00
e8accbe565
petra: inform allied players when advancing to the next phase, patch by maveric, fixes #2757
...
This was SVN commit r16573.
2015-04-24 17:37:46 +00:00
e0606468df
Translate some tooltips as plurals. Unify aura tooltip code.
...
This was SVN commit r16571.
2015-04-23 18:58:39 +00:00
6e58781e51
Make Sicilia Nomad a skirmish map and fix the description.
...
This was SVN commit r16570.
2015-04-23 17:33:49 +00:00
5cbf2404af
Fix tower tech tooltip. Patch by elexis. Fixes #3191 .
...
This was SVN commit r16568.
2015-04-23 00:33:54 +00:00
2e6a248ade
Pass some properties as null instead of undefined to circumvent serializer limitations. Based on patch by elexis. Fixes #3187 .
...
This was SVN commit r16566.
2015-04-22 22:10:18 +00:00
d8f1f19f94
Save game type and victory scripts before random map is selected. Fixes #3184
...
This was SVN commit r16565.
2015-04-22 13:48:45 +00:00
d08fdf43d7
Fix some issues with capturing and miraged entities
...
This was SVN commit r16564.
2015-04-22 09:59:59 +00:00
6c7eb93e1c
Add temporary capture cursor
...
This was SVN commit r16563.
2015-04-22 08:20:41 +00:00
885aec20dd
fix a typo in 9be10939cb
...
This was SVN commit r16562.
2015-04-21 19:25:54 +00:00
625cfb79d3
petra: another fix for capture events
...
This was SVN commit r16561.
2015-04-21 19:00:51 +00:00
7bb30ef6b0
Fix some more flags
...
This was SVN commit r16560.
2015-04-21 17:58:07 +00:00
9be10939cb
petra: react to more capture events and some tweaks on attacks
...
This was SVN commit r16559.
2015-04-21 17:15:19 +00:00
2972cb3202
Small fix
...
This was SVN commit r16558.
2015-04-21 14:33:28 +00:00
fa878c2f31
Force attack instead of capture when the attack hotkey is pressed
...
This was SVN commit r16557.
2015-04-21 13:21:19 +00:00
701663afaa
Add minimap ping alert for capture attack
...
This was SVN commit r16556.
2015-04-21 08:27:26 +00:00
999f3e3497
Fix gui problem when selecting a combination of capturable and non-capturable entities
...
This was SVN commit r16554.
2015-04-20 16:26:58 +00:00
6766401510
Fix the resign problem with capturing
...
This was SVN commit r16553.
2015-04-20 16:22:48 +00:00
535d612e06
Small fixes.
...
This was SVN commit r16552.
2015-04-20 14:51:06 +00:00
a8c44d947c
Fix tests
...
This was SVN commit r16551.
2015-04-20 07:47:07 +00:00
ad27deeb9d
Implement building capturing. Fixes #996
...
This was SVN commit r16550.
2015-04-20 07:45:45 +00:00
751c46c60b
petra: let the AI know it can build a new base around a captured cc,refs #996
...
This was SVN commit r16549.
2015-04-18 18:28:02 +00:00
b8b3f66027
petra: improve attack management and let some parameters vary with maxpopulation, fixes #3173
...
This was SVN commit r16548.
2015-04-17 18:43:07 +00:00
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
a05f146c79
Disable data gathering in AIInterface when no AI players are loaded
...
This was SVN commit r16473.
2015-03-30 18:44:02 +00:00
8712ad835c
Fix buildingAI in case of modifications (techs, auras, ownership changes, ...) + clean up the code a bit
...
This was SVN commit r16472.
2015-03-30 09:25:20 +00:00
809cc074fa
petra: small tweaks and cleanings
...
This was SVN commit r16471.
2015-03-29 13:01:38 +00:00
569b5e244d
fix computation of foundation refund when destroyed, fixes #3132
...
This was SVN commit r16470.
2015-03-26 19:17:37 +00:00
798cd2963e
Add option to disable treasures on skirmish and random maps
...
This was SVN commit r16469.
2015-03-26 08:31:50 +00:00
1cd41e33c6
Niektb's Northern Island skirmish map.
...
This was SVN commit r16468.
2015-03-25 19:50:37 +00:00
61590f28d3
let AIProxy deal with new entities created without ownership, fixes #3142
...
This was SVN commit r16467.
2015-03-25 18:22:23 +00:00
3e98d379ab
LordGood's Alpine Mountains skirmish map with some modifications by niektb.
...
This was SVN commit r16466.
2015-03-25 15:56:30 +00:00
2fe444269e
Game Speed display over UI, Fixes #3129
...
This was SVN commit r16465.
2015-03-25 13:20:54 +00:00
6bc34da330
Emblem button states
...
This was SVN commit r16464.
2015-03-25 00:35:52 +00:00
5950d16500
Some structree improvements for issues exposed by mods. Changes by s0600204.
...
This was SVN commit r16463.
2015-03-24 18:12:42 +00:00
28abcb3bcc
cache some formation info in gui + some cleanings, see #3078
...
This was SVN commit r16460.
2015-03-23 18:38:27 +00:00
a430e03d1d
Petra: fix for nested loops using same loop index
...
This was SVN commit r16459.
2015-03-23 18:06:31 +00:00
58d955e426
Some cleanup.
...
This was SVN commit r16458.
2015-03-23 13:34:23 +00:00
e35970b700
Petra: rewrite of the dock placement. It should be more robust and compatible with the new pathfinder now
...
This was SVN commit r16457.
2015-03-22 22:00:59 +00:00
64adec79da
fix a wrong copy&paste in 86054bcf7e
...
This was SVN commit r16456.
2015-03-22 21:51:57 +00:00
f680caa14f
Escape lobby game names. Fixes #3118 .
...
This was SVN commit r16452.
2015-03-21 16:24:29 +00:00
09ff1f8bea
fix some cases where a water nomad random map could end up without water
...
This was SVN commit r16451.
2015-03-19 21:43:55 +00:00
2a1fcc88e3
Expands game speed dropdown by 10 pixels to accommodate German text and hopefully most other languages
...
This was SVN commit r16448.
2015-03-19 01:43:04 +00:00
5dd3cbb254
Random nomad maps are now in default filter.
...
The number of starting units has been increased to speedup the startup
(building of cc)
Treasures are added when the starting resources are not sufficient to
either build a dock in water maps, or build a cc in land maps.
This was SVN commit r16447.
2015-03-17 22:03:33 +00:00
bed480c433
remove some obsolete variables after #16416
...
This was SVN commit r16446.
2015-03-17 21:43:48 +00:00
e288bb7c4e
Some gamesetup cleanup. Refs #3049 .
...
This was SVN commit r16445.
2015-03-16 23:56:42 +00:00
312155d22f
Use arrays for specifying StartingTechnologies, DisabledTechnologies, and DisabledTemplates.
...
Also add an example for StartingTechnologies to the Carthagian sandbox
map. Refs #1404 .
This was SVN commit r16444.
2015-03-16 21:54:32 +00:00
09796350c8
Fix changephase cheat broken in af8a6f5e8c.
...
This was SVN commit r16443.
2015-03-16 18:50:51 +00:00
14f5eed8c7
Restores action-heal cursor from 1d3adefacc now that the engine supports indexed color PNGs, refs #2823
...
This was SVN commit r16440.
2015-03-16 02:38:03 +00:00
b1c4e29ac8
Fixes inconsistencies in spelling of colour/color by preferring "color" (only wxWidgets remains with some API that requires "colour"), fixes #1029 .
...
NOTE: requires update-workspaces and may require correction of some
modded actors/scenarios
This was SVN commit r16438.
2015-03-15 23:59:48 +00:00
7334f76af6
Fix some issues in af8a6f5e8c.
...
This was SVN commit r16437.
2015-03-15 23:56:18 +00:00
2395204011
fixes some typos in previous commits
...
This was SVN commit r16433.
2015-03-15 20:58:33 +00:00
2b6bde800c
some changes to let Petra build structures with the new PathFinder branch
...
This was SVN commit r16432.
2015-03-15 18:25:03 +00:00
f29d059617
Remove conditional defines as those served a very doubtful purpose with parallax, replacing it with something dynamic in the shader. This cleans the C++ side of the renderer as conditional defines were very ugly.
...
This was SVN commit r16430.
2015-03-15 12:22:36 +00:00
5a4ddb52a2
Change the tooltip for number of builders to give more useful information and add one on the healthbar of foundations.
...
This was SVN commit r16429.
2015-03-15 12:00:28 +00:00
5d6f95321d
Fix actor errors revealed by 618fe81814.
...
This was SVN commit r16428.
2015-03-15 11:45:33 +00:00
618fe81814
Check when loading an actor that it defines all the texture samplers required by its material. Print out a readable error otherwise. Fixes #1613 (note that this does not check for unnecessary samplers as that is non-trivial and does not lead to graphical glitches).
...
Also add a shortcut for some defines to clean-up material files slightly
and make the link between sampler and shader more explicit.
This was SVN commit r16427.
2015-03-15 11:37:26 +00:00
372a016311
do not let animals be preferredTarget
...
This was SVN commit r16426.
2015-03-15 11:30:04 +00:00
24cdf6b851
Petra: check EjectHealth level before trying to garrison
...
This was SVN commit r16425.
2015-03-15 10:57:04 +00:00
866e00d154
Petra AI now warns its allies when in need of a tribute
...
This was SVN commit r16424.
2015-03-15 10:28:48 +00:00
cb2da36527
few tunings for Petra
...
This was SVN commit r16423.
2015-03-15 10:20:20 +00:00
86054bcf7e
reduce time of some rndm map generation, i.e. alpine_lakes is about 3 times faster now
...
This was SVN commit r16422.
2015-03-15 10:08:16 +00:00
a3335b39e5
fix AI init crash when more than 255 disconnected regions in some random maps
...
This was SVN commit r16421.
2015-03-15 10:00:16 +00:00
09dc9e6f1d
fix rounding problem in AI health, fixes #2446
...
This was SVN commit r16420.
2015-03-15 09:54:48 +00:00
47cb6c01db
fix #16416
...
This was SVN commit r16419.
2015-03-15 09:52:15 +00:00
af8a6f5e8c
Removes generic hele and celt civs. Based on patch by prodigalson and
...
comments by s0600204. Fixes #2619 .
Also removes the theb civ json file.
This was SVN commit r16416.
2015-03-15 04:16:24 +00:00
82b08db6ec
Remove grouping from civ info screen. Only show playable civs. Refs #2619 .
...
Does not use loadCivData(true) as the civ info screen can also be opened
from the
gamesetup screen and both use g_CivData.
This was SVN commit r16415.
2015-03-15 04:15:59 +00:00
38a007f6fa
Properly escape a string.
...
This was SVN commit r16414.
2015-03-15 04:15:57 +00:00
6f3e682484
Extract strings from the structree. Fixes #3064 .
...
This was SVN commit r16413.
2015-03-15 04:15:53 +00:00
1303b4d39b
Fix a couple oversights and address cavalry skirmishers.
...
This was SVN commit r16409.
2015-03-09 02:05:32 +00:00
eaa8f89ffc
Reverts action-heal cursor from 1d3adefacc, it was modified to indexed color not currently supported by the engine, fixes #3082 , refs #1640 . Reapplies the transparent color removal, refs #2823 .
...
Deletes unused test-old cursor
This was SVN commit r16407.
2015-03-06 22:01:11 +00:00
206aeaf99f
Revert 37da37dbd5. Refs #3072 .
...
This was SVN commit r16406.
2015-03-03 23:56:00 +00:00
c3f62542a4
Expands area for release name slightly, as it was cut off at 1024x768 resolution
...
This was SVN commit r16404.
2015-03-03 21:37:59 +00:00
54e806e3c6
Slight ranged cavalry health nerf and cost adjustment for cavalry archer.
...
This was SVN commit r16402.
2015-03-03 04:12:30 +00:00
7901f4087d
Revert 1d3adefacc on unused test-old.png (and optimize with optipng and advdef anyway), apparently imagemagick trick mess it up. It could be eventually be removed if not needed.
...
Refs #2823 .
This was SVN commit r16400.
2015-03-02 10:26:12 +00:00
e4bf24dc9a
Adjusts female citizen attack.
...
This was SVN commit r16395.
2015-03-01 19:58:06 +00:00
839264b279
Adds missing GLSL normal definitions to terrain_decal effect (no visible difference on my system but technically correct), refs #2046
...
This was SVN commit r16394.
2015-03-01 19:33:04 +00:00
8a2638a8f5
Nerfs bolt shooters, especially against buildings.
...
This was SVN commit r16392.
2015-02-28 20:56:19 +00:00
37da37dbd5
Cleanup post-game summary page again. Fixes #3072
...
This was SVN commit r16391.
2015-02-28 18:32:50 +00:00
ea2eb2bd57
Removes some outdated techs due to string freeze.
...
This was SVN commit r16390.
2015-02-28 16:55:28 +00:00
2d7d5b446d
Fix Atlas so that changing water type will actually change water type.
...
Fix the water shader so that object reflections are more visible. Looks
better.
This was SVN commit r16388.
2015-02-28 13:50:52 +00:00
b04761f1b8
binaries/data/mods/mod/art/textures/cursors/test.png and binaries/data/mods/public/art/textures/cursors/arrow-default.png were previously a copy of the same file (same md5), during conversion in 1d3adefacc they were indipendently converted and had different md5 (just the date inside the png was different). Use again the same file just to make obvious they are identical.
...
Refs: #2823 .
This was SVN commit r16387.
2015-02-28 08:09:30 +00:00
1d3adefacc
Fixes cursor with dirty transparency.
...
I used elexis script and also optimized pngs with optipng -o 5 and
advdef -z -4
Thanks elexis for the imagemagick script!
Fixes #2823 .
This was SVN commit r16386.
2015-02-27 10:13:24 +00:00
3a25256960
Revert d69ecad481. Refs #3072 .
...
This was SVN commit r16385.
2015-02-25 19:10:10 +00:00
d69ecad481
Cleanup post-game summary page. Fixes #3072
...
This was SVN commit r16384.
2015-02-25 14:51:52 +00:00
72b0f5aaed
Increases swordsmen damage slightly to match spear.
...
This was SVN commit r16383.
2015-02-25 07:33:51 +00:00
fc58b52396
Building defense adjustments for health/armor values for organic units.
...
This was SVN commit r16377.
2015-02-22 18:55:22 +00:00
4860957fa6
Adjusts skirmisher cavalry closer to that of their infantry counterpart.
...
This was SVN commit r16371.
2015-02-21 19:37:06 +00:00
b9cf610562
Makes palisade fort cheaper than defense tower.
...
This was SVN commit r16370.
2015-02-21 19:08:26 +00:00
cdc9d98e00
do not apply multiple leavefoundation orders, fix #3010
...
This was SVN commit r16369.
2015-02-21 17:40:59 +00:00
e67379a25f
Buffs rams for better durability.
...
This was SVN commit r16368.
2015-02-21 15:14:04 +00:00
0817808e9b
Check visibility of units before moving the camera to their position, when using selection groups.
...
Fixes #3065 .
This was SVN commit r16367.
2015-02-21 10:53:56 +00:00
f8ff206169
Recreate some tech modified values upon deserialization. Fixes #3055 .
...
Also check for some possible null pointers.
This was SVN commit r16364.
2015-02-21 01:41:24 +00:00
0da0b062e1
Return the correct projectile id to fix serialization test failure.
...
This was SVN commit r16363.
2015-02-21 01:41:09 +00:00
8ecfa6cf7c
Nerfs skirmishers slightly.
...
This was SVN commit r16361.
2015-02-20 15:17:29 +00:00
6b364ad240
Reverts half of 6317e320f2 due to string freeze.
...
This was SVN commit r16355.
2015-02-18 19:32:08 +00:00
6317e320f2
Nerfs hero aura and deletes hardcoded health.
...
This was SVN commit r16354.
2015-02-18 19:30:22 +00:00
27e4122d44
fix damages on nearby units which, because of wrong argument (3d instead of 2d) was tested on x-y distance instead of x-z, resulting in faraway entities being damaged
...
This was SVN commit r16353.
2015-02-18 19:20:14 +00:00
