Dander7BD
|
3be98e6647
|
Merge remote-tracking branch 'origin/GameServer' into Camera
Conflicts:
Code/Game/DanBiasGame/GameClientState/GameClientState.h
Code/Game/DanBiasGame/GameClientState/GameState.cpp
|
2014-02-11 14:56:43 +01:00 |
Dander7BD
|
0f3c5af04a
|
pre merge
|
2014-02-11 14:47:57 +01:00 |
Dander7BD
|
46d1fa13e1
|
premerge
|
2014-02-11 14:14:06 +01:00 |
Dander7BD
|
c3b2c1e912
|
premerge
|
2014-02-11 14:13:24 +01:00 |
Dander7BD
|
058eada44c
|
Added missing include lines
|
2014-02-11 14:12:14 +01:00 |
Dander7BD
|
03ab4affb7
|
Minor fixes
|
2014-02-11 13:27:33 +01:00 |
dean11
|
7c0a597ed3
|
GameServer - Merge with Gamelogic
|
2014-02-11 13:26:51 +01:00 |
Dander7BD
|
322f752deb
|
Merge remote-tracking branch 'origin/GameServer' into Camera
Conflicts:
Code/Game/DanBiasGame/GameClientState/GameState.cpp
|
2014-02-11 13:21:44 +01:00 |
dean11
|
de4ea0a830
|
GameServer - Merged with GameLogic, some stuff is broken
|
2014-02-11 13:03:37 +01:00 |
dean11
|
3274727923
|
GameServer - Added more gameplay protocols and structured the old mess
|
2014-02-11 10:21:47 +01:00 |
lindaandersson
|
071624779e
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-11 10:11:57 +01:00 |
lindaandersson
|
d16d223c2b
|
GL - player moving
|
2014-02-11 10:11:38 +01:00 |
Dander7BD
|
5ddafc7fc2
|
Merge remote-tracking branch 'origin/GameLogic' into Camera
|
2014-02-11 09:34:17 +01:00 |
Dander7BD
|
d5e85b4258
|
minor refractoring
|
2014-02-11 09:32:49 +01:00 |
Pontus Fransson
|
10a227ff9c
|
Merge remote-tracking branch 'origin/GameLogic-MessageHandler' into GameLogic
Conflicts:
Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
|
2014-02-11 09:25:10 +01:00 |
lindaandersson
|
489115840d
|
GL - base for lvl loading
|
2014-02-11 09:17:16 +01:00 |
Dennis Andersen
|
399e0d049c
|
GameServer - Merged with Graphics
|
2014-02-10 23:10:31 +01:00 |
Dennis Andersen
|
450f4249f3
|
Documentation - Updated uml diagrams
|
2014-02-10 22:25:31 +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 |
lanariel
|
e0f3031187
|
Pointlight no pointer Model render pointer
|
2014-02-10 16:08:03 +01:00 |
lindaandersson
|
b731c206f4
|
GL - physics merge 2
|
2014-02-10 15:54:38 +01:00 |
Dander7BD
|
b435818567
|
Added Camera_FPS
|
2014-02-10 15:19:55 +01:00 |
Dander7BD
|
77eceaf285
|
Camera_Basic edits
|
2014-02-10 15:19:42 +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 |
Robin Engman
|
e5e99924d9
|
Updates for objects
|
2014-02-10 13:25:28 +01:00 |
Dander7BD
|
0153be16d5
|
Added VS Filter Camera
|
2014-02-10 13:03:21 +01:00 |
Dander7BD
|
800d5d0505
|
Camera_Basic stuff
|
2014-02-10 13:01:46 +01:00 |
Robin Engman
|
ba0d6ca73a
|
Amazing merge with server
|
2014-02-10 12:42:31 +01:00 |
Dander7BD
|
da58165645
|
Added Basic camera
|
2014-02-10 12:02:48 +01:00 |
Robin Engman
|
427ec3b716
|
Major overhaul fix
|
2014-02-10 10:52:08 +01:00 |
Robin Engman
|
99146430a4
|
Major overhaul
|
2014-02-09 21:24:09 +01:00 |
Dennis Andersen
|
14bf3ede86
|
Merged with GameLogic and fixed merging errors, some minor justifications may be needed later on due to merging errors..
|
2014-02-09 18:58:14 +01:00 |
Dennis Andersen
|
4abfdd70fe
|
Merged with GameLogic and fixed merging errors, some minor justifications may be needed later on due to merging errors..
|
2014-02-09 18:58:07 +01:00 |
Dennis Andersen
|
310ed3dfc5
|
GameServer - Multiplayer now working properly
|
2014-02-09 16:42:26 +01:00 |
Robin Engman
|
ab9f81ac60
|
Collisions work better
Still needs polishing
|
2014-02-07 15:38:53 +01:00 |
Robin Engman
|
1633129a2c
|
Commit to Dennis
|
2014-02-07 13:09:44 +01:00 |
Robin Engman
|
b225c53611
|
More cool stuff
|
2014-02-07 11:43:18 +01:00 |
lindaandersson
|
91db71fe0e
|
GL - 20 boxes and a house
|
2014-02-05 15:54:48 +01:00 |
Dennis Andersen
|
201a07f0dc
|
GameServer - Merged with GameLogic
|
2014-02-05 15:16:31 +01:00 |
lindaandersson
|
70a2cf27e3
|
GL - almost ok, at least on the top of the world
|
2014-02-05 11:53:38 +01:00 |
lindaandersson
|
426444ca34
|
GL - added more boxes and weaponfunctionality
|
2014-02-05 11:46:04 +01:00 |
Dennis Andersen
|
db822fa832
|
GameServer - Merged with gamelogic
|
2014-02-04 22:33:39 +01:00 |
Dennis Andersen
|
b7f550859d
|
GameServer - Merge with GameLogic
|
2014-02-04 22:13:07 +01:00 |
lindaandersson
|
d8c7220569
|
GL - added some testing things in player and more objects to the world
|
2014-02-04 16:08:28 +01:00 |
Dennis Andersen
|
de8c76f051
|
GameServer - Fixed bugg where threads touched same data, n players should now be able to connect
|
2014-02-04 16:07:10 +01:00 |
Erik Persson
|
bd9e4599cb
|
GL - fixed respawning and also fixed weapon
|
2014-02-04 13:58:48 +01:00 |
lindaandersson
|
d54cffee8e
|
GL - camera follows player
|
2014-02-04 11:50:15 +01:00 |