Changesets: spring
|
develop 5dd70ca4
Timestamp: 2010-05-25 21:10:25 Author: -jk- [ Details ] [ Diff ] |
* new unified PBO class (atm just for uploading) * with fallback solution for older GPUs * used in TextureAtlas & BFGroundTextures |
||
| mod - rts/Map/SMF/BFGroundTextures.cpp | [ Diff ] [ File ] | ||
| mod - rts/Map/SMF/BFGroundTextures.h | [ Diff ] [ File ] | ||
| mod - rts/Map/SMF/SmfReadMap.cpp | [ Diff ] [ File ] | ||
| mod - rts/Map/SMF/SmfReadMap.h | [ Diff ] [ File ] | ||
| add - rts/Rendering/GL/PBO.cpp | [ Diff ] [ File ] | ||
| add - rts/Rendering/GL/PBO.h | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Textures/TextureAtlas.cpp | [ Diff ] [ File ] | ||
|
develop f26ca915
Timestamp: 2010-05-25 19:45:45 Author: -jk- [ Details ] [ Diff ] |
* added a InCameraFrustum check to GroundFlash drawing * save some redundant shader bindings in CProjectileDrawer::DrawShadowPass |
||
| mod - rts/Rendering/GroundFlash.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/GroundFlash.h | [ Diff ] [ File ] | ||
| mod - rts/Rendering/ProjectileDrawer.cpp | [ Diff ] [ File ] | ||
|
develop 06b32856
Timestamp: 2010-05-25 19:40:20 Author: -jk- [ Details ] [ Diff ] |
SMF GLSL shader changes: * fixed some float/int conflicts * made it runable on OpenGL2.0 cards (32 varying components limit) * some syntax cleanup c++ part of it: * the normalmap is now stored in a 2 component 16F texture (z-coord is reconstructed in the shader) * you can increase the normalmap precision to 32F with "GroundNormalTextureHighPrecision" (default off) * fixed some duplicated texture generation note: I just had Blindside as a testmap for the debugging, and it looks quite differently from the screenshots in the forum thread, so I don't know if I broke it somewhere. So responses are welcome. |
||
| mod - cont/base/springcontent/shaders/GLSL/SMFFragProg.glsl | [ Diff ] [ File ] | ||
| mod - cont/base/springcontent/shaders/GLSL/SMFVertProg.glsl | [ Diff ] [ File ] | ||
| mod - rts/Map/SMF/SmfReadMap.cpp | [ Diff ] [ File ] | ||
|
develop 07ab446c
Timestamp: 2010-05-23 19:23:54 Author: zerver [ Details ] [ Diff ] |
Fix dediserv compile error | ||
| mod - rts/Sim/Misc/TeamHandler.cpp | [ Diff ] [ File ] | ||
|
develop 118d1c45
Timestamp: 2010-05-23 01:05:27 Author: zerver [ Details ] [ Diff ] |
Cleanup 2 | ||
| mod - rts/System/Net/UDPConnection.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/Net/UDPConnection.h | [ Diff ] [ File ] | ||
|
develop f2c99f13
Timestamp: 2010-05-22 23:11:19 Author: zerver [ Details ] [ Diff ] |
Cleanup | ||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/GameServer.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/TeamHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/TeamHandler.h | [ Diff ] [ File ] | ||
| add - rts/Sim/Misc/TeamHighlight.cpp | [ Diff ] [ File ] | ||
| add - rts/Sim/Misc/TeamHighlight.h | [ Diff ] [ File ] | ||
| mod - rts/build/vstudio8/rts.vcproj | [ Diff ] [ File ] | ||
|
develop 5c4e2061
Timestamp: 2010-05-22 15:35:43 Author: -jk- [ Details ] [ Diff ] |
LuaParser: handle booleans as "1"/"0" (for tdf/fbi compability) this fixes an issue with lua based CEG configs (you couldn't use booleans in those) |
||
| mod - rts/Lua/LuaParser.cpp | [ Diff ] [ File ] | ||
|
develop 36addeb4
Timestamp: 2010-05-21 20:30:35 Author: -jk- [ Details ] [ Diff ] |
fix bug in groundfx texture atlas generation (it contained all textures of the projectile atlas, too) | ||
| mod - rts/Rendering/ProjectileDrawer.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Textures/TextureAtlas.cpp | [ Diff ] [ File ] | ||
|
develop ba0512db
Timestamp: 2010-05-21 20:29:41 Author: -jk- [ Details ] [ Diff ] |
fix blinking user text input | ||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
|
develop 6ccd6b46
Timestamp: 2010-05-21 02:22:16 Author: zerver [ Details ] [ Diff ] |
Highlight teams that are uncontrolled or have abnormally high ping | ||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/Team.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/Team.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/TeamHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/TeamHandler.h | [ Diff ] [ File ] | ||
| mod - rts/System/GlobalUnsynced.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/GlobalUnsynced.h | [ Diff ] [ File ] | ||
| mod - rts/System/Net/UDPConnection.cpp | [ Diff ] [ File ] | ||
|
develop 4f72b6ba
Timestamp: 2010-05-20 12:29:16 Author: kloot [ Details ] [ Diff ] |
Merge branch 'master' of git@github.com:spring/spring | ||
| mod - AI/Skirmish/E323AI | [ Diff ] [ File ] | ||
| mod - installer/make_luaui_nsh.py | [ Diff ] [ File ] | ||
| mod - installer/sections/luaui.nsh | [ Diff ] [ File ] | ||
|
develop 21ccfde1
Timestamp: 2010-05-20 12:28:38 Author: kloot [ Details ] [ Diff ] |
* unitsync: change the MapInfo description and author fields to JNA-friendly arrays | ||
| mod - tools/unitsync/unitsync.cpp | [ Diff ] [ File ] | ||
| mod - tools/unitsync/unitsync.h | [ Diff ] [ File ] | ||
|
develop 72cfd29c
Timestamp: 2010-05-19 21:54:16 Author: hoijui [ Details ] [ Diff ] |
adjust E323AI to fail force push [AI] [fix] | ||
| mod - AI/Skirmish/E323AI | [ Diff ] [ File ] | ||
|
develop c9bba64e
Timestamp: 2010-05-19 21:48:52 Author: hoijui [ Details ] [ Diff ] |
Merge remote branch 'originSpring/master' into pureint Conflicts: AI/Wrappers/Cpp/CMakeLists.txt AI/Wrappers/JavaOO/CMakeLists.txt AI/Wrappers/LegacyCpp/AIAICallback.cpp rts/ExternalAI/Interface/SSkirmishAICallback.h rts/ExternalAI/SSkirmishAICallbackImpl.cpp rts/ExternalAI/SSkirmishAICallbackImpl.h rts/Sim/Units/UnitDef.h |
||
| mod - AI/Wrappers/Cpp/CMakeLists.txt | [ Diff ] [ File ] | ||
| mod - AI/Wrappers/JavaOO/CMakeLists.txt | [ Diff ] [ File ] | ||
| mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp | [ Diff ] [ File ] | ||
| mod - rts/ExternalAI/Interface/SSkirmishAICallback.h | [ Diff ] [ File ] | ||
| mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp | [ Diff ] [ File ] | ||
| mod - rts/ExternalAI/SSkirmishAICallbackImpl.h | [ Diff ] [ File ] | ||
| mod - rts/Game/SelectedUnits.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/UI/TooltipConsole.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/GL/myGL.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/UnitDrawer.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Features/FeatureDef.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Features/FeatureHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/CollisionHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/CollisionVolume.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/CollisionVolume.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/UnitDef.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/UnitDefHandler.cpp | [ Diff ] [ File ] | ||
|
develop 5810b3cf
Timestamp: 2010-05-19 21:30:08 Author: hoijui [ Details ] [ Diff ] |
adjust to master [minor] | ||
| mod - installer/spring.nsi | [ Diff ] [ File ] | ||
|
develop d465820e
Timestamp: 2010-05-19 21:23:56 Author: hoijui [ Details ] [ Diff ] |
fix Skirmish AI inclusion [installer] [fix] | ||
| mod - installer/include/aiHelpers.nsh | [ Diff ] [ File ] | ||
| mod - installer/include/fileExistChecks.nsh | [ Diff ] [ File ] | ||
|
develop 64b58ec5
Timestamp: 2010-05-19 21:22:20 Author: hoijui [ Details ] [ Diff ] |
fix Lua-UI inclusion [installer] [fix] | ||
| mod - installer/make_luaui_nsh.py | [ Diff ] [ File ] | ||
| mod - installer/sections/luaui.nsh | [ Diff ] [ File ] | ||
|
develop fd4b4151
Timestamp: 2010-05-19 21:22:20 Author: hoijui [ Details ] [ Diff ] |
fix Lua-UI inclusion [installer] [fix] | ||
| mod - installer/make_luaui_nsh.py | [ Diff ] [ File ] | ||
| mod - installer/sections/luaui.nsh | [ Diff ] [ File ] | ||
|
develop 9805a2d3
Timestamp: 2010-05-19 20:23:55 Author: kloot [ Details ] [ Diff ] |
* fix SEGV when drawing the icon of a unit without an active CommandAI | ||
| mod - rts/Rendering/UnitDrawer.cpp | [ Diff ] [ File ] | ||
|
develop 638c5359
Timestamp: 2010-05-19 01:59:48 Author: -jk- [ Details ] [ Diff ] |
UnitDrawer: don't disable shaders when drawing lua Materials | ||
| mod - rts/Rendering/UnitDrawer.cpp | [ Diff ] [ File ] | ||
|
develop 74e2f504
Timestamp: 2010-05-19 01:58:09 Author: -jk- [ Details ] [ Diff ] |
print GLSL version to infolog.txt, too | ||
| mod - rts/Rendering/GL/myGL.cpp | [ Diff ] [ File ] | ||
|
develop bc265bc7
Timestamp: 2010-05-18 19:17:32 Author: kloot [ Details ] [ Diff ] |
* fix Mantis 0001930 | ||
| mod - AI/Wrappers/Cpp/CMakeLists.txt | [ Diff ] [ File ] | ||
| mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp | [ Diff ] [ File ] | ||
| mod - rts/ExternalAI/Interface/SSkirmishAICallback.h | [ Diff ] [ File ] | ||
| mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp | [ Diff ] [ File ] | ||
| mod - rts/ExternalAI/SSkirmishAICallbackImpl.h | [ Diff ] [ File ] | ||
| mod - rts/Rendering/UnitDrawer.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Features/FeatureDef.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Features/FeatureHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/CollisionHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/CollisionVolume.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/CollisionVolume.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/UnitDef.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/UnitDefHandler.cpp | [ Diff ] [ File ] | ||
|
develop 1068bfc6
Timestamp: 2010-05-18 18:01:35 Author: zerver [ Details ] [ Diff ] |
Show player name for units | ||
| mod - rts/Game/SelectedUnits.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/UI/TooltipConsole.cpp | [ Diff ] [ File ] | ||
|
develop a9145a19
Timestamp: 2010-05-18 17:25:07 Author: hoijui [ Details ] [ Diff ] |
Merge remote branch 'originSpring/master' into pureint Conflicts: AI/Skirmish/E323AI AI/Wrappers/LegacyCpp/IAICallback.h AI/Wrappers/LegacyCpp/AIAICallback.h AI/Wrappers/LegacyCpp/AIAICallback.cpp |
||
| mod - AI/Skirmish/E323AI | [ Diff ] [ File ] | ||
| mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp | [ Diff ] [ File ] | ||
| mod - AI/Wrappers/LegacyCpp/AIAICallback.h | [ Diff ] [ File ] | ||
| mod - AI/Wrappers/LegacyCpp/IAICallback.h | [ Diff ] [ File ] | ||
|
develop afb64fff
Timestamp: 2010-05-18 16:55:02 Author: hoijui [ Details ] [ Diff ] |
reference latest E323AI, 3.21.1 | ||
| mod - AI/Skirmish/E323AI | [ Diff ] [ File ] | ||