 Jace
|
2c0f66d9c7
|
Merge remote-tracking branch 'origin/master' into WeaponSystem
# Conflicts:
# include/Engine/Collision/FillFrustumOctreeSystem.h
# include/Engine/Core/Octree.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Game.h
# resources/DefaultInput.ini
# resources/Schema/Components.xsd
# resources/Schema/Entities/Player.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Game/Game.cpp
# src/Game/Systems/PlayerMovementSystem.cpp
|
2016-02-10 17:02:00 +01:00 |
|
|
Jace
|
2b4e00e4b0
|
Refactored System constructor to take a struct instead of a bunch of parameters to reduce future pain and to be able to extend it with IsClient and IsServer flags.
|
2016-02-08 13:33:55 +01:00 |
|
|
Jace
|
bd2da7bc9f
|
Revert "Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping""
This reverts commit b56824786c.
|
2016-02-03 16:30:00 +01:00 |
|
|
Jace
|
b56824786c
|
Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping"
This reverts commit 192de80782, reversing
changes made to 24aac6a00d.
|
2016-02-03 16:16:06 +01:00 |
|
 Tleety
|
7ffbd8455f
|
Added Queues for the models with shield and shielded components.
|
2016-02-03 13:53:57 +01:00 |
|
|
Tleety
|
7b4826cb44
|
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
|
2016-02-02 13:24:31 +01:00 |
|
|
Tleety
|
8299b99e2f
|
Test world changes and some other small fixes
|
2016-02-01 19:08:46 +01:00 |
|
|
Tleety
|
782c1a388a
|
Comment
|
2016-02-01 18:23:40 +01:00 |
|
|
Tleety
|
a188a3f7fa
|
Removed widget pointlight since it is now redundant
|
2016-02-01 18:22:36 +01:00 |
|
|
Tleety
|
ed7d00c1d8
|
Bug where widgets did not get their ambient light now fixed.
|
2016-02-01 18:19:38 +01:00 |
|
|
Jace
|
a3d4eb65d5
|
Fixes #66 warnings
|
2016-02-01 17:53:01 +01:00 |
|
|
Tleety
|
53cae25eb2
|
WIP on widget fuckery
|
2016-02-01 16:56:55 +01:00 |
|
|
Tleety
|
0e70dc6fa3
|
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-27 15:41:31 +01:00 |
|
|
Jace
|
5fcd26cd3e
|
Made TriggerSystem make use of Octree
|
2016-01-27 13:35:16 +01:00 |
|
|
Tleety
|
cbb17d22d4
|
WIP
|
2016-01-27 12:10:00 +01:00 |
|
 viktorljung
|
ada1bac2a7
|
Merge remote-tracking branch 'origin/master' into Menu
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# resources/Schema/Entities/RenderingWorld.xml
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-24 20:48:17 +01:00 |
|
 antc13
|
96a735c542
|
Changed .obj to .mesh for all meshes.
|
2016-01-24 16:12:31 +01:00 |
|
|
viktorljung
|
680a12d88f
|
HealthMeter
|
2016-01-23 14:53:17 +01:00 |
|
|
Jace
|
a6548a72b3
|
Merge remote-tracking branch 'origin/master' into EditorUsefulness
# Conflicts:
# include/Engine/Collision/CollidableOctreeSystem.h
# include/Engine/Collision/CollisionSystem.h
# include/Engine/Collision/TriggerSystem.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Systems/PlayerSystem.h
# resources/Schema/Components/Physics.xsd
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
# src/Game/Systems/HealthSystem.cpp
# src/Game/Systems/PlayerSystem.cpp
# src/Tests/OctTreeTestGameClass.cpp
|
2016-01-21 16:16:35 +01:00 |
|
|
Jace
|
51979d7f0c
|
Changed System to take World through constructor and store it instead, cause it makes more sense.
|
2016-01-18 23:59:33 +01:00 |
|
|
Jace
|
4786986abd
|
Rendering pipeline fixes across the board and base work on refactored editor
|
2016-01-17 06:29:25 +01:00 |
|