gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity
16,323 Commits 1 Branch 39 Tags
eb20661e3494de89ae544e7e44bdcb56daf6f76b
Commit Graph

132 Commits

Author SHA1 Message Date
elexis 20b4e039be Fix fileendings of files with mixed fileendings in the public mod (except art, l10n) and in source/ (except for source/third_party/). 
Thus fix lineendings in files that were missed in bcbf25bfbd, as
reported by Imarok.

(SVN throws an error when trying to set the native filending property on
a file with mixed fileendings. However when recursing it hides this
error).

This was SVN commit r18561.
 2016-07-25 12:58:47 +00:00
wraitii 9b3ec336fe Make non-refraction water less transparent. 
This was SVN commit r18448.
 2016-06-27 13:50:54 +00:00
wraitii d60d7d7da6 pow is behaving in undefined ways for negative numbers and this lead to issues on nvidia and amd. Fix this and comment for future reference. Thanks to fatherbushido for the debugging help. 
This was SVN commit r18447.
 2016-06-27 11:36:10 +00:00
wraitii ead8436b3d Improve water rendering, partly based on a patch by aeonios, including: 
-increase the size of the refraction and reflection texture
-blur the refraction map depending on depth

Fixes #3781

This was SVN commit r18443.
 2016-06-26 16:54:58 +00:00
wraitii 071c5317f4 I have noticed from walking on a bridge everyday to work that reflections are more distorted when vieved at an angle. This is a quick attempt at imitating this effect. 
This was SVN commit r17181.
 2015-11-04 21:08:24 +00:00
wraitii dc29884f6e Fix a shader glitch I left in when removing conditional defines. Fixes #3119 . 
We ought to add more anisotropic filtering on normal textures with
parallax too or it breaks the effect too quickly.

This was SVN commit r16821.
 2015-06-28 13:16:05 +00:00
sanderd17 14bfbbf9d4 Allow sprites to have color multiplication, which allows player-colored bars. Patch by Vladislav. Fixes #3233 
This was SVN commit r16715.
 2015-06-04 12:16:52 +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
wraitii 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
historic_bruno 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
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
Ykkrosh 7a48606471 GLES compatibility for particle shader 
This needs to use the model-view matrix, not model-view-projection (the
transform uniform), else the axes won't be unit vectors and the particle
sizes will be wrong. But GLES doesn't have the pre-defined matrices, so
pass it in explicitly.

This was SVN commit r16165.
 2015-01-19 21:44:53 +00:00
historic_bruno b4997dc7c6 Fixes minimap GLES compatibility by making point size a uniform and passing into the shaders 
This was SVN commit r15901.
 2014-10-26 04:37:26 +00:00
historic_bruno 21b83734f9 Fixes shader type error with some compilers 
This was SVN commit r15900.
 2014-10-26 01:44:58 +00:00
mimo 4cd7dd77c1 add missing files from dd189ffe1f 
This was SVN commit r15680.
 2014-08-26 09:53:29 +00:00
mimo dd189ffe1f fix #15678 when preferglsl=true 
This was SVN commit r15679.
 2014-08-26 09:41:14 +00:00
leper be2f0e69fc Make the modmod standalone. 
Mount public in case we are starting Atlas and no mods are specified in
the config.
If users remove all mods and save this to the config and try to start
Atlas it will
crash, as it cannot find some needed files.

This was SVN commit r15678.
 2014-08-25 16:38:54 +00:00
wraitii 4028cd425e Actually fix bugs on ATI cards. Switch reflection and refractions to use POT textures in an attempt to improve compatibility. 
This was SVN commit r15598.
 2014-08-02 12:54:45 +00:00
wraitii 2b0af756f6 Temporary reversion for a graphic problems with some ATI cards when disabling water reflections. 
This was SVN commit r15595.
 2014-08-01 13:26:45 +00:00
wraitii e50147fd96 Metaprogramming 9ce51f4357. 
Change something on water shaders to see if it works better on ATI
cards.

