Changesets: spring
|
develop 259dc532
Timestamp: 2016-07-04 16:51:32 Author: jK [ Details ] [ Diff ] |
LuaObjRendering: remove not implemented SetObjectUniform the intention of that function can be done with stock gl.Uniform & DrawUnit() event |
||
| mod - rts/Lua/LuaObjectRendering.cpp | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaObjectRendering.h | [ Diff ] [ File ] | ||
|
develop acc07f66
Timestamp: 2016-07-04 16:49:15 Author: jK [ Details ] [ Diff ] |
LuaMaterial: != & == operators aren't needed | ||
| mod - rts/Lua/LuaMaterial.cpp | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaMaterial.h | [ Diff ] [ File ] | ||
|
develop a85e2724
Timestamp: 2016-07-04 13:18:53 Author: jK [ Details ] [ Diff ] |
Revert "Revert "LuaMat: remove sorting by uniform locations"" This reverts commit 881b8ca6b8c3be5996b42a754be38d16b168f921. |
||
| mod - rts/Lua/LuaMaterial.cpp | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaMaterial.h | [ Diff ] [ File ] | ||
|
develop 6bb30ed2
Timestamp: 2016-07-02 00:37:11 Author: abma [ Details ] [ Diff ] |
buildbot: try to readd missing LATEST_win32 / LATEST_win64 file | ||
| mod - buildbot/slave/win/make_installer.sh | [ Diff ] [ File ] | ||
|
develop 881b8ca6
Timestamp: 2016-07-01 10:10:47 Author: Eshed [ Details ] [ Diff ] |
Revert "LuaMat: remove sorting by uniform locations" This reverts commit 0085801e74817b92669590af14ea3a8b111f6867. Materials need to be checked for 100% equality when distributing between bins. jk, please no cleanups before release. |
||
| mod - rts/Lua/LuaMaterial.cpp | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaMaterial.h | [ Diff ] [ File ] | ||
|
develop 6dba3415
Timestamp: 2016-07-01 01:48:37 Author: jK [ Details ] [ Diff ] |
DecalGL4: fix another glPushAttrib bug | ||
| mod - rts/Rendering/Env/Decals/DecalsDrawerGL4.cpp | [ Diff ] [ File ] | ||
|
develop 07d5c78e
Timestamp: 2016-07-01 01:48:18 Author: jK [ Details ] [ Diff ] |
DecalGL4: simplify/reduce profilers | ||
| mod - rts/Rendering/Env/Decals/DecalsDrawerGL4.cpp | [ Diff ] [ File ] | ||
|
develop 76a36192
Timestamp: 2016-07-01 01:47:25 Author: jK [ Details ] [ Diff ] |
BumpWater: fix a severe glPushAttrib bug note: glPopAttrib should be called with the same FBO binding as when glPushAttrib was called! |
||
| mod - rts/Rendering/Env/BumpWater.cpp | [ Diff ] [ File ] | ||
|
develop 57f3d473
Timestamp: 2016-07-01 01:45:42 Author: jK [ Details ] [ Diff ] |
LuaMat: print warning on incorrect keys | ||
| mod - rts/Lua/LuaMaterial.cpp | [ Diff ] [ File ] | ||
|
develop 0085801e
Timestamp: 2016-07-01 01:45:05 Author: jK [ Details ] [ Diff ] |
LuaMat: remove sorting by uniform locations uniform locations have zero influence on the perf cost of a material switch |
||
| mod - rts/Lua/LuaMaterial.cpp | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaMaterial.h | [ Diff ] [ File ] | ||
|
develop e0b30032
Timestamp: 2016-06-30 19:43:04 Author: jK [ Details ] [ Diff ] |
[En/Dis]ableTextures(): remove unused arg | ||
| mod - rts/Rendering/UnitDrawerState.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/UnitDrawerState.hpp | [ Diff ] [ File ] | ||
|
develop 804499ab
Timestamp: 2016-06-30 19:40:39 Author: jK [ Details ] [ Diff ] |
fix UnitsBeingBuilt rendering 1.) in GLSL case: DisableTextures() was called, still the shader was kept bound. And the shader expects a few textures to be bound. Cause severe GL shader bindings errors (-> causing the gpu driver to stumble and crash) 2.) in FFP case: nano color was ignored completely duno about ARB case (too lazy to test/fix that, at least there should be no GL error afaik) |
||
| mod - rts/Rendering/UnitDrawer.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/UnitDrawerState.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/UnitDrawerState.hpp | [ Diff ] [ File ] | ||
|
develop d2ccd764
Timestamp: 2016-06-30 19:19:14 Author: jK [ Details ] [ Diff ] |
fix DNTS after 4fa260c1e468c6581 | ||
| mod - cont/base/springcontent/shaders/GLSL/SMFFragProg.glsl | [ Diff ] [ File ] | ||
|
develop 7e2f5421
Timestamp: 2016-06-30 14:33:49 Author: jK [ Details ] [ Diff ] |
split TrackDrawer from LegacyDecalDrawer and use it for GL4 one, too | ||
| mod - rts/Rendering/CMakeLists.txt | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Env/Decals/DecalsDrawerGL4.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Env/Decals/DecalsDrawerGL4.h | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Env/Decals/GroundDecalHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Env/Decals/GroundDecalHandler.h | [ Diff ] [ File ] | ||
| add - rts/Rendering/Env/Decals/LegacyTrackHandler.cpp | [ Diff ] [ File ] | ||
| add - rts/Rendering/Env/Decals/LegacyTrackHandler.h | [ Diff ] [ File ] | ||
|
develop 4dac6507
Timestamp: 2016-06-30 09:08:39 Author: Eshed [ Details ] [ Diff ] |
deafult FastArchiveScan to true. 1) I'm feeling adventurous 2) I wanted to trigger a build |
||
| mod - rts/System/FileSystem/ArchiveScanner.cpp | [ Diff ] [ File ] | ||
|
develop 4fa260c1
Timestamp: 2016-06-30 08:45:25 Author: Eshed [ Details ] [ Diff ] |
Fix 0005290 (thanks jk!) |
||
| mod - cont/base/springcontent/shaders/GLSL/SMFFragProg.glsl | [ Diff ] [ File ] | ||
|
develop 322b8f9a
Timestamp: 2016-06-29 14:24:34 Author: jK [ Details ] [ Diff ] |
nlc | ||
| mod - rts/Map/SMF/SMFReadMap.cpp | [ Diff ] [ File ] | ||
| mod - rts/Map/SMF/SMFReadMap.h | [ Diff ] [ File ] | ||
|
develop eb4ab50a
Timestamp: 2016-06-29 14:22:00 Author: jK [ Details ] [ Diff ] |
MapInfo.lua: allow absolute paths for all texture tags | ||
| mod - rts/Map/MapInfo.cpp | [ Diff ] [ File ] | ||
|
develop aaaa6aee
Timestamp: 2016-06-29 14:20:02 Author: jK [ Details ] [ Diff ] |
nlc | ||
| mod - rts/System/FileSystem/ArchiveScanner.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/FileSystem/ArchiveScanner.h | [ Diff ] [ File ] | ||
|
develop da0c9392
Timestamp: 2016-06-29 01:11:36 Author: Eshed Committer: GitHub [ Details ] [ Diff ] |
Merge pull request 0000263 from TurBoss/BuildbotBAndwith Increase upload bandwith |
||
| mod - buildbot/slave/rsync.sh | [ Diff ] [ File ] | ||
|
develop 819e86d1
Timestamp: 2016-06-29 01:03:10 Author: TurBoss [ Details ] [ Diff ] |
Increase upload bandwith | ||
| mod - buildbot/slave/rsync.sh | [ Diff ] [ File ] | ||
|
develop 0216888b
Timestamp: 2016-06-28 19:04:10 Author: Eshed [ Details ] [ Diff ] |
Fix 0005269 | ||
| mod - rts/Sim/Units/Unit.cpp | [ Diff ] [ File ] | ||
|
develop 47e015e2
Timestamp: 2016-06-28 17:01:54 Author: Eshed [ Details ] [ Diff ] |
Optimize CFeature::IsInLosForAllyTeam (delay actual InLos check for some significant speedup) |
||
| mod - rts/Sim/Features/Feature.cpp | [ Diff ] [ File ] | ||
|
develop 74dbe36f
Timestamp: 2016-06-28 15:31:04 Author: jK [ Details ] [ Diff ] |
print (early) game & map checksum to infolog | ||
| mod - rts/Game/PreGame.cpp | [ Diff ] [ File ] | ||
|
develop c0bca4f8
Timestamp: 2016-06-28 15:18:16 Author: jK [ Details ] [ Diff ] |
fix unitsync compile | ||
| mod - rts/System/FileSystem/ArchiveScanner.cpp | [ Diff ] [ File ] | ||