Commit Graph

14507 Commits

Author SHA1 Message Date
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
aab15123f1 I hate myself.
This was SVN commit r16389.
2015-02-28 14:11:21 +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
1ac24adde2 Disables some SpiderMonkey-related build warnings with clang
This was SVN commit r16379.
2015-02-22 21:15:47 +00:00
8bf1fe1437 Disables water in actor viewer, as a temporary workaround for the "red water" bug, see #2692 for proper fix
This was SVN commit r16378.
2015-02-22 19:49:06 +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
18a115e772 Forces using libc++ on OS X, to fix pre-Mavericks build given the game's new C++11 requirements, fixes #3062.
Forces using C++11 in build-osx-libs.sh, for consistency

This was SVN commit r16375.
2015-02-22 01:19:39 +00:00
7fe9eb956f Fixes error in SMBIOS::InitStructures by not warning on invalid header size, fixes #2985
This was SVN commit r16374.
2015-02-22 00:42:11 +00:00
21f3be7df5 Always select a texture unit before calling glEnable(GL_TEXTURE_2D).
Without this, some code will enable (and set other parameters for)
whatever random texture unit the previous stage had selected. This can
break any fixed-function rendering, since either it will not have
enabled the correct texture unit, or its correct setup will be
interfered with by another texture unit that shouldn't be enabled. (This
doesn't affect ARB/GLSL shader rendering, since they don't care about
the enabled state, but the GUI (and some debug things) are still FFP in
the default ARB mode.)

Fixes #2833 (in which the fancy water shader selected texture units 5/6,
which then got enabled, and remained enabled forever).

This was SVN commit r16372.
2015-02-21 21:40:10 +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
00da480b83 Trigger a global visibility update after shared LoS changes. Fixes the entities of new mutual allies not visible.
Also add some player-dependent logic to avoid performance bottlenecks.

This was SVN commit r16359.
2015-02-20 14:35:19 +00:00
e48e330db7 Sets SDL2 as default and only build option on Windows.
Removes remnants of WSDL. Refs #2041

This was SVN commit r16357.
2015-02-20 05:52:18 +00:00
d644845ae5 Fixes Atlas on Linux with SDL2 by reordering OpenGL init, based on patch by yashi, fixes #2847
This was SVN commit r16356.
2015-02-20 05:46:24 +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
3dbe3a364f Adds "demo" keyword to some unplayable, unfinished maps so they are hidden in game setup, patch by thamlett, refs #2881
This was SVN commit r16352.
2015-02-17 21:26:24 +00:00
a5e940430f Suppresses libpng warning "iCCP: known incorrect sRGB profile" by manually handling warning messages (errors still use default handler), fixes #2184
This was SVN commit r16350.
2015-02-17 10:50:19 +00:00
70219ab61f Fixes GLSL terrain decal flicker by initializing normal vectors, fixes #2064
This was SVN commit r16349.
2015-02-17 08:13:24 +00:00
4b921d89da prevent JS warning
This was SVN commit r16348.
2015-02-16 19:40:27 +00:00
5871c2c16d fix #3058, patch from Stan
This was SVN commit r16347.
2015-02-16 19:02:40 +00:00
6a12dab20f Some hacks to fix game setup persisting problems, patch by @aBothe.
Fixes #3033, #3034.

The whole gamesetup.js system should be eventually re-factored to remove
those hacks and to improve the robustness of the code: see #3049.

This was SVN commit r16346.
2015-02-16 17:48:27 +00:00
6f9c5efd76 Nerfs the robustness of ranged siege against melee units.
This was SVN commit r16344.
2015-02-16 15:19:41 +00:00
ba210c4d59 Fix c229b46ac2.
This was SVN commit r16343.
2015-02-16 14:38:13 +00:00
72ff88880c Buffs walkspeed of pikemen slightly.
This was SVN commit r16341.
2015-02-16 00:26:43 +00:00
f8bd862512 Updated a few structure icons. Some new tech icons.
This was SVN commit r16340.
2015-02-15 12:32:55 +00:00
a3374d3164 Icons for palisade wall and palisade fort
This was SVN commit r16339.
2015-02-15 11:17:18 +00:00
c229b46ac2 Move visibility component activation check to C++. Patch by Itms.
This improves performance quite a lot because it avoids a huge number of
calls from C++ to JS. Check the ticket for performance measurements.
Refs #2913

This was SVN commit r16337.
2015-02-14 17:13:50 +00:00
f18a6981bb Fixes extraneous attack. Reported by zzippy.
This was SVN commit r16336.
2015-02-14 14:55:32 +00:00
49222a4c6a Fix Windows build
This was SVN commit r16334.
2015-02-14 02:22:22 +00:00
bb9de80dd4 Convert CConsole to take UTF-8 strings.
This avoids vswprintf failures when printing non-ASCII char* strings
from CLogger into the console.

Also convert ScriptInterface::ToString to return UTF-8, to avoid some
utf8_from_wstring calls.

Also remove some unused and redundant CConsole functions.

This was SVN commit r16333.
2015-02-14 01:49:34 +00:00
e06a7b37d8 Convert debug_printf to take UTF-8 strings instead of wchar_t.
This fixes the problem where passing a non-ASCII string to
debug_printf(L"%hs", s) caused vswprintf_s to fail on Linux (because it
doesn't know what encoding the char* is meant to have). Now debug
messages will remain as UTF-8 until they reach the OS.

Fixes #3021.

This was SVN commit r16332.
2015-02-14 01:45:13 +00:00
bf4b8bfe9c Siege balancing.
This was SVN commit r16331.
2015-02-13 07:05:54 +00:00