 stiffly
|
076030a252
|
Fixes, mostly name changes
|
2015-12-17 17:28:43 +01:00 |
|
|
stiffly
|
50822d09fc
|
Merge remote-tracking branch 'origin/master' into Networking
# Conflicts:
# src/Game/Game.cpp
|
2015-12-17 14:10:02 +01:00 |
|
 Jace
|
b87f559291
|
Updated default configs with editor stuff
|
2015-12-17 10:46:49 +01:00 |
|
|
stiffly
|
3f77da4a07
|
Merge remote-tracking branch 'origin/master' into Networking
# Conflicts:
# include/Game/Game.h
# resources/DefaultConfig.ini
# src/Game/Game.cpp
|
2015-12-14 17:07:12 +01:00 |
|
|
Jace
|
e82911cb8b
|
Renderer FOV setting in Config.ini
|
2015-12-14 11:39:13 +01:00 |
|
|
stiffly
|
d22e59f28f
|
Merge remote-tracking branch 'origin/master' into Networking
NOTE (in config file):
[Debug]
LoadMap=Schema/Entities/Test.xml
# Conflicts:
# include/Game/Game.h
# src/Game/Game.cpp
|
2015-12-10 13:53:18 +01:00 |
|
 sippeangelo
|
578018607a
|
Moved decision of which map to load to Config.ini
|
2015-12-09 14:32:34 +01:00 |
|
|
stiffly
|
ce41421dbb
|
Added a "StartNetwork" bool to DefaultConfig.
|
2015-12-09 10:37:40 +01:00 |
|
|
sippeangelo
|
872879c013
|
Engine puzzle completed
|
2015-11-30 17:02:24 +01:00 |
|