Dander7BD
|
f1e6a1c897
|
Merge fixes
Warning! Possibility that code were lost during this merge.
Please oh please do check what branch you are in before you edit files.
|
2014-02-27 10:46:30 +01:00 |
Linda Andersson
|
5a74f5368f
|
Added collision and weapon events and send them to client
|
2014-02-27 10:24:37 +01:00 |
|
Linda Andersson
|
5620a3c517
|
Added eventfunctions for PlayerAction and PickupEvent
|
2014-02-27 10:07:07 +01:00 |
|
Linda Andersson
|
4d967b995d
|
Added player stats. Added players to level. Respawn logic in level.
|
2014-02-27 10:06:01 +01:00 |
|
lindaandersson
|
22f52150d5
|
Sending dmg, respawn and dead from player to client
|
2014-02-21 15:42:09 +01:00 |
Erik Persson
|
3178f08bf0
|
GL - player can shoot, lookdir is now sent
|
2014-02-21 11:10:47 +01:00 |
dean11
|
f84c996a52
|
GameLogic - Added disconnect messages and reuse of players
|
2014-02-20 16:52:36 +01:00 |
|
Dander7BD
|
f04a928d6e
|
Merge remote-tracking branch 'origin/Physics' into GameClient
|
2014-02-19 14:01:46 +01:00 |
|
dean11
|
f0c581ca04
|
GameLogic - Added functions for relative rotation
|
2014-02-19 13:47:49 +01:00 |
Pontus Fransson
|
6c19c12682
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
Conflicts:
Code/Game/GameLogic/LevelLoader/LevelLoader.cpp
Code/Game/GameLogic/LevelLoader/LevelLoader.h
Code/Game/GameLogic/LevelLoader/LevelParser.cpp
Code/Game/GameLogic/LevelLoader/LevelParser.h
Code/Game/GameLogic/LevelLoader/Loader.cpp
Code/Game/GameLogic/LevelLoader/Loader.h
Code/Game/GameLogic/LevelLoader/ObjectDefines.h
Code/Game/GameLogic/LevelLoader/ParseFunctions.cpp
|
2014-02-19 11:25:33 +01:00 |
|
Pontus Fransson
|
7f8c10292e
|
Moved LevelLoader to a seperate lib project.
|
2014-02-19 11:00:16 +01:00 |
|
Dennis Andersen
|
8a0dbe969c
|
GameLogic - Added filename to paramater when initiating a level, Also changed some string to wstrings
|
2014-02-18 21:24:21 +01:00 |
|
dean11
|
484b055338
|
GL - Call by reference instead
|
2014-02-18 11:44:02 +01:00 |
|
Erik Persson
|
06ddb86b17
|
GL - GetAllDynamicObjects , dennis order
|
2014-02-18 11:33:36 +01:00 |
Sam Mario Svensson
|
64b2d688bd
|
Försök till merge men det är cp
|
2014-02-12 14:48:58 +01:00 |
|
lindaandersson
|
e8536cc5d4
|
GL - removed before collision event, sending look and right dir to server
|
2014-02-12 13:11:35 +01:00 |
|
dean11
|
de4ea0a830
|
GameServer - Merged with GameLogic, some stuff is broken
|
2014-02-11 13:03:37 +01:00 |
|
Dennis Andersen
|
310ed3dfc5
|
GameServer - Multiplayer now working properly
|
2014-02-09 16:42:26 +01:00 |
|
lindaandersson
|
426444ca34
|
GL - added more boxes and weaponfunctionality
|
2014-02-05 11:46:04 +01:00 |
|
lindaandersson
|
a3886c4f1f
|
GL - added models and started to fix camera movement
|
2014-02-03 15:52:00 +01:00 |
|
lindaandersson
|
09693c7f35
|
GL - merge
|
2014-01-30 09:40:58 +01:00 |
|
Dennis Andersen
|
1e89bb4e30
|
Fixed protocol messaging. Known crash when recieveing protocol on server after a while...
|
2014-01-29 15:01:14 +01:00 |
|
lindaandersson
|
a56fcbcb9b
|
GL - can send object position from level objects, gravity and frustrum problems.
|
2014-01-28 15:04:25 +01:00 |
|
Erik Persson
|
e11dc6551c
|
GL - ?
|
2014-01-27 14:45:19 +01:00 |
|
lindaandersson
|
8c297d1e9b
|
GL - starting to send lookdir to server
|
2014-01-23 09:24:55 +01:00 |
|
Dennis Andersen
|
f7f59e8ac8
|
GameServer - Added more protocols and modified old ones a bit. Also added a new project that starts both server and client
|
2014-01-21 09:52:48 +01:00 |
|
Dennis Andersen
|
1a3c63cda9
|
GameLogic - fixed some minor merging errors
|
2014-01-20 16:02:26 +01:00 |
|
Dennis Andersen
|
6c3c234be1
|
GameLogic - pree-sprint merge
|
2014-01-20 15:47:52 +01:00 |