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

1572 Commits

Author SHA1 Message Date
Dander7BD 23dab9dea6 Inertia tensor fix 
should produce radian anglevelocities
 2014-01-14 11:32:02 +01:00
Dennis Andersen 54babfc7c7 Gameserver - Merged with Gamelogic 2014-01-14 10:38:35 +01:00
Dander7BD 01e7614a5c Tangiential formula fixes 2014-01-14 10:34:22 +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
Dennis Andersen 87b8c0c7bb Gameserver - Merged with Gamelogic 2014-01-14 10:29:39 +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 844aa37906 Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameServer 2014-01-14 09:25:39 +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 eb6ed13cce Merge remote-tracking branch 'origin/Graphics' into GameLogic 2014-01-14 09:25:16 +01:00
lindaandersson 04c5898f4e GL - sending string and createOBJ working 2014-01-14 09:24:55 +01:00
Dander7BD 8aa5ad7723 Revert "Work asssignment split line" 
This reverts commit 8ecd263318.
 2014-01-14 09:16:54 +01:00
Dander7BD cc68088298 linear coll. resp. fix add 
fix didn't cover all cases. Now it do
 2014-01-14 09:14:17 +01:00
Dander7BD 50b5b2dbf9 linear collision response fix 
moved improved version of Robin's implementation
 2014-01-14 09:12:37 +01:00
Dander7BD c1c3b5e6af angular collision response fix 
Incorrect formula found and corrected
 2014-01-14 09:02:46 +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
Dander7BD 8ecd263318 Work asssignment split line 2014-01-13 10:25:20 +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 40892bfee5 Merge branch 'Network' of https://github.com/dean11/Danbias into GameServer 2014-01-10 09:28:32 +01:00
Dander7BD e575fff610 Physics proj .. show all files should be set to false 
That is how we in Physics rolls
 2014-01-10 08:53:20 +01:00
Dennis Andersen 7262535454 Added some more UML-stuff 2014-01-09 14:19:12 +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
Dander7BD 8b85d1f539 Bug fixing 2014-01-09 11:48:21 +01:00
Dander7BD c13ed71cca post merge removed excess created files 
Gravity struct commit brought excess junk files
 2014-01-09 11:44:37 +01:00
Dander7BD 938447879f post merge + minor edits 
derepetifified code in struct Gravity
and some cosmetic consistency edits.
 2014-01-09 11:36:55 +01:00
Dander7BD c39e2fe791 Merge remote-tracking branch 'origin/PhysicsStructs' into Verifying-Gravity-struct 
Conflicts:
	Bin/Content/Shaders/LightPass.cso
	Code/GamePhysics/PhysicsStructs-Impl.h
 2014-01-09 11:03:25 +01:00
Dander7BD 687ffa4f99 struct State::GetView() overload 
Can now provide an offset vector as argument
 2014-01-09 10:42:22 +01:00
lanariel 0a3d68a407 Small bug fix and include new SSAO shader 2014-01-09 01:08:49 +01:00
Dennis Andersen 42de421904 Master - Modified igore 2014-01-08 13:07:55 +01:00
Dennis Andersen 73302bf171 Added UML-documents 2014-01-08 12:45:48 +01:00
lanariel 7c567ec360 SSAO and frame counter 2014-01-08 07:01:59 +01:00
Dennis Andersen ed202a15a2 Worked over the holidays 2014-01-07 10:26:09 +01:00
Dennis Andersen 4925256fd1 Added .orig to ignore 2013-12-21 23:41:55 +01:00
Dennis Andersen 3890293b03 Added .orig to ignore 2013-12-21 23:38:40 +01:00
Dennis Andersen 578d0a8533 Added .pdb and .cso to git ignore 2013-12-21 21:56:46 +01:00
Dennis Andersen 0065779205 Added comments where the physic generated errors due to big patch 2013-12-21 17:37:30 +01:00
Dander7BD fba52398c3 Merge remote-tracking branch 'origin/Physics' into Sprint2 2013-12-20 12:18:30 +01:00
Dander7BD 4d3032dc81 postmerge compile error fix 2013-12-20 12:13:12 +01:00
Dander7BD ca90b3ae3b OnPossibleCollision updated 2013-12-20 12:08:33 +01:00
Robin Engman a440cffb0e Added function to get delta time 
Now in local physics API
 2013-12-20 12:08:32 +01:00