This was SVN commit r15594.
 2014-08-01 10:15:29 +00:00
wraitii 9ce51f4357 Commit coastal waves when activating fancy effects, and incidentally completely change how this effect work. Refs #48. 
This was SVN commit r15576.
 2014-07-28 10:14:00 +00:00
JoshuaJB 17634d7507 Move the minimap to only use the shader pipeline. Should make it OpenGL ES compatible (untested). 
This was SVN commit r15533.
 2014-07-14 17:15:22 +00:00
wraitii 3ba325f9e8 Remove the HQDOF since it did not really work properly and we already have DOF. Fixes #2111 
This was SVN commit r15501.
 2014-07-08 18:23:53 +00:00
wraitii 62c1ac310d It would appear like I inadvertently committed a version of the water with some debug information in that made it look black. 
This was SVN commit r15497.
 2014-07-06 15:22:44 +00:00
wraitii 5571f7a7f9 Fix "Wind Angle" parameter not working properly. Add a precomputed "wind strength" variable so that waves look smaller behind islands. Some tweaks. Refs #48 as usual. 
This was SVN commit r15492.
 2014-07-05 10:20:30 +00:00
wraitii 326290463e Further WIP water improvements. Add 3 different textures for different looks. Update some oasis maps for that. Streamline water settings (some removed, some added). Update Atlas for those (needs to be tested). Fix an issue with HQ water effects. 
Please report any issue and/or crash. Those will get fixed in commits to
come. Refs #48.

This was SVN commit r15484.
 2014-07-03 20:07:15 +00:00
wraitii 89c6487ffe Forgot to remove my fake radiosity changes. 
This was SVN commit r15476.
 2014-07-01 16:53:13 +00:00
wraitii ab30e0d4fb Change the water texture to a new, bigger one, created in Blender (thanks to Enrique). Change settings so that they are more logical, yet allow reverting back to an even lower quality setting. Add a WIP high setting (with foam) which isn't finished yet. 
Change the shader itself so that the effects look nicer and are more
consistent across settings.
Rework the water mesh generation (simpler system). Fix a few issues.

May work oddly with Atlas since I haven't been able to compile yet.

Refs #1875 (maybe fix), Fixes #2077 (I'll assume it does), Fixes #2114
(assumption again), refs #48.

This was SVN commit r15473.
 2014-07-01 16:05:05 +00:00
Ykkrosh fe3315376c Add BoundingSphere, SOverlaySphere. 
BoundingSphere is similar to a bounding box, but more spherical.

SOverlaySphere is useful for visualising BoundingSphere (it's quite
inefficient and should only be used for debug functionality).

Normalise the camera frustum clipping planes, so that IsSphereVisible
gives the correct result.

This was SVN commit r15261.
 2014-06-01 18:05:46 +00:00
historic_bruno d8dbd499f8 Probably fixes uninitialized variable warning in GLSL model shader on some drivers 
This was SVN commit r15177.
 2014-05-20 03:41:46 +00:00
wraitii 15ec863aec Substantial speed-up of the foam generation code. 
Remove waves for now as they were unsatisfactory.
Removes "shininess" as a water parameter as it was basically useless.
Add a button in Atlas to recompute water parameters so you can now see
fog in Atlas.

Fixes #1743, #1803 (invalid)
Refs #1875, #2114, #48.

This was SVN commit r14514.
 2014-01-05 16:15:20 +00:00
historic_bruno 7cb4c0dcfc Partial fix of minimap rendering for GLES. 
Replaces glBegin/End with glDrawArrays, GL_QUADS with GL_TRIANGLES, and
modifies shaders as needed.

This was SVN commit r14153.
 2013-11-12 01:31:52 +00:00
historic_bruno 7dec618898 Some attempts to fix GLES build in smooth LOS and post proc manager. 
Replaces glBegin/End with glDrawArrays, GL_QUADS with GL_TRIANGLES, and
replaces glPush/PopAttrib by resetting the viewport manually.
Adjusts GLSL shaders for these changes.

