bb8e92ec36
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-01-30 15:20:44 +01:00
0aa39275e3
GL - only client with server update server. Update recieverfunction
2014-01-30 15:20:35 +01:00
ae6a570a12
GL - trying to make walking nice
2014-01-30 15:12:53 +01:00
4167b6a93b
GL- merge fix
2014-01-30 15:02:35 +01:00
2bb2d0cd56
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-01-30 14:58:30 +01:00
0a04c1c9f1
Added document
2014-01-30 14:52:40 +01:00
713dc269d1
Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic
2014-01-30 14:18:00 +01:00
05e24d0514
GL - uppdate server
2014-01-30 14:17:50 +01:00
09f39ec26d
GameServer - Added acces directly to clients in network session
2014-01-30 14:15:25 +01:00
261421af21
Merge remote-tracking branch 'origin/GameLogic-LevelFormat' into GameLogic
2014-01-30 13:44:18 +01:00
c78bbba3eb
GL- Removed commentet unnecessary code
2014-01-30 13:33:59 +01:00
2a69af5c9f
GL - merge
2014-01-30 12:01:48 +01:00
1ccf98e3eb
GL - added loginstate
2014-01-30 11:58:44 +01:00
d41ddca45d
Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic
2014-01-30 11:13:42 +01:00
323b7322fa
GL - testing
2014-01-30 11:11:45 +01:00
05740665da
GameServer - Fixed a small error regarding not reaching some data
2014-01-30 11:11:04 +01:00
a249e7ede9
GL - merge with new serverAPI
2014-01-30 10:57:44 +01:00
09693c7f35
GL - merge
2014-01-30 09:40:58 +01:00
7d9d8e4615
GL - added jump
2014-01-30 09:07:56 +01:00
fa29cd7307
GameServer - Merged with GameLogic
2014-01-30 00:19:00 +01:00
c593fd2225
Merge remote-tracking branch 'origin/Physics' into GameLogic
2014-01-29 16:02:11 +01:00
44ba45bcc2
GL - added setCollisionfunc to object
2014-01-29 16:01:56 +01:00
1e89bb4e30
Fixed protocol messaging. Known crash when recieveing protocol on server after a while...
2014-01-29 15:01:14 +01:00
88e67ff876
Inertia big patch
...
It's ali-..WORKS! It works!
2014-01-29 14:57:39 +01:00
446bdd412b
GL - updated constructors to set before and after collision response functions
2014-01-29 14:33:21 +01:00
3a9c47722a
Merge remote-tracking branch 'origin/Physics' into GameLogic
2014-01-29 13:18:25 +01:00
16334ea2db
GL - collision working, going to merge with physics
2014-01-29 13:18:17 +01:00
aa99742894
Added epsilon value for testing
2014-01-29 12:22:18 +01:00
1d3b073e7f
Added functionallity to stop collision responses
2014-01-29 11:22:04 +01:00
4ccf11b5d6
Fixed vector issue
2014-01-29 10:54:59 +01:00
36f057d2cc
Broekn branch not broekn more
2014-01-29 10:18:01 +01:00
60062feb07
Documentation update
...
Math treatises
2014-01-28 17:51:02 +01:00
f968adebeb
GL - LevelLoader = done and done
2014-01-28 16:15:10 +01:00
3b552d5361
GL - change gamelogic to use the new physics
2014-01-28 15:44:32 +01:00
9ccfebd9fd
GL - merge with physics
2014-01-28 15:43:32 +01:00
a56fcbcb9b
GL - can send object position from level objects, gravity and frustrum problems.
2014-01-28 15:04:25 +01:00
99a605a25b
Iterpolated Animations
2014-01-28 13:48:15 +01:00
15ae3675b4
Updated UML with functions
2014-01-28 13:39:15 +01:00
2b63563a9b
Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat
2014-01-28 11:30:59 +01:00
d2ebad7445
GL - Fixed ParseFunction so now we only have 1 + specialcases functions instead of 1 function for every case
2014-01-28 11:29:35 +01:00
4de1c1aafd
GL - More Object structs, LevelLoader api comments.
...
Changed the LevelParser to use the new functions from ParserFunctions.
Might need to cast something to (void*).
2014-01-28 11:27:29 +01:00
eb27a4edfb
Added ExtractForward to frustum.
2014-01-28 10:38:58 +01:00
6148783fe4
Added args to ApplyEffect
2014-01-28 10:18:26 +01:00
f96c5a9f7e
Changed float4 to float3
2014-01-28 09:52:58 +01:00
018d6e3c5a
Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics
2014-01-28 09:25:07 +01:00
5d1e05cc4e
Added new function to set orientation.
2014-01-28 09:24:51 +01:00
6be72da03a
OysterPhysics3D updated
...
* changed Float4 in header API to Float3
* removed all Set...( Float4x4 ) methods
2014-01-28 09:24:09 +01:00
a07e2911de
Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics
2014-01-28 09:01:50 +01:00
5bf92757a5
State struct fixed since last inactivation.
2014-01-28 09:01:35 +01:00
201095eb41
Merge remote-tracking branch 'origin/Moment-of-Inertia' into Physics
2014-01-28 09:00:47 +01:00
91e825dbfb
Broekn stuff to tobias
2014-01-28 09:00:02 +01:00
4d6cfaf046
... part 3 -_-
2014-01-28 08:57:14 +01:00
4e4aaf881a
Inactivated code part 2
...
Matrix to angularAxis conversions in OysterMath
2014-01-28 08:56:29 +01:00
cbdce81b20
Inactivated code
...
Matrix to Angular Axis
2014-01-28 08:54:20 +01:00
9cf82dd3b1
Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics
...
Conflicts:
Code/DanBias.sln
Code/OysterGraphics/Model/Model.h
Code/OysterGraphics/Shader/HLSL/Deffered Shaders/PostPass.hlsl
Code/Tester/Tester.vcxproj
2014-01-27 15:38:09 +01:00
87793b3926
Added documentation
...
Timestep Impulse fix treatise / proposition
2014-01-27 15:04:48 +01:00
dd2b214122
GL- la in memcpy för parsing i parseFunctions
2014-01-27 14:57:18 +01:00
e11dc6551c
GL - ?
2014-01-27 14:45:19 +01:00
a8dbf2a4c9
GL - added test box to level
2014-01-27 14:43:39 +01:00
15625ac5d2
Basic Animation (NOT STABLE)
2014-01-27 14:24:13 +01:00
3896514bae
GL - mergecommit
2014-01-27 14:02:37 +01:00
99fbef8a64
Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat
2014-01-27 13:57:42 +01:00
91bf6ce901
GL- LevelFormat fix
2014-01-27 13:57:18 +01:00
4085a5f5e2
GL - added shot protocol
2014-01-27 13:56:31 +01:00
1ed1bab751
Created test box that should now be shot at by the player
2014-01-27 13:55:09 +01:00
51a1b3ecff
GL - Resource get size
2014-01-27 13:55:05 +01:00
5b984db9ba
GL - gameState merge
2014-01-27 13:25:09 +01:00
d6432b2c73
Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat
2014-01-27 10:16:25 +01:00
1748fe323a
GL - Added Parsing functions for levelLoader and moved Packing classes to misc
2014-01-27 10:15:39 +01:00
e188794aa3
GL - Load level in LevelParser
2014-01-27 10:14:02 +01:00
74ac5e2d31
Updated creation of objects
2014-01-27 08:54:25 +01:00
30054a8c23
Slerp compile fix
2014-01-24 17:48:49 +01:00
b4eb3eb25d
Slerp
...
Quaternion Slerp
2014-01-24 17:39:09 +01:00
2da3dd29fc
InterpolateOrientation_UsingNonRigidNlerp
2014-01-24 16:32:54 +01:00
8f63bf637e
Physics UMLET diagram
...
Current state under sprint 3
2014-01-24 15:03:03 +01:00
3c1d66e3f8
Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat
...
Conflicts:
Code/Dokumentation/LevelLoader.uxf
Code/Game/GameLogic/GameLogic.vcxproj
2014-01-24 10:42:19 +01:00
c84ed645f0
GameLogic - implementation of LevelLoader
2014-01-24 10:22:18 +01:00
aaf3bf30f9
GL - LevelParser half way implemented.
2014-01-24 10:01:58 +01:00
0f5517398d
GL - Update uml, LevelParser.h.cpp ObjectDefines.h
2014-01-24 09:00:59 +01:00
ff936133fc
Physics engine now using struct MomentOfInertia
...
Some API impact for the other modules.
* Desc. structs
* State struct
2014-01-23 19:13:02 +01:00
c3ed5e78ac
struct ::Oyster::Physics3D::MomentOfInertia
2014-01-23 18:45:33 +01:00
ee5392c60d
Vector::PiecewiseMultiplicationAdd
...
and a few other minor changes in the math lib
2014-01-23 18:34:48 +01:00
163481ce4f
Documentation edit
...
Were missing a final step about the ang. momentum toang. velocity
conversion documentation.
2014-01-23 18:33:48 +01:00
ff1fbdffa1
Vector::PiecewiseMultiplication
2014-01-23 17:13:50 +01:00
76e4b23f19
Added documentation
...
Mathematical exercise on how to convert angular momentum to angular
velocity
2014-01-23 14:54:53 +01:00
fb2cf714c6
GL - sending dir to server, forward and backward walking works
2014-01-23 14:28:53 +01:00
07e5519850
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-01-23 09:25:02 +01:00
8c297d1e9b
GL - starting to send lookdir to server
2014-01-23 09:24:55 +01:00
bd739f8acb
GL - Creation of objects kinda sorted
2014-01-23 09:14:04 +01:00
121fd51c45
GL collision with level should worm
2014-01-23 08:57:46 +01:00
3f144289ec
GL - merge with gameserver, crash on collision in gameLogic
2014-01-23 08:30:26 +01:00
a591903d8f
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-01-23 08:25:10 +01:00
f657a58a4f
GL - adding a camera on the client
2014-01-23 08:24:35 +01:00
6b1dd34a72
Working SSAO + Read Animated .dan
2014-01-22 16:31:33 +01:00
6a888cb154
GL - adjusting collisionManager
2014-01-22 15:47:44 +01:00
9c18ba14b9
Fixed kinetic calculation
2014-01-22 15:29:50 +01:00
22a5db97f8
Added final protocols, and a bit of support for them on server side
2014-01-22 15:22:52 +01:00
467cf1eb68
Merge remote-tracking branch 'origin/Physics' into GameLogic
2014-01-22 14:41:53 +01:00
ce80e8155c
GL - formatting mistake
2014-01-22 14:39:10 +01:00
43eac4cbe3
moved ForcePushAction for massdriver to collisionManager
2014-01-22 14:26:45 +01:00
bcbe67b620
Made default value of onCollisionResponse null
2014-01-22 14:09:53 +01:00
53961f0e88
Added new onCollisionResponse handle
2014-01-22 13:50:54 +01:00
80204ecbe3
GL - Massdriver usage of applyeffect
2014-01-22 13:02:13 +01:00
0cae6261e9
ApplyEffect is now easier to handle for the user
...
Only needs a function with a pointer to an ICustomBody now.
2014-01-22 12:36:12 +01:00
0443e753e8
GameLogic, Uml for levelLoader updated
2014-01-22 11:32:11 +01:00
c178ec34fd
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-01-22 10:51:24 +01:00
db593f65a2
Merge remote-tracking branch 'origin/Physics' into GameLogic
2014-01-22 10:51:13 +01:00
1b86500ab0
GameLogic - Uml for LevelLoader
2014-01-22 10:39:16 +01:00
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
lindaandersson
Erik Persson
Sam Mario Svensson
Dander7BD
Dennis Andersen
Robin Engman
lanariel
Pontus Fransson
bladdidoo