 stiffly
|
729ebe6c8b
|
Merge remote-tracking branch 'origin/master' into Sound
# Conflicts:
# README.md
# resources/Schema/Components.xsd
# resources/Schema/Types/Entity.xsd
|
2016-01-12 14:50:10 +01:00 |
|
 Jace
|
39dd27726d
|
MAJOR BREAKING CHANGE: EntityID 0 is now a valid entity. Use EntityID_Invalid as sentry for checks!
Also contains inseparable editor changes.
|
2016-01-11 14:35:41 +01:00 |
|
|
stiffly
|
d8c4c6e5ff
|
Created a primitive SoundSystem. Can play a sound with 'P' button. Using resourcemanager. Not using the created components yet.
|
2016-01-07 15:22:46 +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 |
|
|
William Moberg
|
ae7d4b9097
|
Put Collision folder in CMakeLists.txt and altered paths.
|
2015-12-14 17:35:39 +01:00 |
|
|
Jace
|
e5084e13ec
|
Added EditorSystem
|
2015-12-14 13:57:51 +01:00 |
|
|
Jace
|
0465fdb16d
|
Added ImGui for compilation
|
2015-12-14 13:57:49 +01:00 |
|
|
Jace
|
bffc97f310
|
Groundwork for input command proxy
|
2015-12-12 13:42:33 +01:00 |
|
 sippeangelo
|
6991a2be26
|
Renamed Networking -> Network
|
2015-12-07 15:22:26 +01:00 |
|
|
stiffly
|
dbac9a9669
|
Added filter to CMakeLists.txt.
|
2015-12-07 15:03:03 +01:00 |
|
 Tleety
|
45a48bbbe5
|
Merge remote-tracking branch 'origin/master' into Rendering
|
2015-12-03 18:15:56 +01:00 |
|
|
Tleety
|
64aa3a1064
|
rendering/util now added to CMakeLists.txt
|
2015-12-03 15:02:14 +01:00 |
|
|
sippeangelo
|
6ca1977e78
|
Added Xerces dependency
|
2015-12-01 17:04:03 +01:00 |
|
|
sippeangelo
|
6ded34d160
|
Made Rendering/Util visible to CMake project
|
2015-12-01 17:04:03 +01:00 |
|
|
sippeangelo
|
872879c013
|
Engine puzzle completed
|
2015-11-30 17:02:24 +01:00 |
|
|
sippeangelo
|
52278d7bc2
|
More CMake bullshit
|
2015-11-30 11:16:43 +01:00 |
|
|
sippeangelo
|
059dee76ed
|
Initial CMake bullshit
|
2015-11-24 10:36:49 +01:00 |
|