Dander7BD
|
60a5ddc79d
|
Merge remote-tracking branch 'origin/GameClient' into New-inputsystem
Conflicts:
Code/Game/GameClient/GameClient.vcxproj
Code/Game/GameClient/GameClientState/GameState.cpp
|
2014-02-21 12:14:22 +01:00 |
Dander7BD
|
adda3c1fff
|
Merge remote-tracking branch 'origin/Input' into New-inputsystem
Conflicts:
Code/Misc/Input/Include/Mouse.h
|
2014-02-21 11:54:40 +01:00 |
dean11
|
ed6f80765e
|
Misc - Intergrated seperate textual input
|
2014-02-21 11:43:05 +01:00 |
lindaandersson
|
0ade5fde25
|
GameClient UI base. TODO: make it look pretty
|
2014-02-21 10:49:02 +01:00 |
Dander7BD
|
ac492b413b
|
implementations
|
2014-02-21 09:36:43 +01:00 |
Dander7BD
|
ab70cb53c4
|
Merge remote-tracking branch 'origin/GameClient' into New-inputsystem
Conflicts:
Code/Game/GameClient/GameClientState/GameState.cpp
Code/Game/GameClient/GameClientState/GamingUI.cpp
|
2014-02-20 17:19:48 +01:00 |
lindaandersson
|
d83e545e58
|
Started adding GameUI
|
2014-02-20 16:35:49 +01:00 |
Dander7BD
|
fa2c4455f1
|
missed file
|
2014-02-20 14:59:24 +01:00 |
Dander7BD
|
0f1d07cee0
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-19 13:15:29 +01:00 |
Dander7BD
|
8816efafc8
|
GameState pre-work for subStates
|
2014-02-19 13:15:19 +01:00 |
lindaandersson
|
ad37095a80
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-19 11:31:14 +01:00 |
lindaandersson
|
77ad199cf6
|
GameClient - merged with all new things
|
2014-02-19 11:31:05 +01:00 |
Pontus Fransson
|
7f8c10292e
|
Moved LevelLoader to a seperate lib project.
|
2014-02-19 11:00:16 +01:00 |
lindaandersson
|
6ef0a7caa6
|
Added lights to client
|
2014-02-19 10:59:23 +01:00 |
Dander7BD
|
2e75d168a1
|
New Cameras
V2 is quaternion based
|
2014-02-18 12:04:22 +01:00 |
Dander7BD
|
12623d1b16
|
Bunch of implementations
|
2014-02-17 16:16:39 +01:00 |
Dander7BD
|
29f66d2874
|
Fixed build errors in GameClient
|
2014-02-17 11:50:51 +01:00 |
dean11
|
7395a0a495
|
Major cleanup
|
2014-02-17 10:38:11 +01:00 |