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
86aac0c72a
Link error fixed and ObjReader
2013-11-19 13:30:46 +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
12d72b8b6e
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
2013-11-19 09:49:02 +01:00
b2710737c6
Signed-off-by: Sam Mario Svensson <sammario.svensson@gmail.com>
2013-11-19 09:47:58 +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
c9e6bbf899
Forgot to update git ignore x)
2013-11-18 15:44:46 +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
a628d8a488
Merge branch 'master' of https://github.com/dean11/Danbias into Graphics
2013-11-18 14:18:25 +01:00
7275b52609
Preliminary Rigidbody
...
Absolutly not done, but it compiles
2013-11-18 14:06:27 +01:00
d4b4973d3f
GameLogic Properties edited
...
Now they will be properly linked to Physics, and everything else Physics
depends on
2013-11-18 14:06:22 +01:00
74aee284f9
PhysicsAPI created
2013-11-18 14:06:17 +01:00
ab70bed60b
Shader main Rename
2013-11-15 11:05:19 +01:00
ed3ad9fef3
GraphicTestTri
2013-11-15 08:41:11 +01:00
19522d8ff6
References in solution adjusted
...
All references to ::Utility::Memory changed to ::Utility::DynamicMemory
2013-11-13 14:50:08 +01:00
893e6427a5
UniquePointer and UniqeArray ready to use
...
All compile errors fixed.
Tested against Visual Leak detector. No leak detected!
2013-11-13 14:48:24 +01:00
fa43650439
Forgot to #include the inline implementation file For Utilities
2013-11-13 13:56:25 +01:00
ac1fb8bab9
UniquePointer and UniqueArray
...
UniquePointer - removed hazardous members.
UniqueArray - added
All Documented
2013-11-13 12:07:21 +01:00
d9bc8ce640
Moved to Graphics Test Environment
2013-11-13 10:27:37 +01:00
55879138c4
Big Patch
...
Tons of stuff like fixing Pär's linking errors
2013-11-12 12:33:52 +01:00
d5414d1443
Big Pack
2013-11-12 00:10:48 +01:00
056fadbf79
Merge branch 'master' of https://github.com/dean11/Danbias
2013-11-11 21:16:52 +01:00
f0b464bccf
Frustrum fix
2013-11-11 21:14:52 +01:00
0ba290a385
Latest updates to Graphics, need to do test run
2013-11-11 20:02:00 +01:00
lanariel
Linda Andersson
Erik Persson
Robin Engman
Dander7BD
Pontus Fransson
Sam Mario Svensson
Tobias Grundel
dean11