954de26b43
GL - mergeproblems
2014-01-21 16:11:02 +01:00
0aae9de92b
blah
2014-01-21 16:10:07 +01:00
ebaa668382
Major updates to Collision handling with the class CollitionManager. changes started on the massdriver
2014-01-21 16:09:39 +01:00
6cf5ed3a22
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-01-21 14:58:08 +01:00
5c85580ffd
Added gravity normal to state struct
2014-01-21 14:56:34 +01:00
8792aab992
GL - merge with gameServer
2014-01-21 14:36:46 +01:00
50c09547f3
GameServer - Added protocols and stuff
2014-01-21 14:32:42 +01:00
561418c427
GL - gravity working
2014-01-21 14:28:27 +01:00
39e4f7881b
Added typedef for collision response
2014-01-21 14:24:45 +01:00
b0227ab513
Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics
2014-01-21 14:11:17 +01:00
090d44b518
Added visit function to API
...
Called with collideable and hit action
2014-01-21 14:10:31 +01:00
65db1bf90d
lerp fix 3
2014-01-21 12:11:30 +01:00
0d39240fc2
lerp fix 2
2014-01-21 12:08:31 +01:00
b422d2d509
lerp fix
2014-01-21 12:01:12 +01:00
94f1c20817
Added more data to rigid body description.
...
Friction and restitution coeffs
2014-01-21 11:48:04 +01:00
ea647c185c
Merge branch 'LERP' into Physics
2014-01-21 11:23:32 +01:00
9a2d2b9490
Interpolation methods referred in ::Oyster::Math & Math3D
2014-01-21 11:23:03 +01:00
408d51e46b
SnapAxisYToNormal_UsingNlerp implemented
2014-01-21 11:15:33 +01:00
c7b3c1ec30
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-01-21 10:38:03 +01:00
06d468299a
GL - linking problem fix
2014-01-21 10:37:45 +01:00
43e5561995
Gravity fix 3
2014-01-21 10:34:22 +01:00
7087421bb9
InterpolateAxisYToAxis_Nlerp implemented
2014-01-21 10:32:44 +01:00
a1d98b9357
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-01-21 10:05:03 +01:00
44929f005d
Merge remote-tracking branch 'origin/GameServer' into GameLogic
2014-01-21 10:03:51 +01:00
76723cf2d8
Gravity fix 2
2014-01-21 09:58:33 +01:00
f7f59e8ac8
GameServer - Added more protocols and modified old ones a bit. Also added a new project that starts both server and client
2014-01-21 09:52:48 +01:00
98563b6c33
Gravity fix
2014-01-21 09:27:52 +01:00
748023bf9e
Vector Nlerp fix
2014-01-21 08:57:18 +01:00
2ec8662a83
Utility::Value::Clamp
2014-01-20 18:46:08 +01:00
28fbcebf98
general lerp & vector nlerp
2014-01-20 18:45:34 +01:00
24a6e7478e
Merge remote-tracking branch 'origin/Physics' into Sprint3
2014-01-20 17:08:52 +01:00
0a41d20099
GameLogic - Merged with graphics
2014-01-20 16:36:25 +01:00
386b27e2f7
GameLogic - Merge with sprint2.5
2014-01-20 16:17:01 +01:00
7cdfa726ea
GameLogic - Merged with Sprint2.5, fixed physics errors
2014-01-20 16:09:58 +01:00
1a3c63cda9
GameLogic - fixed some minor merging errors
2014-01-20 16:02:26 +01:00
ab2a3a3892
GameLogic - fixed some minor merging errors
2014-01-20 16:01:54 +01:00
6c3c234be1
GameLogic - pree-sprint merge
2014-01-20 15:47:52 +01:00
0107745c7e
Disable rotation
...
disabled at:
* RigidBody::Update_LeapFrog
* SimpleRigidBody::SetState
* SphericalRigidBody::SetState
2014-01-20 15:31:19 +01:00
82d1a03450
ICustomBody :: Custom Tag added
2014-01-20 13:44:12 +01:00
a1128986d5
Merge with Gamle Logic
2014-01-20 11:59:43 +01:00
0b8ecd740a
Added ICustombody event subscription
...
ICustomBody::EventAction_Move
if an object have moved, an event can now be subscribed.
External Impact:
ICustomBody
SimpleBodyDescription
SphericalBodyDescription
2014-01-20 11:29:43 +01:00
a8c87273e2
Gravity normal fix
...
Forgot to update that value. Done
2014-01-20 11:29:42 +01:00
80c835be58
BoxVsBox pointOfContact fix
...
it was not translated
2014-01-20 11:29:42 +01:00
ff4a39cdac
Gravity implemented
2014-01-20 11:29:41 +01:00
337c92a5b8
Added Equal operators to Gravity struct
...
== & !=
2014-01-20 11:29:40 +01:00
0f3c92cd52
Obsolete code removed
...
More commentated out than deleted actually
2014-01-20 11:29:39 +01:00
acb344ca44
Added missing mass and inertia
2014-01-20 11:29:39 +01:00
2dfe312e04
AngularVelocity fix
2014-01-20 11:29:38 +01:00
a41d53b911
Revert "Inertia tensor fix"
...
This reverts commit 23dab9dea6
2014-01-20 11:29:37 +01:00
461d153036
Inertia tensor fix
...
should produce radian anglevelocities
2014-01-20 11:29:37 +01:00
34dc27655b
Tangiential formula fixes
2014-01-20 11:29:36 +01:00
f2c6cc5306
Revert "Work asssignment split line"
...
This reverts commit 8ecd263318
2014-01-20 11:29:35 +01:00
2314935f48
linear coll. resp. fix add
...
fix didn't cover all cases. Now it do
2014-01-20 11:29:35 +01:00
ee5e5ff8ce
linear collision response fix
...
moved improved version of Robin's implementation
2014-01-20 11:29:34 +01:00
727b2acb82
angular collision response fix
...
Incorrect formula found and corrected
2014-01-20 11:29:33 +01:00
502513d4f8
Work asssignment split line
2014-01-20 11:29:33 +01:00
7834264e5f
Physics proj .. show all files should be set to false
...
That is how we in Physics rolls
2014-01-20 11:29:32 +01:00
ce4c57bab3
GL - player inherits dynamicobject instead of object
2014-01-20 08:40:41 +01:00
b85439bd5e
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-01-18 18:01:23 +01:00
f660a5c64e
Added ICustombody event subscription
...
ICustomBody::EventAction_Move
if an object have moved, an event can now be subscribed.
External Impact:
ICustomBody
SimpleBodyDescription
SphericalBodyDescription
2014-01-17 16:07:25 +01:00
7c448792dd
Gravity normal fix
...
Forgot to update that value. Done
2014-01-17 13:30:07 +01:00
893934dcf4
Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics
...
Conflicts:
Code/Tester/MainTest.cpp
2014-01-17 09:07:42 +01:00
ab0b9a925a
/Graphics Fixed stable pipeline with no warnings
2014-01-17 09:05:18 +01:00
61b8baed1b
Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics
...
Conflicts:
Code/OysterGraphics/Shader/HLSL/Deffered Shaders/GBufferHeader.hlsli
Code/Tester/MainTest.cpp
2014-01-17 08:58:49 +01:00
eaf0ae1479
GL - can now compile
2014-01-17 08:52:34 +01:00
c48f640cdf
Loading .Dan geometry and material
2014-01-17 08:51:12 +01:00
7b2be02113
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-01-16 12:26:33 +01:00
a168328a44
GL - movement with physics working!!
2014-01-16 12:26:14 +01:00
d08e999f07
Create level and initiate it with a rigidbody etc
2014-01-16 12:08:24 +01:00
df7801336a
Merge remote-tracking branch 'origin/Physics' into GameLogic
2014-01-16 11:40:58 +01:00
225d8912da
GL - make rigidbody level
2014-01-16 11:40:29 +01:00
36a8372072
Merge branch 'Gravity' into Physics
2014-01-16 11:36:31 +01:00
2e32ac02fa
Merge remote-tracking branch 'origin/CollisionResponse' into Physics
2014-01-16 11:36:18 +01:00
27b6affd6a
BoxVsBox pointOfContact fix
...
it was not translated
2014-01-16 11:28:07 +01:00
0080a9f6f2
small name changes
2014-01-16 11:17:19 +01:00
8f3befecf4
Merge remote-tracking branch 'origin/Physics' into GameLogic
2014-01-16 11:16:26 +01:00
567fa229eb
small name changes
2014-01-16 11:07:45 +01:00
a070e4d459
Merge remote-tracking branch 'origin/Physics' into GameLogic
2014-01-16 09:30:30 +01:00
aac92bc20e
GL- send new player pos to client
2014-01-16 09:30:16 +01:00
483236801f
Fixed compile warnings and crash on non existing models
2014-01-16 09:30:01 +01:00
0c8783ba84
GL - merge done
2014-01-15 12:02:52 +01:00
8557559b9b
GL - going to merge
2014-01-15 11:57:36 +01:00
5f00aa7af7
GL - Merge with origin/Gamelogic
2014-01-15 11:45:34 +01:00
208482b0ce
GL merge error
2014-01-15 11:25:59 +01:00
ceac5ce31d
Modified namespace around Threadsafe queue and IQueue. Added TCP_NODELAY to sockets. Implemented some functionality to gamelogic
2014-01-15 11:03:25 +01:00
44e071fba9
Gravity implemented
2014-01-15 10:44:31 +01:00
7a48e058da
Added Equal operators to Gravity struct
...
== & !=
2014-01-15 10:44:20 +01:00
e9ad87507f
Obsolete code removed
...
More commentated out than deleted actually
2014-01-15 09:06:57 +01:00
9a32c44e49
GL - Merge branch 'GameLogic'
2014-01-15 08:19:35 +01:00
0ffe26c134
GL - Merge client with gameserver
2014-01-15 08:18:06 +01:00
8c7a17ff8f
Added missing mass and inertia
2014-01-14 11:58:53 +01:00
8f630125b4
AngularVelocity fix
2014-01-14 11:42:54 +01:00
89ef3b830a
Revert "Inertia tensor fix"
...
This reverts commit 23dab9dea6
2014-01-14 11:40:47 +01:00
23dab9dea6
Inertia tensor fix
...
should produce radian anglevelocities
2014-01-14 11:32:02 +01:00
54babfc7c7
Gameserver - Merged with Gamelogic
2014-01-14 10:38:35 +01:00
01e7614a5c
Tangiential formula fixes
2014-01-14 10:34:22 +01:00
4c1be4d807
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
...
Conflicts:
Code/Game/GameLogic/Game.cpp
2014-01-14 10:33:08 +01:00
87b8c0c7bb
Gameserver - Merged with Gamelogic
2014-01-14 10:29:39 +01:00
54240b217c
GameLogic - game interface updated(not finnished)
...
förlåt dennis
2014-01-14 10:28:12 +01:00
32e64c0dbb
GL - moved reciever struct to a separate file
2014-01-14 10:25:49 +01:00
82de85d1ac
Fixed minor server network bug, modified shader to get visual
2014-01-14 10:15:50 +01:00
844aa37906
Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameServer
2014-01-14 09:25:39 +01:00
97cba4248d
GameServer - Added more protocols. Divided the code in gamesession into several .cpp files
2014-01-14 09:25:22 +01:00
eb6ed13cce
Merge remote-tracking branch 'origin/Graphics' into GameLogic
2014-01-14 09:25:16 +01:00
04c5898f4e
GL - sending string and createOBJ working
2014-01-14 09:24:55 +01:00
8aa5ad7723
Revert "Work asssignment split line"
...
This reverts commit 8ecd263318
2014-01-14 09:16:54 +01:00
cc68088298
linear coll. resp. fix add
...
fix didn't cover all cases. Now it do
2014-01-14 09:14:17 +01:00
50b5b2dbf9
linear collision response fix
...
moved improved version of Robin's implementation
2014-01-14 09:12:37 +01:00
c1c3b5e6af
angular collision response fix
...
Incorrect formula found and corrected
2014-01-14 09:02:46 +01:00
eb9360377d
GameServer - Merged with other half of GameLogic
2014-01-13 12:50:27 +01:00
ce89e6bc98
GameServer - Fixed some minor bugs, one that made server crash on exit. Also integrated some of GameLogics new API functions
2014-01-13 12:44:33 +01:00
792f78c34a
GL- adding client UML, trying AddObj protocol with down-button. Problem with sending char*
2014-01-13 12:11:45 +01:00
8ecd263318
Work asssignment split line
2014-01-13 10:25:20 +01:00
2b5a5b2fbd
GameServer - Merge with gamelogic
2014-01-10 23:36:03 +01:00
059b3dd5e4
GameLogic - Basic game interface made (functions not yet implemented)
2014-01-10 12:33:15 +01:00
f6ba81cd44
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-01-10 10:48:29 +01:00
c541d032e7
GL - can move a obj on the client via the server
2014-01-10 10:47:54 +01:00
586031aa94
GameLogic - making sure GameLogic uses the new physics api
2014-01-10 10:08:42 +01:00
40892bfee5
Merge branch 'Network' of https://github.com/dean11/Danbias into GameServer
2014-01-10 09:28:32 +01:00
e575fff610
Physics proj .. show all files should be set to false
...
That is how we in Physics rolls
2014-01-10 08:53:20 +01:00
7262535454
Added some more UML-stuff
2014-01-09 14:19:12 +01:00
a02a32c029
Network now closes listener gracefully, meaning threads dont crash anymore, also fixed a minor bug in Game folder
2014-01-09 14:18:01 +01:00
52ba5602d5
GameLogic - player now using some of the new phys api
2014-01-09 13:06:18 +01:00
48b9189a03
Revert "state"
...
This reverts commit 4a07586076
2014-01-09 12:51:17 +01:00
4a07586076
state
2014-01-09 12:43:32 +01:00
8b85d1f539
Bug fixing
2014-01-09 11:48:21 +01:00
c13ed71cca
post merge removed excess created files
...
Gravity struct commit brought excess junk files
2014-01-09 11:44:37 +01:00
938447879f
post merge + minor edits
...
derepetifified code in struct Gravity
and some cosmetic consistency edits.
2014-01-09 11:36:55 +01:00
c39e2fe791
Merge remote-tracking branch 'origin/PhysicsStructs' into Verifying-Gravity-struct
...
Conflicts:
Bin/Content/Shaders/LightPass.cso
Code/GamePhysics/PhysicsStructs-Impl.h
2014-01-09 11:03:25 +01:00
687ffa4f99
struct State::GetView() overload
...
Can now provide an offset vector as argument
2014-01-09 10:42:22 +01:00
0a3d68a407
Small bug fix and include new SSAO shader
2014-01-09 01:08:49 +01:00
42de421904
Master - Modified igore
2014-01-08 13:07:55 +01:00
73302bf171
Added UML-documents
2014-01-08 12:45:48 +01:00
7c567ec360
SSAO and frame counter
2014-01-08 07:01:59 +01:00
ed202a15a2
Worked over the holidays
2014-01-07 10:26:09 +01:00
0065779205
Added comments where the physic generated errors due to big patch
2013-12-21 17:37:30 +01:00
fba52398c3
Merge remote-tracking branch 'origin/Physics' into Sprint2
2013-12-20 12:18:30 +01:00
4d3032dc81
postmerge compile error fix
2013-12-20 12:13:12 +01:00
ca90b3ae3b
OnPossibleCollision updated
2013-12-20 12:08:33 +01:00
a440cffb0e
Added function to get delta time
...
Now in local physics API
2013-12-20 12:08:32 +01:00
66e93fbdae
SimpleRigid functions mirrored in SphericalRigid
...
The functions added to SimpleRigidBody has been added to
SphericalRigidBody too.
2013-12-20 12:08:31 +01:00
ec0f0e0d14
SimpleRigidBody::Predict(..) added
2013-12-20 12:08:30 +01:00
d163b7d8cf
Partial SimpleRigidBody update end
2013-12-20 12:08:30 +01:00
9a67e7ef3d
RigidBody::Move(..) added
2013-12-20 12:08:29 +01:00
604a17056c
Partial SimpleRigid update
2013-12-20 12:08:28 +01:00
c4bbc09a97
CustomBodyState::ApplyForwarding(..) added
2013-12-20 12:08:28 +01:00
9aa584acc7
RigidBody::Predict_Leapfrog(..) added
...
needed for collision response rewinding/forwarding
2013-12-20 12:08:27 +01:00
ec9f2379c7
Minor bug fixes in math librrary
2013-12-20 12:08:26 +01:00
bbc489eac9
RigidBody improved and Gimbal lock proofed
2013-12-20 12:08:25 +01:00
ff52977dcf
Bug fixes
...
including a hack
2013-12-20 12:08:24 +01:00
461fecd1d2
Bug fixing
...
SimpleRigidBody::GetNormal returned wrong results.
Second bounce impulse in OnPossibleCollision, should be subtracted
instead of added.
2013-12-20 12:08:24 +01:00
9b9e549a5e
bug fix in bool Intersect( const Box &box, const Sphere &sphere, Float4 &worldPointOfContact )
2013-12-20 12:08:22 +01:00
840f000ec9
Bug fix in API_Impl OnPossibleCollision(...)
2013-12-20 12:08:22 +01:00
4ebb8cd9b8
Minor edit in CustomBodyState
2013-12-20 12:08:21 +01:00
4e21e2b0c0
Renamed Formula::CollisionResponse::Impulse to..
...
.. Formula::CollisionResponse::Bounce
2013-12-20 12:08:20 +01:00
24418603ad
ICustomBody::GetNormal returns Float4::null if..
...
.. no normal can be decided.
2013-12-20 12:08:20 +01:00
76c83add3d
Added sanity check to SphericalRigidBody::GetNormalAt
2013-12-20 12:08:19 +01:00
42418257cb
CustomBodies now aware of it's scene
...
+ other minor changes
2013-12-20 12:08:18 +01:00
59d5a3dc1e
Created function for friction
2013-12-20 12:08:17 +01:00
9cee69edd6
Extended friction content of the ICustomBody::State struct
2013-12-20 12:08:17 +01:00
56dec6cf5d
Added "alpha" friction
...
Alpha means that the friction is not tested and most likely needs
tweaking.
2013-12-20 12:08:16 +01:00
09e55ddc30
SimpleRigidBody::GetNormalAt Done
...
implemented by using RayVsPlane tests
2013-12-20 12:07:46 +01:00
5051a9e767
Major StateStruct and API update
2013-12-20 12:07:45 +01:00
96bf20e5ae
compile errors fixed
2013-12-20 12:07:43 +01:00
dbb0c38432
Big patch
...
Loads of collision response related implementations/edits
2013-12-20 12:07:43 +01:00
9cdbe2c861
Added algorithms for collision stubs
2013-12-20 12:01:08 +01:00
e8952dc739
CollideAble implementations updated
2013-12-20 12:01:07 +01:00
632570f66b
Updated the BoxVsBox collision alghorithm
...
and added overloaded
2013-12-20 12:01:06 +01:00
a03568e19e
Updated formula for BoxVsBox point of contact
...
good enough approximation. Tested
2013-12-20 12:01:05 +01:00
ec6cd72f3c
SeperatingAxisTest_AxisAlignedVsTransformedBox overloaded
2013-12-20 12:01:05 +01:00
4858f573e6
Added more collision subs
2013-12-20 12:01:04 +01:00
d8b323e230
Extractable collision point for SphereVSSphere
2013-12-20 12:01:03 +01:00
a3ced24fea
Some compile error fixes
2013-12-20 12:01:02 +01:00
61e1d20748
Fixed const problem
2013-12-20 12:01:02 +01:00
5f305b7086
Oops
2013-12-20 11:59:38 +01:00
283633c6c6
Added stub functions
...
More funcitonallity for intersect functions.
2013-12-20 11:59:37 +01:00
de0078265c
Stub response to new ICollideAble method
...
Stubbed: Box, BoxAxisAligned, Frustrum
Fully implemented: Line & Universe
2013-12-20 11:59:36 +01:00
da996a5deb
Added cirtual function to ICollideAble
...
Overload of Intersects(...)
2013-12-20 11:59:35 +01:00
c854b1af58
Stuff
2013-12-20 11:59:35 +01:00
15dc962709
Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic
2013-12-20 11:40:07 +01:00
d3721fcada
last updates
...
random stuff
2013-12-20 11:10:36 +01:00
be39365a27
Gamelogic - Merged with existing stuff
2013-12-20 09:47:24 +01:00
15d6ac8cf9
GameLogic - Final sprint2 merge
2013-12-20 09:42:02 +01:00
ea5fc78817
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-20 09:04:30 +01:00
606cb10f8b
GL - removed server include from gameLancher
2013-12-20 09:04:18 +01:00
f4232ca0b4
gamplay code in gamesession
2013-12-20 08:59:59 +01:00
694d5576d7
GameLogic - Pre-merge with physics
2013-12-19 15:35:49 +01:00
ecf1c5fc36
GL - delete timer
2013-12-19 14:32:52 +01:00
855860d454
Gravity struct
...
Unions are the devil's work, but now there's GravityWell, Directed and
DirectedField structs implemented in PhysicsStructs
2013-12-19 14:30:16 +01:00
ea59c25119
GL - mergeing error
2013-12-19 13:49:46 +01:00
bb61b83392
GL - merge
2013-12-19 13:46:01 +01:00
d68fd63b25
Added server launcher
2013-12-19 13:35:56 +01:00
0570d76e24
Modified part of some player states
2013-12-19 12:41:37 +01:00
934aa6e45a
Merge
2013-12-19 12:34:59 +01:00
beb116e964
Fixed some threafing and stuff
2013-12-19 12:32:23 +01:00
27aad0d86f
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-19 11:58:54 +01:00
ba6f7114b5
GL - added id in object, vector
2013-12-19 11:58:42 +01:00
e68001da0e
testing updated
...
message to client about object creation, message to client about player
movement
2013-12-19 11:46:11 +01:00
057dce0aca
GL - merge errors
2013-12-19 10:31:59 +01:00
13430f31fc
GL - merge and some more protocols
2013-12-19 10:22:32 +01:00
0ea08fbd54
gamesession testing
2013-12-19 10:21:03 +01:00
341e33ee78
Rebased Lights to Use World Coordinates
2013-12-18 20:36:41 +01:00
3139585e7b
Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics
...
Conflicts:
Code/OysterGraphics/DllInterfaces/GFXAPI.cpp
Code/OysterGraphics/Shader/HLSL/Deffered Shaders/LightPass.hlsl
Code/OysterGraphics/Shader/HLSL/Deffered Shaders/VertexGatherData.hlsl
Code/Tester/MainTest.cpp
2013-12-18 20:29:24 +01:00
718b1ade2b
Proper Lighting, supports Multiple Lights
2013-12-18 20:28:06 +01:00
a4907c8e2e
GL - control protocol added
2013-12-18 15:28:47 +01:00
92b3525587
GameLogic - Cleanup after erik ;)
2013-12-18 13:12:11 +01:00
33d045de1a
GameLogic - Merge with Erik
2013-12-18 13:10:47 +01:00
8721224d7c
GameLogic - Added alot of functionality to Game related parts
2013-12-18 13:07:10 +01:00
f5490bf111
using a global id in object
2013-12-18 13:01:25 +01:00
0c98e2847d
GL - added some protocols
2013-12-18 12:18:01 +01:00
e16c939285
GL - using window manager, fixed consistent linking in danBiasGame
2013-12-18 10:47:30 +01:00
e9c5a49778
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-18 08:44:18 +01:00
347b546566
GameLogic - some minor fixes
2013-12-18 08:44:10 +01:00
2daf93987a
team fix
2013-12-18 08:41:31 +01:00
1eceb6095f
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-18 08:37:55 +01:00
bf5cc69ff7
GameLogic - Added Postbox system to netsession
2013-12-18 08:37:45 +01:00
4d7be753c5
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-18 08:32:20 +01:00
8173f3818d
gamelogic update and added some level design elements
...
teammanager, team,
2013-12-18 08:30:58 +01:00
d4e92d4bbe
Network - Fixed clear string in Translator.
2013-12-18 00:21:00 +01:00
745268eeed
Network - Removed line so it doesn't causes error.
2013-12-18 00:15:21 +01:00
623267ad1b
Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic
2013-12-18 00:10:47 +01:00
fc8dba6610
Network - Fixed Unpackb.
...
Changed Unpackb to "*buffer" instead of "buffer".
2013-12-18 00:08:50 +01:00
e1d0150ef1
Network - OysterByte += should now work correctly.
2013-12-18 00:07:24 +01:00
4df33b759c
Network - char[] unpacking.
...
Fixed correct unpacking on char[].
Fixed not clearing string in translator unpack function.
2013-12-18 00:04:25 +01:00
6f48e6a13a
Deffered Render Update
2013-12-17 14:49:45 +01:00
8700824d12
Gamlogic - Merge with Linda
2013-12-17 14:32:57 +01:00
097fa1da34
GameLogic - Pre merge with Linda
2013-12-17 14:15:20 +01:00
9d722bced3
GL - recieve messages from server
2013-12-17 13:39:10 +01:00
682a28513b
Gamelogic - Merge with network
2013-12-17 11:35:34 +01:00
7c029a5242
Network - Fixed bugs
2013-12-17 10:58:07 +01:00
8667e14afb
Merged with Linda after merge conflicts
2013-12-17 10:28:44 +01:00
4650615a61
Gamelogic - Pre merge with Linda
2013-12-17 10:25:34 +01:00
5d1d64bebb
GL - trying to send move protocol
2013-12-17 10:07:46 +01:00
cbf3c7db8f
asd
2013-12-17 09:05:49 +01:00
f31da90830
Network - Connection set blocking to true while connecting.
2013-12-17 09:05:32 +01:00
23a05bf431
Network - OysterByte += operator
2013-12-17 08:45:47 +01:00
abc94e9acb
Nothing important done
2013-12-17 00:51:42 +01:00
e4e0e1c189
Network - Fixed delay loading dll.
2013-12-16 19:58:31 +01:00
3ee25f0112
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-16 11:08:22 +01:00
dc3221ee11
GL - set pos function for C_models
2013-12-16 11:08:10 +01:00
ec3c5f1290
Gamelogic - Added threading functionality to NetworkClient
2013-12-16 11:05:24 +01:00
1c8f9c7801
Fixed link errors with dll files
2013-12-16 11:04:21 +01:00
b351a7bac4
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-16 10:02:41 +01:00
6bfe7711ab
Gamelogic - Modified gameprotocol id:s
2013-12-16 10:02:30 +01:00
b60166a6e8
GL - connect to server, need right IP
2013-12-16 09:55:51 +01:00
0d5b84a7dd
Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic
2013-12-16 09:54:05 +01:00
7cda07507a
GameLogic - Pre merge with Netowkr
2013-12-16 09:50:23 +01:00
8a8cfcc5d6
Network - Forgot to use Initiateclient().
2013-12-16 09:48:41 +01:00
fa1473455f
GL - added C_obj files, client obj in game state to send input
2013-12-16 09:45:12 +01:00
0c6badb749
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into Network
2013-12-16 09:11:18 +01:00
34d79d1207
Gamelogic - Forgot some stuff
2013-12-16 09:09:54 +01:00
3a752f6b95
Network - Merge with gamelogic
2013-12-16 09:09:48 +01:00
9eb8fcba40
Gamelogic - Publication to others...
2013-12-16 09:00:11 +01:00
7acb3a3613
Network -
2013-12-16 08:59:38 +01:00
17aa38d865
GameLogic - Merge with network, resolved 2 merging errors
2013-12-14 22:54:24 +01:00
f29f50f830
Merged with Gamelogic branch and fixed errors and added features
2013-12-14 22:04:42 +01:00
8b1c2b91e8
Fixed some craches and stuff
2013-12-13 23:47:16 +01:00
c41f5dda3f
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-13 12:03:04 +01:00
7c1d19946d
GL - Connection to network in clinet
2013-12-13 12:02:49 +01:00
f1f9f4d20a
added include string in level.h
2013-12-13 11:11:51 +01:00
7817003db8
updated h.files
...
description, started with level concept
2013-12-13 11:09:09 +01:00
94ccd91828
Network - Added comments
2013-12-13 08:23:54 +01:00
2ddb984a2b
Network - Fixed bugg, and small fixed
...
Using sizeof in MessageHeader class.
Fixed bugg in Translator.
2013-12-13 08:17:05 +01:00
4617523f8b
Gamelogic - Commit because branch switch
2013-12-12 20:32:54 +01:00
092f83a084
Network - Id on client and == operator.
2013-12-12 15:33:11 +01:00
a3e4262c08
Merge with Other part of gamelogic(DanbiasGame)
2013-12-12 14:44:06 +01:00
71d31db884
GAMELOGIC - Fixed a minor major huge issue with no problems
2013-12-12 14:37:35 +01:00
42fa756866
GameLogic - Merge with util fixed
2013-12-12 14:29:56 +01:00
94651ec77a
Network - Added stop in listener destructor.
2013-12-12 14:14:48 +01:00
693b9df928
Some wierd stuff is going on here
2013-12-12 12:54:08 +01:00
d0bd60c856
Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic
2013-12-12 12:23:55 +01:00
c661d26d2a
Network - Not deleting smart pointers anymore.
2013-12-12 12:23:35 +01:00
c63e9f1c08
Some comments on the massdriver and player
2013-12-12 12:21:19 +01:00
a5ee468795
Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic
2013-12-12 12:17:52 +01:00
9b9a92556a
Pre-merge with network, (again)
2013-12-12 12:17:39 +01:00
8f36f64c4f
updated AttatchmentMassDriver and CollisionManager
...
weapon attatchments now have a owner(player) to facillitate the weapon
manipulating the player using it.
CollisionManager now works with a tag void* in the rigidbody to link
with a game object instead of the RefManager component
2013-12-12 12:16:13 +01:00
e9b41f8cb8
Network - Fixed copy construct
2013-12-12 12:14:53 +01:00
2ea252919a
Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic
2013-12-12 10:37:40 +01:00
af7f0e01a8
Pre-network merge, (again)
2013-12-12 10:36:55 +01:00
49cfbbebd5
Network - Changed to CustomProtocolObject on send.
2013-12-12 10:32:43 +01:00
c801ab829a
Merge remote-tracking branch 'origin/Physics' into GameLogic
...
Conflicts:
Bin/Content/Shaders/TextureDebug.cso
2013-12-12 10:10:52 +01:00
c740bd5935
Added some data to PhysicsAPI
...
GetRigidLinearVelocity() and void* as reference to game object.
2013-12-12 10:02:35 +01:00
2424b51c3e
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
...
Conflicts:
Bin/Content/Shaders/DebugVertex.cso
2013-12-12 09:39:27 +01:00
0adb831f7a
Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic
2013-12-12 09:36:30 +01:00
e11d7d94f7
updated the weapon system, collisionManager and redid the "object" heirarki
2013-12-12 09:36:14 +01:00
fd3776a53b
GameLogic - Pre-network merge
2013-12-12 09:33:59 +01:00
04436258a5
Network - Non-blocking
2013-12-12 09:24:57 +01:00
bbe59836da
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
2013-12-11 21:45:51 +01:00
5a3188d5f6
Network - NetworkServer, NetworkClient, Translator
...
First version of the NetworkAPI. It should work.
2013-12-11 21:45:43 +01:00
22665bc44b
GL - started using network and protocols for sending/recieveing
2013-12-11 12:14:00 +01:00
bb789faa67
GL - merge with network - fixed dependencies in launcher project
2013-12-11 09:00:36 +01:00
d95d771c43
Network - Merged with Gamelogic
2013-12-10 14:00:20 +01:00
eb0b5ec0ee
Network - Removing old gamelogic stuff before replacing them with new stuff
2013-12-10 13:38:25 +01:00
465ea1bd19
GL - soleved merge errors in project files
2013-12-10 11:50:35 +01:00
78f20e04a1
GL - moved object files to Obj
2013-12-10 11:27:20 +01:00
f0181ad9f4
GL - fixed defines in headers - more structure for states
2013-12-10 11:26:18 +01:00
4b9f2671bf
updated weapon
2013-12-10 11:17:25 +01:00
58c3371edd
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-10 09:57:13 +01:00
97e0b1298a
added functionallity to player and weapon, started on the weapon design.
2013-12-10 09:57:05 +01:00
e06ee31754
Network - First basic API.
2013-12-10 08:32:08 +01:00
226bbcc8af
MISC - Added a release feature in smartpointers
2013-12-09 22:55:22 +01:00
d27dcbe5b6
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
2013-12-09 22:22:40 +01:00
2cb8bbd8a9
Network - IServer running on separate thread.
...
IServer accepting clients.
2013-12-09 22:22:05 +01:00
9d264b0d89
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
2013-12-09 14:24:12 +01:00
5473c5160f
NETWORK - Modified the protocol creation structure
2013-12-09 14:23:30 +01:00
1f172b422a
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-09 12:05:30 +01:00
ea593743ad
GL - added UI object
2013-12-09 12:01:36 +01:00
a45ffb2e40
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-09 11:58:44 +01:00
fbd95a7109
GAMELOGIC - Added a protocol api
2013-12-09 11:57:34 +01:00
4134836405
GL - added client objects
...
- no memory leaks in client
2013-12-09 11:05:47 +01:00
b72fb21b07
Network - Fixed all thread related crashes.
...
The crashes was caused by OysterMutex, so i changed all OysterMutex to
std::mutex instead.
2013-12-09 10:48:43 +01:00
5416df6d86
Merge remote-tracking branch 'origin/GameLogic' into GameLogic
2013-12-09 09:24:01 +01:00
38a1602d3f
GL - merge with graphics api. Lobby and game state.
2013-12-09 09:23:39 +01:00
a79dc61159
Network - Stuff
2013-12-08 23:56:17 +01:00
597891acfe
Misc - Added more fetures to Smart pointers
2013-12-06 11:46:47 +01:00
bbb79a4ba9
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
2013-12-06 10:46:05 +01:00
5465ccf51a
Network - Started implementing Server,client,session.
2013-12-06 10:45:53 +01:00
b331ce1a1f
GL - started working with client application
2013-12-06 10:38:43 +01:00
cb8fee9227
NETWORK - Added network custom protocol
2013-12-06 10:00:58 +01:00
5835a72acc
Setstruct introduction done
...
Can be found as:
Physics::Struct::CustomBodyState
Physics::ICustomBody::State
Is all inline thus no expensive API calls, as intended.
Will be expanded to move API call methods from Physics::ICustomBody to
it.
2013-12-06 09:46:30 +01:00
fb51881fab
Fixed Mem leaks on gpu and start on deffered pipeline
2013-12-05 14:56:34 +01:00
63addde51e
made "interfaces" of most classes
2013-12-05 11:50:39 +01:00
1cb880a66e
GameLogic - Fixed the window class
2013-12-04 15:59:44 +01:00
cc793851af
Network- set blocking mode
2013-12-04 14:59:00 +01:00
df1594a43b
Network - Fixed small errors
2013-12-04 14:58:15 +01:00
d0936f9133
InverseRotationMatrix fixed
...
Compiler overstepping its bound, doing whatever it wants.
2013-12-04 14:22:25 +01:00
7ad60969fc
Sphere Vs Box collision detect fix
...
second ed. ... Works now! :3
2013-12-04 14:12:06 +01:00
e0adc0ae93
Sphere Vs Box collision detect fix
2013-12-04 13:52:07 +01:00
e81062b875
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
2013-12-04 12:41:37 +01:00
f0dff0b728
Network - Starting to implement correct shutdown connection.
2013-12-04 12:41:25 +01:00
79cf9df111
Network - changed from & to smartpoints
2013-12-04 12:40:49 +01:00
202ee23b25
Octtree::leafData Container should be kept updated now
2013-12-04 11:49:33 +01:00
080bbf68fd
Collideables fixed
...
Missing returns
2013-12-04 11:42:11 +01:00
b35ffdecfd
GameLogic - Merged with DanbiasGame project
2013-12-04 11:40:22 +01:00
64a8089e54
GameLogic - Worked on server
2013-12-04 11:37:26 +01:00
e658071643
GL- open a red window from lancher project
2013-12-04 11:32:43 +01:00
1d94ed0ddc
Fixed MomentOfInertia methods
2013-12-04 11:30:56 +01:00
f10f3b0bef
Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics
2013-12-04 10:05:02 +01:00
87e9d137ea
Merge remote-tracking branch 'origin/Graphics' into Physics
2013-12-04 09:58:11 +01:00
47aa2c89a2
Quick Error fix and using .png
2013-12-04 09:56:03 +01:00
f2548c43ce
Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics
2013-12-04 09:52:03 +01:00
b03e9af027
Fixed octree and API
...
Rewrote AddObject function in octree and OnPossibleCollision in
PhysocsAPI_Impl
2013-12-04 09:51:48 +01:00
d03f1eaf44
Merge to sprint2
2013-12-04 09:42:52 +01:00
f29af8b8bd
Release Now Stable
2013-12-04 09:36:43 +01:00
df1470eb2c
Network - Send/Recv both ways.
...
Impl: SetBlockingMode() : Connection.
Impl: Resize() : OysterByte.
Remade Clear() : OysterByte.
Added bool return if FetchMessage() succeded or failed : PostBox.
Fixed a few errors with mutex on ThreadedClient.
Added missing mutex unlock in ThreadSafeQueue.
2013-12-03 23:12:48 +01:00
e4476f7757
Added function for ICustomBody
...
void ICustomBody::SetMomentum( const ::Oyster::Math::Float3 &worldG )
- Added and implemented
2013-12-03 15:11:24 +01:00
e837b80e43
Network - Fixed warning, made functions private.
...
Fixed warnings.
Made functions regarding the thread private in listener.
2013-12-03 13:20:50 +01:00
1466c0db31
Network - projectfile fix
2013-12-03 13:16:44 +01:00
aa19002cbe
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
...
Conflicts:
Code/Network/NetworkDependencies/NetworkDependencies.vcxproj.filters
2013-12-03 13:12:17 +01:00
10c1dc57f3
merge fix
2013-12-03 13:08:04 +01:00
aa4cf634d3
Client interface and class for both server and client. now using postbox system
2013-12-03 13:04:53 +01:00
3d973c16a2
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-03 12:09:22 +01:00
a852e8eab4
Created the game modules
2013-12-03 12:07:37 +01:00
804c5df7a9
GL uppdate game test progam for physics
2013-12-03 11:47:04 +01:00
d78b48319d
Network - Added MessagePlayerPos
...
Added MessagePlayerPos
Fixed bugg with adding float array.
2013-12-03 11:46:46 +01:00
f0b766e37c
Something done in misc
2013-12-02 14:43:57 +01:00
c0807442a4
Fixed some minor errors with project linking
2013-11-29 11:04:52 +01:00
07a616b252
Correct VertexShader
2013-11-29 10:44:04 +01:00
469ccaab6c
Merge branch 'Sprint1' of https://github.com/dean11/Danbias into Graphics
...
Conflicts:
Bin/DLL/DebugCameraVertex.cso
Bin/DLL/DebugPixel.cso
Bin/DLL/GamePhysics_x86D.dll
Bin/DLL/GamePhysics_x86D.exp
Bin/DLL/GamePhysics_x86D.ilk
Bin/DLL/GamePhysics_x86D.pdb
Bin/DLL/OysterGraphics_x86D.dll
Bin/DLL/OysterGraphics_x86D.exp
Bin/DLL/OysterGraphics_x86D.ilk
Bin/DLL/OysterGraphics_x86D.pdb
Bin/DLL/TextureDebug.cso
Bin/DLL/VertexGatherData.cso
Code/OysterGraphics/FileLoader/ObjReader.cpp
Code/OysterGraphics/FileLoader/TextureLoader.cpp
Code/OysterGraphics/FileLoader/TextureLoader.h
Code/OysterGraphics/OysterGraphics.vcxproj
Code/OysterGraphics/OysterGraphics.vcxproj.filters
Code/OysterGraphics/Render/Resources/Resources.cpp
Code/OysterGraphics/Shader/HLSL/SimpleDebug/Debug.hlsl
Code/OysterGraphics/Shader/HLSL/SimpleDebug/DebugCameraVertex.hlsl
Code/OysterGraphics/Shader/HLSL/SimpleDebug/DebugPixel.hlsl
Code/OysterGraphics/Shader/HLSL/SimpleDebug/TextureDebug.hlsl
Code/Tester/MainTest.cpp
2013-11-29 10:31:19 +01:00
ca20a5af9e
Stable Resource Management with 4 unidentified Memory Leaks
2013-11-29 10:25:27 +01:00
2ca3cdd705
merge with sprint branch - working
2013-11-29 10:13:18 +01:00
4cb82e6396
Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
2013-11-29 10:04:59 +01:00
7a663b2e16
GL - camera movement working
2013-11-29 10:04:44 +01:00
f31bf1db5f
some fixing
2013-11-29 10:03:32 +01:00
026b427deb
Implemented a temporary collision test update
...
Will only call the subscribed CollisioEventAction whenevera collision is
detected.
2013-11-29 10:00:07 +01:00
1a06c7c7e6
Changed from pointer to reference
...
Did it in sample and visit functions
2013-11-29 10:00:06 +01:00
c31ea9730b
Added overloads for visitor and sample functions
...
They now have an overload for accepting ICollideable
2013-11-29 10:00:05 +01:00
5d5f684ad6
minor compilation error fix
...
Forgot that UniquePointer had a special operator for checking if it is
not NULL >.<
2013-11-29 10:00:04 +01:00
ec7185f463
Bunch of implementations
2013-11-29 10:00:03 +01:00
10f8df45a8
Merge branch 'Sprint1' of https://github.com/dean11/Danbias into Network
2013-11-29 09:36:31 +01:00
f9a1aaf43c
Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
2013-11-29 09:26:16 +01:00
b28a558732
fix transpose
2013-11-29 09:24:41 +01:00
04e48ec550
Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
2013-11-29 09:23:42 +01:00
de01d23d1d
Fixed some structure issues and commented
2013-11-29 09:23:08 +01:00
eb026cb9c7
GL more comments
2013-11-29 09:23:00 +01:00
32c529feb6
converted camera class
2013-11-29 09:20:37 +01:00
3c681352da
Documentation of the code done by Sam
2013-11-29 09:19:14 +01:00
407f3c5c9a
Added documentation and removed unecessesary code.
2013-11-29 09:11:30 +01:00
d9fcec0c1c
Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
2013-11-29 09:05:12 +01:00
017efd55e5
GL starting commenting
2013-11-29 09:05:01 +01:00
8138afb6b5
object update
2013-11-29 09:00:12 +01:00
1cbdb0bcfa
cleanup commented section in ClientMain
2013-11-29 08:59:36 +01:00
a3ae340a30
Merge after pull from misc branch
2013-11-28 23:22:50 +01:00
f5aa5d03db
Modified project file to include Thread in misc
2013-11-28 23:18:48 +01:00
8dab865cb6
Changed to our own Queue
2013-11-28 16:20:50 +01:00
9d92b292d9
Improved documentation of UniquePointer and UniqueArray
2013-11-28 16:18:20 +01:00
1453d81a9d
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
2013-11-28 16:15:41 +01:00
1617606145
PostBox
...
Created PostBox and IPostBox.
Listener post new clients to PostBox.
2013-11-28 16:15:28 +01:00
23fa090296
Threadsafe Queue implemented with IQueue interface
...
threadsafe by using mutex lock in the Queue
2013-11-28 16:14:59 +01:00
036519f3f6
Fixed potential ambiguity bug
...
Ambiguity in assignment operator with UniquePointer and UniqueArray
2013-11-28 16:06:01 +01:00
045cfe28fe
Renamed Utilities-InlineImpl.h to Utilities-Impl.h
...
Implied that only Inlines were implemented there.
Contains template implementations as well.
2013-11-28 15:45:09 +01:00
0785e54dfd
Removed .orig files after merge
2013-11-28 15:19:52 +01:00
6e71b6ac54
Fixed merging errors
2013-11-28 15:17:25 +01:00
cc4835a97b
Merge with Physics branch
2013-11-28 15:09:09 +01:00
d241298308
merging MiscBranch into Physics with conflict fixes
2013-11-28 14:52:13 +01:00
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
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
9749749748
IRigidBody done
...
Renamed to ICustomBody
* Added bunch of other stuff
2013-11-21 17:22:13 +01:00
af2b01d975
Fixed commit errors + other stuff
2013-11-21 15:29:35 +01:00
3ef36547a9
Merge branch 'RigidBody' of https://github.com/dean11/Danbias into Graphics
2013-11-21 15:21:03 +01:00
dc9f4597e2
Added OrientationMatrix build methods + other stuff
2013-11-21 15:19:32 +01:00
dcf456ce6d
Fixed implementation of Translator
2013-11-21 14:49:30 +01:00
b419849fd4
Merged Obj and Engine Restructure
2013-11-21 14:17:03 +01:00
9a0206bf35
More
2013-11-21 14:14:30 +01:00
7b31377be8
Engine Sructured
2013-11-21 13:50:43 +01:00
7c417dd223
Merge
2013-11-21 13:46:25 +01:00
f08e9491ed
ObjReader
2013-11-21 13:45:11 +01:00
87e1cf0436
Added Message base class
...
Packing functions,
MessageHeader; MessageTest,
2013-11-21 13:42:38 +01:00
f77efb107d
Implemented Translator
...
also fixed some coding standards with namespaces in client, connection,
listener, server.
added protocols with enums for packagetype.
2013-11-21 13:40:52 +01:00
c6064887b7
Forgot to test compile RigidBody
...
Compile Errors is fixed
2013-11-21 13:15:10 +01:00
4362b88a74
RigidBody DONE
...
Needs only testing for confirmations
2013-11-21 13:15:09 +01:00
5aa8e07b0d
Minor changes
...
Some argument renaming and changed a few RigidBody functions, in respect
to the change in the Box struct
2013-11-21 13:15:09 +01:00
5cd36f1995
TangentialImpulseAcceleration
...
fixed selfexplanatory documentation
2013-11-21 13:15:08 +01:00
fbeeb5f72c
Robin's fix part of RigidBody.cpp DONE
2013-11-21 13:15:07 +01:00
caa61d3ae9
Dans fix part of RigidBody.cpp DONE
2013-11-21 13:15:07 +01:00
1b2c49457c
Task assignment in RigidBody.cpp
2013-11-21 13:15:06 +01:00
ddbc808977
Re-fixed ObjReader
2013-11-21 12:47:47 +01:00
2408bf49a1
projectfiles
2013-11-21 12:31:31 +01:00
b38545962b
GL test main project: Drawing a object
2013-11-21 12:05:39 +01:00
3f518c72e8
Added inertia functions.
2013-11-21 11:47:34 +01:00
938826b84e
Forgot to test compile RigidBody
...
Compile Errors is fixed
2013-11-21 11:47:20 +01:00
f51d2312dd
RigidBody DONE
...
Needs only testing for confirmations
2013-11-21 11:39:11 +01:00
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
Erik Persson
lindaandersson
Robin Engman
Dennis Andersen
Dander7BD
lanariel
bladdidoo
Tobias Grundel
Pontus Fransson
Sam Mario Svensson