Commit Graph

11 Commits

Author SHA1 Message Date
Stiffly 98399c3995 Merge branch 'FMOD'
Conflicts:
	src/GameWorld.cpp
	src/Renderer.cpp
	src/Systems/PhysicsSystem.cpp
	src/Systems/PhysicsSystem.h
	src/Systems/SoundSystem.cpp
	src/Systems/SoundSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
2014-06-02 20:16:08 +02:00
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
Stiffly 072e4d4dbb OnComponentCreated nu eventbaserat 2014-05-25 04:01:40 +02:00
ViktorLjung 7e5cf8efaa Fuckhack 2014-05-20 03:41:10 +02:00
Jace 57d29d0db7 Started implementation of events for InputSystem and SoundSystem 2014-04-28 19:55:31 +02:00
Jace 84d6911744 Barebones entity component commit events 2014-04-22 15:42:40 +02:00
Jace 062242ab8e Refactored existing systems to register their own components and resource types. 2014-04-13 17:15:46 +02:00
Jace 14feb3659b Initial work for pre-caching resources in render system 2014-04-13 01:25:21 +02:00
Jace a7985b1686 Adapted Escape the Dawn engine. 2014-04-05 21:20:48 +02:00