# # ChangeLog for / # # Generated by Trac 1.0.9 # Nov 26, 2024, 4:02:28 AM Wed, 21 Nov 2018 10:49:03 GMT ottka [12111] * code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.cc (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.h (modified) stop timer after round Wed, 21 Nov 2018 10:45:27 GMT linggj [12110] * code/branches/WorldMap_HS18/ToDo (added) * code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw (modified) * code/branches/WorldMap_HS18/src/modules/flappyorx/FlappyOrxShip.cc (modified) * code/branches/WorldMap_HS18/src/orxonox/controllers/SMCoord.cc (modified) * code/branches/WorldMap_HS18/src/orxonox/controllers/SMCoord.h (modified) * code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.cc (modified) * code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.h (modified) some changes Wed, 21 Nov 2018 09:19:21 GMT stadlero [12109] * code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h (modified) Player class does now compile Wed, 21 Nov 2018 08:32:15 GMT ottka [12108] * code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/CMakeLists.txt (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartFlag.cc (added) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartFlag.h (added) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartPrereqs.h (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.cc (modified) implement simple respawn Thu, 15 Nov 2018 21:23:48 GMT stadlero [12107] * code/branches/wagnis_HS18/data/levels/Wagnis.oxw (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h (modified) Province is now a pawn Wed, 14 Nov 2018 10:59:52 GMT linggj [12106] * code/branches/WorldMap_HS18/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/WorldMap_HS18/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/WorldMap_HS18/data/levels/StoryModeMapDev.oxw (modified) * code/branches/WorldMap_HS18/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/WorldMap_HS18/src/orxonox/controllers/SMCoord.cc (added) * code/branches/WorldMap_HS18/src/orxonox/controllers/SMCoord.h (added) * code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.cc (modified) * code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.h (modified) Story Mode Controller added again as a controllabel entitz Wed, 14 Nov 2018 10:58:59 GMT samuelbl [12105] * code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h (modified) Player update Wed, 14 Nov 2018 09:43:18 GMT samuelbl [12104] * code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h (modified) Province all public Wed, 14 Nov 2018 09:38:10 GMT samuelbl [12103] * code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified) Player updated Wed, 14 Nov 2018 09:30:44 GMT stadlero [12102] * code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h (modified) Billboard added to Province Wed, 14 Nov 2018 09:01:05 GMT linggj [12101] * code/branches/WorldMap_HS18/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/WorldMap_HS18/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/WorldMap_HS18/data/levels/NC_StoryModeLevel.oxw (modified) * code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw (modified) * code/branches/WorldMap_HS18/data/levels/StoryModeMapDev.oxw (modified) * code/branches/WorldMap_HS18/data/levels/templates/StoryMode.oxt (modified) * code/branches/WorldMap_HS18/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/WorldMap_HS18/src/modules/towerdefense/TowerDefenseSelecter.cc (modified) * code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.cc (modified) * code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.h (modified) 12 Wed, 14 Nov 2018 08:29:00 GMT samuelbl [12100] * code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h (modified) Wagnis Player updated Wed, 14 Nov 2018 08:17:56 GMT merholzl [12099] * code/trunk (modified) * code/trunk/cmake/InstallCheck.cmake (modified) * code/trunk/cmake/tools/FindCEGUI.cmake (modified) * code/trunk/src/libraries/tools/Timer.h (modified) Merging changes for Flatpak building convenience into trunk Sun, 11 Nov 2018 16:38:58 GMT wiesep [12098] * code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw (modified) * code/branches/shader_HS18/src/libraries/tools/Mesh.cc (modified) * code/branches/shader_HS18/src/libraries/tools/Timer.h (modified) Working version Sun, 11 Nov 2018 16:38:26 GMT wiesep [12097] * data/branches/Shader_HS18/materials/Example.material (deleted) * data/branches/Shader_HS18/materials/Examples.compositor (deleted) * data/branches/Shader_HS18/materials/Examples.program (deleted) Removed unused files Sun, 11 Nov 2018 16:37:35 GMT wiesep [12096] * data/branches/Shader_HS18/materials/Cube_Lava_Normal.material (modified) * data/branches/Shader_HS18/materials/Example (added) * data/branches/Shader_HS18/materials/Example/Examples-Advanced.program (added) * data/branches/Shader_HS18/materials/Example/Examples.program (added) * data/branches/Shader_HS18/programs/Example/GLSL120/AmbientOneTexture.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL120/skinningTwoWeightsVp.glsl (modified) * data/branches/Shader_HS18/programs/OLD/skinningTwoWeightsVp.glsl (modified) * data/branches/Shader_HS18/resources.oxr (modified) Working version Sun, 11 Nov 2018 15:45:00 GMT wiesep [12095] * code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw (modified) Adjusted lights Fri, 09 Nov 2018 22:36:12 GMT merholzl [12094] * code/branches/Flatpak/cmake/InstallCheck.cmake (modified) * code/branches/Flatpak/cmake/tools/FindCEGUI.cmake (modified) * code/branches/Flatpak/src/libraries/tools/Timer.h (modified) Changes needed for Flatpak compilation Fri, 09 Nov 2018 22:28:21 GMT merholzl [12093] * code/branches/Flatpak (copied) Flatpak test branch Fri, 09 Nov 2018 12:10:40 GMT wiesep [12092] * data/branches/Shader_HS18/materials/Cube_Lava_Normal.material (modified) * data/branches/Shader_HS18/programs/Cg (deleted) * data/branches/Shader_HS18/programs/Example/Cg (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/AmbientOneTexture.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/Bloom2_ps20.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/Blur0_vs.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/Blur1_vs.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/BlurH_ps20.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/BlurV_ps20.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/Blur_ps.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/Blur_vs.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/BrightBloom2_ps20.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/DiffuseOneTexture.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/DualQuaternion.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/DualQuaternion_Common.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/DualQuaternion_ShadowCaster.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/DualQuaternion_TwoPhase.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/DualQuaternion_TwoPhaseShadowCaster.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/Example_TextureArrayPS.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/Example_TextureArrayVS.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/HWBasicInstancing.vert (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/HW_VTFInstancing.vert (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/Instancing.frag (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/InstancingMisc.vert (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/Ocean2GLSL.frag (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/Ocean2GLSL.vert (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/OffsetMappingFp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/OffsetMappingVp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/PassthroughFP.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/PassthroughVP.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/ShaderInstancing.vert (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/VTFInstancing.vert (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/crowdVp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/hdr_tonemap_util.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/oceanGLSL.frag (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/oceanGLSL.vert (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/shadows.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/skinningTwoWeightsShadowCasterVp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL/skinningTwoWeightsVp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/AmbientOneTexture.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/AmbientOneTextureWithUV.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/Bloom2_ps20.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/BlurH_ps20.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/BlurV_ps20.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/Blur_vs.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/BrightBloom2_ps20.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/BumpMapVPTangentParity.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/DiffuseOneTexture.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/DualQuaternion.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/DualQuaternion_Common.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/DualQuaternion_ShadowCaster.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/DualQuaternion_TwoPhase.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/DualQuaternion_TwoPhaseShadowCaster.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/Dyn-TextFP.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/Dyn-TextVP.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_BumpMappingFp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_BumpMappingShadowRcvFp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_BumpMappingShadowRcvVp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_BumpMappingSpecularFp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_BumpMappingSpecularVp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_BumpMappingVp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_FresnelFp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_FresnelVp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_TextureArrayPS.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_TextureArrayVS.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/GlassFP.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/GrayScale.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/HWBasicInstancing.vert (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/HW_VTFInstancing.vert (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/HeatBlurVp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/Instancing.frag (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/InstancingMisc.vert (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/LightToHeatVp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/MetaballFP.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/Ocean2GLSL.frag (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/Ocean2GLSL.vert (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/OffsetMappingFp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/OffsetMappingShadowsFp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/OffsetMappingShadowsVp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/OffsetMappingVp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/OffsetMapping_specular.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/ParticleGS_DisplayPS.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/PassthroughFP.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/PassthroughVP.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/SampleFieldVS.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/ShaderInstancing.vert (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/ShowNormals.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/ShowTangents.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/ShowUV.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/ShowUVdir3D.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/StdQuad_Tex2_vp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/StdQuad_Tex2a_vp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/StdQuad_Tex3_vp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/StdQuad_Tex4_vp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/TessellateTetrahedraGS.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/VTFInstancing.vert (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/crowdVp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/hdr_tonemap_util.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/oceanGLSL.frag (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/oceanGLSL.vert (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/shadows.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/skinningTwoWeightsShadowCasterVp.glsl (deleted) * data/branches/Shader_HS18/programs/Example/GLSL150/skinningTwoWeightsVp.glsl (deleted) Remove unused files Fri, 09 Nov 2018 12:06:05 GMT wiesep [12091] * data/branches/Shader_HS18/materials/Cube_Lava_Normal.material (modified) * data/branches/Shader_HS18/materials/ToonShader.material (modified) * data/branches/Shader_HS18/programs/Example/GLSL/DepthShadowmapCasterFp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL/DepthShadowmapCasterVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL/DepthShadowmapNormalMapReceiverFp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL/DepthShadowmapNormalMapReceiverVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL/DepthShadowmapReceiverFp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL/DepthShadowmapReceiverVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL/StdQuad_vp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL/SwizzleGP.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL/hdr_bloom.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL/hdr_downscale2x2luminence.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL/hdr_downscale3x3.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL/hdr_downscale3x3brightpass.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL/hdr_finalToneMapping.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL/instancingVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL/mrttestfp_quad.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL/mrttestfp_scene.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL120 (added) * data/branches/Shader_HS18/programs/Example/GLSL120/AmbientOneTexture.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/AmbientOneTextureWithUV.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/Bloom2_ps20.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/BlurH_ps20.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/BlurV_ps20.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/Blur_vs.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/BrightBloom2_ps20.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/BumpMapVPTangentParity.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/DiffuseOneTexture.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/DualQuaternion.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/DualQuaternion_ShadowCaster.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/DualQuaternion_TwoPhase.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/DualQuaternion_TwoPhaseShadowCaster.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/Example_BumpMappingFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/Example_BumpMappingShadowRcvFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/Example_BumpMappingShadowRcvVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/Example_BumpMappingSpecularFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/Example_BumpMappingSpecularVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/Example_BumpMappingVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/Example_FresnelFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/Example_FresnelVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/Example_TextureArrayPS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/Example_TextureArrayVS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/GlassFP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/GrayScale.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/HWBasicInstancing.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL120/HW_VTFInstancing.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL120/Instancing.frag (added) * data/branches/Shader_HS18/programs/Example/GLSL120/InstancingMisc.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL120/Ocean2GLSL.frag (added) * data/branches/Shader_HS18/programs/Example/GLSL120/Ocean2GLSL.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL120/OffsetMappingFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/OffsetMappingShadowsFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/OffsetMappingShadowsVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/OffsetMappingVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/OffsetMapping_specular.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/PassthroughFP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/PassthroughVP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/ShaderInstancing.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL120/ShowNormals.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/ShowTangents.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/ShowUV.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/ShowUVdir3D.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/StdQuad_Tex2_vp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/StdQuad_Tex2a_vp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/StdQuad_Tex3_vp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/StdQuad_Tex4_vp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/VTFInstancing.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL120/hdr_tonemap_util.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/oceanGLSL.frag (added) * data/branches/Shader_HS18/programs/Example/GLSL120/oceanGLSL.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL120/shadows.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/skinningTwoWeightsShadowCasterVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL120/skinningTwoWeightsVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/ASCIIFP.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/AtomicFS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/AtomicGS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/AtomicVS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Blur0_vs.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/Blur1_vs.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/Blur_ps.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/ColdCasterFp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/ColdCasterVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/Combine_fp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/DepthShadowObjectFp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/DepthShadowObjectVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/DepthShadowmapCasterFp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/DepthShadowmapCasterVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/DepthShadowmapNormalMapReceiverFp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/DepthShadowmapNormalMapReceiverVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/DepthShadowmapReceiverFp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/DepthShadowmapReceiverVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/DitherFP.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/EmbossedFp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_CelShadingFp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_CelShadingVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/GrassAmbientFp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/GrassAmbientVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/GrassCasterFp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/GrassCasterVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/GrassFp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/GrassReceiverFp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/GrassReceiverVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/GrassTexVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/GrassVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/HalftoneFP.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/HardwareMorphAnimationVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/HardwareMorphAnimationWithNormalsVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/HardwarePoseAnimationVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/HardwarePoseAnimationWithNormalsVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/HeatBlurFp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/HeatCasterFp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/HeatCasterVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/InvertFP.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/IsosurfFS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/IsosurfGS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/IsosurfVS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/LaplaceFP.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/LightToHeatFp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/NightVisionFP.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/OldMovieFP.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/OldTV.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/ParticleGS_DisplayFS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/ParticleGS_DisplayGS.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/ParticleGS_DisplayVS.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/ParticleGS_GenerateGS.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/ParticleGS_GenerateVS.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/PassthroughGP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/PosterizeFP.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/Radial_Blur_FP.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/SharpenEdgesFP.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/StdQuad_vp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/SwizzleGP.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/TilingFP.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/hdr_bloom.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/hdr_downscale2x2luminence.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/hdr_downscale3x3.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/hdr_downscale3x3brightpass.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/hdr_finalToneMapping.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/instancingVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/mrttestfp_quad.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/mrttestfp_scene.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/pssmCasterFp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/pssmCasterVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/pssmReceiverFp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL150/pssmReceiverVp.glsl (modified) * data/branches/Shader_HS18/programs/Example/GLSL400 (added) * data/branches/Shader_HS18/programs/Example/GLSL400/ComputeCS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL400/RasterizationOrderFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL400/TessellationFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL400/TessellationTd.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL400/TessellationTh.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL400/TessellationVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSLES (added) * data/branches/Shader_HS18/programs/Example/GLSLES/ASCIIFP.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/AmbientOneTexture.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/AmbientOneTextureWithUV.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Bloom2_ps20.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/BlurH_ps20.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/BlurV_ps20.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Blur_vs.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/BrightBloom2_ps20.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/BumpMapVPTangentParity.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/ColdCasterFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/ColdCasterVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Combine_fp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/DOF_ps.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/DepthShadowmapCasterFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/DepthShadowmapCasterVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/DepthShadowmapNormalMapReceiverFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/DepthShadowmapNormalMapReceiverVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/DepthShadowmapReceiverFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/DepthShadowmapReceiverVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/DiffuseOneTexture.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/DitherFP.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/EmbossedFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Example_BumpMappingFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Example_BumpMappingShadowRcvFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Example_BumpMappingShadowRcvVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Example_BumpMappingSpecularFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Example_BumpMappingSpecularVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Example_BumpMappingVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Example_CelShadingFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Example_CelShadingVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Example_FresnelFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Example_FresnelVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Example_ProjectionFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Example_ProjectionVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Example_TextureArrayPS.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Example_TextureArrayVS.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/GlassFP.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/GrassAmbientFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/GrassAmbientVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/GrassCasterFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/GrassCasterVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/GrassFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/GrassReceiverFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/GrassReceiverVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/GrassTexVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/GrassVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/GrayScale.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/HWBasicInstancing.vert (added) * data/branches/Shader_HS18/programs/Example/GLSLES/HW_VTFInstancing.vert (added) * data/branches/Shader_HS18/programs/Example/GLSLES/HalftoneFP.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/HardwareMorphAnimationVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/HardwareMorphAnimationWithNormalsVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/HardwarePoseAnimationVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/HardwarePoseAnimationWithNormalsVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/HeatBlurFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/HeatBlurVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/HeatCasterFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/HeatCasterVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Instancing.frag (added) * data/branches/Shader_HS18/programs/Example/GLSLES/InstancingMisc.vert (added) * data/branches/Shader_HS18/programs/Example/GLSLES/InvertFP.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/LaplaceFP.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/LightToHeatFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/LightToHeatVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/NightVisionFP.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Ocean2GLSLES.frag (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Ocean2GLSLES.vert (added) * data/branches/Shader_HS18/programs/Example/GLSLES/OffsetMappingFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/OffsetMappingShadowsFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/OffsetMappingShadowsVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/OffsetMappingVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/OffsetMapping_specular.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/OldMovieFP.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/OldTV.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/PassthroughFP.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/PassthroughVP.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/PosterizeFP.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/Radial_Blur_FP.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/ShaderInstancing.vert (added) * data/branches/Shader_HS18/programs/Example/GLSLES/SharpenEdgesFP.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/ShowNormals.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/ShowTangents.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/ShowUV.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/ShowUVdir3D.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/StdQuad_Tex2_vp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/StdQuad_Tex2a_vp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/StdQuad_Tex3_vp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/StdQuad_Tex4_vp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/StdQuad_vp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/SwizzleGP.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/TilingFP.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/VTFInstancing.vert (added) * data/branches/Shader_HS18/programs/Example/GLSLES/depthshadowobjectFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/depthshadowobjectVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/hdrFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/hdr_bloom.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/hdr_downscale2x2luminence.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/hdr_downscale3x3.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/hdr_downscale3x3brightpass.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/hdr_finalToneMapping.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/instancingVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/mrttestfp_quad.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/mrttestfp_scene.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/pssmCasterFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/pssmCasterVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/pssmFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/pssmReceiverFp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/pssmReceiverVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/pssmVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/shadows.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/skinningTwoWeightsShadowCasterVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/skinningTwoWeightsVp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/varianceshadowcasterfp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/varianceshadowcastervp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/varianceshadowreceiverfp.glsles (added) * data/branches/Shader_HS18/programs/Example/GLSLES/varianceshadowreceivervp.glsles (added) * data/branches/Shader_HS18/resources.oxr (modified) Updated programs and adjusted Material to work with GLSL>150 Wed, 07 Nov 2018 10:52:40 GMT ottka [12090] * code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.cc (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.h (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.cc (modified) clean up of module :) Wed, 07 Nov 2018 10:42:26 GMT ottka [12089] * code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.cc (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.h (modified) implement module Wed, 07 Nov 2018 10:29:12 GMT wiesep [12088] * data/branches/Shader_HS18/materials/Cube_Lava_Normal.material (modified) Working version Wed, 07 Nov 2018 10:28:25 GMT thomkell [12087] * code/branches/TixyTaxyTorxy_HS18/data/levels/TixyTaxyTorxy.oxw (modified) field Wed, 07 Nov 2018 10:26:02 GMT sastocke [12086] * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxy.cc (modified) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyField.cc (modified) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyField.h (modified) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyTower.cc (modified) switching towers Wed, 07 Nov 2018 09:52:17 GMT wiesep [12085] * data/branches/Shader_HS18/images/textures/Cube_Lava_COLOR.jpg (added) * data/branches/Shader_HS18/images/textures/Cube_Lava_MASK.jpg (added) * data/branches/Shader_HS18/images/textures/Cube_Lava_NORM.jpg (added) * data/branches/Shader_HS18/materials/Cube_Lava.material (added) * data/branches/Shader_HS18/materials/Cube_Lava_Normal-Mask.material (added) * data/branches/Shader_HS18/materials/Cube_Lava_Normal.material (added) * data/branches/Shader_HS18/models/Cube_Lava_V2.mesh (added) * data/branches/Shader_HS18/models/Cube_Lava_V2_Normal.mesh (added) * data/branches/Shader_HS18/resources.oxr (modified) Files for shader testing Wed, 07 Nov 2018 09:51:06 GMT wiesep [12084] * data/branches/Shader_HS18/programs/AmbientOneTexture.glsl (deleted) * data/branches/Shader_HS18/programs/BloomFP.cg (deleted) * data/branches/Shader_HS18/programs/Blur0_ps20.hlsl (deleted) * data/branches/Shader_HS18/programs/Blur0_vs.glsl (deleted) * data/branches/Shader_HS18/programs/Blur0_vs11.hlsl (deleted) * data/branches/Shader_HS18/programs/Blur1_ps20.hlsl (deleted) * data/branches/Shader_HS18/programs/Blur1_vs.glsl (deleted) * data/branches/Shader_HS18/programs/Blur1_vs11.hlsl (deleted) * data/branches/Shader_HS18/programs/Blur_ps.glsl (deleted) * data/branches/Shader_HS18/programs/BumpMapping.cg (deleted) * data/branches/Shader_HS18/programs/Combine_fp.cg (deleted) * data/branches/Shader_HS18/programs/Example_Basic.cg (deleted) * data/branches/Shader_HS18/programs/Example_Basic.hlsl (deleted) * data/branches/Shader_HS18/programs/GlassFP.cg (deleted) * data/branches/Shader_HS18/programs/Grass.cg (deleted) * data/branches/Shader_HS18/programs/GrayScale.cg (deleted) * data/branches/Shader_HS18/programs/InvertFP.cg (deleted) * data/branches/Shader_HS18/programs/LaplaceFP.cg (deleted) * data/branches/Shader_HS18/programs/OldMovieFP.cg (deleted) * data/branches/Shader_HS18/programs/OldTV.cg (deleted) * data/branches/Shader_HS18/programs/PosterizeFP.cg (deleted) * data/branches/Shader_HS18/programs/Radial_Blur_FP.cg (deleted) * data/branches/Shader_HS18/programs/SharpenEdgesFP.cg (deleted) * data/branches/Shader_HS18/programs/StdQuad_vp.cg (deleted) * data/branches/Shader_HS18/programs/StdQuad_vp.glsl (deleted) * data/branches/Shader_HS18/programs/TilingFP.cg (deleted) * data/branches/Shader_HS18/programs/ToonShaderPS.cg (deleted) * data/branches/Shader_HS18/programs/ToonShader_ps.frag (deleted) * data/branches/Shader_HS18/programs/ToonShader_vs.vert (deleted) * data/branches/Shader_HS18/programs/glow.cg (deleted) * data/branches/Shader_HS18/programs/hdr.cg (deleted) * data/branches/Shader_HS18/programs/hdr.hlsl (deleted) * data/branches/Shader_HS18/programs/hdr_bloom.glsl (deleted) * data/branches/Shader_HS18/programs/hdr_downscale2x2luminence.glsl (deleted) * data/branches/Shader_HS18/programs/hdr_downscale3x3.glsl (deleted) * data/branches/Shader_HS18/programs/hdr_downscale3x3brightpass.glsl (deleted) * data/branches/Shader_HS18/programs/hdr_finalToneMapping.glsl (deleted) * data/branches/Shader_HS18/programs/hdr_tonemap_util.glsl (deleted) * data/branches/Shader_HS18/programs/ps_glow.cg (deleted) * data/branches/Shader_HS18/programs/skinningTwoWeightsShadowCasterVp.glsl (deleted) * data/branches/Shader_HS18/programs/skinningTwoWeightsVp.glsl (deleted) * data/branches/Shader_HS18/programs/vs_glow.cg (deleted) Reorganised shader programs Wed, 07 Nov 2018 09:49:23 GMT wiesep [12083] * data/branches/Shader_HS18/programs/Cg (added) * data/branches/Shader_HS18/programs/Example (added) * data/branches/Shader_HS18/programs/Example/Cg (added) * data/branches/Shader_HS18/programs/Example/Cg/ASCIIFP.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/Combine_fp.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/Common.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/DOF_ps.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/DitherFP.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/DualQuaternion.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/DualQuaternion_Common.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/Dyn-Text.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/Example_Basic.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/Example_Basic_sm4.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/Example_BumpMapping.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/Example_CelShading.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/Example_Fresnel.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/Example_Projection.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/Example_TextureArrayVS.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/GlassFP.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/Grass.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/GrayScale.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/HWBasicInstancing.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/HW_VTFInstancing.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/HalftoneFP.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/HeatVision.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/InstancingMisc.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/InstancingVertexInterpolators.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/Instancing_ps.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/InvertFP.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/LaplaceFP.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/NightVisionFP.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/Ocean2HLSL_Cg.frag (added) * data/branches/Shader_HS18/programs/Example/Cg/Ocean2HLSL_Cg.vert (added) * data/branches/Shader_HS18/programs/Example/Cg/OffsetMapping.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/OldMovieFP.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/OldTV.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/ParticleGS.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/PassthroughFP.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/PassthroughFP_sm4.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/PosterizeFP.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/Radial_Blur_FP.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/ShaderInstancing.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/SharpenEdgesFP.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/StdQuad_vp.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/Swizzle.gp (added) * data/branches/Shader_HS18/programs/Example/Cg/SwizzleGP.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/TilingFP.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/VTFInstancing.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/depthshadowobject.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/hdr.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/instancing.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/isosurf.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/oceanHLSL_Cg.frag (added) * data/branches/Shader_HS18/programs/Example/Cg/oceanHLSL_Cg.vert (added) * data/branches/Shader_HS18/programs/Example/Cg/pssm.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/shadows.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/varianceshadowcasterfp.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/varianceshadowcastervp.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/varianceshadowreceiverfp.cg (added) * data/branches/Shader_HS18/programs/Example/Cg/varianceshadowreceivervp.cg (added) * data/branches/Shader_HS18/programs/Example/GLSL (added) * data/branches/Shader_HS18/programs/Example/GLSL/AmbientOneTexture.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/Bloom2_ps20.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/Blur0_vs.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/Blur1_vs.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/BlurH_ps20.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/BlurV_ps20.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/Blur_ps.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/Blur_vs.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/BrightBloom2_ps20.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/DepthShadowmapCasterFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/DepthShadowmapCasterVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/DepthShadowmapNormalMapReceiverFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/DepthShadowmapNormalMapReceiverVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/DepthShadowmapReceiverFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/DepthShadowmapReceiverVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/DiffuseOneTexture.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/DualQuaternion.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/DualQuaternion_Common.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/DualQuaternion_ShadowCaster.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/DualQuaternion_TwoPhase.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/DualQuaternion_TwoPhaseShadowCaster.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/Example_TextureArrayPS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/Example_TextureArrayVS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/HWBasicInstancing.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL/HW_VTFInstancing.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL/Instancing.frag (added) * data/branches/Shader_HS18/programs/Example/GLSL/InstancingMisc.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL/Ocean2GLSL.frag (added) * data/branches/Shader_HS18/programs/Example/GLSL/Ocean2GLSL.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL/OffsetMappingFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/OffsetMappingVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/PassthroughFP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/PassthroughVP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/ShaderInstancing.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL/StdQuad_vp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/SwizzleGP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/VTFInstancing.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL/crowdVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/hdr_bloom.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/hdr_downscale2x2luminence.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/hdr_downscale3x3.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/hdr_downscale3x3brightpass.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/hdr_finalToneMapping.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/hdr_tonemap_util.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/instancingVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/mrttestfp_quad.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/mrttestfp_scene.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/oceanGLSL.frag (added) * data/branches/Shader_HS18/programs/Example/GLSL/oceanGLSL.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL/shadows.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/skinningTwoWeightsShadowCasterVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL/skinningTwoWeightsVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150 (added) * data/branches/Shader_HS18/programs/Example/GLSL150/ASCIIFP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/AmbientOneTexture.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/AmbientOneTextureWithUV.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Bloom2_ps20.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Blur0_vs.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Blur1_vs.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/BlurH_ps20.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/BlurV_ps20.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Blur_ps.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Blur_vs.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/BrightBloom2_ps20.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/BumpMapVPTangentParity.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/ColdCasterFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/ColdCasterVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Combine_fp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/DepthShadowObjectFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/DepthShadowObjectVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/DepthShadowmapCasterFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/DepthShadowmapCasterVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/DepthShadowmapNormalMapReceiverFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/DepthShadowmapNormalMapReceiverVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/DepthShadowmapReceiverFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/DepthShadowmapReceiverVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/DiffuseOneTexture.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/DitherFP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/DualQuaternion.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/DualQuaternion_Common.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/DualQuaternion_ShadowCaster.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/DualQuaternion_TwoPhase.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/DualQuaternion_TwoPhaseShadowCaster.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Dyn-TextFP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Dyn-TextVP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/EmbossedFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_BumpMappingFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_BumpMappingShadowRcvFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_BumpMappingShadowRcvVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_BumpMappingSpecularFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_BumpMappingSpecularVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_BumpMappingVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_CelShadingFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_CelShadingVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_FresnelFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_FresnelVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_TextureArrayPS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Example_TextureArrayVS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/GlassFP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/GrassAmbientFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/GrassAmbientVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/GrassCasterFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/GrassCasterVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/GrassFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/GrassReceiverFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/GrassReceiverVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/GrassTexVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/GrassVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/GrayScale.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/HWBasicInstancing.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL150/HW_VTFInstancing.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL150/HalftoneFP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/HardwareMorphAnimationVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/HardwareMorphAnimationWithNormalsVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/HardwarePoseAnimationVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/HardwarePoseAnimationWithNormalsVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/HeatBlurFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/HeatBlurVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/HeatCasterFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/HeatCasterVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Instancing.frag (added) * data/branches/Shader_HS18/programs/Example/GLSL150/InstancingMisc.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL150/InvertFP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/LaplaceFP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/LightToHeatFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/LightToHeatVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/MetaballFP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/NightVisionFP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Ocean2GLSL.frag (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Ocean2GLSL.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL150/OffsetMappingFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/OffsetMappingShadowsFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/OffsetMappingShadowsVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/OffsetMappingVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/OffsetMapping_specular.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/OldMovieFP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/OldTV.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/ParticleGS_DisplayGS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/ParticleGS_DisplayPS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/ParticleGS_DisplayVS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/ParticleGS_GenerateGS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/ParticleGS_GenerateVS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/PassthroughFP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/PassthroughVP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/PosterizeFP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/Radial_Blur_FP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/SampleFieldVS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/ShaderInstancing.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL150/SharpenEdgesFP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/ShowNormals.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/ShowTangents.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/ShowUV.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/ShowUVdir3D.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/StdQuad_Tex2_vp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/StdQuad_Tex2a_vp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/StdQuad_Tex3_vp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/StdQuad_Tex4_vp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/StdQuad_vp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/SwizzleGP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/TessellateTetrahedraGS.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/TilingFP.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/VTFInstancing.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL150/crowdVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/hdr_bloom.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/hdr_downscale2x2luminence.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/hdr_downscale3x3.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/hdr_downscale3x3brightpass.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/hdr_finalToneMapping.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/hdr_tonemap_util.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/instancingVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/mrttestfp_quad.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/mrttestfp_scene.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/oceanGLSL.frag (added) * data/branches/Shader_HS18/programs/Example/GLSL150/oceanGLSL.vert (added) * data/branches/Shader_HS18/programs/Example/GLSL150/pssmCasterFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/pssmCasterVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/pssmReceiverFp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/pssmReceiverVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/shadows.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/skinningTwoWeightsShadowCasterVp.glsl (added) * data/branches/Shader_HS18/programs/Example/GLSL150/skinningTwoWeightsVp.glsl (added) * data/branches/Shader_HS18/programs/GLSL (added) * data/branches/Shader_HS18/programs/GLSL/ToonShader_ps.glsl (added) * data/branches/Shader_HS18/programs/GLSL/ToonShader_vs.glsl (added) * data/branches/Shader_HS18/programs/OLD (added) * data/branches/Shader_HS18/programs/OLD/BloomFP.cg (added) * data/branches/Shader_HS18/programs/OLD/Blur0_ps20.hlsl (added) * data/branches/Shader_HS18/programs/OLD/Blur0_vs.glsl (added) * data/branches/Shader_HS18/programs/OLD/Blur0_vs11.hlsl (added) * data/branches/Shader_HS18/programs/OLD/Blur1_ps20.hlsl (added) * data/branches/Shader_HS18/programs/OLD/Blur1_vs.glsl (added) * data/branches/Shader_HS18/programs/OLD/Blur1_vs11.hlsl (added) * data/branches/Shader_HS18/programs/OLD/Blur_ps.glsl (added) * data/branches/Shader_HS18/programs/OLD/BumpMapping.cg (added) * data/branches/Shader_HS18/programs/OLD/Combine_fp.cg (added) * data/branches/Shader_HS18/programs/OLD/Example_Basic.cg (added) * data/branches/Shader_HS18/programs/OLD/Example_Basic.hlsl (added) * data/branches/Shader_HS18/programs/OLD/GlassFP.cg (added) * data/branches/Shader_HS18/programs/OLD/Grass.cg (added) * data/branches/Shader_HS18/programs/OLD/GrayScale.cg (added) * data/branches/Shader_HS18/programs/OLD/InvertFP.cg (added) * data/branches/Shader_HS18/programs/OLD/LaplaceFP.cg (added) * data/branches/Shader_HS18/programs/OLD/OldMovieFP.cg (added) * data/branches/Shader_HS18/programs/OLD/OldTV.cg (added) * data/branches/Shader_HS18/programs/OLD/PosterizeFP.cg (added) * data/branches/Shader_HS18/programs/OLD/Radial_Blur_FP.cg (added) * data/branches/Shader_HS18/programs/OLD/SharpenEdgesFP.cg (added) * data/branches/Shader_HS18/programs/OLD/StdQuad_vp.cg (added) * data/branches/Shader_HS18/programs/OLD/StdQuad_vp.glsl (added) * data/branches/Shader_HS18/programs/OLD/TilingFP.cg (added) * data/branches/Shader_HS18/programs/OLD/ToonShaderPS.cg (added) * data/branches/Shader_HS18/programs/OLD/glow.cg (added) * data/branches/Shader_HS18/programs/OLD/hdr.cg (added) * data/branches/Shader_HS18/programs/OLD/hdr.hlsl (added) * data/branches/Shader_HS18/programs/OLD/hdr_bloom.glsl (added) * data/branches/Shader_HS18/programs/OLD/hdr_downscale2x2luminence.glsl (added) * data/branches/Shader_HS18/programs/OLD/hdr_downscale3x3.glsl (added) * data/branches/Shader_HS18/programs/OLD/hdr_downscale3x3brightpass.glsl (added) * data/branches/Shader_HS18/programs/OLD/hdr_finalToneMapping.glsl (added) * data/branches/Shader_HS18/programs/OLD/hdr_tonemap_util.glsl (added) * data/branches/Shader_HS18/programs/OLD/ps_glow.cg (added) * data/branches/Shader_HS18/programs/OLD/skinningTwoWeightsShadowCasterVp.glsl (added) * data/branches/Shader_HS18/programs/OLD/skinningTwoWeightsVp.glsl (added) * data/branches/Shader_HS18/programs/OLD/vs_glow.cg (added) Reorganised shader programs Wed, 07 Nov 2018 09:48:46 GMT cadick [12082] * code/branches/OrxoKart_HS18/svn_is_cancer/images/textures/OrxoKartStreckenabschnitt.png (added) * code/branches/OrxoKart_HS18/svn_is_cancer/images/textures/OrxoKartStreckenabschnittZiel.png (added) * code/branches/OrxoKart_HS18/svn_is_cancer/materials/OrxoKartStreckenabschnitt.material (added) * code/branches/OrxoKart_HS18/svn_is_cancer/materials/OrxoKartStreckenabschnittZiel.material (added) * code/branches/OrxoKart_HS18/svn_is_cancer/models/OrxoKartStreckenabschnitt.mesh (added) * code/branches/OrxoKart_HS18/svn_is_cancer/models/OrxoKartStreckenabschnittZiel.mesh (added) added textures for Strecke Wed, 07 Nov 2018 09:45:50 GMT ottka [12081] * code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified) it is alive Wed, 07 Nov 2018 09:44:00 GMT stadlero [12080] * code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h (modified) private variables added in player class Wed, 07 Nov 2018 09:38:34 GMT ottka [12079] * code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified) * code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt (modified) * code/branches/OrxoKart_HS18/data/overlays/OrxoKartHUD.oxo (added) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc (modified) fixed HUD Wed, 07 Nov 2018 09:28:08 GMT merholzl [12078] * data/branches/Shader_HS18 (copied) Data Extern branch for shader testing Wed, 07 Nov 2018 09:23:46 GMT kunzro [12077] * code/branches/wagnis_HS18/data/levels/Wagnis.oxw (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h (modified) gameboard string fixed Wed, 07 Nov 2018 09:21:44 GMT wiesep [12076] * code/branches/shader_HS18/src/libraries/tools/Mesh.cc (modified) Added tangent vector generating Wed, 07 Nov 2018 09:21:08 GMT wiesep [12075] * code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw (added) Test Level for Shaders Wed, 07 Nov 2018 09:14:37 GMT ottka [12074] * code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified) * code/branches/OrxoKart_HS18/src/modules/CMakeLists.txt (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/CMakeLists.txt (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.cc (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.h (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.cc (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.h (modified) makefile update Wed, 07 Nov 2018 09:13:31 GMT emustafa [12073] * code/branches/OrxoKart_HS18/data/levels/templates/spaceshipHover.oxt (modified) * code/branches/OrxoKart_HS18/src/modules/hover/Hover.cc (modified) * code/branches/OrxoKart_HS18/src/modules/hover/HoverShip.cc (modified) reverted hover files Sat, 03 Nov 2018 22:49:55 GMT stadlero [12072] * code/branches/wagnis_HS18/data/levels/Wagnis.oxw (modified) * code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc (modified) Added connections-string parser in WagnisGameboard which still needs work Wed, 31 Oct 2018 10:49:41 GMT emustafa [12071] * code/branches/OrxoKart_HS18/data/levels/kart_alpha0.1.oxw (added) * code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt (added) OrxoKart uses OrxoKartKart and not HoverShip Wed, 31 Oct 2018 10:39:26 GMT emustafa [12070] * code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified) OrxoKart uses OrxoKartKart and not HoverShip Wed, 31 Oct 2018 10:32:03 GMT stadlero [12069] * code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (added) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h (added) Player class added Wed, 31 Oct 2018 10:30:19 GMT samuelbl [12068] * code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc (added) * code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h (added) Wagnis class added. Wed, 31 Oct 2018 10:27:04 GMT kunzro [12067] * code/branches/wagnis_HS18/data/levels/Wagnis.oxw (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h (modified) XML and CMake updated, Gameboard is working Wed, 31 Oct 2018 10:23:24 GMT emustafa [12066] * code/branches/OrxoKart_HS18/data/levels/templates/spaceshipHover.oxt (modified) * code/branches/OrxoKart_HS18/src/modules/hover/HoverShip.cc (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.cc (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.h (modified) OrxoKartKart controls optimized Wed, 31 Oct 2018 10:20:31 GMT ottka [12065] * code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified) * code/branches/OrxoKart_HS18/svn_is_cancer (added) * code/branches/OrxoKart_HS18/svn_is_cancer/images (added) * code/branches/OrxoKart_HS18/svn_is_cancer/images/textures (added) * code/branches/OrxoKart_HS18/svn_is_cancer/images/textures/teststrecke.png (added) * code/branches/OrxoKart_HS18/svn_is_cancer/materials (added) * code/branches/OrxoKart_HS18/svn_is_cancer/materials/teststrecke.material (added) * code/branches/OrxoKart_HS18/svn_is_cancer/models (added) * code/branches/OrxoKart_HS18/svn_is_cancer/models/teststrecke.mesh (added) god help us Wed, 31 Oct 2018 10:02:38 GMT sastocke [12064] * code/branches/TixyTaxyTorxy_HS18/data/levels/TixyTaxyTorxy.oxw (added) * code/branches/TixyTaxyTorxy_HS18/data/overlays/TixyTaxyTorxyHUD.oxo (added) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy (added) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/CMakeLists.txt (added) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxy.cc (added) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxy.h (added) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyCenterpoint.cc (added) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyCenterpoint.h (added) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyCoordinate.cc (added) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyCoordinate.h (added) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyField.cc (added) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyField.h (added) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyHUDController.cc (added) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyHUDController.h (added) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyPrereqs.h (added) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxySelecter.cc (added) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxySelecter.h (added) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyTower.cc (added) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyTower.h (added) * code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyreadme.txt (added) second initial setup Wed, 31 Oct 2018 10:01:02 GMT sastocke [12063] * code/branches/TixyTaxyTorxy_HS18/src/modules/CMakeLists.txt (modified) * code/branches/TixyTaxyTorxy_HS18/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) Initial setup Wed, 31 Oct 2018 09:56:46 GMT ottka [12062] * code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified) * code/branches/OrxoKart_HS18/src/modules/hover/Hover.cc (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.cc (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.h (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.cc (modified) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.h (modified) level added Wed, 31 Oct 2018 09:52:15 GMT merholzl [12061] * data/data_extern (modified) * data/data_extern/images/levelpreviews/Pacman.png (copied) * data/data_extern/images/textures/PacmanAfraidGhost.PNG (copied) * data/data_extern/images/textures/PacmanGelb.PNG (copied) * data/data_extern/images/textures/PacmanGhostBlue.PNG (copied) * data/data_extern/images/textures/PacmanGhostOrange.PNG (copied) * data/data_extern/images/textures/PacmanGhostPink.PNG (copied) * data/data_extern/images/textures/PacmanGhostRed.PNG (copied) * data/data_extern/images/textures/PacmanMap.PNG (copied) * data/data_extern/images/textures/PacmanPointAfraid.PNG (copied) * data/data_extern/images/textures/PacmanPointSphere.PNG (copied) * data/data_extern/materials/PacmanAfraidGhost.material (copied) * data/data_extern/materials/PacmanGelb.material (copied) * data/data_extern/materials/PacmanGhostBlue.material (copied) * data/data_extern/materials/PacmanGhostOrange.material (copied) * data/data_extern/materials/PacmanGhostPink.material (copied) * data/data_extern/materials/PacmanGhostRed.material (copied) * data/data_extern/materials/PacmanMap.material (copied) * data/data_extern/materials/PacmanPointAfraid.material (copied) * data/data_extern/materials/PacmanPointSphere.material (copied) * data/data_extern/models/PacmanAfraidGhost.mesh (copied) * data/data_extern/models/PacmanGelb.mesh (copied) * data/data_extern/models/PacmanGhostBlue.mesh (copied) * data/data_extern/models/PacmanGhostOrange.mesh (copied) * data/data_extern/models/PacmanGhostPink.mesh (copied) * data/data_extern/models/PacmanGhostRed.mesh (copied) * data/data_extern/models/PacmanMap.mesh (copied) * data/data_extern/models/PacmanPointAfraid.mesh (copied) * data/data_extern/models/PacmanPointSphere.mesh (copied) Final Pacman merge Wed, 31 Oct 2018 09:40:50 GMT linggj [12060] * code/branches/WorldMap_HS18/data/levels/StoryModeMapDev.oxw (added) * code/branches/WorldMap_HS18/data/levels/emptyLevel22.oxw (added) * code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.cc (added) * code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.h (added) Story Mode Controller added Wed, 31 Oct 2018 09:37:15 GMT linggj [12059] * code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw (modified) * code/branches/WorldMap_HS18/src/orxonox/controllers/CMakeLists.txt (modified) Story Mode Controller added Wed, 31 Oct 2018 08:13:23 GMT linggj [12058] * code/branches/WorldMap_HS18/data/levels/NC_StoryModeLevel.oxw (modified) * code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw (modified) * code/branches/WorldMap_HS18/src/orxonox/LevelManager.cc (modified) * code/branches/WorldMap_HS18/src/orxonox/gametypes/StoryMode.cc (modified) building Wed, 24 Oct 2018 09:43:55 GMT ottka [12057] * code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (added) * code/branches/OrxoKart_HS18/src/modules/orxokart (added) * code/branches/OrxoKart_HS18/src/modules/orxokart/CMakeLists.txt (added) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc (added) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h (added) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.cc (added) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.h (added) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.cc (added) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.h (added) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartPrereqs.h (added) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.cc (added) * code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.h (added) * code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.cc (added) * code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.h (added) rainbow road testing Wed, 24 Oct 2018 09:38:45 GMT ottka [12056] * code/branches/OrxoKart_HS18/data/levels/templates/spaceshipHover.oxt (modified) rainbow road test Wed, 24 Oct 2018 09:37:10 GMT linggj [12055] * code/branches/WorldMap_HS18/path.txt (added) Text file Wed, 24 Oct 2018 09:33:55 GMT linggj [12054] * code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw (modified) Ship added Wed, 24 Oct 2018 09:32:57 GMT linggj [12053] * code/branches/WorldMap_HS18/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/WorldMap_HS18/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw (modified) * code/branches/WorldMap_HS18/data/levels/templates/StoryModeEscort.oxt (modified) * code/branches/WorldMap_HS18/src/orxonox/LevelManager.cc (modified) * code/branches/WorldMap_HS18/src/orxonox/gametypes/StoryMode.cc (modified) Ship added Wed, 24 Oct 2018 09:29:37 GMT kunzro [12052] * code/branches/wagnis_HS18/data/levels/Wagnis.oxw (added) Levelfile added Wed, 24 Oct 2018 09:22:05 GMT stadlero [12051] * code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h (modified) XML Funkion von Province-Klasse hinzugefuegt Sun, 21 Oct 2018 12:54:21 GMT stadlero [12050] * code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h (modified) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc (modified) Eine XMLPort Funktion in der Gameboard-Klasse hinzugefügt Sun, 21 Oct 2018 11:28:52 GMT stadlero [12049] * code/branches/wagnis_HS18/src/modules/wagnis (added) * code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt (added) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc (added) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h (added) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisPrereqs.h (added) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc (added) * code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h (added) Klassen jetzt hinzugefügt -Oli Sun, 21 Oct 2018 11:24:43 GMT stadlero [12048] * code/branches/wagnis_HS18/src/libraries/tools/Timer.cc (modified) * code/branches/wagnis_HS18/src/libraries/tools/Timer.h (modified) * code/branches/wagnis_HS18/src/modules/CMakeLists.txt (modified) Klassen WagnisProvince und WagnisGameboard hinzugefügt und in Klasse ... Wed, 17 Oct 2018 09:42:24 GMT merholzl [12047] * code/trunk (copied) Copied branch with new ogre version to trunk location Wed, 17 Oct 2018 09:41:22 GMT merholzl [12046] * code/trunk_ogre_old (moved) Changed the location of old trunk Wed, 17 Oct 2018 09:38:23 GMT merholzl [12045] * code/branches/mergeFS18 (modified) * code/branches/mergeFS18/data/levels/3DPacman.oxw (copied) * code/branches/mergeFS18/data/levels/templates/PacmanGelb.oxt (copied) * code/branches/mergeFS18/data/overlays/PacmanHUD.oxo (copied) * code/branches/mergeFS18/src/modules/CMakeLists.txt (modified) * code/branches/mergeFS18/src/modules/dodgerace/DodgeRaceShip.cc (modified) * code/branches/mergeFS18/src/modules/pacman (copied) merged pacman Wed, 17 Oct 2018 09:35:13 GMT merholzl [12044] * data/branches/cegui0.8_ogre1.9/images/levelpreviews/Pacman.png (added) * data/branches/cegui0.8_ogre1.9/materials/PacmanAfraidGhost.material (added) * data/branches/cegui0.8_ogre1.9/materials/PacmanGelb.material (added) * data/branches/cegui0.8_ogre1.9/materials/PacmanGhostBlue.material (added) * data/branches/cegui0.8_ogre1.9/materials/PacmanGhostOrange.material (added) * data/branches/cegui0.8_ogre1.9/materials/PacmanGhostPink.material (added) * data/branches/cegui0.8_ogre1.9/materials/PacmanGhostRed.material (added) * data/branches/cegui0.8_ogre1.9/materials/PacmanMap.material (added) * data/branches/cegui0.8_ogre1.9/materials/PacmanPointAfraid.material (added) * data/branches/cegui0.8_ogre1.9/materials/PacmanPointSphere.material (added) * data/branches/cegui0.8_ogre1.9/models/PacmanAfraidGhost.mesh (modified) * data/branches/cegui0.8_ogre1.9/models/PacmanGelb.mesh (modified) * data/branches/cegui0.8_ogre1.9/models/PacmanGhostBlue.mesh (modified) * data/branches/cegui0.8_ogre1.9/models/PacmanGhostOrange.mesh (modified) * data/branches/cegui0.8_ogre1.9/models/PacmanGhostPink.mesh (modified) * data/branches/cegui0.8_ogre1.9/models/PacmanGhostRed.mesh (modified) * data/branches/cegui0.8_ogre1.9/models/PacmanMap.mesh (modified) * data/branches/cegui0.8_ogre1.9/models/PacmanPointAfraid.mesh (modified) * data/branches/cegui0.8_ogre1.9/models/PacmanPointSphere.mesh (modified) merged all materials, meshes from Pacman Wed, 17 Oct 2018 09:23:17 GMT patricwi [12043] * code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanAfraidGhost.mesh (modified) * code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanGelb.mesh (modified) * code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanGhostBlue.mesh (modified) * code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanGhostOrange.mesh (modified) * code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanGhostPink.mesh (modified) * code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanGhostRed.mesh (modified) * code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanMap.mesh (modified) * code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanPointAfraid.mesh (modified) * code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanPointSphere.mesh (modified) Updated Meshes to v 1.8 Wed, 17 Oct 2018 08:54:21 GMT merholzl [12042] * data/branches/cegui0.8_ogre1.9/images/textures/PacmanAfraidGhost.PNG (added) * data/branches/cegui0.8_ogre1.9/images/textures/PacmanGelb.PNG (added) * data/branches/cegui0.8_ogre1.9/images/textures/PacmanGhostBlue.PNG (added) * data/branches/cegui0.8_ogre1.9/images/textures/PacmanGhostOrange.PNG (added) * data/branches/cegui0.8_ogre1.9/images/textures/PacmanGhostPink.PNG (added) * data/branches/cegui0.8_ogre1.9/images/textures/PacmanGhostRed.PNG (added) * data/branches/cegui0.8_ogre1.9/images/textures/PacmanMap.PNG (added) * data/branches/cegui0.8_ogre1.9/images/textures/PacmanPointAfraid.PNG (added) * data/branches/cegui0.8_ogre1.9/images/textures/PacmanPointSphere.PNG (added) * data/branches/cegui0.8_ogre1.9/models/PacmanAfraidGhost.mesh (added) * data/branches/cegui0.8_ogre1.9/models/PacmanGelb.mesh (added) * data/branches/cegui0.8_ogre1.9/models/PacmanGhostBlue.mesh (added) * data/branches/cegui0.8_ogre1.9/models/PacmanGhostOrange.mesh (added) * data/branches/cegui0.8_ogre1.9/models/PacmanGhostPink.mesh (added) * data/branches/cegui0.8_ogre1.9/models/PacmanGhostRed.mesh (added) * data/branches/cegui0.8_ogre1.9/models/PacmanMap.mesh (added) * data/branches/cegui0.8_ogre1.9/models/PacmanPointAfraid.mesh (added) * data/branches/cegui0.8_ogre1.9/models/PacmanPointSphere.mesh (added) Pacman merged ghosts Wed, 17 Oct 2018 08:41:31 GMT patricwi [12041] * code/branches/3DPacman_FS18/New Material/updated_mesh (added) * code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanAfraidGhost.mesh (added) * code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanGelb.mesh (added) * code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanGhostBlue.mesh (added) * code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanGhostOrange.mesh (added) * code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanGhostPink.mesh (added) * code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanGhostRed.mesh (added) * code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanMap.mesh (added) * code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanPointAfraid.mesh (added) * code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanPointSphere.mesh (added) Upgraded meshes Wed, 17 Oct 2018 07:12:58 GMT merholzl [12040] * code/branches/SuperOrxoBros_HS18 (copied) SuperOrxoBros improvements Wed, 17 Oct 2018 07:12:22 GMT merholzl [12039] * code/branches/TixyTaxyTorxy_HS18 (copied) interesting TicTacToe Wed, 17 Oct 2018 07:11:25 GMT merholzl [12038] * code/branches/TowerDefense_HS18/mergeFS18 (copied) Tower Defense improvements Wed, 17 Oct 2018 07:10:24 GMT merholzl [12037] * code/branches/OrxoKart_HS18 (copied) MarioKart apation Wed, 17 Oct 2018 07:09:33 GMT merholzl [12036] * code/branches/WorldMap_HS18 (copied) World Map Wed, 17 Oct 2018 07:08:16 GMT merholzl [12035] * code/branches/wagnis_HS18 (copied) Risiko adaption Wed, 17 Oct 2018 07:06:50 GMT merholzl [12034] * code/branches/shader_HS18 (copied) New branch for shader Wed, 17 Oct 2018 07:04:27 GMT merholzl [12033] * data/data_extern (copied) new Data_extern folder Wed, 17 Oct 2018 06:59:04 GMT merholzl [12032] * data/branches/cegui0.8_ogre1.9/images/levelpreviews/OrxyRoad.png (added) * data/branches/cegui0.8_ogre1.9/materials/botpointer4.material (added) * data/branches/cegui0.8_ogre1.9/models/botpointer4.mesh (added) added materials from last semester without pacman Wed, 10 Oct 2018 14:08:48 GMT merholzl [12031] * code/branches/mergeFS18 (modified) * code/branches/mergeFS18/data/levels/SOB.oxw (modified) * code/branches/mergeFS18/src/modules/superorxobros/CMakeLists.txt (modified) * code/branches/mergeFS18/src/modules/superorxobros/SOB.cc (modified) * code/branches/mergeFS18/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/mergeFS18/src/modules/superorxobros/SOBFigure.h (modified) * code/branches/mergeFS18/src/modules/superorxobros/SOBGumba.cc (modified) * code/branches/mergeFS18/src/modules/superorxobros/SOBItem.h (modified) * code/branches/mergeFS18/src/modules/superorxobros/SOBPrereqs.h (modified) * code/branches/mergeFS18/src/modules/superorxobros/SOBTube.cc (copied) * code/branches/mergeFS18/src/modules/superorxobros/SOBTube.h (copied) merged Tubes into SuperOrxoBros Wed, 10 Oct 2018 13:55:21 GMT merholzl [12030] * code/branches/mergeFS18 (modified) * code/branches/mergeFS18/data/levels/OrxyRoad.oxw (copied) * code/branches/mergeFS18/data/levels/templates/OrxyRoadPattern.oxt (copied) * code/branches/mergeFS18/data/levels/templates/spaceshipOrxyRoad.oxt (copied) * code/branches/mergeFS18/data/overlays/OrxyRoadHUD.oxo (copied) * code/branches/mergeFS18/src/modules/CMakeLists.txt (modified) * code/branches/mergeFS18/src/modules/orxyroad (copied) added OrxyRoad Wed, 10 Oct 2018 13:36:53 GMT merholzl [12029] * code/branches/mergeFS18 (modified) * code/branches/mergeFS18/data/levels/newnewnewspacerace.oxw (modified) * code/branches/mergeFS18/data/levels/presentationHS12.oxw (modified) * code/branches/mergeFS18/data/levels/templates/SpaceRaceTemplates.oxt (copied) * code/branches/mergeFS18/data/levels/templates/fastship.oxt (modified) * code/branches/mergeFS18/data/levels/templates/spaceshipCollateralDamage.oxt (modified) * code/branches/mergeFS18/src/libraries/tools/Timer.h (modified) * code/branches/mergeFS18/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/mergeFS18/src/modules/gametypes/SpaceRace.h (modified) * code/branches/mergeFS18/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/mergeFS18/src/modules/gametypes/SpaceRaceController.h (modified) * code/branches/mergeFS18/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/mergeFS18/src/orxonox/items/Engine.cc (modified) * code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.h (modified) added space race improvements Wed, 10 Oct 2018 13:16:51 GMT merholzl [12028] * code/branches/mergeFS18 (modified) * code/branches/mergeFS18/data/levels/ScriptableControllerTestMoveKillDrone.oxw (copied) * code/branches/mergeFS18/data/levels/ScriptableControllerTestSpawn.oxw (copied) * code/branches/mergeFS18/data/levels/scriptController.oxw (modified) * code/branches/mergeFS18/data/levels/scriptableControllerTest.oxw (copied) * code/branches/mergeFS18/data/levels/scripts (copied) * code/branches/mergeFS18/data/levels/templates/ScriptableControllerDroneTemplate.oxt (copied) * code/branches/mergeFS18/src/libraries/core/BaseObject.cc (modified) * code/branches/mergeFS18/src/libraries/core/BaseObject.h (modified) * code/branches/mergeFS18/src/libraries/tools/Timer.cc (modified) * code/branches/mergeFS18/src/libraries/tools/Timer.h (modified) * code/branches/mergeFS18/src/orxonox/CMakeLists.txt (modified) * code/branches/mergeFS18/src/orxonox/Level.cc (modified) * code/branches/mergeFS18/src/orxonox/Level.h (modified) * code/branches/mergeFS18/src/orxonox/controllers/AutonomousDroneController.cc (copied) * code/branches/mergeFS18/src/orxonox/controllers/AutonomousDroneController.h (copied) * code/branches/mergeFS18/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/mergeFS18/src/orxonox/controllers/Controller.cc (modified) * code/branches/mergeFS18/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/mergeFS18/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/mergeFS18/src/orxonox/infos/HumanPlayer.cc (modified) * code/branches/mergeFS18/src/orxonox/items/ShipPart.cc (modified) * code/branches/mergeFS18/src/orxonox/scriptablecontroller (copied) * code/branches/mergeFS18/src/orxonox/worldentities/AutonomousDrone.cc (copied) * code/branches/mergeFS18/src/orxonox/worldentities/AutonomousDrone.h (copied) * code/branches/mergeFS18/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/mergeFS18/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/mergeFS18/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/mergeFS18/src/orxonox/worldentities/MobileEntity.cc (modified) * code/branches/mergeFS18/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/mergeFS18/src/orxonox/worldentities/WorldEntity.h (modified) * code/branches/mergeFS18/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/branches/mergeFS18/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/mergeFS18/src/orxonox/worldentities/pawns/ScriptableControllerDrone.cc (copied) * code/branches/mergeFS18/src/orxonox/worldentities/pawns/ScriptableControllerDrone.h (copied) * code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.h (modified) added scriptable controller Wed, 10 Oct 2018 13:06:55 GMT merholzl [12027] * code/branches/mergeFS18 (modified) * code/branches/mergeFS18/data/levels/testMultiplayerLevel.oxw (copied) * code/branches/mergeFS18/data/levels/testMultiplayerLevelLTS.oxw (copied) * code/branches/mergeFS18/data/overlays/lastTeamStandingHUD.oxo (modified) * code/branches/mergeFS18/src/libraries/network/Client.cc (modified) * code/branches/mergeFS18/src/libraries/network/Client.h (modified) * code/branches/mergeFS18/src/libraries/network/ClientConnection.cc (modified) * code/branches/mergeFS18/src/libraries/network/ClientConnection.h (modified) * code/branches/mergeFS18/src/libraries/network/ClientConnectionListener.cc (modified) * code/branches/mergeFS18/src/libraries/network/ClientConnectionListener.h (modified) * code/branches/mergeFS18/src/libraries/network/Connection.cc (modified) * code/branches/mergeFS18/src/libraries/network/Connection.h (modified) * code/branches/mergeFS18/src/libraries/network/FunctionCallManager.cc (modified) * code/branches/mergeFS18/src/libraries/network/FunctionCallManager.h (modified) * code/branches/mergeFS18/src/libraries/network/GamestateHandler.cc (modified) * code/branches/mergeFS18/src/libraries/network/GamestateHandler.h (modified) * code/branches/mergeFS18/src/libraries/network/GamestateManager.cc (modified) * code/branches/mergeFS18/src/libraries/network/GamestateManager.h (modified) * code/branches/mergeFS18/src/libraries/network/Host.cc (modified) * code/branches/mergeFS18/src/libraries/network/Host.h (modified) * code/branches/mergeFS18/src/libraries/network/LANDiscoverable.cc (modified) * code/branches/mergeFS18/src/libraries/network/LANDiscoverable.h (modified) * code/branches/mergeFS18/src/libraries/network/LANDiscovery.cc (modified) * code/branches/mergeFS18/src/libraries/network/MasterServer.cc (modified) * code/branches/mergeFS18/src/libraries/network/MasterServerComm.cc (modified) * code/branches/mergeFS18/src/libraries/network/Server.cc (modified) * code/branches/mergeFS18/src/libraries/network/Server.h (modified) * code/branches/mergeFS18/src/libraries/network/ServerConnection.cc (modified) * code/branches/mergeFS18/src/libraries/network/ServerConnection.h (modified) * code/branches/mergeFS18/src/libraries/network/packet/Acknowledgement.cc (modified) * code/branches/mergeFS18/src/libraries/network/packet/Acknowledgement.h (modified) * code/branches/mergeFS18/src/libraries/network/packet/Chat.cc (modified) * code/branches/mergeFS18/src/libraries/network/packet/Chat.h (modified) * code/branches/mergeFS18/src/libraries/network/packet/ClassID.cc (modified) * code/branches/mergeFS18/src/libraries/network/packet/DeleteObjects.cc (modified) * code/branches/mergeFS18/src/libraries/network/packet/FunctionCalls.cc (modified) * code/branches/mergeFS18/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/mergeFS18/src/libraries/network/packet/Gamestate.h (modified) * code/branches/mergeFS18/src/libraries/network/packet/Packet.cc (modified) * code/branches/mergeFS18/src/libraries/network/packet/Packet.h (modified) * code/branches/mergeFS18/src/libraries/network/packet/ServerInformation.cc (modified) * code/branches/mergeFS18/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/mergeFS18/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/branches/mergeFS18/src/modules/overlays/hud/HUDWeaponSystem.cc (modified) * code/branches/mergeFS18/src/orxonox/graphics/Model.cc (modified) Merged Masterserver, refresh button had to be removed Wed, 10 Oct 2018 09:13:30 GMT merholzl [12026] * code/branches/mergeFS18 (copied) new merge branch to cequi 0.8 and ogre 1.9 Wed, 10 Oct 2018 08:18:18 GMT patricwi [12025] * code/branches/TowerDefense_HS18 (copied) Made new branch for TowerDefense HS18 from new Ogre branch. Wed, 10 Oct 2018 08:15:09 GMT patricwi [12024] * code/branches/SuperOrxoBrosOgre1.9 (modified) * code/branches/SuperOrxoBrosOgre1.9/data/levels/SOB.oxw (modified) * code/branches/SuperOrxoBrosOgre1.9/src/modules/superorxobros/CMakeLists.txt (modified) * code/branches/SuperOrxoBrosOgre1.9/src/modules/superorxobros/SOB.cc (modified) * code/branches/SuperOrxoBrosOgre1.9/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/SuperOrxoBrosOgre1.9/src/modules/superorxobros/SOBFigure.h (modified) * code/branches/SuperOrxoBrosOgre1.9/src/modules/superorxobros/SOBGumba.cc (modified) * code/branches/SuperOrxoBrosOgre1.9/src/modules/superorxobros/SOBItem.h (modified) * code/branches/SuperOrxoBrosOgre1.9/src/modules/superorxobros/SOBPrereqs.h (modified) * code/branches/SuperOrxoBrosOgre1.9/src/modules/superorxobros/SOBTube.cc (copied) * code/branches/SuperOrxoBrosOgre1.9/src/modules/superorxobros/SOBTube.h (copied) Merged SOBTubes into branch Wed, 10 Oct 2018 07:51:20 GMT patricwi [12023] * code/branches/SuperOrxoBrosOgre1.9 (copied) Creating temporary branch for SuperOrxoBros with new Ogre version Wed, 26 Sep 2018 08:44:07 GMT patricwi [12022] * code/branches/cegui0.8_ogre1.9/src/external/ois/linux/LinuxKeyboard.cpp (modified) Set locale to minimum locale C and not user-preferred locale, as ... Thu, 20 Sep 2018 13:11:38 GMT patricwi [12021] * code/branches/cegui0.8_ogre1.9/cmake/LibraryConfigTardis.cmake (modified) Changed cmake config file to ogre 1.9 Wed, 30 May 2018 12:56:24 GMT patricwi [12020] * code/branches/PresentationFS18 (modified) * code/branches/PresentationFS18/data/gui/layouts/MultiplayerMenu.layout (modified) * code/branches/PresentationFS18/data/levels/testMultiplayerLevel.oxw (copied) * code/branches/PresentationFS18/data/levels/testMultiplayerLevelLTS.oxw (copied) * code/branches/PresentationFS18/data/overlays/lastTeamStandingHUD.oxo (modified) * code/branches/PresentationFS18/src/libraries/network/Client.cc (modified) * code/branches/PresentationFS18/src/libraries/network/Client.h (modified) * code/branches/PresentationFS18/src/libraries/network/ClientConnection.cc (modified) * code/branches/PresentationFS18/src/libraries/network/ClientConnection.h (modified) * code/branches/PresentationFS18/src/libraries/network/ClientConnectionListener.cc (modified) * code/branches/PresentationFS18/src/libraries/network/ClientConnectionListener.h (modified) * code/branches/PresentationFS18/src/libraries/network/Connection.cc (modified) * code/branches/PresentationFS18/src/libraries/network/Connection.h (modified) * code/branches/PresentationFS18/src/libraries/network/FunctionCallManager.cc (modified) * code/branches/PresentationFS18/src/libraries/network/FunctionCallManager.h (modified) * code/branches/PresentationFS18/src/libraries/network/GamestateHandler.cc (modified) * code/branches/PresentationFS18/src/libraries/network/GamestateHandler.h (modified) * code/branches/PresentationFS18/src/libraries/network/GamestateManager.cc (modified) * code/branches/PresentationFS18/src/libraries/network/GamestateManager.h (modified) * code/branches/PresentationFS18/src/libraries/network/Host.cc (modified) * code/branches/PresentationFS18/src/libraries/network/Host.h (modified) * code/branches/PresentationFS18/src/libraries/network/LANDiscoverable.cc (modified) * code/branches/PresentationFS18/src/libraries/network/LANDiscoverable.h (modified) * code/branches/PresentationFS18/src/libraries/network/LANDiscovery.cc (modified) * code/branches/PresentationFS18/src/libraries/network/MasterServer.cc (modified) * code/branches/PresentationFS18/src/libraries/network/MasterServerComm.cc (modified) * code/branches/PresentationFS18/src/libraries/network/Server.cc (modified) * code/branches/PresentationFS18/src/libraries/network/Server.h (modified) * code/branches/PresentationFS18/src/libraries/network/ServerConnection.cc (modified) * code/branches/PresentationFS18/src/libraries/network/ServerConnection.h (modified) * code/branches/PresentationFS18/src/libraries/network/packet/Acknowledgement.cc (modified) * code/branches/PresentationFS18/src/libraries/network/packet/Acknowledgement.h (modified) * code/branches/PresentationFS18/src/libraries/network/packet/Chat.cc (modified) * code/branches/PresentationFS18/src/libraries/network/packet/Chat.h (modified) * code/branches/PresentationFS18/src/libraries/network/packet/ClassID.cc (modified) * code/branches/PresentationFS18/src/libraries/network/packet/DeleteObjects.cc (modified) * code/branches/PresentationFS18/src/libraries/network/packet/FunctionCalls.cc (modified) * code/branches/PresentationFS18/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/PresentationFS18/src/libraries/network/packet/Gamestate.h (modified) * code/branches/PresentationFS18/src/libraries/network/packet/Packet.cc (modified) * code/branches/PresentationFS18/src/libraries/network/packet/Packet.h (modified) * code/branches/PresentationFS18/src/libraries/network/packet/ServerInformation.cc (modified) * code/branches/PresentationFS18/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/PresentationFS18/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/branches/PresentationFS18/src/modules/overlays/hud/HUDWeaponSystem.cc (modified) * code/branches/PresentationFS18/src/orxonox/graphics/Model.cc (modified) Merged Masterserver Wed, 30 May 2018 12:48:17 GMT patricwi [12019] * code/branches/PresentationFS18 (modified) * code/branches/PresentationFS18/data/levels/Hover.oxw (modified) * code/branches/PresentationFS18/data/levels/templates/spaceshipHover.oxt (modified) * code/branches/PresentationFS18/src/modules/hover/CMakeLists.txt (modified) * code/branches/PresentationFS18/src/modules/hover/Hover.cc (modified) * code/branches/PresentationFS18/src/modules/hover/HoverWall.cc (deleted) * code/branches/PresentationFS18/src/modules/hover/HoverWall.h (deleted) * code/branches/PresentationFS18/src/modules/hover/MazeGenerator.cc (deleted) * code/branches/PresentationFS18/src/modules/hover/MazeGenerator.h (deleted) Merged Hover Wed, 30 May 2018 12:44:47 GMT patricwi [12018] * code/branches/PresentationFS18 (modified) * code/branches/PresentationFS18/data/levels/towerDefense.oxw (modified) * code/branches/PresentationFS18/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/PresentationFS18/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) Merged TowerDefense Wed, 30 May 2018 12:41:42 GMT patricwi [12017] * code/branches/PresentationFS18 (modified) * code/branches/PresentationFS18/data/levels/SOB.oxw (modified) * code/branches/PresentationFS18/src/modules/superorxobros/CMakeLists.txt (modified) * code/branches/PresentationFS18/src/modules/superorxobros/SOB.cc (modified) * code/branches/PresentationFS18/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/PresentationFS18/src/modules/superorxobros/SOBFigure.h (modified) * code/branches/PresentationFS18/src/modules/superorxobros/SOBGumba.cc (modified) * code/branches/PresentationFS18/src/modules/superorxobros/SOBItem.h (modified) * code/branches/PresentationFS18/src/modules/superorxobros/SOBPrereqs.h (modified) * code/branches/PresentationFS18/src/modules/superorxobros/SOBTube.cc (copied) * code/branches/PresentationFS18/src/modules/superorxobros/SOBTube.h (copied) Merged SuperOrxoBros Wed, 30 May 2018 12:37:02 GMT patricwi [12016] * code/branches/PresentationFS18 (modified) * code/branches/PresentationFS18/data/levels/ScriptableControllerTestMoveKillDrone.oxw (copied) * code/branches/PresentationFS18/data/levels/ScriptableControllerTestSpawn.oxw (copied) * code/branches/PresentationFS18/data/levels/scriptController.oxw (modified) * code/branches/PresentationFS18/data/levels/scriptableControllerTest.oxw (copied) * code/branches/PresentationFS18/data/levels/scripts (copied) * code/branches/PresentationFS18/data/levels/templates/ScriptableControllerDroneTemplate.oxt (copied) * code/branches/PresentationFS18/src/libraries/core/BaseObject.cc (modified) * code/branches/PresentationFS18/src/libraries/core/BaseObject.h (modified) * code/branches/PresentationFS18/src/libraries/tools/Timer.cc (modified) * code/branches/PresentationFS18/src/libraries/tools/Timer.h (modified) * code/branches/PresentationFS18/src/orxonox/CMakeLists.txt (modified) * code/branches/PresentationFS18/src/orxonox/Level.cc (modified) * code/branches/PresentationFS18/src/orxonox/Level.h (modified) * code/branches/PresentationFS18/src/orxonox/controllers/AutonomousDroneController.cc (copied) * code/branches/PresentationFS18/src/orxonox/controllers/AutonomousDroneController.h (copied) * code/branches/PresentationFS18/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/PresentationFS18/src/orxonox/controllers/Controller.cc (modified) * code/branches/PresentationFS18/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/PresentationFS18/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/PresentationFS18/src/orxonox/infos/HumanPlayer.cc (modified) * code/branches/PresentationFS18/src/orxonox/items/ShipPart.cc (modified) * code/branches/PresentationFS18/src/orxonox/scriptablecontroller (copied) * code/branches/PresentationFS18/src/orxonox/worldentities/AutonomousDrone.cc (copied) * code/branches/PresentationFS18/src/orxonox/worldentities/AutonomousDrone.h (copied) * code/branches/PresentationFS18/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/MobileEntity.cc (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/WorldEntity.h (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/pawns/ScriptableControllerDrone.cc (copied) * code/branches/PresentationFS18/src/orxonox/worldentities/pawns/ScriptableControllerDrone.h (copied) * code/branches/PresentationFS18/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merged Scriptable Controller Wed, 30 May 2018 12:23:47 GMT patricwi [12015] * code/branches/PresentationFS18 (modified) * code/branches/PresentationFS18/data/levels/newnewnewspacerace.oxw (modified) * code/branches/PresentationFS18/data/levels/presentationHS12.oxw (modified) * code/branches/PresentationFS18/data/levels/templates/SpaceRaceTemplates.oxt (copied) * code/branches/PresentationFS18/data/levels/templates/fastship.oxt (modified) * code/branches/PresentationFS18/data/levels/templates/spaceshipCollateralDamage.oxt (modified) * code/branches/PresentationFS18/src/libraries/tools/Timer.cc (modified) * code/branches/PresentationFS18/src/libraries/tools/Timer.h (modified) * code/branches/PresentationFS18/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/PresentationFS18/src/modules/gametypes/SpaceRace.h (modified) * code/branches/PresentationFS18/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/PresentationFS18/src/modules/gametypes/SpaceRaceController.h (modified) * code/branches/PresentationFS18/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/PresentationFS18/src/orxonox/items/Engine.cc (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Added RacingBots Wed, 30 May 2018 12:09:58 GMT patricwi [12014] * code/branches/PresentationFS18 (modified) * code/branches/PresentationFS18/data/levels/OrxyRoad.oxw (copied) * code/branches/PresentationFS18/data/levels/templates/OrxyRoadPattern.oxt (copied) * code/branches/PresentationFS18/data/levels/templates/spaceshipOrxyRoad.oxt (copied) * code/branches/PresentationFS18/data/overlays/OrxyRoadHUD.oxo (copied) * code/branches/PresentationFS18/src/modules/CMakeLists.txt (modified) * code/branches/PresentationFS18/src/modules/orxyroad (copied) Merged OrxyRoad Wed, 30 May 2018 11:55:34 GMT patricwi [12013] * code/branches/PresentationFS18 (modified) * code/branches/PresentationFS18/data/levels/3DPacman.oxw (copied) * code/branches/PresentationFS18/data/levels/templates/PacmanGelb.oxt (copied) * code/branches/PresentationFS18/data/overlays/PacmanHUD.oxo (copied) * code/branches/PresentationFS18/src/modules/CMakeLists.txt (modified) * code/branches/PresentationFS18/src/modules/pacman (copied) Merged 3DPacman Wed, 30 May 2018 11:01:48 GMT patricwi [12012] * code/branches/PresentationFS18 (copied) Created presentation branch