BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
ab58cbc08d293194129d35b9be985f66cd6dae95
fishtanks/src
T
History
ViktorLjung ab58cbc08d Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
2014-05-13 03:36:09 +02:00
..
Components
Shots fired! （ ﾟДﾟ）
2014-05-13 03:32:58 +02:00
Events
Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok
2014-05-13 03:36:09 +02:00
GUI
Xbox360 controller support
2014-05-13 02:24:42 +02:00
Physics
Merge remote-tracking branch 'origin/particles' into havok
2014-05-13 01:57:28 +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-05-13 03:36:09 +02:00
Util
Xbox360 controller support
2014-05-13 02:24:42 +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
Implemented entity cloning
2014-04-27 07:48:16 +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
Xbox360 controller support
2014-05-13 02:24:42 +02:00
Entity.h
Adapted Escape the Dawn engine.
2014-04-05 21:20:48 +02:00
EventBroker.cpp
Started implementation of events for InputSystem and SoundSystem
2014-04-28 19:55:31 +02:00
EventBroker.h
WIP InputController for easier command handling in systems
2014-05-06 14:33:02 +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-05-13 03:36:09 +02:00
GameWorld.h
Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok
2014-05-13 03:36:09 +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
InputController.h
FreeSteeringSystem converted to take input commands
2014-05-06 17:07:38 +02:00
InputManager.cpp
Xbox360 controller support
2014-05-13 02:24:42 +02:00
InputManager.h
Xbox360 controller support
2014-05-13 02:24:42 +02:00
main.cpp
Started implementation of events for InputSystem and SoundSystem
2014-04-28 19:55:31 +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
Emitter childed to a wheel. BUG FIXED: Billboarding calculation.
2014-05-12 22:21:27 +02:00
Renderer.h
Merge remote-tracking branch 'origin/master' into particles
2014-05-12 13:55:48 +02:00
RenderQueue.h
WIP Render Queue
2014-05-11 01:46:02 +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
Started implementation of events for InputSystem and SoundSystem
2014-04-28 19:55:31 +02:00
Texture.cpp
Proper rotation of child physics objects
2014-04-28 19:51:13 +02:00
Texture.h
Initial work for pre-caching resources in render system
2014-04-13 01:25:21 +02:00
World.cpp
Shots fired! （ ﾟДﾟ）
2014-05-13 03:32:58 +02:00
World.h
Merge remote-tracking branch 'origin/particles' into havok
2014-05-13 01:57:28 +02:00