Commit Graph

23 Commits

Author SHA1 Message Date
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 bafa8d0a5d Merge remote-tracking branch 'origin/deffered_rendering'
Conflicts:
	assets
	src/Components/PointLight.h
	src/GameWorld.cpp
	src/Renderer.cpp
	src/Renderer.h
	vs11/Returngeance/Returngeance.vcxproj.filters
2014-05-13 04:07:24 +02:00
Stiffly 457ee84903 Merge remote-tracking branch 'origin/havok' into particles
Conflicts:
	src/Components/Vehicle.h
2014-05-12 15:43:41 +02:00
Stiffly e0b5b72454 Merge remote-tracking branch 'origin/master' into particles
Conflicts:
	src/Components/Physics.h
	src/GameWorld.cpp
	src/World.cpp
	src/World.h
	vs11/Returngeance/Returngeance.vcxproj.filters
2014-05-12 13:55:48 +02:00
Tleety 22d855a521 Fixed attenuation for lights. 2014-05-11 00:02:34 +02:00
Tleety c1c30b0019 Fixed lights and added a bad gamma correction 2014-05-10 19:51:48 +02:00
Tleety b1b60bce61 WIP 2014-05-07 14:23:01 +00:00
Stiffly 398b157b89 Rendering sprites 2014-05-06 13:52:34 +02:00
Jace 5e1355f3fe Optimizations
(cherry picked from commit 7e32946173)
2014-04-28 16:24:17 +02:00
Jace 7e32946173 Optimizations 2014-04-28 04:00:53 +02:00
ViktorLjung 720cf3aa87 Added support for HkpExtendedMeshShape. 2014-04-27 08:08:00 +02:00
Jace 0b7c383e8a Merge branch 'havok'
Conflicts:
	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
	src/Systems/PhysicsSystem.h
	vs11/Returngeance/Returngeance.vcxproj.filters
2014-04-24 23:11:16 +02:00
ViktorLjung 613610d5b1 Fixed camera view matrix. 2014-04-24 19:49:14 +02:00
Jace 62abb3f964 Merge branch 'havok'
Conflicts:
	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
	src/Systems/RenderSystem.cpp
	src/Systems/RenderSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
2014-04-16 00:38:30 +02:00
Jace e4e5068727 Resource manager refactoring 2014-04-13 03:42:12 +02:00
Jace 14feb3659b Initial work for pre-caching resources in render system 2014-04-13 01:25:21 +02:00
Jace d13c19d654 Removed unused components 2014-04-12 18:36:06 +02:00
ViktorLjung 04fff4a27b Changed toolset to vs11, for future Havok implementation. 2014-04-12 01:59:55 +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 ad2862bf84 A gray tank! :D 2014-04-05 21:20:49 +02:00
Jace a7985b1686 Adapted Escape the Dawn engine. 2014-04-05 21:20:48 +02:00