9bf84cdc65
Stable Graphics, hard coded texture read in ObjReader.ToModel
2013-11-28 14:34:52 +01:00
4672984b51
Merge remote-tracking branch 'origin/Octree' into Physics
2013-11-28 14:19:11 +01:00
632d412f9c
Fixed sample and added visit.
2013-11-28 14:18:44 +01:00
35f66da760
Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics
2013-11-28 13:43:38 +01:00
d08644e8e1
Added a force reload feture in resource loading
2013-11-28 13:43:11 +01:00
f379ed49e5
inertiaTensor removed from API::SphericalBodyDescription
...
was redundant. struct already have everything that the factory needs to
generate one.
2013-11-28 12:18:06 +01:00
2928e08252
SphericalRigidBody factory done
...
not tested though
2013-11-28 12:13:14 +01:00
89fd71fb02
SimpleRigidBody factory done
...
not tested though
2013-11-28 12:08:41 +01:00
3a3d6fb151
Added comparison operators to UniquePointer and UniqueArray
...
operator ==
operator !=
2013-11-28 12:08:40 +01:00
b06a03a543
Improved Collision Event Subscription
...
From now on, will each ICustomBody instance have it's own
collisionAction function.
2013-11-28 12:08:40 +01:00
39c54f4816
Moved Octree.h into the Implementation Filter
2013-11-28 12:08:39 +01:00
64565b50de
Merge remote-tracking branch 'origin/GameLogicBranch' into Physics
2013-11-28 11:59:15 +01:00
3a6cb98b08
SimpleRigidBody factory done
...
not tested though
2013-11-28 11:58:46 +01:00
5ab1c39e3a
GL stable - running from DanBiasGame
2013-11-28 11:46:20 +01:00
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
d87e643777
lite saker + debug fönster
2013-11-26 11:30:49 +01:00
f3be9f03a3
Merge branch 'MiscBranch' of https://github.com/dean11/Danbias into Graphics
2013-11-26 11:15:19 +01:00
e5cef4895e
Added support for custom loading, unloading and reloading
2013-11-26 10:55:51 +01:00
2890c2a9ea
Added beginning of Octree class.
2013-11-26 10:21:20 +01:00
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
2859588d20
added collisionManager
...
also some changes around the place
2013-11-26 09:19:59 +01:00
abfd3116ca
Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
2013-11-26 09:17:25 +01:00
f78027a1cf
dll - working
...
fix in unique pointer and array - missing copy constructor
2013-11-26 09:16:51 +01:00
973aadac2d
Engine tweaks + DefferedVertexDefinition
2013-11-26 09:09:35 +01:00
220f1da8b6
added GameMode class to level
2013-11-26 08:56:31 +01:00
45c145439a
Fixade crash och flyttade initsockets, shutdownsockets.
...
Moved initsocket and shutdownsockets to WinsockFunctions.
2013-11-25 20:27:23 +01:00
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
caabb6702e
Fixed code standard, Added packing functions
2013-11-25 19:00:33 +01:00
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
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
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
ca5e578af5
reconstruction in connection.
2013-11-25 14:03:32 +01:00
bc988eff0d
ICustomBody Documented
2013-11-25 13:46:05 +01:00
e2c90a467b
reference manager for physics communication
2013-11-25 12:52:07 +01:00
0db45bd63f
game_dll_usage
2013-11-25 12:36:25 +01:00
241d1b2d3d
Merge remote-tracking branch 'origin/Physics' into GameLogicBranch
2013-11-25 12:34:13 +01:00
de9a1cae56
Game_Dll_export
2013-11-25 12:33:27 +01:00
bf3dcd088b
Moar dll fixes for Physics
2013-11-25 12:21:44 +01:00
82b8ef7b05
Fixed connection split up connect function and added initiateClient()
2013-11-25 12:14:01 +01:00
d600668df7
Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
2013-11-25 12:05:23 +01:00
0bee758848
Merge remote-tracking branch 'origin/Physics' into GameLogicBranch
2013-11-25 12:04:07 +01:00
cc67d227ab
Dll fixes
...
API::Instance were not properly implemented
Added __stdcall
2013-11-25 12:03:41 +01:00
956fbc21e7
Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
2013-11-25 11:57:07 +01:00
8ded483442
Merge remote-tracking branch 'origin/Physics' into GameLogicBranch
2013-11-25 11:56:25 +01:00
46abe2c8c6
namespace Physics::Error removed
...
No need for it anymore.
2013-11-25 11:55:58 +01:00
de3286306a
Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
2013-11-25 11:51:18 +01:00
0e2401ef69
test with physics dll
2013-11-25 11:49:40 +01:00
275c1a96d9
Merge remote-tracking branch 'origin/Physics' into GameLogicBranch
2013-11-25 11:48:15 +01:00
4072bf50fb
Fixed DLL support for physics Engine
...
.. hopefully
2013-11-25 11:47:42 +01:00
640ac2172a
checked the coding standard and changed it accordinly
2013-11-25 11:39:54 +01:00
d33d1f41bc
Some documentation
2013-11-25 11:35:38 +01:00
lanariel
Robin Engman
dean11
Dander7BD
Linda Andersson
Erik Persson
Pontus Fransson
Sam Mario Svensson