This was SVN commit r14152.
 2013-11-12 01:30:17 +00:00
Ykkrosh 8aa6485d78 Fix shader errors with OpenGL ES 
This was SVN commit r14067.
 2013-11-02 22:58:38 +00:00
Ykkrosh 14a73204dd Disable distance-sorting for most transparent objects 
Distance-sorting of the alpha-blend pass of objects like trees and grass
is quite expensive (partly the cost of sorting, partly the cost of being
unable to batch efficiently), and the effect on visual quality is
typically very hard to see (the alpha-test pass does most of the work
for
objects that aren't fully translucent). That's not a good tradeoff, so
turn it off.

Leave distance sorting enabled for e.g. waterfalls since it might make a
more noticeable difference for them.

This was SVN commit r13753.
 2013-08-24 14:48:02 +00:00
wraitii f106d7714a Fix a swap between reflections and refractions in config.cfg . Disabling "Render Reflections" now reverts to the skybox for better results. 
Allows to oversaturate in Atlas' HDR settings.

This was SVN commit r13752.
 2013-08-24 14:44:38 +00:00
wraitii 957c51727b Improve on-water shadows. Fix an issue with foam looking static. Add anisotropic filtering (x4) to the water normal texture for testing. 
This was SVN commit r13750.
 2013-08-24 14:12:39 +00:00
wraitii 03bf727d9a Fix deactivation of HQ waviness causing the specular effect to go crazy. 
This was SVN commit r13708.
 2013-08-19 10:19:21 +00:00
historic_bruno b770c41f0b Removes shadow casting and receiving on preview entities, patch started by ericb, fixes #1771 
This was SVN commit r13706.
 2013-08-18 22:17:57 +00:00
wraitii de5b584cbf Fixes #2037 
This was SVN commit r13562.
 2013-07-15 05:54:46 +00:00
wraitii 595c964d77 Make water specular more visible and fixes a few cases where it would actually hardly appear when it should. 
Adds the ability to access an element in a dropdown box by typing the
first letters (Refs #1532).

This was SVN commit r13556.
 2013-07-14 12:17:07 +00:00
wraitii 4233acfa36 Slight clean up of the water code. Uses vertex data instead of a texture for foam. Should be faster to generate and render. Still no Atlas support. 
This was SVN commit r13374.
 2013-04-27 12:20:42 +00:00
wraitii d40a66f310 Fix particle to correctly display in the FOW, and to adapt slightly to sunColor settings (both on ARB and GLSL). 
This was SVN commit r13287.
 2013-03-15 10:22:24 +00:00
myconid 21a70c0399 Bloom shader rewrite. 
This was SVN commit r13076.
 2013-01-14 16:57:09 +00:00
gregory 6f4b1ec5a1 eihrul's shadow filter patch, fixes ticket #1738. 
This was SVN commit r12929.
 2012-12-03 19:34:43 +00:00
myconid f456112492 Shadowmapping bugfixes and tweaks. 
This was SVN commit r12884.
 2012-11-25 18:35:59 +00:00
leper a6f1620621 Add nop rendering technique to water and waterfall to stop crashes in fixed and arb mode when those are used. 
This was SVN commit r12882.
 2012-11-25 15:26:09 +00:00
wraitii 8c86beb0fa Made silhouettes display correctly in the fog. 
This was SVN commit r12862.
 2012-11-18 12:34:42 +00:00
Mythos_Ruler 55be4f8d0e Made houses construct 20% faster. 
Made the Mauryan "Warrior" into a siege dude.

Started switching over the Mauryan cav jav to Mauryan textures and
actors.

This was SVN commit r12846.
 2012-11-11 21:16:50 +00:00
Mythos_Ruler be0beacd1a Brit War Dog nerf. 
This was SVN commit r12841.
 2012-11-10 19:14:16 +00:00