ViktorLjung 94178098ea Merge remote-tracking branch 'origin/master' into havok ...

Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters

2014-06-04 05:48:48 +02:00

..

Components

Merge remote-tracking branch 'origin/master' into havok

2014-06-04 05:48:48 +02:00

Events

Merge remote-tracking branch 'origin/master' into havok

2014-06-04 05:48:48 +02:00

GUI

Fixed frame scissor test

2014-06-04 00:46:03 +02:00

Physics

Kind of retarded tank

2014-06-02 17:50:46 +02:00

Shaders

WIP on deffered_rendering: a459a1c Skybox bugfix

2014-05-31 17:12:31 +02:00

Systems

Merge remote-tracking branch 'origin/master' into havok

2014-06-04 05:48:48 +02:00

Util

One hell of a GUI interface (minus graphical)

2014-05-26 03:33:11 +02:00

Camera.cpp

Merge commit 'e3aab96a750d6e5d6f8ff42ffdb5a23a47ab929d' into render_queue

2014-05-26 04:21:08 +02:00

Camera.h

I'll create a GUI interface using Visual Basic, see if I can track an IP address

2014-05-25 04:12:28 +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

Cleanup

2014-06-02 17:01:07 +02:00

Entity.h

Adapted Escape the Dawn engine.

2014-04-05 21:20:48 +02:00

EventBroker.cpp

Better events

2014-05-23 23:41:34 +02:00

EventBroker.h

Vehicle selection!

2014-05-31 03:45:37 +02:00

Factory.h

ECS improved to make it less annoying to use

2014-05-17 17:46:17 +02:00

GameWorld.cpp

Merge remote-tracking branch 'origin/master' into havok

2014-06-04 05:48:48 +02:00

GameWorld.h

Merge remote-tracking branch 'origin/master' into havok

2014-06-04 05:48:48 +02:00

InputController.h

Beautifully broken

2014-05-22 22:04:54 +02:00

InputManager.cpp

Removed temporary debug code

2014-06-02 16:25:00 +02:00

InputManager.h

Removed temporary debug code

2014-06-02 16:25:00 +02:00

main.cpp

One hell of a GUI interface (minus graphical)

2014-05-26 03:33:11 +02:00

Model.cpp

Fixed a createWall function.

2014-06-02 20:01:28 +02:00

Model.h

One hell of a GUI interface (minus graphical)

2014-05-26 03:33:11 +02:00

OBJ.cpp

Fixed so OBJ-loader now loads map_Bump options correctly.

2014-05-28 20:05:28 +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

Merge remote-tracking branch 'origin/Sound+Particles'

2014-06-04 04:24:10 +02:00

Renderer.h

Fixed transparency

2014-06-02 22:15:52 +02:00

RenderQueue.h

Fixed some things in gameworld and added a new skymap.

2014-05-31 23:14:33 +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

Semi-working world rendering

2014-05-27 06:45:26 +02:00

ShaderProgram.h

Semi-working world rendering

2014-05-27 06:45:26 +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

Uses an enumerator to seperate 3D and 2D sound instead of the path name.

2014-05-29 21:25:21 +02:00

Sound.h

Uses an enumerator to seperate 3D and 2D sound instead of the path name.

2014-05-29 21:25:21 +02:00

System.h

Merge branch 'FMOD'

2014-06-02 20:16:08 +02:00

Texture.cpp

Texture error checking and removed redundant caching

2014-05-30 18:51:11 +02:00

Texture.h

NormalMaps Working and started work on specular maps.

2014-05-19 01:01:46 +02:00

World.cpp

Merge branch 'FMOD'

2014-06-02 20:16:08 +02:00

World.h

Merge branch 'FMOD'

2014-06-02 20:16:08 +02:00