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

1153 Commits

Author SHA1 Message Date
lanariel faa6efba57 added .cso to git ignore 2014-01-17 09:04:13 +01:00
bladdidoo 61b8baed1b Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics 
Conflicts:
	Code/OysterGraphics/Shader/HLSL/Deffered Shaders/GBufferHeader.hlsli
	Code/Tester/MainTest.cpp
 2014-01-17 08:58:49 +01:00
Erik Persson eaf0ae1479 GL - can now compile 2014-01-17 08:52:34 +01:00
bladdidoo c48f640cdf Loading .Dan geometry and material 2014-01-17 08:51:12 +01:00
lindaandersson 7b2be02113 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-16 12:26:33 +01:00
lindaandersson a168328a44 GL - movement with physics working!! 2014-01-16 12:26:14 +01:00
Erik Persson d08e999f07 Create level and initiate it with a rigidbody etc 2014-01-16 12:08:24 +01:00
Erik Persson df7801336a Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-01-16 11:40:58 +01:00
Erik Persson 225d8912da GL - make rigidbody level 2014-01-16 11:40:29 +01:00
Dander7BD 36a8372072 Merge branch 'Gravity' into Physics 2014-01-16 11:36:31 +01:00
Dander7BD 2e32ac02fa Merge remote-tracking branch 'origin/CollisionResponse' into Physics 2014-01-16 11:36:18 +01:00
Dander7BD 27b6affd6a BoxVsBox pointOfContact fix 
it was not translated
 2014-01-16 11:28:07 +01:00
Erik Persson 0080a9f6f2 small name changes 2014-01-16 11:17:19 +01:00
Erik Persson 8f3befecf4 Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-01-16 11:16:26 +01:00
Erik Persson 567fa229eb small name changes 2014-01-16 11:07:45 +01:00
lindaandersson a070e4d459 Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-01-16 09:30:30 +01:00
lindaandersson aac92bc20e GL- send new player pos to client 2014-01-16 09:30:16 +01:00
lanariel 483236801f Fixed compile warnings and crash on non existing models 2014-01-16 09:30:01 +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
Dander7BD 44e071fba9 Gravity implemented 2014-01-15 10:44:31 +01:00
Dander7BD 7a48e058da Added Equal operators to Gravity struct 
== & !=
 2014-01-15 10:44:20 +01:00
Dander7BD e9ad87507f Obsolete code removed 
More commentated out than deleted actually
 2014-01-15 09:06:57 +01:00
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
Robin Engman 8c7a17ff8f Added missing mass and inertia 2014-01-14 11:58:53 +01:00
Dander7BD 8f630125b4 AngularVelocity fix 2014-01-14 11:42:54 +01:00
Dander7BD 89ef3b830a Revert "Inertia tensor fix" 
This reverts commit 23dab9dea6.
 2014-01-14 11:40:47 +01:00
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