Dander7BD
|
4d78e30fb8
|
Overhaul of GameState
|
2014-02-12 09:02:44 +01:00 |
|
Dander7BD
|
f53926444f
|
Merge remote-tracking branch 'origin/GameLogic' into Camera-merge-attempt
Conflicts:
Code/Game/DanBiasGame/GameClientState/GameState.cpp
Code/Game/DanBiasGame/GameClientState/GameState.h
|
2014-02-10 17:00:45 +01:00 |
|
Dander7BD
|
1e70640d6e
|
Premerge
not compilable
|
2014-02-10 16:30:47 +01:00 |
lindaandersson
|
bfb763501d
|
GL - i think this is working, not using the lvl loader. put models in /Content/Models and /textures
|
2014-02-10 16:28:25 +01:00 |
|
lindaandersson
|
49d29d87a5
|
GL - merge with bullet physics and updated server
|
2014-02-10 14:41:43 +01:00 |
|
lindaandersson
|
c87bab8808
|
GL - started using the lvl format. Objects on client have pos, rot and scale (not verified)
|
2014-02-10 14:00:14 +01:00 |
Dennis Andersen
|
201a07f0dc
|
GameServer - Merged with GameLogic
|
2014-02-05 15:16:31 +01:00 |
|
lindaandersson
|
d54cffee8e
|
GL - camera follows player
|
2014-02-04 11:50:15 +01:00 |
|
lindaandersson
|
e327f64702
|
GL - can play with two characters
|
2014-01-31 16:33:16 +01:00 |
|
lindaandersson
|
7d9d8e4615
|
GL - added jump
|
2014-01-30 09:07:56 +01:00 |
|
lindaandersson
|
4085a5f5e2
|
GL - added shot protocol
|
2014-01-27 13:56:31 +01:00 |
|
lindaandersson
|
f657a58a4f
|
GL - adding a camera on the client
|
2014-01-23 08:24:35 +01:00 |
|
lindaandersson
|
792f78c34a
|
GL- adding client UML, trying AddObj protocol with down-button. Problem with sending char*
|
2014-01-13 12:11:45 +01:00 |
|
Linda Andersson
|
ba6f7114b5
|
GL - added id in object, vector
|
2013-12-19 11:58:42 +01:00 |
|
Linda Andersson
|
a4907c8e2e
|
GL - control protocol added
|
2013-12-18 15:28:47 +01:00 |
|
Linda Andersson
|
0c98e2847d
|
GL - added some protocols
|
2013-12-18 12:18:01 +01:00 |
|
Linda Andersson
|
9d722bced3
|
GL - recieve messages from server
|
2013-12-17 13:39:10 +01:00 |
|
Linda Andersson
|
dc3221ee11
|
GL - set pos function for C_models
|
2013-12-16 11:08:10 +01:00 |
|
Linda Andersson
|
fa1473455f
|
GL - added C_obj files, client obj in game state to send input
|
2013-12-16 09:45:12 +01:00 |
|
Linda Andersson
|
7c1d19946d
|
GL - Connection to network in clinet
|
2013-12-13 12:02:49 +01:00 |
|
Linda Andersson
|
f0181ad9f4
|
GL - fixed defines in headers - more structure for states
|
2013-12-10 11:26:18 +01:00 |
|
Linda Andersson
|
38a1602d3f
|
GL - merge with graphics api. Lobby and game state.
|
2013-12-09 09:23:39 +01:00 |
|
Linda Andersson
|
b331ce1a1f
|
GL - started working with client application
|
2013-12-06 10:38:43 +01:00 |