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

287 Commits

Author SHA1 Message Date
Linda Andersson 5e8e106327 add simple input class for testing 2013-11-26 11:33:16 +01:00
Erik Persson 97e92f8516 GL: debug fix 2013-11-26 11:32:00 +01:00
Erik Persson d87e643777 lite saker + debug fönster 2013-11-26 11:30:49 +01:00
lanariel f3be9f03a3 Merge branch 'MiscBranch' of https://github.com/dean11/Danbias into Graphics 2013-11-26 11:15:19 +01:00
dean11 e5cef4895e Added support for custom loading, unloading and reloading 2013-11-26 10:55:51 +01:00
Robin Engman 2890c2a9ea Added beginning of Octree class. 2013-11-26 10:21:20 +01:00
Erik Persson 5cc6ff81b5 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 
Conflicts:
	Code/GameLogic/Player.cpp
 2013-11-26 09:26:04 +01:00
Erik Persson 2859588d20 added collisionManager 
also some changes around the place
 2013-11-26 09:19:59 +01:00
Linda Andersson abfd3116ca Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-26 09:17:25 +01:00
Linda Andersson f78027a1cf dll - working 
fix in unique pointer and array - missing copy constructor
 2013-11-26 09:16:51 +01:00
lanariel 973aadac2d Engine tweaks + DefferedVertexDefinition 2013-11-26 09:09:35 +01:00
Erik Persson 220f1da8b6 added GameMode class to level 2013-11-26 08:56:31 +01:00
Pontus Fransson 45c145439a Fixade crash och flyttade initsockets, shutdownsockets. 
Moved initsocket and shutdownsockets to WinsockFunctions.
 2013-11-25 20:27:23 +01:00
Pontus Fransson 6b57815bb8 Merge branch 'Network' of https://github.com/dean11/Danbias into Network 
Conflicts:
	Code/Network/NetworkDependencies/Connection.cpp
 2013-11-25 19:05:28 +01:00
Pontus Fransson caabb6702e Fixed code standard, Added packing functions 2013-11-25 19:00:33 +01:00
Dander7BD 26e5fde8b0 Some PhysicsAPI implementations 
Nothing related to the oct tree though. That will have be done next
 2013-11-25 16:57:38 +01:00
Dander7BD a869771ffa Simple Rigid Body implementation 
Second Iteration
[iteration 1]: stubs
[iteration 2]: implementations with shortcuts
[iteration final]: implementations with real solutions
 2013-11-25 16:35:56 +01:00
Dander7BD 311beaac14 ICollideable edited 
For some reason the Intersects() and Contains() methods were taking a
pointer as parameter then I am certain that I wrote it as a &-reference.
If someone edited this, there is no GIT history logged about it.

Please, DO NOT CHANGE this again, thanks
 2013-11-25 14:22:38 +01:00
Sam Mario Svensson ca5e578af5 reconstruction in connection. 2013-11-25 14:03:32 +01:00
Dander7BD bc988eff0d ICustomBody Documented 2013-11-25 13:46:05 +01:00
Erik Persson e2c90a467b reference manager for physics communication 2013-11-25 12:52:07 +01:00
Linda Andersson 0db45bd63f game_dll_usage 2013-11-25 12:36:25 +01:00
Linda Andersson 241d1b2d3d Merge remote-tracking branch 'origin/Physics' into GameLogicBranch 2013-11-25 12:34:13 +01:00
Linda Andersson de9a1cae56 Game_Dll_export 2013-11-25 12:33:27 +01:00
Dander7BD bf3dcd088b Moar dll fixes for Physics 2013-11-25 12:21:44 +01:00
Sam Mario Svensson 82b8ef7b05 Fixed connection split up connect function and added initiateClient() 2013-11-25 12:14:01 +01:00
Linda Andersson d600668df7 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-25 12:05:23 +01:00
Dander7BD 0bee758848 Merge remote-tracking branch 'origin/Physics' into GameLogicBranch 2013-11-25 12:04:07 +01:00
Dander7BD cc67d227ab Dll fixes 
API::Instance were not properly implemented
Added __stdcall
 2013-11-25 12:03:41 +01:00
Linda Andersson 956fbc21e7 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-25 11:57:07 +01:00
Dander7BD 8ded483442 Merge remote-tracking branch 'origin/Physics' into GameLogicBranch 2013-11-25 11:56:25 +01:00
Dander7BD 46abe2c8c6 namespace Physics::Error removed 
No need for it anymore.
 2013-11-25 11:55:58 +01:00
Linda Andersson de3286306a Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-25 11:51:18 +01:00
Linda Andersson 0e2401ef69 test with physics dll 2013-11-25 11:49:40 +01:00
Dander7BD 275c1a96d9 Merge remote-tracking branch 'origin/Physics' into GameLogicBranch 2013-11-25 11:48:15 +01:00
Dander7BD 4072bf50fb Fixed DLL support for physics Engine 
.. hopefully
 2013-11-25 11:47:42 +01:00
Sam Mario Svensson 640ac2172a checked the coding standard and changed it accordinly 2013-11-25 11:39:54 +01:00
Dander7BD d33d1f41bc Some documentation 2013-11-25 11:35:38 +01:00
Linda Andersson 97b599c99f Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-25 11:04:59 +01:00
Linda Andersson 15a55f76a3 test with physic 2013-11-25 11:03:06 +01:00
Robin Engman 1ff4fb6a20 Merge remote-tracking branch 'origin/Physics' into GameLogicBranch 2013-11-25 10:55:33 +01:00
Robin Engman c3e3f9e461 Changed API. 
Replaced unsigned int references with ICustomBody pointers and replaced
documentation as needed.
 2013-11-25 10:54:27 +01:00
Dander7BD dece558947 Merge remote-tracking branch 'origin/Physics' into GameLogicBranch 2013-11-25 08:58:21 +01:00
Dander7BD 6ac4254b9d Documentations 
PhysicsAPI mostly documented.
Namespace MomentOFInertia and ICustomBody still not documented
 2013-11-25 08:57:47 +01:00
Pontus Fransson ad7091e520 Fixed automatic size on Messages 2013-11-22 15:48:49 +01:00
lanariel abed0157ec Do fix during weekend; Non stable 2013-11-22 15:18:52 +01:00
Pontus Fransson 6eff55e763 Fixed possible crash 2013-11-22 14:31:07 +01:00
Pontus Fransson d33220f8ca Fixed memory leaks 
Fixed memory leaks.
 2013-11-22 14:23:08 +01:00
lanariel 205c58430f Merge branch 'MiscBranch' of https://github.com/dean11/Danbias into Graphics 2013-11-22 14:14:54 +01:00
lanariel 328e4777ce Started to wrap into dll 2013-11-22 14:09:47 +01:00