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

697 Commits

Author SHA1 Message Date
Sam Mario Svensson 2b63563a9b Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat 2014-01-28 11:30:59 +01:00
Sam Mario Svensson d2ebad7445 GL - Fixed ParseFunction so now we only have 1 + specialcases functions instead of 1 function for every case 2014-01-28 11:29:35 +01:00
Pontus Fransson 4de1c1aafd GL - More Object structs, LevelLoader api comments. 
Changed the LevelParser to use the new functions from ParserFunctions.
Might need to cast something to (void*).
 2014-01-28 11:27:29 +01:00
Sam Mario Svensson dd2b214122 GL- la in memcpy för parsing i parseFunctions 2014-01-27 14:57:18 +01:00
Sam Mario Svensson 99fbef8a64 Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat 2014-01-27 13:57:42 +01:00
Sam Mario Svensson 91bf6ce901 GL- LevelFormat fix 2014-01-27 13:57:18 +01:00
Pontus Fransson 51a1b3ecff GL - Resource get size 2014-01-27 13:55:05 +01:00
Sam Mario Svensson d6432b2c73 Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat 2014-01-27 10:16:25 +01:00
Sam Mario Svensson 1748fe323a GL - Added Parsing functions for levelLoader and moved Packing classes to misc 2014-01-27 10:15:39 +01:00
Pontus Fransson e188794aa3 GL - Load level in LevelParser 2014-01-27 10:14:02 +01:00
Sam Mario Svensson 3c1d66e3f8 Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat 
Conflicts:
	Code/Dokumentation/LevelLoader.uxf
	Code/Game/GameLogic/GameLogic.vcxproj
 2014-01-24 10:42:19 +01:00
Sam Mario Svensson c84ed645f0 GameLogic - implementation of LevelLoader 2014-01-24 10:22:18 +01:00
Pontus Fransson aaf3bf30f9 GL - LevelParser half way implemented. 2014-01-24 10:01:58 +01:00
Pontus Fransson 0f5517398d GL - Update uml, LevelParser.h.cpp ObjectDefines.h 2014-01-24 09:00:59 +01:00
Erik Persson 121fd51c45 GL collision with level should worm 2014-01-23 08:57:46 +01:00
lindaandersson 3f144289ec GL - merge with gameserver, crash on collision in gameLogic 2014-01-23 08:30:26 +01:00
lindaandersson a591903d8f Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-23 08:25:10 +01:00
lindaandersson f657a58a4f GL - adding a camera on the client 2014-01-23 08:24:35 +01:00
Erik Persson 6a888cb154 GL - adjusting collisionManager 2014-01-22 15:47:44 +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
Erik Persson 467cf1eb68 Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-01-22 14:41:53 +01:00
Erik Persson ce80e8155c GL - formatting mistake 2014-01-22 14:39:10 +01:00
Erik Persson 43eac4cbe3 moved ForcePushAction for massdriver to collisionManager 2014-01-22 14:26:45 +01:00
Robin Engman bcbe67b620 Made default value of onCollisionResponse null 2014-01-22 14:09:53 +01:00
Robin Engman 53961f0e88 Added new onCollisionResponse handle 2014-01-22 13:50:54 +01:00
Erik Persson 80204ecbe3 GL - Massdriver usage of applyeffect 2014-01-22 13:02:13 +01:00
Robin Engman 0cae6261e9 ApplyEffect is now easier to handle for the user 
Only needs a function with a pointer to an ICustomBody now.
 2014-01-22 12:36:12 +01:00
Sam Mario Svensson 0443e753e8 GameLogic, Uml for levelLoader updated 2014-01-22 11:32:11 +01:00
Erik Persson c178ec34fd Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-22 10:51:24 +01:00
Erik Persson db593f65a2 Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-01-22 10:51:13 +01:00
Sam Mario Svensson 1b86500ab0 GameLogic - Uml for LevelLoader 2014-01-22 10:39:16 +01:00
Erik Persson 954de26b43 GL - mergeproblems 2014-01-21 16:11:02 +01:00
Erik Persson 0aae9de92b blah 2014-01-21 16:10:07 +01:00
Erik Persson ebaa668382 Major updates to Collision handling with the class CollitionManager. changes started on the massdriver 2014-01-21 16:09:39 +01:00
lindaandersson 6cf5ed3a22 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-01-21 14:58:08 +01:00
Robin Engman 5c85580ffd Added gravity normal to state struct 2014-01-21 14:56:34 +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
Robin Engman 39e4f7881b Added typedef for collision response 2014-01-21 14:24:45 +01:00
Robin Engman b0227ab513 Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics 2014-01-21 14:11:17 +01:00
Robin Engman 090d44b518 Added visit function to API 
Called with collideable and hit action
 2014-01-21 14:10:31 +01:00
Dander7BD 65db1bf90d lerp fix 3 2014-01-21 12:11:30 +01:00
Dander7BD 0d39240fc2 lerp fix 2 2014-01-21 12:08:31 +01:00
Dander7BD b422d2d509 lerp fix 2014-01-21 12:01:12 +01:00
Robin Engman 94f1c20817 Added more data to rigid body description. 
Friction and restitution coeffs
 2014-01-21 11:48:04 +01:00
Dander7BD ea647c185c Merge branch 'LERP' into Physics 2014-01-21 11:23:32 +01:00
Dander7BD 9a2d2b9490 Interpolation methods referred in ::Oyster::Math & Math3D 2014-01-21 11:23:03 +01:00
Dander7BD 408d51e46b SnapAxisYToNormal_UsingNlerp implemented 2014-01-21 11:15:33 +01:00
lindaandersson c7b3c1ec30 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-01-21 10:38:03 +01:00