 stiffly
|
44baa47bba
|
Merge remote-tracking branch 'origin/master' into CoolDeathAnimation
# Conflicts:
# include/Engine/Common.h
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/DrawScenePass.h
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.frag.glsl
# resources/Shaders/ForwardPlus.vert.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
|
2016-01-25 01:21:15 +01:00 |
|
 antc13
|
96a735c542
|
Changed .obj to .mesh for all meshes.
|
2016-01-24 16:12:31 +01:00 |
|
 Ayumiwii
|
37aa1eaa18
|
Merge remote-tracking branch 'origin/master' into CoolDeathAnimation
# Conflicts:
# include/Engine/Rendering/DrawScenePass.h
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/RenderQueueFactory.h
# include/Engine/Rendering/Renderer.h
# include/Game/Game.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
|
2016-01-18 16:02:43 +01:00 |
|
|
Ayumiwii
|
35269315cc
|
Rename the thingie
|
2016-01-18 13:51:32 +01:00 |
|
|
Ayumiwii
|
8f8b64f99c
|
First pass that actually work
Not at all done, but it'll have to do for now
|
2016-01-18 11:50:00 +01:00 |
|
 Jace
|
0d50ede6f5
|
Base work on reimplementing editor GUI
|
2016-01-17 07:34:20 +01:00 |
|
|
Jace
|
4786986abd
|
Rendering pipeline fixes across the board and base work on refactored editor
|
2016-01-17 06:29:25 +01:00 |
|
|
Ayumiwii
|
00eeed2e20
|
Broken stuff, refactoring
|
2016-01-12 16:16:42 +01:00 |
|
 viktorljung
|
0f17f9a888
|
Merge remote-tracking branch 'origin/master' into Rendering
# Conflicts:
# include/Engine/Editor/EditorSystem.h
# include/Engine/Rendering/EPicking.h
# include/Engine/Rendering/Renderer.h
# include/Game/Game.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Rendering/RawModel.cpp
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
|
2016-01-12 16:13:20 +01:00 |
|
|
Ayumiwii
|
0630885d92
|
Many more things done
|
2016-01-11 19:59:45 +01:00 |
|
|
Jace
|
b908a9f9c6
|
Revert "Forward+"
|
2016-01-11 13:48:55 +01:00 |
|
|
Ayumiwii
|
3467315aef
|
Lots of things done
|
2016-01-08 16:42:59 +01:00 |
|
|
viktorljung
|
a7b43b06a2
|
Camera component and RenderQueue changes
|
2016-01-08 16:21:59 +01:00 |
|
 Tleety
|
6e6460a000
|
Commented out the bugged models
|
2016-01-08 16:15:18 +01:00 |
|
|
stiffly
|
330f08b926
|
Merge remote-tracking branch 'origin/master' into Networking
# Conflicts:
# include/Game/PlayerSystem.h
# src/Game/Game.cpp
# src/Game/PlayerSystem.cpp
|
2015-12-18 14:18:53 +01:00 |
|
 William Moberg
|
e2417be8c7
|
Very simple CollisionSystem made, 'Z','Y' to toggle on/off.
|
2015-12-15 15:36:28 +01:00 |
|
|
viktorljung
|
fa66e9ff47
|
Camera Switch event now working, Camera models Rotation still bugged
|
2015-12-15 15:29:19 +01:00 |
|
|
William Moberg
|
170610bcb1
|
Added a TriggerSystem, seems to work as intended.
|
2015-12-15 14:49:52 +01:00 |
|
|
viktorljung
|
05b78265be
|
Fixed some transparency bugs and started on component based camera
|
2015-12-14 19:10:00 +01:00 |
|
|
stiffly
|
3f77da4a07
|
Merge remote-tracking branch 'origin/master' into Networking
# Conflicts:
# include/Game/Game.h
# resources/DefaultConfig.ini
# src/Game/Game.cpp
|
2015-12-14 17:07:12 +01:00 |
|
|
stiffly
|
bac0a1de26
|
Removed annoying cube
|
2015-12-14 16:55:23 +01:00 |
|
|
Jace
|
7464facab9
|
Next generation raptor copter
|
2015-12-12 03:38:17 +01:00 |
|
|
stiffly
|
c2435fda2d
|
Added Component to Components.xsd and Entity.xsd
|
2015-12-11 14:27:54 +01:00 |
|
|
stiffly
|
80f028edf2
|
Added a very basic PlayerSystem, and a PlayerComponent.
|
2015-12-11 13:45:19 +01:00 |
|
 sippeangelo
|
0367826f16
|
Added RaptorCopter example system
|
2015-12-10 10:17:18 +01:00 |
|
|
sippeangelo
|
90a79c702f
|
Added crude absolute positioning when rendering
|
2015-12-09 15:26:49 +01:00 |
|
|
sippeangelo
|
58d827f7d0
|
Moved world definition to Schema/Entities/Test.xml and removed HardcodedTestWorld
|
2015-12-09 14:25:41 +01:00 |
|
|
sippeangelo
|
c9b140bd6b
|
Semi-working entity loading from XML files!
|
2015-12-09 12:29:32 +01:00 |
|
|
sippeangelo
|
8419d2e7b9
|
Updated schema with custom type names to better match their C++ counterparts
|
2015-11-26 16:09:11 +01:00 |
|
|
sippeangelo
|
ac05975fd5
|
Updated schema
|
2015-11-25 18:04:11 +01:00 |
|