 Jace
|
f31b2b7ddb
|
Merge branch 'render_queue'
Conflicts:
src/GameWorld.cpp
src/Renderer.cpp
src/Shaders/Fragment.glsl
src/Systems/PhysicsSystem.h
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-05-27 09:35:52 +02:00 |
|
 ViktorLjung
|
c37df5c178
|
Damage and Spashdamage working, phantomShapes not really working
|
2014-05-27 07:04:29 +02:00 |
|
|
Jace
|
22442708cc
|
One hell of a GUI interface (minus graphical)
"how does this even work lol"
|
2014-05-26 03:33:11 +02:00 |
|
|
Jace
|
542ad075ea
|
ECS improved to make it less annoying to use
AddComponent<Components::Transform>(entity, "Transform")
is now
AddComponent<Components::Transform>(entity)
etc.
|
2014-05-17 17:46:17 +02:00 |
|
|
Jace
|
57d29d0db7
|
Started implementation of events for InputSystem and SoundSystem
|
2014-04-28 19:55:31 +02:00 |
|
|
Jace
|
062242ab8e
|
Refactored existing systems to register their own components and resource types.
|
2014-04-13 17:15:46 +02:00 |
|
|
Jace
|
3470a80f40
|
Revert "Indentation style changed to Horstmann"
This reverts commit f2259f712d.
Conflicts:
src/GameWorld.cpp
src/Systems/PhysicsSystem.cpp
|
2014-04-12 01:48:15 +02:00 |
|
|
Jace
|
f2259f712d
|
Indentation style changed to Horstmann
|
2014-04-11 21:53:05 +02:00 |
|
|
Jace
|
4c081d0e1c
|
Indentation style changed to Allman
Using Artistic Style (http://astyle.sourceforge.net/)
Options:
--style=allman
--indent=tab
--keep-one-line-blocks
--align-pointer=type
--align-reference=name
|
2014-04-11 20:59:42 +02:00 |
|
|
Jace
|
d7fa9eb70f
|
Sound!
|
2014-04-10 07:39:44 +02:00 |
|