Dander7BD
|
0a04c1c9f1
|
Added document
|
2014-01-30 14:52:40 +01:00 |
Dennis Andersen
|
e043d03a59
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer
|
2014-01-30 14:40:04 +01:00 |
lindaandersson
|
713dc269d1
|
Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic
|
2014-01-30 14:18:00 +01:00 |
|
lindaandersson
|
05e24d0514
|
GL - uppdate server
|
2014-01-30 14:17:50 +01:00 |
|
Dennis Andersen
|
09f39ec26d
|
GameServer - Added acces directly to clients in network session
|
2014-01-30 14:15:25 +01:00 |
Sam Mario Svensson
|
261421af21
|
Merge remote-tracking branch 'origin/GameLogic-LevelFormat' into GameLogic
|
2014-01-30 13:44:18 +01:00 |
|
Sam Mario Svensson
|
c78bbba3eb
|
GL- Removed commentet unnecessary code
|
2014-01-30 13:33:59 +01:00 |
|
lindaandersson
|
2a69af5c9f
|
GL - merge
|
2014-01-30 12:01:48 +01:00 |
|
lindaandersson
|
1ccf98e3eb
|
GL - added loginstate
|
2014-01-30 11:58:44 +01:00 |
|
lindaandersson
|
d41ddca45d
|
Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic
|
2014-01-30 11:13:42 +01:00 |
Erik Persson
|
323b7322fa
|
GL - testing
|
2014-01-30 11:11:45 +01:00 |
|
Dennis Andersen
|
05740665da
|
GameServer - Fixed a small error regarding not reaching some data
|
2014-01-30 11:11:04 +01:00 |
|
lindaandersson
|
a249e7ede9
|
GL - merge with new serverAPI
|
2014-01-30 10:57:44 +01:00 |
|
lindaandersson
|
09693c7f35
|
GL - merge
|
2014-01-30 09:40:58 +01:00 |
|
lindaandersson
|
7d9d8e4615
|
GL - added jump
|
2014-01-30 09:07:56 +01:00 |
|
Dennis Andersen
|
fa29cd7307
|
GameServer - Merged with GameLogic
|
2014-01-30 00:19:00 +01:00 |
|
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 |
|
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 |