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
97b599c99f
Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
2013-11-25 11:04:59 +01:00
15a55f76a3
test with physic
2013-11-25 11:03:06 +01:00
1ff4fb6a20
Merge remote-tracking branch 'origin/Physics' into GameLogicBranch
2013-11-25 10:55:33 +01:00
c3e3f9e461
Changed API.
...
Replaced unsigned int references with ICustomBody pointers and replaced
documentation as needed.
2013-11-25 10:54:27 +01:00
dece558947
Merge remote-tracking branch 'origin/Physics' into GameLogicBranch
2013-11-25 08:58:21 +01:00
6ac4254b9d
Documentations
...
PhysicsAPI mostly documented.
Namespace MomentOFInertia and ICustomBody still not documented
2013-11-25 08:57:47 +01:00
ad7091e520
Fixed automatic size on Messages
2013-11-22 15:48:49 +01:00
abed0157ec
Do fix during weekend; Non stable
2013-11-22 15:18:52 +01:00
6eff55e763
Fixed possible crash
2013-11-22 14:31:07 +01:00
d33220f8ca
Fixed memory leaks
...
Fixed memory leaks.
2013-11-22 14:23:08 +01:00
205c58430f
Merge branch 'MiscBranch' of https://github.com/dean11/Danbias into Graphics
2013-11-22 14:14:54 +01:00
328e4777ce
Started to wrap into dll
2013-11-22 14:09:47 +01:00
7b0265db1d
Merge branch 'Graphics' of https://github.com/dean11/Danbias into MiscBranch
2013-11-22 12:05:58 +01:00
3ef5a46779
Added functions to API.
...
Now has access to inertia functions through physics API.
2013-11-22 11:52:45 +01:00
623cffced6
Added protocols to an enum
...
Now we don't have to type cast
2013-11-22 11:40:55 +01:00
8a9ea82d7d
Added a namespace to PhysicsAPI
...
+ namespace MomentOfInertia
2013-11-22 11:17:14 +01:00
fcd88a63ae
deletedFiles
2013-11-22 11:07:14 +01:00
08b4fb5dfd
Merge branch 'Physics' of https://github.com/dean11/Danbias into Graphics
...
Conflicts:
Code/Debug/Tester.ilk
Code/Debug/Tester.pdb
2013-11-22 11:05:04 +01:00
59dcbc9729
Fixed Projection
2013-11-22 10:55:21 +01:00
dad958b612
Added Math3D methods
...
ViewMatrix_LookAtDirection
ViewMatrix_LookAtPos
as requested by Pär
2013-11-22 10:49:17 +01:00
15455db1b2
Added a resource handler with basic byte loading
2013-11-22 10:46:25 +01:00
ba4576a07a
Fixed projection and added overload function.
...
Overload function is for a different way of building FOV projection
matrices.
2013-11-22 10:44:06 +01:00
f7240ef16b
Corrected OrientationMatrix_LookAtDirection
...
Z Axis were incorrectly negated
2013-11-22 10:23:00 +01:00
9e6593abd1
bug med reference på typecast
2013-11-22 09:49:48 +01:00
c5e432b566
Fixed size
2013-11-22 09:43:24 +01:00
bacb83b084
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
...
Conflicts:
Code/Network/NetworkDependencies/Connection.cpp
Code/Network/NetworkDependencies/Connection.h
Code/Network/OysterNetworkClient/ClientMain.cpp
Code/Network/OysterNetworkServer/ServerMain.cpp
2013-11-22 09:24:44 +01:00
61be10b573
Merge remote-tracking branch 'origin/Physics' into GameLogicBranch
2013-11-22 09:22:17 +01:00
5265fd1af1
Fixed merge errors
2013-11-22 09:17:07 +01:00
6494bcb09e
Added more inertia functions.
2013-11-22 08:58:00 +01:00
954a1ac669
Fixed error
...
Fixed translation
2013-11-22 08:56:00 +01:00
4142688f6c
unsigned char instead of char and chat program with protocols
2013-11-22 08:54:26 +01:00
5abaef6e86
Fixed render errors
2013-11-21 23:54:12 +01:00
ff1695497f
Debug From Home
2013-11-21 18:31:16 +01:00
91af42c0bd
Merge conflict fixed
2013-11-21 17:27:28 +01:00
eba7995374
Merge remote-tracking branch 'origin/RigidBody' into Physics
2013-11-21 17:25:19 +01:00
dean11
Linda Andersson
lanariel
Dander7BD
Pontus Fransson
Erik Persson
Sam Mario Svensson
Robin Engman