Commit Graph

145 Commits

Author SHA1 Message Date
Erik Persson ce80e8155c GL - formatting mistake 2014-01-22 14:39:10 +01:00
Erik Persson 43eac4cbe3 moved ForcePushAction for massdriver to collisionManager 2014-01-22 14:26:45 +01:00
Erik Persson 80204ecbe3 GL - Massdriver usage of applyeffect 2014-01-22 13:02:13 +01:00
Erik Persson 954de26b43 GL - mergeproblems 2014-01-21 16:11:02 +01:00
Erik Persson 0aae9de92b blah 2014-01-21 16:10:07 +01:00
Erik Persson ebaa668382 Major updates to Collision handling with the class CollitionManager. changes started on the massdriver 2014-01-21 16:09:39 +01:00
lindaandersson 8792aab992 GL - merge with gameServer 2014-01-21 14:36:46 +01:00
Dennis Andersen 50c09547f3 GameServer - Added protocols and stuff 2014-01-21 14:32:42 +01:00
lindaandersson 561418c427 GL - gravity working 2014-01-21 14:28:27 +01:00
lindaandersson 06d468299a GL - linking problem fix 2014-01-21 10:37:45 +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 0a41d20099 GameLogic - Merged with graphics 2014-01-20 16:36:25 +01:00
Dennis Andersen 386b27e2f7 GameLogic - Merge with sprint2.5 2014-01-20 16:17:01 +01:00
Dennis Andersen 1a3c63cda9 GameLogic - fixed some minor merging errors 2014-01-20 16:02:26 +01:00
Dennis Andersen ab2a3a3892 GameLogic - fixed some minor merging errors 2014-01-20 16:01:54 +01:00
Dennis Andersen 6c3c234be1 GameLogic - pree-sprint merge 2014-01-20 15:47:52 +01:00
lindaandersson a1128986d5 Merge with Gamle Logic 2014-01-20 11:59:43 +01:00
Erik Persson ce4c57bab3 GL - player inherits dynamicobject instead of object 2014-01-20 08:40:41 +01:00
Erik Persson eaf0ae1479 GL - can now compile 2014-01-17 08:52:34 +01:00
lindaandersson 7b2be02113 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-16 12:26:33 +01:00
lindaandersson a168328a44 GL - movement with physics working!! 2014-01-16 12:26:14 +01:00
Erik Persson d08e999f07 Create level and initiate it with a rigidbody etc 2014-01-16 12:08:24 +01:00
Erik Persson 225d8912da GL - make rigidbody level 2014-01-16 11:40:29 +01:00
Erik Persson 0080a9f6f2 small name changes 2014-01-16 11:17:19 +01:00
Erik Persson 567fa229eb small name changes 2014-01-16 11:07:45 +01:00
lindaandersson aac92bc20e GL- send new player pos to client 2014-01-16 09:30:16 +01:00
lindaandersson 0c8783ba84 GL - merge done 2014-01-15 12:02:52 +01:00
lindaandersson 8557559b9b GL - going to merge 2014-01-15 11:57:36 +01:00
Dennis Andersen 5f00aa7af7 GL - Merge with origin/Gamelogic 2014-01-15 11:45:34 +01:00
Erik Persson 208482b0ce GL merge error 2014-01-15 11:25:59 +01:00
Dennis Andersen 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
lindaandersson 9a32c44e49 GL - Merge branch 'GameLogic' 2014-01-15 08:19:35 +01:00
lindaandersson 0ffe26c134 GL - Merge client with gameserver 2014-01-15 08:18:06 +01:00
Dennis Andersen 54babfc7c7 Gameserver - Merged with Gamelogic 2014-01-14 10:38:35 +01:00
Erik Persson 4c1be4d807 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
Conflicts:
	Code/Game/GameLogic/Game.cpp
2014-01-14 10:33:08 +01:00
Dennis Andersen 87b8c0c7bb Gameserver - Merged with Gamelogic 2014-01-14 10:29:39 +01:00
Erik Persson 54240b217c GameLogic - game interface updated(not finnished)
förlåt dennis
2014-01-14 10:28:12 +01:00
lindaandersson 32e64c0dbb GL - moved reciever struct to a separate file 2014-01-14 10:25:49 +01:00
Dennis Andersen 82de85d1ac Fixed minor server network bug, modified shader to get visual 2014-01-14 10:15:50 +01:00
Dennis Andersen 97cba4248d GameServer - Added more protocols. Divided the code in gamesession into several .cpp files 2014-01-14 09:25:22 +01:00
lindaandersson 04c5898f4e GL - sending string and createOBJ working 2014-01-14 09:24:55 +01:00
Dennis Andersen eb9360377d GameServer - Merged with other half of GameLogic 2014-01-13 12:50:27 +01:00
Dennis Andersen 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
lindaandersson 792f78c34a GL- adding client UML, trying AddObj protocol with down-button. Problem with sending char* 2014-01-13 12:11:45 +01:00
Dennis Andersen 2b5a5b2fbd GameServer - Merge with gamelogic 2014-01-10 23:36:03 +01:00
Erik Persson 059b3dd5e4 GameLogic - Basic game interface made (functions not yet implemented) 2014-01-10 12:33:15 +01:00
lindaandersson f6ba81cd44 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-10 10:48:29 +01:00
lindaandersson c541d032e7 GL - can move a obj on the client via the server 2014-01-10 10:47:54 +01:00
Erik Persson 586031aa94 GameLogic - making sure GameLogic uses the new physics api 2014-01-10 10:08:42 +01:00
Dennis Andersen a02a32c029 Network now closes listener gracefully, meaning threads dont crash anymore, also fixed a minor bug in Game folder 2014-01-09 14:18:01 +01:00