Commit Graph

25 Commits

Author SHA1 Message Date
Sam Mario Svensson 261421af21 Merge remote-tracking branch 'origin/GameLogic-LevelFormat' into GameLogic 2014-01-30 13:44:18 +01:00
lindaandersson 09693c7f35 GL - merge 2014-01-30 09:40:58 +01:00
lindaandersson 3a9c47722a Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-01-29 13:18:25 +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
lindaandersson 9ccfebd9fd GL - merge with physics 2014-01-28 15:43:32 +01:00
Robin Engman 15ae3675b4 Updated UML with functions 2014-01-28 13:39:15 +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
Dander7BD 201095eb41 Merge remote-tracking branch 'origin/Moment-of-Inertia' into Physics 2014-01-28 09:00:47 +01:00
Dennis Andersen 91e825dbfb Broekn stuff to tobias 2014-01-28 09:00:02 +01:00
Dander7BD 87793b3926 Added documentation
Timestep Impulse fix treatise / proposition
2014-01-27 15:04:48 +01:00
Dander7BD 8f63bf637e Physics UMLET diagram
Current state under sprint 3
2014-01-24 15:03:03 +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 0f5517398d GL - Update uml, LevelParser.h.cpp ObjectDefines.h 2014-01-24 09:00:59 +01:00
Dander7BD 163481ce4f Documentation edit
Were missing a final step about the ang. momentum toang. velocity
conversion documentation.
2014-01-23 18:33:48 +01:00
Dander7BD 76e4b23f19 Added documentation
Mathematical exercise on how to convert angular momentum to angular
velocity
2014-01-23 14:54:53 +01:00
Sam Mario Svensson 0443e753e8 GameLogic, Uml for levelLoader updated 2014-01-22 11:32:11 +01:00
Sam Mario Svensson 1b86500ab0 GameLogic - Uml for LevelLoader 2014-01-22 10:39:16 +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 7262535454 Added some more UML-stuff 2014-01-09 14:19:12 +01:00
Dennis Andersen 73302bf171 Added UML-documents 2014-01-08 12:45:48 +01:00
dean11 33e7afabcd Restructured folders to give a flexible solution for dependencies and added to ignore list 2013-11-18 15:41:09 +01:00