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 |
Sam Mario Svensson
|
d6432b2c73
|
Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat
|
2014-01-27 10:16:25 +01:00 |
Sam Mario Svensson
|
1748fe323a
|
GL - Added Parsing functions for levelLoader and moved Packing classes to misc
|
2014-01-27 10:15:39 +01:00 |
Pontus Fransson
|
e188794aa3
|
GL - Load level in LevelParser
|
2014-01-27 10:14:02 +01:00 |
Erik Persson
|
74ac5e2d31
|
Updated creation of objects
|
2014-01-27 08:54:25 +01:00 |
Dander7BD
|
30054a8c23
|
Slerp compile fix
|
2014-01-24 17:48:49 +01:00 |
Dander7BD
|
b4eb3eb25d
|
Slerp
Quaternion Slerp
|
2014-01-24 17:39:09 +01:00 |
Dander7BD
|
2da3dd29fc
|
InterpolateOrientation_UsingNonRigidNlerp
|
2014-01-24 16:32:54 +01:00 |
Dander7BD
|
8f63bf637e
|
Physics UMLET diagram
Current state under sprint 3
|
2014-01-24 15:03:03 +01:00 |
Sam Mario Svensson
|
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 |
Sam Mario Svensson
|
c84ed645f0
|
GameLogic - implementation of LevelLoader
|
2014-01-24 10:22:18 +01:00 |
Pontus Fransson
|
aaf3bf30f9
|
GL - LevelParser half way implemented.
|
2014-01-24 10:01:58 +01:00 |
Pontus Fransson
|
0f5517398d
|
GL - Update uml, LevelParser.h.cpp ObjectDefines.h
|
2014-01-24 09:00:59 +01:00 |
Dander7BD
|
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 |
Dander7BD
|
c3ed5e78ac
|
struct ::Oyster::Physics3D::MomentOfInertia
|
2014-01-23 18:45:33 +01:00 |
Dander7BD
|
ee5392c60d
|
Vector::PiecewiseMultiplicationAdd
and a few other minor changes in the math lib
|
2014-01-23 18:34:48 +01:00 |
Dander7BD
|
163481ce4f
|
Documentation edit
Were missing a final step about the ang. momentum toang. velocity
conversion documentation.
|
2014-01-23 18:33:48 +01:00 |
Dander7BD
|
ff1fbdffa1
|
Vector::PiecewiseMultiplication
|
2014-01-23 17:13:50 +01:00 |
Dander7BD
|
76e4b23f19
|
Added documentation
Mathematical exercise on how to convert angular momentum to angular
velocity
|
2014-01-23 14:54:53 +01:00 |
lindaandersson
|
fb2cf714c6
|
GL - sending dir to server, forward and backward walking works
|
2014-01-23 14:28:53 +01:00 |
lindaandersson
|
07e5519850
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-01-23 09:25:02 +01:00 |
lindaandersson
|
8c297d1e9b
|
GL - starting to send lookdir to server
|
2014-01-23 09:24:55 +01:00 |
Erik Persson
|
bd739f8acb
|
GL - Creation of objects kinda sorted
|
2014-01-23 09:14:04 +01:00 |
Erik Persson
|
121fd51c45
|
GL collision with level should worm
|
2014-01-23 08:57:46 +01:00 |
lindaandersson
|
3f144289ec
|
GL - merge with gameserver, crash on collision in gameLogic
|
2014-01-23 08:30:26 +01:00 |
lindaandersson
|
a591903d8f
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-01-23 08:25:10 +01:00 |
lindaandersson
|
f657a58a4f
|
GL - adding a camera on the client
|
2014-01-23 08:24:35 +01:00 |
lanariel
|
6b1dd34a72
|
Working SSAO + Read Animated .dan
|
2014-01-22 16:31:33 +01:00 |
Erik Persson
|
6a888cb154
|
GL - adjusting collisionManager
|
2014-01-22 15:47:44 +01:00 |