Danbias

Commit Graph

Author	SHA1	Message	Date
Erik Persson	d08e999f07	Create level and initiate it with a rigidbody etc	2014-01-16 12:08:24 +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
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
Erik Persson	54240b217c	GameLogic - game interface updated(not finnished) förlåt dennis	2014-01-14 10:28:12 +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
Erik Persson	059b3dd5e4	GameLogic - Basic game interface made (functions not yet implemented)	2014-01-10 12:33:15 +01:00
Dennis Andersen	92b3525587	GameLogic - Cleanup after erik ;)	2013-12-18 13:12:11 +01:00
Linda Andersson	38a1602d3f	GL - merge with graphics api. Lobby and game state.	2013-12-09 09:23:39 +01:00
dean11	3d973c16a2	Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic	2013-12-03 12:09:22 +01:00
dean11	a852e8eab4	Created the game modules	2013-12-03 12:07:37 +01:00

17 Commits