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

199 Commits

Author SHA1 Message Date
Pontus Fransson 6f264f5e7b Misc - EventHandler fixed all errors. 2014-01-31 15:38:12 +01:00
Pontus Fransson d5f285c089 Misc - Test 2014-01-31 14:31:27 +01:00
Erik Persson 16f535bfa3 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 
Conflicts:
	Code/Game/GameLogic/AttatchmentMassDriver.cpp
	Code/Game/GameLogic/Game_PlayerData.cpp
	Code/Game/GameLogic/Level.cpp
 2014-01-31 14:16:32 +01:00
Erik Persson b753387649 asd 2014-01-31 14:14:20 +01:00
Erik Persson 16a342da49 GL - adjusting in GL, added forcepushData struct for passing args when shooting. connect changes in network 2014-01-31 14:05:52 +01:00
lindaandersson 57c230d458 GL - will merge with physics 2014-01-31 13:56:22 +01:00
Pontus Fransson 8ee8374169 Misc - EventHandler 2014-01-31 11:28:01 +01:00
Pontus Fransson da9b615994 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 
Conflicts:
	Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
 2014-01-31 11:10:35 +01:00
Dennis Andersen 21cb7731b7 Merge with GL 2014-01-31 11:03:45 +01:00
Dennis Andersen c9c562fda6 GameServer - Added some functionality in windowshell 2014-01-31 10:50:38 +01:00
Pontus Fransson e718048f7f GL - Lan State 2014-01-31 10:49:52 +01:00
lindaandersson 4df6b849a6 GL - working with new models and server 2014-01-31 09:39:44 +01:00
Dennis Andersen 34b6b29fc4 GameLogic - Merged with GL 2014-01-31 09:24:16 +01:00
Erik Persson 31feccf284 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 
Conflicts:
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
	Code/Game/GameLogic/Game.cpp
 2014-01-31 09:17:54 +01:00
