lindaandersson
|
c593fd2225
|
Merge remote-tracking branch 'origin/Physics' into GameLogic
|
2014-01-29 16:02:11 +01:00 |
lindaandersson
|
44ba45bcc2
|
GL - added setCollisionfunc to object
|
2014-01-29 16:01:56 +01:00 |
Dennis Andersen
|
1e89bb4e30
|
Fixed protocol messaging. Known crash when recieveing protocol on server after a while...
|
2014-01-29 15:01:14 +01:00 |
Dander7BD
|
88e67ff876
|
Inertia big patch
It's ali-..WORKS! It works!
|
2014-01-29 14:57:39 +01:00 |
lindaandersson
|
446bdd412b
|
GL - updated constructors to set before and after collision response functions
|
2014-01-29 14:33:21 +01:00 |
lindaandersson
|
3a9c47722a
|
Merge remote-tracking branch 'origin/Physics' into GameLogic
|
2014-01-29 13:18:25 +01:00 |
lindaandersson
|
16334ea2db
|
GL - collision working, going to merge with physics
|
2014-01-29 13:18:17 +01:00 |
Robin Engman
|
aa99742894
|
Added epsilon value for testing
|
2014-01-29 12:22:18 +01:00 |
Robin Engman
|
1d3b073e7f
|
Added functionallity to stop collision responses
|
2014-01-29 11:22:04 +01:00 |
Robin Engman
|
4ccf11b5d6
|
Fixed vector issue
|
2014-01-29 10:54:59 +01:00 |
Dennis Andersen
|
36f057d2cc
|
Broekn branch not broekn more
|
2014-01-29 10:18:01 +01:00 |
Dander7BD
|
60062feb07
|
Documentation update
Math treatises
|
2014-01-28 17:51:02 +01:00 |
Sam Mario Svensson
|
f968adebeb
|
GL - LevelLoader = done and done
|
2014-01-28 16:15:10 +01:00 |
lindaandersson
|
3b552d5361
|
GL - change gamelogic to use the new physics
|
2014-01-28 15:44:32 +01:00 |
lindaandersson
|
9ccfebd9fd
|
GL - merge with physics
|
2014-01-28 15:43:32 +01:00 |
lindaandersson
|
a56fcbcb9b
|
GL - can send object position from level objects, gravity and frustrum problems.
|
2014-01-28 15:04:25 +01:00 |
lanariel
|
99a605a25b
|
Iterpolated Animations
|
2014-01-28 13:48:15 +01:00 |
Robin Engman
|
42addb9c06
|
Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics
|
2014-01-28 13:39:28 +01:00 |
Robin Engman
|
15ae3675b4
|
Updated UML with functions
|
2014-01-28 13:39:15 +01:00 |
Dander7BD
|
78706f9929
|
Revert "Formula fix"
This reverts commit 8435a2c970 .
|
2014-01-28 11:43:24 +01:00 |
Dander7BD
|
8435a2c970
|
Formula fix
TangentialLinearMomentum(..)
|
2014-01-28 11:31:23 +01:00 |
Sam Mario Svensson
|
2b63563a9b
|
Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat
|
2014-01-28 11:30:59 +01:00 |
Sam Mario Svensson
|
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 |
Pontus Fransson
|
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 |
Robin Engman
|
eb27a4edfb
|
Added ExtractForward to frustum.
|
2014-01-28 10:38:58 +01:00 |
Robin Engman
|
6148783fe4
|
Added args to ApplyEffect
|
2014-01-28 10:18:26 +01:00 |
Robin Engman
|
f96c5a9f7e
|
Changed float4 to float3
|
2014-01-28 09:52:58 +01:00 |
Robin Engman
|
018d6e3c5a
|
Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics
|
2014-01-28 09:25:07 +01:00 |
Robin Engman
|
5d1e05cc4e
|
Added new function to set orientation.
|
2014-01-28 09:24:51 +01:00 |
Dander7BD
|
6be72da03a
|
OysterPhysics3D updated
* changed Float4 in header API to Float3
* removed all Set...( Float4x4 ) methods
|
2014-01-28 09:24:09 +01:00 |
Robin Engman
|
a07e2911de
|
Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics
|
2014-01-28 09:01:50 +01:00 |
Robin Engman
|
5bf92757a5
|
State struct fixed since last inactivation.
|
2014-01-28 09:01:35 +01:00 |
Dander7BD
|
201095eb41
|
Merge remote-tracking branch 'origin/Moment-of-Inertia' into Physics
|
2014-01-28 09:00:47 +01:00 |
Dennis Andersen
|
91e825dbfb
|
Broekn stuff to tobias
|
2014-01-28 09:00:02 +01:00 |
Dander7BD
|
4d6cfaf046
|
... part 3 -_-
|
2014-01-28 08:57:14 +01:00 |
Dander7BD
|
4e4aaf881a
|
Inactivated code part 2
Matrix to angularAxis conversions in OysterMath
|
2014-01-28 08:56:29 +01:00 |
Dander7BD
|
cbdce81b20
|
Inactivated code
Matrix to Angular Axis
|
2014-01-28 08:54:20 +01:00 |
lanariel
|
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 |
Dander7BD
|
87793b3926
|
Added documentation
Timestep Impulse fix treatise / proposition
|
2014-01-27 15:04:48 +01:00 |
Sam Mario Svensson
|
dd2b214122
|
GL- la in memcpy för parsing i parseFunctions
|
2014-01-27 14:57:18 +01:00 |
Erik Persson
|
e11dc6551c
|
GL - ?
|
2014-01-27 14:45:19 +01:00 |
lindaandersson
|
a8dbf2a4c9
|
GL - added test box to level
|
2014-01-27 14:43:39 +01:00 |
lanariel
|
15625ac5d2
|
Basic Animation (NOT STABLE)
|
2014-01-27 14:24:13 +01:00 |
lindaandersson
|
3896514bae
|
GL - mergecommit
|
2014-01-27 14:02:37 +01:00 |
Sam Mario Svensson
|
99fbef8a64
|
Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat
|
2014-01-27 13:57:42 +01:00 |
Sam Mario Svensson
|
91bf6ce901
|
GL- LevelFormat fix
|
2014-01-27 13:57:18 +01:00 |
lindaandersson
|
4085a5f5e2
|
GL - added shot protocol
|
2014-01-27 13:56:31 +01:00 |
Erik Persson
|
1ed1bab751
|
Created test box that should now be shot at by the player
|
2014-01-27 13:55:09 +01:00 |
Pontus Fransson
|
51a1b3ecff
|
GL - Resource get size
|
2014-01-27 13:55:05 +01:00 |
lindaandersson
|
5b984db9ba
|
GL - gameState merge
|
2014-01-27 13:25:09 +01:00 |