gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity
14,439 Commits 1 Branch 39 Tags
dfd7978cb24d18feef9f2d4f11dc2e8e6fc13fce
Commit Graph

5778 Commits

Author SHA1 Message Date
sanderd17 0e2c30c7d2 Reduce the strength of the elevation brushes in Atlas. 
This was SVN commit r16488.
 2015-04-02 13:43:47 +00:00
leper 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
leper 41863d6ae2 Explicitly cast to unsigned to fix a warning. 
This was SVN commit r16483.
 2015-04-01 23:48:23 +00:00
sanderd17 96410ee9a4 Fix heightmap rectangle. Take the water plain height as the base plane, instead of a hardcoded value. 
This was SVN commit r16482.
 2015-04-01 14:17:18 +00:00
sanderd17 ebb57aa516 Fix tests by enlarging the precision bumped in 7ed45213a9 
This was SVN commit r16479.
 2015-03-31 16:56:09 +00:00
sanderd17 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
leper c73c9370ee Update tinygettext. Fixes #2522. 
Updates to upstream changeset f71a8e5e84bffadd61ac93768b332262989844fd,
with some additions
that will be submitted upstream (without the addition of precompiled.h
and win32 dirent).

This was SVN commit r16462.
 2015-03-24 17:47:08 +00:00
historic_bruno dec4552ffe Removes special handling of fullscreen toggle on OS X w/ SDL 1.2, which is no longer used 
This was SVN commit r16453.
 2015-03-21 21:01:01 +00:00
historic_bruno 89107d1406 Fixes grayscale PNG handling, there is no need to convert them all to RGB and 4741e896c4 broke special font texture handling. Instead, only grayscale with alpha PNGs will be converted to RGBA (they fail to load otherwise). 
Removes warning about converting grayscale textures, refs #1640.

This was SVN commit r16449.
 2015-03-19 03:04:01 +00:00
historic_bruno 4741e896c4 Improves handling of PNG textures based on GdkPixbuf's setup_png_transformations. The PNG decoder should now support grayscale, RGB or indexed color; bit depth up to 16; and interlacing. Fixes #1640, refs #2823, #3082 
This was SVN commit r16439.
 2015-03-16 02:28:00 +00:00
historic_bruno 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
historic_bruno 99cb4b42fd Deletes old autobuilder files. 
Deletes old dds_analyse.pl script.
Updates tools LICENSE.txt

This was SVN commit r16435.
 2015-03-15 22:18:02 +00:00
historic_bruno 333c4401b9 Deletes obsolete entity converter tool. 
Deletes unmaintained contributors.txt list, see forum topic for more
useful list: http://wildfiregames.com/forum/index.php?showtopic=15542

This was SVN commit r16434.
 2015-03-15 21:38:43 +00:00
Itms caf89fa04e Rename ps/Overlay(.h|.cpp) to ps/Shapes(.h|.cpp), fixes a TODO located in graphics/Overlay.h. 
The file name did not match the content.

Also little cleanup of some unnecessary includes.

This was SVN commit r16431.
 2015-03-15 18:06:32 +00:00
wraitii 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
leper e41ec77eb6 Remove unused file. 
This was SVN commit r16417.
 2015-03-15 04:16:31 +00:00
leper 3c093ef741 Update lobby room. 
This was SVN commit r16412.
 2015-03-15 04:15:45 +00:00
leper 2b5de1df93 Do not send VisionRangeChanged messages when deserializing. Fixes #3075. 
This was SVN commit r16401.
 2015-03-03 01:59:42 +00:00
leper a5db659ce4 Update translations to be included in the release. 
This was SVN commit r16399.
 2015-03-02 00:10:00 +00:00
historic_bruno 607bbcc2f1 Fixes invisible particles (clouds, dust storms) due to incorrect bounds calculations on the emitters, fixes #2643. 
Makes the emitters a little more efficient by only setting
position/rotation when their transform changes.

This was SVN commit r16397.
 2015-03-01 23:58:53 +00:00
wraitii aab15123f1 I hate myself. 
This was SVN commit r16389.
 2015-02-28 14:11:21 +00:00
wraitii 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
historic_bruno 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
historic_bruno 1ac24adde2 Disables some SpiderMonkey-related build warnings with clang 
This was SVN commit r16379.
 2015-02-22 21:15:47 +00:00
historic_bruno 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
historic_bruno 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
Ykkrosh 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
leper 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
leper 0da0b062e1 Return the correct projectile id to fix serialization test failure. 
This was SVN commit r16363.
 2015-02-21 01:41:09 +00:00
Itms 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
historic_bruno 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
historic_bruno 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
historic_bruno 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
historic_bruno 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
Itms ba210c4d59 Fix c229b46ac2. 
This was SVN commit r16343.
 2015-02-16 14:38:13 +00:00
Yves 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
Ykkrosh 49222a4c6a Fix Windows build 
This was SVN commit r16334.
 2015-02-14 02:22:22 +00:00
Ykkrosh 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
Ykkrosh 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
Itms 682a944d7e Little code tweak without performance impact 
This was SVN commit r16329.
 2015-02-12 23:24:48 +00:00
Itms bd7b07cc80 Make the visibility cache a bit more clever, by making LoS tiles as dirty separately for each player. 
It is necessary to rely on shared los masks, else some visibility
updates will be missing.

Refs #2913, see this ticket for a performance graph.

This was SVN commit r16328.
 2015-02-12 23:22:29 +00:00
leper c049b0ae27 Treat \t as whitespace in config files. Fixes #3050. 
This was SVN commit r16326.
 2015-02-12 17:31:10 +00:00
leper 1e54289aa8 Only check binaries/data for po/pot files. 
This was SVN commit r16324.
 2015-02-12 00:25:47 +00:00
wraitii 143e199d45 Add a new function to update the water renderer textures when resizing the renderer window. Patch by pendingchaos. 
This fixes #2692 though the same issue might appear in some other cases
(possibly Atlas) and those will have to be checked.

This was SVN commit r16315.
 2015-02-10 19:41:29 +00:00
Ykkrosh bb99c42aa5 Increase max VBO size back to 4MB. 
Some meshes (e.g. pers_gardens_struct with gentangents enabled) have
>32K vertexes, and won't fit in a 2MB VBO. 0ef6c7555e had reduced them
from 4MB to 2MB. So just make the VBOs bigger again, and try not to
worry about the waste of memory.

Fixes #3026, #3042.

This was SVN commit r16309.
 2015-02-08 23:39:02 +00:00
leper f9c95b6953 Do not send gaia stats for rated games. 
This was SVN commit r16292.
 2015-02-08 01:59:02 +00:00
scythetwirler 5e7b55996c Fixes build with libmozjs-31-dev package from Ubuntu PPA. Fixes #3039. 
This was SVN commit r16283.
 2015-02-07 18:28:44 +00:00
Itms da0f33f137 Reduce drastically the number of mirages by making fogging conditional: entities will be miraged only if their health/resource amount is modified, or if they have a non-gaia owner. 
Fixes the animals hidden in the FoW, and adds the missing status bars
for mirages.

Also small cleanup of the code.

Refs #2913

This was SVN commit r16281.
 2015-02-07 15:48:32 +00:00
Itms b66465de73 Improve code clarity after 0a53c5e06a by removing a fall-through. 
Also fix the indentation to follow the coding conventions.

This was SVN commit r16280.
 2015-02-07 15:38:22 +00:00
Itms f6903393bd Add various rotation modes for multiple object selections (individual rotation, global rotation with or without individual rotation). 
Patch by trompetin17, fixes #1213

This was SVN commit r16275.
 2015-02-06 22:23:50 +00:00