f88e16c581
GL - merge
2014-02-04 11:53:40 +01:00
e2bac798c4
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-02-04 11:50:51 +01:00
fa02814ca0
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-04 11:50:40 +01:00
d54cffee8e
GL - camera follows player
2014-02-04 11:50:15 +01:00
e39eb5fb4b
RigidBody update adjusted
...
Spherical and Simple
2014-02-04 11:48:50 +01:00
2897305dd0
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-04 11:36:24 +01:00
1261ed734f
GL - Updated level loader.
2014-02-04 11:36:10 +01:00
3bf9f59f5a
GL - Player dies and respawns
2014-02-04 11:13:16 +01:00
07e8624807
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-02-04 10:39:09 +01:00
00400a7d32
GL - camera testing
2014-02-04 10:38:59 +01:00
42cb1dab1d
API::SimpleBodyDescription API::SphericalBodyDescription fix
...
3 coeffs were not saved in factory constructor
2014-02-04 10:32:43 +01:00
fcadd5b4c3
GL - testing physics
2014-02-04 10:29:02 +01:00
9817f844ef
Rebound adjustment trial
...
Rebound had a strong friction-like effect. Testing to see if it works
better if applied before the leapfrog update
2014-02-04 10:23:14 +01:00
6e9423670f
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-02-04 08:56:32 +01:00
d4bd72bb4a
Friction fix
...
special case; no movement
special case; movement directly into surface
.. dealt with
2014-02-04 08:55:57 +01:00
50d28a5784
Misc - Still having problems with template with eventhandler.
2014-02-04 08:46:20 +01:00
1f28c05983
GL - added jump
2014-02-03 16:30:47 +01:00
03385f486b
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-02-03 16:22:11 +01:00
cf73524e3b
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-03 16:21:57 +01:00
e21cfe4cd4
GL - merge with Erik
2014-02-03 16:21:48 +01:00
2c3b1e5038
GL - using real dmg algorithm
2014-02-03 16:20:50 +01:00
358cddfd9a
SnapAngularAxis fix
...
floating point error there acos param could be slightly higher than 1.
Caused it to return undefined.
A clamp ought to fix it.
2014-02-03 16:20:16 +01:00
ab962eea99
GL - added error check
2014-02-03 16:20:05 +01:00
7f29b62c6f
GL - YOU CAN NOW SHOOT STUFF YAAAAY
2014-02-03 16:19:24 +01:00
c08c3d2b53
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-02-03 15:52:15 +01:00
a3886c4f1f
GL - added models and started to fix camera movement
2014-02-03 15:52:00 +01:00
8b0e1b2426
Big patch! New feature :)
...
Objects will now rebound back when colliding.
2014-02-03 15:48:55 +01:00
d77b3d92d8
GL - using movetolimbo in massdriver pickup functionallity
2014-02-03 15:45:48 +01:00
f1f56fc769
Merge remote-tracking branch 'origin/Physics' into GameLogic
2014-02-03 15:38:36 +01:00
99b041f165
GL - first implementation of weapons forcepull with pickup functionallity
2014-02-03 15:32:58 +01:00
dc5b408196
Network - Updated network api with comment.
2014-02-03 15:32:20 +01:00
f527d329a2
Added limbo functionality
2014-02-03 15:15:47 +01:00
e7fee8b2e7
GL - Updated LevelLoader. Added lights.
...
Added lights.
Changed the return type to vector<SmartPointer<ObjectTypeHeader>>
Hid the LevelParser from the outside.
2014-02-03 14:50:27 +01:00
34f58d4140
Anim Testing
2014-02-03 12:09:11 +01:00
b8e6b83148
Momentum "fall-off" added
...
Temporary till real fluid drag is implemented.
2014-02-03 11:10:04 +01:00
8f234611d2
GL - mergeissues fixed
2014-02-03 10:48:12 +01:00
50d895d37c
Applied friction
...
Needs to be tested.
2014-02-03 10:45:25 +01:00
ef71b365ab
asd
2014-02-03 10:42:40 +01:00
9671eb8ee9
Misc - Having problems with template with events.
2014-02-03 10:41:54 +01:00
a673e64694
GameServer - Pre-merge with graphic
2014-01-31 22:52:52 +01:00
5aede62af6
Gameserver - Merge with gamelogic
2014-01-31 22:36:43 +01:00
83ca3c2ff2
GL - remove buttons from GL branch
2014-01-31 16:43:18 +01:00
5b263caccd
GL - merge with GL
2014-01-31 16:42:25 +01:00
89a538e887
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-01-31 16:33:32 +01:00
e327f64702
GL - can play with two characters
2014-01-31 16:33:16 +01:00
069acee8cc
Anim Error
2014-01-31 16:29:50 +01:00
fabf471e76
Removed malign obsolete hack fix
2014-01-31 15:58:02 +01:00
6f264f5e7b
Misc - EventHandler fixed all errors.
2014-01-31 15:38:12 +01:00
0ae551f2d8
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-01-31 15:31:03 +01:00
8f576c9a75
Removed malign obsolete hack fix
2014-01-31 15:30:23 +01:00
e82e61374a
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-01-31 15:18:19 +01:00
7b503bcb52
GL - working with snap
2014-01-31 15:17:09 +01:00
b3656a0527
Gravity fix
2014-01-31 15:15:08 +01:00
e7d592e71a
Merge branch 'GameLogic-MessageHandler' of https://github.com/dean11/Danbias into GameLogic-MessageHandler
...
Conflicts:
Code/Misc/EventHandler/EventButton.h
2014-01-31 15:07:55 +01:00
dbe8b4706b
Misc - Changed to no template/template
2014-01-31 15:06:30 +01:00
e76dfc73f2
Misc - EventButton changed to inheritance
2014-01-31 15:06:25 +01:00
c318223bcf
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-01-31 14:41:24 +01:00
2a816469d5
SnapAngularAxis fix
2014-01-31 14:40:09 +01:00
d5f285c089
Misc - Test
2014-01-31 14:31:27 +01:00
26fed11910
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-01-31 14:30:53 +01:00
8f83dcd413
GL- Eventbutton implemented
2014-01-31 14:29:49 +01:00
22d0722dfa
SnapAngularFix
...
compilation fix
forgot to remove a copy pasted comma
2014-01-31 14:29:49 +01:00
79872a45ee
SnapAngularAxis fix + added overload
...
compilation error fix
+ Float3 version
2014-01-31 14:27:33 +01:00
a864ad81e7
Misc - EventHandler, EventCollection updated.
2014-01-31 14:16:58 +01:00
16f535bfa3
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
...
Conflicts:
Code/Game/GameLogic/AttatchmentMassDriver.cpp
Code/Game/GameLogic/Game_PlayerData.cpp
Code/Game/GameLogic/Level.cpp
2014-01-31 14:16:32 +01:00
b753387649
asd
2014-01-31 14:14:20 +01:00
16a342da49
GL - adjusting in GL, added forcepushData struct for passing args when shooting. connect changes in network
2014-01-31 14:05:52 +01:00
57c230d458
GL - will merge with physics
2014-01-31 13:56:22 +01:00
7a62121fa0
SnapAngularAxis fix
...
accidently used asin instead of acos
2014-01-31 13:49:09 +01:00
ac635ccaef
SnapAngularAxis fix
2014-01-31 13:47:40 +01:00
190f7e2882
SnapAngularAxis introduced
2014-01-31 13:42:55 +01:00
c7bc7281d8
Prefix for "sinking" objects
2014-01-31 13:41:06 +01:00
d6769ac62f
Misc - EventHandler, EventCollection
2014-01-31 13:06:11 +01:00
8ee8374169
Misc - EventHandler
2014-01-31 11:28:01 +01:00
e3376eba7c
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-01-31 11:11:48 +01:00
da9b615994
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
...
Conflicts:
Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
2014-01-31 11:10:35 +01:00
21cb7731b7
Merge with GL
2014-01-31 11:03:45 +01:00
cac38decca
MISC - Fixed a bug in ResourceLoader
2014-01-31 11:00:04 +01:00
fa7f400c71
GL - test this robin
2014-01-31 10:58:03 +01:00
c9c562fda6
GameServer - Added some functionality in windowshell
2014-01-31 10:50:38 +01:00
e718048f7f
GL - Lan State
2014-01-31 10:49:52 +01:00
4df6b849a6
GL - working with new models and server
2014-01-31 09:39:44 +01:00
34b6b29fc4
GameLogic - Merged with GL
2014-01-31 09:24:16 +01:00
31feccf284
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
...
Conflicts:
Code/Game/DanBiasGame/GameClientState/GameState.cpp
Code/Game/GameLogic/Game.cpp
2014-01-31 09:17:54 +01:00
a6ff6eba42
GL - merge with server
2014-01-31 09:14:55 +01:00
c30db71e94
GL - more testing and changes to the level and using the physics API
2014-01-31 09:12:15 +01:00
40f0fe61f0
GameServer - Fixed Protocols not recieveing properly and fixed the resource loader.
2014-01-31 08:41:08 +01:00
cec022b381
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-01-30 23:24:16 +01:00
3c1eed0f3f
GL - Added LanMenuState
2014-01-30 23:23:37 +01:00
3b8a8e9c09
Network - Fixed receiving parts of packages.
2014-01-30 23:22:46 +01:00
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
lindaandersson
Dander7BD
Pontus Fransson
Erik Persson
Robin Engman
lanariel
Dennis Andersen
Sam Mario Svensson