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

1494 Commits

Author SHA1 Message Date
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 cac38decca MISC - Fixed a bug in ResourceLoader 2014-01-31 11:00:04 +01:00
lindaandersson fa7f400c71 GL - test this robin 2014-01-31 10:58:03 +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
Pontus Fransson 3b8a8e9c09 Network - Fixed receiving parts of packages. 2014-01-30 23:22:46 +01:00
lindaandersson bb8e92ec36 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-30 15:20:44 +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
Sam Mario Svensson 4167b6a93b GL- merge fix 2014-01-30 15:02:35 +01:00
Dennis Andersen 77932ecce7 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer 2014-01-30 14:59:38 +01:00
lindaandersson 2bb2d0cd56 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-30 14:58:30 +01:00
Dander7BD 0a04c1c9f1 Added document 2014-01-30 14:52:40 +01:00
Dennis Andersen e043d03a59 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer 2014-01-30 14:40:04 +01:00
lindaandersson 713dc269d1 Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic 2014-01-30 14:18:00 +01:00
lindaandersson 05e24d0514 GL - uppdate server 2014-01-30 14:17:50 +01:00
Dennis Andersen 09f39ec26d GameServer - Added acces directly to clients in network session 2014-01-30 14:15:25 +01:00
Sam Mario Svensson 261421af21 Merge remote-tracking branch 'origin/GameLogic-LevelFormat' into GameLogic 2014-01-30 13:44:18 +01:00
Sam Mario Svensson c78bbba3eb GL- Removed commentet unnecessary code 2014-01-30 13:33:59 +01:00
lindaandersson 2a69af5c9f GL - merge 2014-01-30 12:01:48 +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 c593fd2225 Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-01-29 16:02:11 +01:00
lindaandersson 44ba45bcc2 GL - added setCollisionfunc to object 2014-01-29 16:01:56 +01:00
Dennis Andersen 1e89bb4e30 Fixed protocol messaging. Known crash when recieveing protocol on server after a while... 2014-01-29 15:01:14 +01:00
Dander7BD 88e67ff876 Inertia big patch 
It's ali-..WORKS! It works!
 2014-01-29 14:57:39 +01:00
lindaandersson 446bdd412b GL - updated constructors to set before and after collision response functions 2014-01-29 14:33:21 +01:00
lindaandersson 3a9c47722a Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-01-29 13:18:25 +01:00
lindaandersson 16334ea2db GL - collision working, going to merge with physics 2014-01-29 13:18:17 +01:00
Robin Engman aa99742894 Added epsilon value for testing 2014-01-29 12:22:18 +01:00
Robin Engman 1d3b073e7f Added functionallity to stop collision responses 2014-01-29 11:22:04 +01:00
Robin Engman 4ccf11b5d6 Fixed vector issue 2014-01-29 10:54:59 +01:00
Dennis Andersen 36f057d2cc Broekn branch not broekn more 2014-01-29 10:18:01 +01:00
Dander7BD 60062feb07 Documentation update 
Math treatises
 2014-01-28 17:51:02 +01:00
Sam Mario Svensson f968adebeb GL - LevelLoader = done and done 2014-01-28 16:15:10 +01:00