Michal Marcinkowski bd841c488c Merge branch 'develop' into solarsystem2 ...

Conflicts:
	.gitignore
	src/rendering/renderablefov.cpp
	src/rendering/renderablepath.cpp
	src/scenegraph/scenegraph.cpp
	src/util/factorymanager.cpp

2014-12-08 21:26:38 -05:00

..

bind_keys.lua

Rebind keys to toggle GUI with F1 key

2014-12-08 20:26:13 +01:00

default_keybinding.lua

More work in preparing for lua-based keyboard controller

2014-10-14 00:08:26 +02:00

default_startup.lua

intermediary commit.

2014-12-08 14:48:38 -05:00