Commit Graph

26 Commits

Author SHA1 Message Date
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
Dennis Andersen fa29cd7307 GameServer - Merged with GameLogic 2014-01-30 00:19:00 +01:00
Dennis Andersen 36f057d2cc Broekn branch not broekn more 2014-01-29 10:18:01 +01:00
Dennis Andersen 91e825dbfb Broekn stuff to tobias 2014-01-28 09:00:02 +01:00
Dennis Andersen 6c3c234be1 GameLogic - pree-sprint merge 2014-01-20 15:47:52 +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
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
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 d68fd63b25 Added server launcher 2013-12-19 13:35:56 +01:00
Dennis Andersen beb116e964 Fixed some threafing and stuff 2013-12-19 12:32:23 +01:00
Dennis Andersen 097fa1da34 GameLogic - Pre merge with Linda 2013-12-17 14:15:20 +01:00
dean11 4650615a61 Gamelogic - Pre merge with Linda 2013-12-17 10:25:34 +01:00
dean11 ec3c5f1290 Gamelogic - Added threading functionality to NetworkClient 2013-12-16 11:05:24 +01:00
dean11 f29f50f830 Merged with Gamelogic branch and fixed errors and added features 2013-12-14 22:04:42 +01:00
dean11 8b1c2b91e8 Fixed some craches and stuff 2013-12-13 23:47:16 +01:00
dean11 693b9df928 Some wierd stuff is going on here 2013-12-12 12:54:08 +01:00
dean11 de01d23d1d Fixed some structure issues and commented 2013-11-29 09:23:08 +01:00
dean11 0785e54dfd Removed .orig files after merge 2013-11-28 15:19:52 +01:00
dean11 6e71b6ac54 Fixed merging errors 2013-11-28 15:17:25 +01:00
dean11 cc4835a97b Merge with Physics branch 2013-11-28 15:09:09 +01:00
Dander7BD d241298308 merging MiscBranch into Physics with conflict fixes 2013-11-28 14:52:13 +01:00
dean11 d08644e8e1 Added a force reload feture in resource loading 2013-11-28 13:43:11 +01:00
dean11 fe7fd6b0b3 Fixed bugs in the threading wrapper 2013-11-27 21:47:32 +01:00
dean11 48c812b033 Forgot to follow coding standard... 2013-11-26 21:51:40 +01:00
dean11 e4904870b3 Added a threading wrapper with basic functionality that needs real testing 2013-11-26 21:08:34 +01:00