Commit Graph

15 Commits

Author SHA1 Message Date
stiffly d28583ca9e Fixes for #34 (Licenses) 2016-01-15 17:20:11 +01:00
William Moberg 04a01104b5 Merge branch 'master' into OctTree
# Conflicts:
#	src/Engine/CMakeLists.txt
#	src/Game/Game.cpp
2015-12-15 17:11:11 +01:00
Jace 51dd627ae3 Added Fonts to deploy.bat 2015-12-15 09:49:43 +01:00
Jace 35624008e7 InputProxy with a KeyboardInputHandler to translate keyboard keys to input commands. Input origins are bound to commands through the BindOrigin event, or through loading them from a config file. 2015-12-12 13:42:34 +01:00
William Moberg b87e543420 Merge branch 'master' into OctTree 2015-12-08 10:47:27 +01:00
antc13 83e2429c36 Maya Exporter WIP 2015-12-07 14:44:34 +01:00
viktorljung 0f33089039 Merge remote-tracking branch 'origin/master' into Rendering 2015-12-03 14:59:45 +01:00
verysecrethero 1f99d46a8d Merge branch 'master' into OctTree 2015-12-02 15:15:05 +01:00
William Moberg c698149bdd Added Ray, AABB structs, and basic rayVsAABB test function. 2015-12-02 14:24:21 +01:00
sippeangelo ae759654c1 Made deploy create a bin folder so it doesn't fail if it's missing 2015-12-01 11:21:33 +01:00
viktorljung 798e42999d Deploy now linking Shaders correctly 2015-12-01 10:34:53 +01:00
sippeangelo 55276c0bd2 Made path to json file relative 2015-11-25 12:53:50 +01:00
antc13 a854570bce Edit the path to the json_key in the script!
Once you've edited that, you should be able to just run the script.
2015-11-25 09:54:37 +01:00
sippeangelo 1a8784b4be Added resource folder for lightweight run-time resources that is also relevant to code, eg. shaders and XML schemas 2015-11-20 16:06:30 +01:00
sippeangelo 63674946ca Initial directory structure 2015-11-20 15:01:37 +01:00