NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
558 Commits 1 Branch 0 Tags 38 MiB
Commit Graph

112 Commits

Author SHA1 Message Date
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
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
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
Erik Persson 52ba5602d5 GameLogic - player now using some of the new phys api 2014-01-09 13:06:18 +01:00
Erik Persson 48b9189a03 Revert "state" 
This reverts commit 4a07586076.
 2014-01-09 12:51:17 +01:00
Erik Persson 4a07586076 state 2014-01-09 12:43:32 +01:00
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 0065779205 Added comments where the physic generated errors due to big patch 2013-12-21 17:37:30 +01:00
Erik Persson d3721fcada last updates 
random stuff
 2013-12-20 11:10:36 +01:00
Dennis Andersen be39365a27 Gamelogic - Merged with existing stuff 2013-12-20 09:47:24 +01:00
Dennis Andersen 15d6ac8cf9 GameLogic - Final sprint2 merge 2013-12-20 09:42:02 +01:00
Linda Andersson ea5fc78817 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-20 09:04:30 +01:00
Linda Andersson 606cb10f8b GL - removed server include from gameLancher 2013-12-20 09:04:18 +01:00
Erik Persson f4232ca0b4 gamplay code in gamesession 2013-12-20 08:59:59 +01:00
Dennis Andersen 694d5576d7 GameLogic - Pre-merge with physics 2013-12-19 15:35:49 +01:00
Linda Andersson ecf1c5fc36 GL - delete timer 2013-12-19 14:32:52 +01:00
Linda Andersson ea59c25119 GL - mergeing error 2013-12-19 13:49:46 +01:00
Linda Andersson bb61b83392 GL - merge 2013-12-19 13:46:01 +01:00
Dennis Andersen d68fd63b25 Added server launcher 2013-12-19 13:35:56 +01:00
Dennis Andersen 0570d76e24 Modified part of some player states 2013-12-19 12:41:37 +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
Linda Andersson 27aad0d86f Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-19 11:58:54 +01:00
Linda Andersson ba6f7114b5 GL - added id in object, vector 2013-12-19 11:58:42 +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 92b3525587 GameLogic - Cleanup after erik ;) 2013-12-18 13:12:11 +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
Erik Persson f5490bf111 using a global id in object 2013-12-18 13:01:25 +01:00
Linda Andersson 0c98e2847d GL - added some protocols 2013-12-18 12:18:01 +01:00
Linda Andersson e16c939285 GL - using window manager, fixed consistent linking in danBiasGame 2013-12-18 10:47:30 +01:00