dean11
|
ca715dbe05
|
GameLogic - Merged with gamelogic
|
2014-02-27 09:11:00 +01:00 |
|
Dennis Andersen
|
ffa6da1a2f
|
GameLogic - Fixed drop on secondary, Modified how keys are sent
|
2014-02-27 08:19:50 +01:00 |
|
dean11
|
b289741897
|
Broken shit, dont take
|
2014-02-26 16:57:32 +01:00 |
Linda Andersson
|
9c4f72882c
|
Merged: game logic with new Input
|
2014-02-26 15:12:13 +01:00 |
|
dean11
|
504f11ef4c
|
Gameserver - Merged with gamelogic
|
2014-02-26 14:42:17 +01:00 |
|
dean11
|
b1f82c8ef2
|
Merged with Physics
|
2014-02-26 14:07:46 +01:00 |
|
Linda Andersson
|
934bc80b62
|
InGame keys: Go to mainMenu with M. Exit client with ESC. Fix drop in drop out correctly.
|
2014-02-26 11:53:33 +01:00 |
|
dean11
|
7c52fe236f
|
NewInput - Merged with gameClient
|
2014-02-25 16:42:51 +01:00 |
|
Linda Andersson
|
7460f16512
|
Added player stats. Added players to level. Respawn logic in level.
|
2014-02-25 11:46:05 +01:00 |
Dander7BD
|
1f90de4cb4
|
some implemetations
|
2014-02-24 19:45:13 +01:00 |
|
Dennis Andersen
|
44aab68bfb
|
Input - More support for mouse
|
2014-02-21 21:04:30 +01:00 |
|
lindaandersson
|
22f52150d5
|
Sending dmg, respawn and dead from player to client
|
2014-02-21 15:42:09 +01:00 |
|
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 |
Erik Persson
|
695d6db7a9
|
Merge remote-tracking branch 'origin/GameServer' into GameLogic
|
2014-02-21 11:57:21 +01:00 |
|
lindaandersson
|
7de0a2ba1b
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameClient
|
2014-02-21 11:24:11 +01:00 |
|
Erik Persson
|
3178f08bf0
|
GL - player can shoot, lookdir is now sent
|
2014-02-21 11:10:47 +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 |
|
Dander7BD
|
61ce9a9a3e
|
New input system integrations
|
2014-02-20 16:55:34 +01:00 |
|
lindaandersson
|
3bee35785a
|
moved debug buttons to gameState
|
2014-02-20 16:51:14 +01:00 |
|
lindaandersson
|
d83e545e58
|
Started adding GameUI
|
2014-02-20 16:35:49 +01:00 |
|
Dander7BD
|
cd4e5ae0ec
|
compilation error fixes
|
2014-02-19 14:00:48 +01:00 |
|
Dander7BD
|
8816efafc8
|
GameState pre-work for subStates
|
2014-02-19 13:15:19 +01:00 |