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
3c093ef741
Update lobby room.
...
This was SVN commit r16412.
2015-03-15 04:15:45 +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
7ce48dda69
Adds macmouse config option, this enables SDL2's Ctrl+Click emulation of right-clicking on OS X. NOTE: enabling this option will affect game hotkeys (e.g. garrisoning), so they should be reassigned to something like Super in that case
...
This was SVN commit r16380.
2015-02-22 21:24:27 +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
historic_bruno