74456a4d80
Spawning players on rand spawnpoint when they connect
2014-02-26 14:55:29 +01:00
15df481dd3
GL - merge stuff
2014-02-26 12:00:30 +01:00
f56323ee01
Merge with affectedByTag. Sending killer ID
2014-02-25 12:12:24 +01:00
7460f16512
Added player stats. Added players to level. Respawn logic in level.
2014-02-25 11:46:05 +01:00
bc17a9f09e
merge
2014-02-25 10:37:33 +01:00
22f52150d5
Sending dmg, respawn and dead from player to client
2014-02-21 15:42:09 +01:00
3178f08bf0
GL - player can shoot, lookdir is now sent
2014-02-21 11:10:47 +01:00
f84c996a52
GameLogic - Added disconnect messages and reuse of players
2014-02-20 16:52:36 +01:00
3520062577
Implemented TurnLeft function
2014-02-19 13:59:59 +01:00
f0c581ca04
GameLogic - Added functions for relative rotation
2014-02-19 13:47:49 +01:00
61c49cf352
Merge with game logic
2014-02-14 11:54:28 +01:00
a42dfe96f1
Jump implemented
2014-02-14 11:52:44 +01:00
8bbdb1156a
Merge remote-tracking branch 'origin/GamePhysics' into GameLogic
2014-02-14 11:34:47 +01:00
59697bfcea
GL - fixed constructors to ease creation of objects, also fixed weapon crash on destruction
2014-02-14 09:59:26 +01:00
ff951d2183
Moving fixed
...
Jumping and waiting for camera is next
2014-02-13 19:49:33 +01:00
64b2d688bd
Försök till merge men det är cp
2014-02-12 14:48:58 +01:00
e8536cc5d4
GL - removed before collision event, sending look and right dir to server
2014-02-12 13:11:35 +01:00
cc4e3f947c
GL - playermovement fixed, can walk in diagonal directions
2014-02-12 12:16:16 +01:00
fa16f71a26
GL - forgot to commit files
2014-02-12 11:36:08 +01:00
310ed3dfc5
GameServer - Multiplayer now working properly
2014-02-09 16:42:26 +01:00
426444ca34
GL - added more boxes and weaponfunctionality
2014-02-05 11:46:04 +01:00
d8c7220569
GL - added some testing things in player and more objects to the world
2014-02-04 16:08:28 +01:00
e21cfe4cd4
GL - merge with Erik
2014-02-03 16:21:48 +01:00
a3886c4f1f
GL - added models and started to fix camera movement
2014-02-03 15:52:00 +01:00
99b041f165
GL - first implementation of weapons forcepull with pickup functionallity
2014-02-03 15:32:58 +01:00
446bdd412b
GL - updated constructors to set before and after collision response functions
2014-01-29 14:33:21 +01:00
3b552d5361
GL - change gamelogic to use the new physics
2014-01-28 15:44:32 +01:00
4085a5f5e2
GL - added shot protocol
2014-01-27 13:56:31 +01:00
74ac5e2d31
Updated creation of objects
2014-01-27 08:54:25 +01:00
8c297d1e9b
GL - starting to send lookdir to server
2014-01-23 09:24:55 +01:00
6a888cb154
GL - adjusting collisionManager
2014-01-22 15:47:44 +01:00
954de26b43
GL - mergeproblems
2014-01-21 16:11:02 +01:00
0aae9de92b
blah
2014-01-21 16:10:07 +01:00
ebaa668382
Major updates to Collision handling with the class CollitionManager. changes started on the massdriver
2014-01-21 16:09:39 +01:00
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
386b27e2f7
GameLogic - Merge with sprint2.5
2014-01-20 16:17:01 +01:00
6c3c234be1
GameLogic - pree-sprint merge
2014-01-20 15:47:52 +01:00
ce4c57bab3
GL - player inherits dynamicobject instead of object
2014-01-20 08:40:41 +01:00
0080a9f6f2
small name changes
2014-01-16 11:17:19 +01:00
ceac5ce31d
Modified namespace around Threadsafe queue and IQueue. Added TCP_NODELAY to sockets. Implemented some functionality to gamelogic
2014-01-15 11:03:25 +01:00
ce89e6bc98
GameServer - Fixed some minor bugs, one that made server crash on exit. Also integrated some of GameLogics new API functions
2014-01-13 12:44:33 +01:00
059b3dd5e4
GameLogic - Basic game interface made (functions not yet implemented)
2014-01-10 12:33:15 +01:00
0065779205
Added comments where the physic generated errors due to big patch
2013-12-21 17:37:30 +01:00
15d6ac8cf9
GameLogic - Final sprint2 merge
2013-12-20 09:42:02 +01:00
8173f3818d
gamelogic update and added some level design elements
...
teammanager, team,
2013-12-18 08:30:58 +01:00
f29f50f830
Merged with Gamelogic branch and fixed errors and added features
2013-12-14 22:04:42 +01:00
8f36f64c4f
updated AttatchmentMassDriver and CollisionManager
...
weapon attatchments now have a owner(player) to facillitate the weapon
manipulating the player using it.
CollisionManager now works with a tag void* in the rigidbody to link
with a game object instead of the RefManager component
2013-12-12 12:16:13 +01:00
e11d7d94f7
updated the weapon system, collisionManager and redid the "object" heirarki
2013-12-12 09:36:14 +01:00
4b9f2671bf
updated weapon
2013-12-10 11:17:25 +01:00
97e0b1298a
added functionallity to player and weapon, started on the weapon design.
2013-12-10 09:57:05 +01:00
Linda Andersson
Erik Persson
dean11
Robin Engman
Sam Mario Svensson