Commit Graph

29 Commits

Author SHA1 Message Date
Dennis Andersen 42de421904 Master - Modified igore 2014-01-08 13:07:55 +01:00
Dennis Andersen ed202a15a2 Worked over the holidays 2014-01-07 10:26:09 +01:00
Dennis Andersen 15d6ac8cf9 GameLogic - Final sprint2 merge 2013-12-20 09:42:02 +01:00
Dennis Andersen 694d5576d7 GameLogic - Pre-merge with physics 2013-12-19 15:35:49 +01:00
Dennis Andersen 934aa6e45a Merge 2013-12-19 12:34:59 +01:00
Dennis Andersen beb116e964 Fixed some threafing and stuff 2013-12-19 12:32:23 +01:00
Erik Persson e68001da0e testing updated
message to client about object creation, message to client about player
movement
2013-12-19 11:46:11 +01:00
Linda Andersson 057dce0aca GL - merge errors 2013-12-19 10:31:59 +01:00
Linda Andersson 13430f31fc GL - merge and some more protocols 2013-12-19 10:22:32 +01:00
Erik Persson 0ea08fbd54 gamesession testing 2013-12-19 10:21:03 +01:00
Linda Andersson a4907c8e2e GL - control protocol added 2013-12-18 15:28:47 +01:00
Dennis Andersen 33d045de1a GameLogic - Merge with Erik 2013-12-18 13:10:47 +01:00
Dennis Andersen 8721224d7c GameLogic - Added alot of functionality to Game related parts 2013-12-18 13:07:10 +01:00
Linda Andersson 0c98e2847d GL - added some protocols 2013-12-18 12:18:01 +01:00
dean11 8667e14afb Merged with Linda after merge conflicts 2013-12-17 10:28:44 +01:00
dean11 4650615a61 Gamelogic - Pre merge with Linda 2013-12-17 10:25:34 +01:00
Linda Andersson 5d1d64bebb GL - trying to send move protocol 2013-12-17 10:07:46 +01:00
dean11 6bfe7711ab Gamelogic - Modified gameprotocol id:s 2013-12-16 10:02:30 +01:00
dean11 7cda07507a GameLogic - Pre merge with Netowkr 2013-12-16 09:50:23 +01:00
dean11 9eb8fcba40 Gamelogic - Publication to others... 2013-12-16 09:00:11 +01:00
dean11 f29f50f830 Merged with Gamelogic branch and fixed errors and added features 2013-12-14 22:04:42 +01:00
Linda Andersson 7c1d19946d GL - Connection to network in clinet 2013-12-13 12:02:49 +01:00
dean11 4617523f8b Gamelogic - Commit because branch switch 2013-12-12 20:32:54 +01:00
dean11 a3e4262c08 Merge with Other part of gamelogic(DanbiasGame) 2013-12-12 14:44:06 +01:00
dean11 71d31db884 GAMELOGIC - Fixed a minor major huge issue with no problems 2013-12-12 14:37:35 +01:00
dean11 af7f0e01a8 Pre-network merge, (again) 2013-12-12 10:36:55 +01:00
dean11 fd3776a53b GameLogic - Pre-network merge 2013-12-12 09:33:59 +01:00
Linda Andersson 22665bc44b GL - started using network and protocols for sending/recieveing 2013-12-11 12:14:00 +01:00
dean11 fbd95a7109 GAMELOGIC - Added a protocol api 2013-12-09 11:57:34 +01:00