ac37ff90de
Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
2013-11-28 11:27:02 +01:00
42948a1412
collision and refrence managers updated
2013-11-28 11:23:11 +01:00
bb7c635223
unstageing graphics
2013-11-28 11:20:46 +01:00
6d12045df9
Merge remote-tracking branch 'origin/Physics' into Octree
2013-11-28 11:20:33 +01:00
28dc57cf38
Added basic functionality for container
2013-11-28 11:18:07 +01:00
23d3af21c6
Added comparison operators to UniquePointer and UniqueArray
...
operator ==
operator !=
2013-11-28 11:15:25 +01:00
ecbb606544
Added basic functionality for container.
2013-11-28 11:14:24 +01:00
4cab44063d
dll problems
2013-11-28 10:40:23 +01:00
07e3aa1697
Improved Collision Event Subscription
...
From now on, will each ICustomBody instance have it's own
collisionAction function.
2013-11-28 10:26:29 +01:00
3a444aaae8
Moved Octree.h into the Implementation Filter
2013-11-28 10:24:32 +01:00
9bddfc9ffa
changed collision manager
...
is now a namespace with functions that are to be sent to a rigidbody
2013-11-28 09:26:29 +01:00
0c40ca1be5
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
2013-11-28 08:52:22 +01:00
00e02b6909
Removed OysterMath from OysterNetworkClient
2013-11-28 08:52:11 +01:00
a59cd54688
enum type naming fixed continued.
2013-11-28 08:51:21 +01:00
0feb4dff7e
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
2013-11-28 08:41:24 +01:00
b3ec2f3aa1
fix
2013-11-28 08:41:20 +01:00
14eee7d2da
Merge branch 'MiscBranch' of https://github.com/dean11/Danbias into Network
2013-11-28 08:40:40 +01:00
d29046652e
enum type naming fixed
2013-11-28 08:40:38 +01:00
899e833fca
Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
...
Conflicts:
Bin/DLL/GamePhysics_x86D.dll
Bin/DLL/GamePhysics_x86D.exp
Bin/DLL/GamePhysics_x86D.ilk
Bin/DLL/GamePhysics_x86D.pdb
Code/GameLogic/Object.cpp
Code/GameLogic/Object.h
2013-11-28 08:37:56 +01:00
acd8681489
asd
2013-11-28 08:33:29 +01:00
5eec570768
Added an atomic<int> to the reference counter for thread saftey
2013-11-27 22:39:49 +01:00
fe7fd6b0b3
Fixed bugs in the threading wrapper
2013-11-27 21:47:32 +01:00
972cfa0d39
Fixed bugs with custom loading
2013-11-27 21:12:37 +01:00
01515a4d2d
merge with physics
2013-11-27 16:21:57 +01:00
c06a53addb
Merge remote-tracking branch 'origin/Physics' into GameLogicBranch
2013-11-27 16:18:28 +01:00
1a5d1217a3
GL could draw an object but now adding DanBiasGame - problems with dll!
2013-11-27 16:17:47 +01:00
8f6ca79e6b
Unstable RenderTexture
2013-11-27 15:26:29 +01:00
6ba10d48c6
Some matrix constructors made explicit
2013-11-27 15:24:09 +01:00
36741de19b
Evil Incompotent Compiler fix
...
Sometimes the compiler decides to not compile constructors properly. :(
Edited all constructors in Collision3D to reduce chance of this.
2013-11-27 15:20:29 +01:00
6e24acea2b
Listener's Accept() is now threaded.
...
Added function private to Connection SetBlockingMode(bool blocking); But
it doesn't do anything yet.
Listener is now accepting clients in a thread.
GetNewClient() returns the socket that has connected. -1 if there is no
new client connected. (Can only connect 1 client at a time.)
The simple chat program is not working anymore because of changes in the
server.
2013-11-27 14:33:08 +01:00
fd1ac35c45
Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
2013-11-27 12:01:01 +01:00
fb3ae57bbe
GL: key input
2013-11-27 12:00:44 +01:00
43b111f0d3
Pull MiscBranch
2013-11-27 11:28:11 +01:00
f02a67b9b1
Merge branch 'MiscBranch' of https://github.com/dean11/Danbias into Network
2013-11-27 11:26:54 +01:00
aeddc032d9
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
...
Conflicts:
Code/Network/NetworkDependencies/Connection.cpp
Code/Network/NetworkDependencies/Connection.h
Code/Network/NetworkDependencies/IConnection.h
Code/Network/OysterNetworkClient/Client.cpp
Code/Network/OysterNetworkClient/Client.h
Code/Network/OysterNetworkClient/ClientMain.cpp
Code/Network/OysterNetworkServer/Client.cpp
Code/Network/OysterNetworkServer/Client.h
Code/Network/OysterNetworkServer/ServerMain.cpp
2013-11-27 11:06:03 +01:00
214e29e906
OysterByte
...
Added Byte class instead of handling byte messages manually.
Converted all functions to use OysterByte.
2013-11-27 11:01:22 +01:00
2ce74e74cc
fix
2013-11-27 09:14:44 +01:00
61777e23df
Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch
...
Conflicts:
Bin/DLL/GamePhysics_x86D.dll
Bin/DLL/GamePhysics_x86D.exp
Bin/DLL/GamePhysics_x86D.ilk
Bin/DLL/GamePhysics_x86D.pdb
Code/OysterGraphics/OysterGraphics.vcxproj
Code/OysterGraphics/OysterGraphics.vcxproj.filters
Code/OysterGraphics/OysterGraphics.vcxproj.filters.orig
2013-11-27 09:12:21 +01:00
4b6cdab17b
Stable Rendering
2013-11-27 08:22:20 +01:00
48c812b033
Forgot to follow coding standard...
2013-11-26 21:51:40 +01:00
e4904870b3
Added a threading wrapper with basic functionality that needs real testing
2013-11-26 21:08:34 +01:00
f9d9479dad
Stable Dll read, unstable Pos
2013-11-26 15:33:05 +01:00
f6ade9e4fd
ErrorMessages everywhere!
2013-11-26 13:45:03 +01:00
2de2ef9cd0
Pre merge Commit
2013-11-26 13:44:58 +01:00
c2484a363d
Merge branch 'Physics' of https://github.com/dean11/Danbias into Graphics
2013-11-26 13:43:33 +01:00
62b1c68479
Created SphericalRigidBody
...
A rotateable rigidbody that represents something spherical.
2013-11-26 13:28:47 +01:00
29362c8c60
Added more API & ICustomBody methods
...
API::Init
ICustomBody::SetSubscription
Gravity related calls
moved DLLMain.cpp
2013-11-26 13:28:46 +01:00
1f27336b3f
Added filename paramater in custom load function
2013-11-26 12:09:38 +01:00
5e8e106327
add simple input class for testing
2013-11-26 11:33:16 +01:00
97e92f8516
GL: debug fix
2013-11-26 11:32:00 +01:00
Linda Andersson
Erik Persson
Robin Engman
Dander7BD
Pontus Fransson
Sam Mario Svensson
dean11
lanariel