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

1493 Commits

Author SHA1 Message Date
Dander7BD 1b2c49457c Task assignment in RigidBody.cpp 2013-11-21 13:15:06 +01:00
Tobias Grundel ddbc808977 Re-fixed ObjReader 2013-11-21 12:47:47 +01:00
Linda Andersson 2408bf49a1 projectfiles 2013-11-21 12:31:31 +01:00
Linda Andersson b38545962b GL test main project: Drawing a object 2013-11-21 12:05:39 +01:00
Robin Engman 3f518c72e8 Added inertia functions. 2013-11-21 11:47:34 +01:00
Dander7BD 938826b84e Forgot to test compile RigidBody 
Compile Errors is fixed
 2013-11-21 11:47:20 +01:00
Dander7BD f51d2312dd RigidBody DONE 
Needs only testing for confirmations
 2013-11-21 11:39:11 +01:00
Linda Andersson ece4a74838 succesfull merge 2013-11-21 10:07:49 +01:00
Linda Andersson a220faf7b6 Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch 2013-11-21 10:05:48 +01:00
Linda Andersson 8f0d6ec139 core update 2013-11-21 10:05:40 +01:00
Linda Andersson 2c395807cd Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch 2013-11-21 10:04:47 +01:00
lanariel a94429fd9d Fixed Unresolved Externals from Hiarchy Flattening 2013-11-21 10:02:17 +01:00
Linda Andersson 229741e707 merge with graphics 2013-11-21 09:46:26 +01:00
lanariel dc9c448150 Fix compile Errors 2013-11-21 09:43:53 +01:00
Dander7BD d90074d909 Minor changes 
Some argument renaming and changed a few RigidBody functions, in respect
to the change in the Box struct
 2013-11-20 17:40:12 +01:00
Dander7BD 8dee300dc8 Merge remote-tracking branch 'origin/Physics' into RigidBody 2013-11-20 17:01:12 +01:00
Dander7BD baec4b0392 Box updated 
orientation Matrix have been split into a rotation Matrix and a
translation Vector
 2013-11-20 16:59:12 +01:00
lanariel 16be725743 Project Include Model 2013-11-20 16:55:13 +01:00
lanariel adfec528bf Fixing Render Namespace, See, todo in Resources.cpp 2013-11-20 16:51:53 +01:00
Linda Andersson 96245fc52e merged with wapon, static and dynamic 2013-11-20 16:01:39 +01:00
Linda Andersson 28da371b80 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-20 15:47:31 +01:00
Linda Andersson 68d516cc86 adding IGame interface 2013-11-20 15:47:11 +01:00
Erik Persson 717b425147 split worldObject into dynamic and static types 2013-11-20 14:25:37 +01:00
Erik Persson abf81b7c3c added weapon and connected it to player 
changed player
 2013-11-20 14:18:31 +01:00
Robin Engman da6eda2a8c Commented non-functional features. 2013-11-20 13:48:54 +01:00
Erik Persson ce9746f10c worldObject update 2013-11-20 12:23:45 +01:00
Dander7BD 687fb6835a TangentialImpulseAcceleration 
fixed selfexplanatory documentation
 2013-11-20 11:58:27 +01:00
Robin Engman 80301ae02e Robin's fix part of RigidBody.cpp DONE 2013-11-20 11:48:54 +01:00
Dander7BD 2149ca8ab5 Dans fix part of RigidBody.cpp DONE 2013-11-20 11:44:54 +01:00
Dander7BD e41d16cc03 Task assignment in RigidBody.cpp 2013-11-20 11:36:17 +01:00
Dander7BD b8d0a106b3 Physics branch disaster Patch 
critical changes in Sprint1 branch caused major problems for the physics
patch. Files had to be backed up, Physics branch destroyed along with
it's log data. So that a new Physics branch could be made from the new
Sprint1. This patch is those copied files put back into the new physics
branch. .. logdata and 3hours lost (1h/person)
 2013-11-20 11:09:27 +01:00
lanariel 3512121f52 Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics 
Conflicts:
	Code/OysterGraphics/OysterGraphics.vcxproj
	Debug/Tester.ilk
	Debug/Tester.pdb
	OysterGraphics/Core/ShaderManager.cpp
	OysterGraphics/OysterGraphics.vcxproj.filters
	Tester/Debug/CL.read.1.tlog
	Tester/Debug/CL.write.1.tlog
	Tester/Debug/cl.command.1.tlog
	Tester/Debug/link.command.1.tlog
	Tester/Debug/link.read.1.tlog
	Tester/Debug/link.write.1.tlog
	Tester/Tester.vcxproj
 2013-11-20 10:35:00 +01:00
Pontus Fransson 5bcc285141 Sending empty strings, prints messages on server 2013-11-20 10:34:05 +01:00
lanariel 425a838f31 Core Update 2013-11-20 10:22:01 +01:00
Erik Persson 27e5b07ef6 object and worldObject 2013-11-19 18:35:35 +01:00
Sam Mario Svensson 58efe7fdd3 getline fix in chat program 2013-11-19 14:59:00 +01:00
Pontus Fransson 816dced937 Chat test server 2013-11-19 14:24:38 +01:00
Sam Mario Svensson 1df11becf7 chat test with server 
created simple chat program for the client to be able to chat between
client through a server
 2013-11-19 14:18:34 +01:00
Pontus Fransson ac75e178ce Sending a message from server to client (done and done) 2013-11-19 13:42:50 +01:00
Tobias Grundel 86aac0c72a Link error fixed and ObjReader 2013-11-19 13:30:46 +01:00
Sam Mario Svensson adcef51227 third time is the charm 
fixed send and recieve functions in IConnection
 2013-11-19 12:55:54 +01:00
Sam Mario Svensson 89ce3dd0d1 Fixed IConnection and Connection 2013-11-19 12:41:58 +01:00
Sam Mario Svensson 56c32fcbc3 Iconnection interface 2013-11-19 12:38:13 +01:00
Erik Persson ea0f3f05b4 added level and player 2013-11-19 11:07:14 +01:00
Erik Persson 33f9a86945 Added Game 
cpp and h files
 2013-11-19 09:52:36 +01:00
Sam Mario Svensson 12d72b8b6e Merge branch 'Network' of https://github.com/dean11/Danbias into Network 2013-11-19 09:49:02 +01:00
Sam Mario Svensson b2710737c6 Signed-off-by: Sam Mario Svensson <sammario.svensson@gmail.com> 2013-11-19 09:47:58 +01:00
Pontus Fransson c04593b575 Changed name on main files on server and client 2013-11-19 09:34:24 +01:00
Pontus Fransson 1022b15ea2 Removed stuff from project files 2013-11-18 16:47:57 +01:00
Pontus Fransson 32348f4cc2 Removed old stuff, and added main files for all projects 2013-11-18 16:34:50 +01:00