a220faf7b6
Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch
2013-11-21 10:05:48 +01:00
8f0d6ec139
core update
2013-11-21 10:05:40 +01:00
2c395807cd
Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch
2013-11-21 10:04:47 +01:00
a94429fd9d
Fixed Unresolved Externals from Hiarchy Flattening
2013-11-21 10:02:17 +01:00
229741e707
merge with graphics
2013-11-21 09:46:26 +01:00
dc9c448150
Fix compile Errors
2013-11-21 09:43:53 +01:00
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
8dee300dc8
Merge remote-tracking branch 'origin/Physics' into RigidBody
2013-11-20 17:01:12 +01:00
baec4b0392
Box updated
...
orientation Matrix have been split into a rotation Matrix and a
translation Vector
2013-11-20 16:59:12 +01:00
16be725743
Project Include Model
2013-11-20 16:55:13 +01:00
adfec528bf
Fixing Render Namespace, See, todo in Resources.cpp
2013-11-20 16:51:53 +01:00
96245fc52e
merged with wapon, static and dynamic
2013-11-20 16:01:39 +01:00
28da371b80
Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
2013-11-20 15:47:31 +01:00
68d516cc86
adding IGame interface
2013-11-20 15:47:11 +01:00
717b425147
split worldObject into dynamic and static types
2013-11-20 14:25:37 +01:00
abf81b7c3c
added weapon and connected it to player
...
changed player
2013-11-20 14:18:31 +01:00
da6eda2a8c
Commented non-functional features.
2013-11-20 13:48:54 +01:00
ce9746f10c
worldObject update
2013-11-20 12:23:45 +01:00
687fb6835a
TangentialImpulseAcceleration
...
fixed selfexplanatory documentation
2013-11-20 11:58:27 +01:00
80301ae02e
Robin's fix part of RigidBody.cpp DONE
2013-11-20 11:48:54 +01:00
2149ca8ab5
Dans fix part of RigidBody.cpp DONE
2013-11-20 11:44:54 +01:00
e41d16cc03
Task assignment in RigidBody.cpp
2013-11-20 11:36:17 +01:00
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
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
5bcc285141
Sending empty strings, prints messages on server
2013-11-20 10:34:05 +01:00
425a838f31
Core Update
2013-11-20 10:22:01 +01:00
27e5b07ef6
object and worldObject
2013-11-19 18:35:35 +01:00
58efe7fdd3
getline fix in chat program
2013-11-19 14:59:00 +01:00
816dced937
Chat test server
2013-11-19 14:24:38 +01:00
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
ac75e178ce
Sending a message from server to client (done and done)
2013-11-19 13:42:50 +01:00
adcef51227
third time is the charm
...
fixed send and recieve functions in IConnection
2013-11-19 12:55:54 +01:00
89ce3dd0d1
Fixed IConnection and Connection
2013-11-19 12:41:58 +01:00
56c32fcbc3
Iconnection interface
2013-11-19 12:38:13 +01:00
ea0f3f05b4
added level and player
2013-11-19 11:07:14 +01:00
33f9a86945
Added Game
...
cpp and h files
2013-11-19 09:52:36 +01:00
c04593b575
Changed name on main files on server and client
2013-11-19 09:34:24 +01:00
1022b15ea2
Removed stuff from project files
2013-11-18 16:47:57 +01:00
32348f4cc2
Removed old stuff, and added main files for all projects
2013-11-18 16:34:50 +01:00
33e7afabcd
Restructured folders to give a flexible solution for dependencies and added to ignore list
2013-11-18 15:41:09 +01:00
Linda Andersson
lanariel
Dander7BD
Erik Persson
Robin Engman
Pontus Fransson
Sam Mario Svensson
dean11