lindaandersson a6ff6eba42 GL - merge with server 2014-01-31 09:14:55 +01:00
Erik Persson c30db71e94 GL - more testing and changes to the level and using the physics API 2014-01-31 09:12:15 +01:00
Dennis Andersen 40f0fe61f0 GameServer - Fixed Protocols not recieveing properly and fixed the resource loader. 2014-01-31 08:41:08 +01:00
Pontus Fransson cec022b381 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-30 23:24:16 +01:00
Pontus Fransson 3c1eed0f3f GL - Added LanMenuState 2014-01-30 23:23:37 +01:00
lindaandersson 0aa39275e3 GL - only client with server update server. Update recieverfunction 2014-01-30 15:20:35 +01:00
Erik Persson ae6a570a12 GL - trying to make walking nice 2014-01-30 15:12:53 +01:00
lindaandersson 05e24d0514 GL - uppdate server 2014-01-30 14:17:50 +01:00
lindaandersson 1ccf98e3eb GL - added loginstate 2014-01-30 11:58:44 +01:00
lindaandersson d41ddca45d Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic 2014-01-30 11:13:42 +01:00
Erik Persson 323b7322fa GL - testing 2014-01-30 11:11:45 +01:00
Dennis Andersen 05740665da GameServer - Fixed a small error regarding not reaching some data 2014-01-30 11:11:04 +01:00
lindaandersson a249e7ede9 GL - merge with new serverAPI 2014-01-30 10:57:44 +01:00
lindaandersson 09693c7f35 GL - merge 2014-01-30 09:40:58 +01:00
lindaandersson 7d9d8e4615 GL - added jump 2014-01-30 09:07:56 +01:00
Dennis Andersen fa29cd7307 GameServer - Merged with GameLogic 2014-01-30 00:19:00 +01:00
lindaandersson 44ba45bcc2 GL - added setCollisionfunc to object 2014-01-29 16:01:56 +01:00
lindaandersson 16334ea2db GL - collision working, going to merge with physics 2014-01-29 13:18:17 +01:00
Dennis Andersen 36f057d2cc Broekn branch not broekn more 2014-01-29 10:18:01 +01:00
lindaandersson a56fcbcb9b GL - can send object position from level objects, gravity and frustrum problems. 2014-01-28 15:04:25 +01:00
Dennis Andersen 91e825dbfb Broekn stuff to tobias 2014-01-28 09:00:02 +01:00
lindaandersson 3896514bae GL - mergecommit 2014-01-27 14:02:37 +01:00
lindaandersson 4085a5f5e2 GL - added shot protocol 2014-01-27 13:56:31 +01:00
lindaandersson 5b984db9ba GL - gameState merge 2014-01-27 13:25:09 +01:00
lindaandersson fb2cf714c6 GL - sending dir to server, forward and backward walking works 2014-01-23 14:28:53 +01:00
lindaandersson 8c297d1e9b GL - starting to send lookdir to server 2014-01-23 09:24:55 +01:00
lindaandersson f657a58a4f GL - adding a camera on the client 2014-01-23 08:24:35 +01:00
Dennis Andersen 22a5db97f8 Added final protocols, and a bit of support for them on server side 2014-01-22 15:22:52 +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
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 6c3c234be1 GameLogic - pree-sprint merge 2014-01-20 15:47:52 +01:00
lindaandersson a168328a44 GL - movement with physics working!! 2014-01-16 12:26:14 +01:00
lindaandersson 8557559b9b GL - going to merge 2014-01-15 11:57:36 +01:00
lindaandersson 0ffe26c134 GL - Merge client with gameserver 2014-01-15 08:18:06 +01:00
lindaandersson 32e64c0dbb GL - moved reciever struct to a separate file 2014-01-14 10:25:49 +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
lindaandersson c541d032e7 GL - can move a obj on the client via the server 2014-01-10 10:47:54 +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 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
Linda Andersson 16715f3f2a GL - push before merge 2013-12-20 11:27:04 +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
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
Linda Andersson ba6f7114b5 GL - added id in object, vector 2013-12-19 11:58:42 +01:00
Linda Andersson 13430f31fc GL - merge and some more protocols 2013-12-19 10:22:32 +01:00
Linda Andersson a4907c8e2e GL - control protocol added 2013-12-18 15:28:47 +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
Erik Persson 4d7be753c5 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-18 08:32:20 +01:00
Erik Persson 8173f3818d gamelogic update and added some level design elements 
teammanager, team,
 2013-12-18 08:30:58 +01:00
Linda Andersson 9d722bced3 GL - recieve messages from server 2013-12-17 13:39:10 +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
Linda Andersson dc3221ee11 GL - set pos function for C_models 2013-12-16 11:08:10 +01:00
Linda Andersson b60166a6e8 GL - connect to server, need right IP 2013-12-16 09:55:51 +01:00
Linda Andersson fa1473455f GL - added C_obj files, client obj in game state to send input 2013-12-16 09:45:12 +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
Linda Andersson 7c1d19946d GL - Connection to network in clinet 2013-12-13 12:02:49 +01:00
dean11 a3e4262c08 Merge with Other part of gamelogic(DanbiasGame) 2013-12-12 14:44:06 +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
Linda Andersson bb789faa67 GL - merge with network - fixed dependencies in launcher project 2013-12-11 09:00:36 +01:00
Linda Andersson 78f20e04a1 GL - moved object files to Obj 2013-12-10 11:27:20 +01:00
Linda Andersson f0181ad9f4 GL - fixed defines in headers - more structure for states 2013-12-10 11:26:18 +01:00
Linda Andersson ea593743ad GL - added UI object 2013-12-09 12:01:36 +01:00
Linda Andersson 4134836405 GL - added client objects 
-  no memory leaks in client
 2013-12-09 11:05:47 +01:00
Linda Andersson 38a1602d3f GL - merge with graphics api. Lobby and game state. 2013-12-09 09:23:39 +01:00
Linda Andersson b331ce1a1f GL - started working with client application 2013-12-06 10:38:43 +01:00
Linda Andersson e658071643 GL- open a red window from lancher project 2013-12-04 11:32:43 +01:00
dean11 a852e8eab4 Created the game modules 2013-12-03 12:07:37 +01:00