 Jace
|
01db8e0615
|
Merge remote-tracking branch 'origin/master' into Dirtybit
# Conflicts:
# src/Engine/Collision/CollisionSystem.cpp
# src/Engine/Core/Transform.cpp
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Rendering/AnimationSystem.cpp
# src/Engine/Rendering/BoneAttachmentSystem.cpp
# src/Game/Systems/CapturePointSystem.cpp
# src/Game/Systems/ExplosionEffectSystem.cpp
# src/Game/Systems/PlayerMovementSystem.cpp
|
2016-03-12 04:09:53 +01:00 |
|
 stiffly
|
6f69b52358
|
Merge remote-tracking branch 'origin/Menu' into FriendlyHost/Join
|
2016-03-09 14:34:41 +01:00 |
|
 Tleety
|
500ebfa08c
|
Menu should now show the correct server IP instead of default.
Start of a StartMenu entity that will show when the game is started.
|
2016-03-09 14:34:02 +01:00 |
|
|
stiffly
|
09171a1a18
|
WIP connect from menu
|
2016-03-09 14:33:20 +01:00 |
|
|
Tleety
|
3394d65055
|
Servers now show up in the server list.
|
2016-03-08 18:13:21 +01:00 |
|
|
Tleety
|
280de0e984
|
Merge remote-tracking branch 'origin/FriendlyHost/Join' into Menu
# Conflicts:
# include/Game/Systems/MainMenuSystem.h
# src/Engine/GUI/MainMenuSystem.cpp
|
2016-03-08 17:03:50 +01:00 |
|
|
Tleety
|
ba9208085b
|
WIP
|
2016-03-08 16:52:56 +01:00 |
|