Robin Engman
|
59d5a3dc1e
|
Created function for friction
|
2013-12-20 12:08:17 +01:00 |
Dander7BD
|
9cee69edd6
|
Extended friction content of the ICustomBody::State struct
|
2013-12-20 12:08:17 +01:00 |
Robin Engman
|
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 |
Dander7BD
|
09e55ddc30
|
SimpleRigidBody::GetNormalAt Done
implemented by using RayVsPlane tests
|
2013-12-20 12:07:46 +01:00 |
Dander7BD
|
5051a9e767
|
Major StateStruct and API update
|
2013-12-20 12:07:45 +01:00 |
Dander7BD
|
96bf20e5ae
|
compile errors fixed
|
2013-12-20 12:07:43 +01:00 |
Dander7BD
|
dbb0c38432
|
Big patch
Loads of collision response related implementations/edits
|
2013-12-20 12:07:43 +01:00 |
Robin Engman
|
9cdbe2c861
|
Added algorithms for collision stubs
|
2013-12-20 12:01:08 +01:00 |
Dander7BD
|
e8952dc739
|
CollideAble implementations updated
|
2013-12-20 12:01:07 +01:00 |
Dander7BD
|
632570f66b
|
Updated the BoxVsBox collision alghorithm
and added overloaded
|
2013-12-20 12:01:06 +01:00 |
Dander7BD
|
a03568e19e
|
Updated formula for BoxVsBox point of contact
good enough approximation. Tested
|
2013-12-20 12:01:05 +01:00 |
Dander7BD
|
ec6cd72f3c
|
SeperatingAxisTest_AxisAlignedVsTransformedBox overloaded
|
2013-12-20 12:01:05 +01:00 |
Dander7BD
|
4858f573e6
|
Added more collision subs
|
2013-12-20 12:01:04 +01:00 |
Robin Engman
|
d8b323e230
|
Extractable collision point for SphereVSSphere
|
2013-12-20 12:01:03 +01:00 |
Dander7BD
|
a3ced24fea
|
Some compile error fixes
|
2013-12-20 12:01:02 +01:00 |
Robin Engman
|
61e1d20748
|
Fixed const problem
|
2013-12-20 12:01:02 +01:00 |
Robin Engman
|
5f305b7086
|
Oops
|
2013-12-20 11:59:38 +01:00 |
Robin Engman
|
283633c6c6
|
Added stub functions
More funcitonallity for intersect functions.
|
2013-12-20 11:59:37 +01:00 |
Dander7BD
|
de0078265c
|
Stub response to new ICollideAble method
Stubbed: Box, BoxAxisAligned, Frustrum
Fully implemented: Line & Universe
|
2013-12-20 11:59:36 +01:00 |
Dander7BD
|
da996a5deb
|
Added cirtual function to ICollideAble
Overload of Intersects(...)
|
2013-12-20 11:59:35 +01:00 |
Dander7BD
|
c854b1af58
|
Stuff
|
2013-12-20 11:59:35 +01:00 |
Linda Andersson
|
15dc962709
|
Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-20 11:40:07 +01:00 |
Linda Andersson
|
59ba530761
|
GL - merge error
|
2013-12-20 11:27:49 +01:00 |
Linda Andersson
|
16715f3f2a
|
GL - push before merge
|
2013-12-20 11:27:04 +01:00 |
Erik Persson
|
d3721fcada
|
last updates
random stuff
|
2013-12-20 11:10:36 +01:00 |
Dennis Andersen
|
be39365a27
|
Gamelogic - Merged with existing stuff
|
2013-12-20 09:47:24 +01:00 |
Dennis Andersen
|
15d6ac8cf9
|
GameLogic - Final sprint2 merge
|
2013-12-20 09:42:02 +01:00 |
Linda Andersson
|
ea5fc78817
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-20 09:04:30 +01:00 |
Linda Andersson
|
606cb10f8b
|
GL - removed server include from gameLancher
|
2013-12-20 09:04:18 +01:00 |
Erik Persson
|
f4232ca0b4
|
gamplay code in gamesession
|
2013-12-20 08:59:59 +01:00 |
Dennis Andersen
|
694d5576d7
|
GameLogic - Pre-merge with physics
|
2013-12-19 15:35:49 +01:00 |
Linda Andersson
|
ecf1c5fc36
|
GL - delete timer
|
2013-12-19 14:32:52 +01:00 |
Tobias Grundel
|
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 |
Linda Andersson
|
ea59c25119
|
GL - mergeing error
|
2013-12-19 13:49:46 +01:00 |
Linda Andersson
|
bb61b83392
|
GL - merge
|
2013-12-19 13:46:01 +01:00 |
Dennis Andersen
|
d68fd63b25
|
Added server launcher
|
2013-12-19 13:35:56 +01:00 |
Dennis Andersen
|
0570d76e24
|
Modified part of some player states
|
2013-12-19 12:41:37 +01:00 |
Dennis Andersen
|
934aa6e45a
|
Merge
|
2013-12-19 12:34:59 +01:00 |
Dennis Andersen
|
beb116e964
|
Fixed some threafing and stuff
|
2013-12-19 12:32:23 +01:00 |
Linda Andersson
|
27aad0d86f
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-19 11:58:54 +01:00 |
Linda Andersson
|
ba6f7114b5
|
GL - added id in object, vector
|
2013-12-19 11:58:42 +01:00 |
Erik Persson
|
e68001da0e
|
testing updated
message to client about object creation, message to client about player
movement
|
2013-12-19 11:46:11 +01:00 |
Linda Andersson
|
057dce0aca
|
GL - merge errors
|
2013-12-19 10:31:59 +01:00 |
Linda Andersson
|
13430f31fc
|
GL - merge and some more protocols
|
2013-12-19 10:22:32 +01:00 |
Erik Persson
|
0ea08fbd54
|
gamesession testing
|
2013-12-19 10:21:03 +01:00 |
lanariel
|
341e33ee78
|
Rebased Lights to Use World Coordinates
|
2013-12-18 20:36:41 +01:00 |
lanariel
|
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 |
lanariel
|
718b1ade2b
|
Proper Lighting, supports Multiple Lights
|
2013-12-18 20:28:06 +01:00 |
Linda Andersson
|
a4907c8e2e
|
GL - control protocol added
|
2013-12-18 15:28:47 +01:00 |
Dennis Andersen
|
92b3525587
|
GameLogic - Cleanup after erik ;)
|
2013-12-18 13:12:11 +01:00 |