BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
5f3b03fa6d962e85d782e4d3e7ac9a55b7ba98a3
fishtanks/src
T
History
ViktorLjung 5f3b03fa6d Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok 
Conflicts:
	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
2014-04-27 08:13:57 +02:00
..
Components
Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok
2014-04-27 08:13:57 +02:00
Physics
Vehicle component based, wheel rotation and position not working.
2014-04-22 19:14:35 +02:00
Shaders
Merge branch 'havok'
2014-04-24 23:11:16 +02:00
Systems
Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok
2014-04-27 08:13:57 +02:00
Util
Resource manager OBJ vs Model conflict fixed
2014-04-27 08:07:18 +02:00
Camera.cpp
Fixed camera view matrix.
2014-04-24 19:49:14 +02:00
Camera.h
Indentation style changed to Allman
2014-04-11 20:59:42 +02:00
Color.h
Revert "Indentation style changed to Horstmann"
2014-04-12 01:48:15 +02:00
Component.h
Revert "Indentation style changed to Horstmann"
2014-04-12 01:48:15 +02:00
CubemapTexture.cpp
Revert "Indentation style changed to Horstmann"
2014-04-12 01:48:15 +02:00
CubemapTexture.h
Indentation style changed to Allman
2014-04-11 20:59:42 +02:00
Engine.h
Revert "Indentation style changed to Horstmann"
2014-04-12 01:48:15 +02:00
Entity.h
Adapted Escape the Dawn engine.
2014-04-05 21:20:48 +02:00
Factory.h
Revert "Indentation style changed to Horstmann"
2014-04-12 01:48:15 +02:00
GameWorld.cpp
Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok
2014-04-27 08:13:57 +02:00
GameWorld.h
Box and Sphere components renamed to BoxShape and SphereShape
2014-04-25 01:05:53 +02:00
gBuffer.cpp
La till lite ljus och annan skit. Började på defucked rendering och det gick ju jävligt bra fucktiskt.
2014-04-17 00:05:19 +02:00
gBuffer.h
La till lite ljus och annan skit. Började på defucked rendering och det gick ju jävligt bra fucktiskt.
2014-04-17 00:05:19 +02:00
main.cpp
Revert "Indentation style changed to Horstmann"
2014-04-12 01:48:15 +02:00
Model.cpp
Resource manager OBJ vs Model conflict fixed
2014-04-27 08:07:18 +02:00
Model.h
Resource manager OBJ vs Model conflict fixed
2014-04-27 08:07:18 +02:00
OBJ.cpp
Resource manager OBJ vs Model conflict fixed
2014-04-27 08:07:18 +02:00
OBJ.h
Resource manager OBJ vs Model conflict fixed
2014-04-27 08:07:18 +02:00
PrecompiledHeader.cpp
Adapted Escape the Dawn engine.
2014-04-05 21:20:48 +02:00
PrecompiledHeader.h
Adapted Escape the Dawn engine.
2014-04-05 21:20:48 +02:00
Renderer.cpp
Initial work for pre-caching resources in render system
2014-04-13 01:25:21 +02:00
Renderer.h
Initial work for pre-caching resources in render system
2014-04-13 01:25:21 +02:00
ResourceManager.cpp
Resource manager OBJ vs Model conflict fixed
2014-04-27 08:07:18 +02:00
ResourceManager.h
Resource manager OBJ vs Model conflict fixed
2014-04-27 08:07:18 +02:00
ShaderProgram.cpp
Revert "Indentation style changed to Horstmann"
2014-04-12 01:48:15 +02:00
ShaderProgram.h
Indentation style changed to Allman
2014-04-11 20:59:42 +02:00
Skybox.cpp
Changed toolset to vs11, for future Havok implementation.
2014-04-12 01:59:55 +02:00
Skybox.h
Indentation style changed to Allman
2014-04-11 20:59:42 +02:00
Sound.cpp
Refactored existing systems to register their own components and resource types.
2014-04-13 17:15:46 +02:00
Sound.h
Refactored existing systems to register their own components and resource types.
2014-04-13 17:15:46 +02:00
System.h
Barebones entity component commit events
2014-04-22 17:18:54 +02:00
Texture.cpp
Initial work for pre-caching resources in render system
2014-04-13 01:25:21 +02:00
Texture.h
Initial work for pre-caching resources in render system
2014-04-13 01:25:21 +02:00
World.cpp
Barebones entity component commit events
2014-04-22 17:18:54 +02:00
World.h
Barebones entity component commit events
2014-04-22 17:18:54 +02:00