d01acbcbe0
Misc - Added text and textcolor to buttons, seperate render function.
2014-02-13 15:21:19 +01:00
95e08e84c3
Network - Overloaded Connect in NetworkClient to use std::wstring.
2014-02-13 15:21:19 +01:00
cccaf68672
premerge
2014-02-13 15:21:02 +01:00
d705e73dc5
Added LobbyAdminState + other stuff
2014-02-13 13:30:14 +01:00
d60fd65805
Overhaul LanMenuState
2014-02-13 10:14:44 +01:00
bd6b531418
GL - added Portal and started on crystalformation
2014-02-13 09:58:25 +01:00
6c667f32cd
some fixes
2014-02-13 09:45:45 +01:00
c2f67f6f77
Merge branch 'Camera-test-merge' into Camera
...
Conflicts:
Code/Misc/EventHandler/EventHandler.cpp
2014-02-13 08:49:45 +01:00
45f6d983ad
Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge
...
Conflicts:
Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
Code/Game/DanBiasGame/GameClientState/GameState.cpp
Code/Game/DanBiasGame/GameClientState/LoginState.cpp
2014-02-13 08:48:34 +01:00
8744c751a8
resized buttons
2014-02-13 08:43:47 +01:00
5d4d66cf06
stuff
2014-02-12 17:20:42 +01:00
63bc360645
stuff
2014-02-12 16:31:15 +01:00
5fbb901c69
Model Tint added
2014-02-12 16:21:46 +01:00
74d28d1f62
Misc - Changed to MouseInput struct in EventHandler update.
2014-02-12 15:44:27 +01:00
7a218c61d8
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-12 15:12:28 +01:00
b9c4fe1849
GL - Eventhandler does not delete collections any more.
2014-02-12 15:12:01 +01:00
587fe62b8e
Removed obosolete functions
2014-02-12 15:06:08 +01:00
573a0109e3
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
...
Conflicts:
Code/Game/GameLogic/GameLogicStates.h
Code/Game/GameLogic/JumpPad.cpp
Code/Game/GameLogic/JumpPad.h
2014-02-12 15:03:40 +01:00
492205b24a
Merge branch 'Camera' of https://github.com/dean11/Danbias into Camera
2014-02-12 15:02:57 +01:00
20c4833126
Fix start render
2014-02-12 15:02:29 +01:00
9d9481b87a
stuff
2014-02-12 14:52:31 +01:00
64b2d688bd
Försök till merge men det är cp
2014-02-12 14:48:58 +01:00
6cbec3e2ac
GL - jumppad testing
2014-02-12 14:45:10 +01:00
5ff8661843
Bugs and Compilation errors dealt with
2014-02-12 14:33:56 +01:00
14d492f22e
changes in massdriver
2014-02-12 14:12:48 +01:00
7c44e8ba17
GL - added jumppad model and rigidbody
2014-02-12 14:12:47 +01:00
5e1bc2264c
Fixed set position
2014-02-12 14:10:17 +01:00
b95e1d6b7a
changes in massdriver
2014-02-12 14:00:53 +01:00
8f627f8a71
Merge remote-tracking branch 'origin/GamePhysics' into GameLogic
2014-02-12 13:57:01 +01:00
777c1183c5
Fixed set transformation
2014-02-12 13:55:43 +01:00
11b6f6eddc
Fixed Spec coefficient
2014-02-12 13:53:52 +01:00
97c3097fc7
GL - added jumppad model and rigidbody
2014-02-12 13:37:21 +01:00
d7102fe7e6
Merge remote-tracking branch 'origin/GamePhysics' into Camera-test-merge
2014-02-12 13:30:03 +01:00
3e181cd34e
post merge
2014-02-12 13:27:34 +01:00
60d1fdba97
Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge
...
Conflicts:
Code/Game/DanBiasGame/DanBiasGame.vcxproj
Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
Code/Game/DanBiasGame/GameClientState/C_Object.h
Code/Game/DanBiasGame/GameClientState/GameClientState.h
Code/Game/DanBiasGame/GameClientState/GameState.cpp
Code/Game/DanBiasGame/GameClientState/GameState.h
Code/Game/DanBiasGame/GameClientState/LobbyState.h
Code/Game/DanBiasGame/GameClientState/LoginState.h
Code/Game/DanBiasGame/GameClientState/MainState.cpp
Code/Game/GameProtocols/ObjectProtocols.h
Code/Game/GameServer/Implementation/GameSession_General.cpp
2014-02-12 13:23:50 +01:00
d4fa29e8a8
Fixed project files
2014-02-12 13:21:59 +01:00
14077c6d4e
GL - moved camera for testing
2014-02-12 13:17:27 +01:00
88341eaff7
Fixed incorrect settings for vld in some projects
...
Now links well with x64 as well
2014-02-12 13:14:28 +01:00
25590566d1
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-12 13:13:40 +01:00
b34df93e49
GL - Massdriver updates
2014-02-12 13:12:51 +01:00
57ef395bd2
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-12 13:11:43 +01:00
e8536cc5d4
GL - removed before collision event, sending look and right dir to server
2014-02-12 13:11:35 +01:00
26a6bde42a
Merge remote-tracking branch 'origin/GamePhysics' into GameLogic
2014-02-12 12:43:08 +01:00
15cc7cb85e
Fixed collision for object not in world
2014-02-12 12:38:52 +01:00
6bbb988268
Merge remote-tracking branch 'origin/GamePhysics' into GameLogic
2014-02-12 12:37:02 +01:00
1841685edb
Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GamePhysics
2014-02-12 12:34:04 +01:00
cc4e3f947c
GL - playermovement fixed, can walk in diagonal directions
2014-02-12 12:16:16 +01:00
134994447f
Fixed compilation error
2014-02-12 12:11:23 +01:00
da5b9c7306
Nomal Mapping For TA
2014-02-12 12:05:27 +01:00
d21a03f621
Merge remote-tracking branch 'origin/GamePhysics' into Camera
2014-02-12 11:56:02 +01:00
295568d5e7
Fixed incorrect project settings
2014-02-12 11:54:47 +01:00
377c752c46
Fixed Target Build table in solution file
2014-02-12 11:50:36 +01:00
786c6bb3c1
Merge remote-tracking branch 'origin/GamePhysics' into Camera
2014-02-12 11:45:48 +01:00
10c0019c02
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-12 11:36:19 +01:00
fa16f71a26
GL - forgot to commit files
2014-02-12 11:36:08 +01:00
f2a444507c
GL - FIxed Button state flickering, added flag resizeToScreenAspectRatio.
2014-02-12 11:35:57 +01:00
c1757eef21
GL - moving character
2014-02-12 11:35:34 +01:00
3a80a71143
GL - working on weapon
2014-02-12 11:32:30 +01:00
6becd58833
DanBiasGame_Impl overhauled
...
+ compilation errorfixes
2014-02-12 11:19:25 +01:00
9f64a1b441
Merge remote-tracking branch 'origin/GamePhysics' into GameLogic
2014-02-12 11:03:33 +01:00
5d29979875
Fixed which body to send
2014-02-12 10:58:05 +01:00
7394f68769
GL - fixed what some asshole did in weapon
2014-02-12 10:57:43 +01:00
1db41a863b
Merge remote-tracking branch 'origin/GamePhysics' into GameLogic
2014-02-12 10:44:13 +01:00
0d643a890d
GL - massdriver
2014-02-12 10:43:41 +01:00
af85a6efdc
Compiler fixes in State classes
2014-02-12 10:43:06 +01:00
5e4532d50e
Merge remote-tracking branch 'origin/GamePhysics' into GameLogic
2014-02-12 10:34:56 +01:00
2a214f5305
Added cone to apply effect
2014-02-12 10:31:50 +01:00
f0178cf558
Added apply effect functionality
2014-02-12 10:23:17 +01:00
3324da528d
GFERIK - added icollideable cone
2014-02-12 10:16:00 +01:00
8e07475434
GL - Buttons is now using one texture per button type. Fixed button state when spamming the button.
2014-02-12 10:02:52 +01:00
fdb7a7e1b6
Added General Protocol to DataRecieved overloads
2014-02-12 09:54:33 +01:00
d4b7fbf1b4
Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic
2014-02-12 09:52:46 +01:00
0bae7b9c6b
Misc - Fixed a few errors that can occur
2014-02-12 09:50:09 +01:00
6bf7bc898e
some more of those overhauls
2014-02-12 09:49:08 +01:00
8c1f1e6608
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-12 09:32:22 +01:00
e6316f3239
removed some old stuff, respect animation looping state
2014-02-12 09:32:15 +01:00
bdc5b5e736
GL - fixed graphics, collision with house, locked to 30 fps on client, jump added
2014-02-12 09:32:13 +01:00
f92bed35f5
Colored Text and Tinted Gui elements
2014-02-12 09:24:37 +01:00
d7c381cc85
GL- fixed subscription
2014-02-12 09:23:25 +01:00
8dc22c854c
Overhaul of LobbyState
2014-02-12 09:15:41 +01:00
291e60d7b4
Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic
2014-02-12 09:11:11 +01:00
d0955b2f4e
GL - Button delete update.
2014-02-12 09:08:38 +01:00
4d78e30fb8
Overhaul of GameState
2014-02-12 09:02:44 +01:00
4c9d62b163
Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic
2014-02-12 08:56:39 +01:00
7541994419
Added support for applying impulse
2014-02-12 08:50:10 +01:00
ebf313ccd6
2D transparancy
2014-02-12 08:35:21 +01:00
4a6cd390eb
Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic
2014-02-12 08:26:56 +01:00
474744c72a
Fixed wierd ambience, 2DText Render and Lighting
2014-02-12 08:24:24 +01:00
6fc110c2e8
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-11 15:07:10 +01:00
1725f05c4b
GUI - GUI testing.
2014-02-11 15:06:46 +01:00
56205ff774
GL - mergeerror with button handling
2014-02-11 15:03:27 +01:00
5ebac80ec1
GL - animated character and some textrendering
2014-02-11 15:00:52 +01:00
3be98e6647
Merge remote-tracking branch 'origin/GameServer' into Camera
...
Conflicts:
Code/Game/DanBiasGame/GameClientState/GameClientState.h
Code/Game/DanBiasGame/GameClientState/GameState.cpp
2014-02-11 14:56:43 +01:00
0f3c5af04a
pre merge
2014-02-11 14:47:57 +01:00
813a97cfbf
Merge remote-tracking branch 'origin/GamePhysics' into Camera
2014-02-11 14:15:00 +01:00
46d1fa13e1
premerge
2014-02-11 14:14:06 +01:00
a99a9b3e2e
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-11 14:13:49 +01:00
696d6997f6
GL - Button system done, only need to add 2d rendering to it.
2014-02-11 14:13:35 +01:00
c3b2c1e912
premerge
2014-02-11 14:13:24 +01:00
058eada44c
Added missing include lines
2014-02-11 14:12:14 +01:00
89189f93d8
asd
2014-02-11 14:03:14 +01:00
5d245d7151
Added quaternion to angular axis in Math
2014-02-11 14:00:38 +01:00
1aa66dc79f
Quaternion to angular axis complete
2014-02-11 13:53:44 +01:00
d771a5181d
GL - rotation and gravity fixed
2014-02-11 13:41:38 +01:00
398be8361b
Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic
2014-02-11 13:36:49 +01:00
7075e6add6
Gravity well
2014-02-11 13:36:14 +01:00
f0df377bcd
Basic 2d Render + Anim Updates
2014-02-11 13:29:19 +01:00
03ab4affb7
Minor fixes
2014-02-11 13:27:33 +01:00
7c0a597ed3
GameServer - Merge with Gamelogic
2014-02-11 13:26:51 +01:00
289439b768
Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic
2014-02-11 13:22:17 +01:00
322f752deb
Merge remote-tracking branch 'origin/GameServer' into Camera
...
Conflicts:
Code/Game/DanBiasGame/GameClientState/GameState.cpp
2014-02-11 13:21:44 +01:00
70c388779e
Lib change for bullet
2014-02-11 13:21:22 +01:00
f9a4fce5aa
Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic
2014-02-11 13:12:35 +01:00
462413b527
Added support for gravity change
2014-02-11 13:09:46 +01:00
de4ea0a830
GameServer - Merged with GameLogic, some stuff is broken
2014-02-11 13:03:37 +01:00
b883e2de39
Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic
2014-02-11 11:46:17 +01:00
528a591fab
GL - almost rotating
2014-02-11 11:46:06 +01:00
b5631457d3
Fixed up functions again
2014-02-11 11:45:16 +01:00
2d22d5d274
Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic
2014-02-11 10:50:12 +01:00
ee1dc530fa
Fixed up functions
2014-02-11 10:49:37 +01:00
3274727923
GameServer - Added more gameplay protocols and structured the old mess
2014-02-11 10:21:47 +01:00
dc5783ad4f
Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic
2014-02-11 10:21:11 +01:00
071624779e
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-11 10:11:57 +01:00
d16d223c2b
GL - player moving
2014-02-11 10:11:38 +01:00
5ddafc7fc2
Merge remote-tracking branch 'origin/GameLogic' into Camera
2014-02-11 09:34:17 +01:00
d5e85b4258
minor refractoring
2014-02-11 09:32:49 +01:00
10a227ff9c
Merge remote-tracking branch 'origin/GameLogic-MessageHandler' into GameLogic
...
Conflicts:
Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
2014-02-11 09:25:10 +01:00
489115840d
GL - base for lvl loading
2014-02-11 09:17:16 +01:00
9a82b70020
Misc - Button system working. (Logic)
2014-02-11 09:16:01 +01:00
985dcf9691
Set up and stop angular movement support added
2014-02-11 09:15:21 +01:00
399e0d049c
GameServer - Merged with Graphics
2014-02-10 23:10:31 +01:00
450f4249f3
Documentation - Updated uml diagrams
2014-02-10 22:25:31 +01:00
f53926444f
Merge remote-tracking branch 'origin/GameLogic' into Camera-merge-attempt
...
Conflicts:
Code/Game/DanBiasGame/GameClientState/GameState.cpp
Code/Game/DanBiasGame/GameClientState/GameState.h
2014-02-10 17:00:45 +01:00
1e70640d6e
Premerge
...
not compilable
2014-02-10 16:30:47 +01:00
f473136ae1
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-10 16:29:04 +01:00
bfb763501d
GL - i think this is working, not using the lvl loader. put models in /Content/Models and /textures
2014-02-10 16:28:25 +01:00
26755f8b0b
GL- level format more updates....
2014-02-10 16:24:05 +01:00
cc55a3471f
Fixed Const View Proj
2014-02-10 16:22:23 +01:00
e0f3031187
Pointlight no pointer Model render pointer
2014-02-10 16:08:03 +01:00
a12146215d
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-10 15:54:46 +01:00
b731c206f4
GL - physics merge 2
2014-02-10 15:54:38 +01:00
26e151f9b4
Fixed state problem
2014-02-10 15:46:55 +01:00
b435818567
Added Camera_FPS
2014-02-10 15:19:55 +01:00
77eceaf285
Camera_Basic edits
2014-02-10 15:19:42 +01:00
1a86ed23cc
Float3 SnapAngular compile error fix
2014-02-10 15:19:06 +01:00
b80f594440
Changed Animated model
2014-02-10 15:11:33 +01:00
c75493b6ce
GL - Levelformat updated 3.0 with new format!
2014-02-10 14:59:12 +01:00
8ff81fb06a
Fixed compatability with Gamelogic
2014-02-10 14:54:54 +01:00
1b5e8e11cb
Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic
2014-02-10 14:52:46 +01:00
6d7893c6e9
GL - merge with physics
2014-02-10 14:52:34 +01:00
55a2c6593c
Added states
2014-02-10 14:50:40 +01:00
49d29d87a5
GL - merge with bullet physics and updated server
2014-02-10 14:41:43 +01:00
7167d042ac
Merge remote-tracking branch 'origin/GameLogic' into Graphics
...
Conflicts:
Code/OysterGraphics/Shader/HLSL/Deffered Shaders/PostPass.hlsl
Code/OysterGraphics/Shader/Passes/Light/LightPass.hlsl
2014-02-10 14:41:04 +01:00
bd8722f107
Options for rigid bodies are now set directly
2014-02-10 14:39:45 +01:00
77c3ba06aa
Framerate fix in release
2014-02-10 14:39:26 +01:00
30196aebc2
Float3 SnapAngularAxis fix
2014-02-10 14:30:15 +01:00
8547d17d0f
Friction and restitution is now set
2014-02-10 14:22:10 +01:00
c18eb668aa
Added more data for bodies and added cylinder
2014-02-10 14:18:45 +01:00
eb39008529
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-10 14:00:24 +01:00
c87bab8808
GL - started using the lvl format. Objects on client have pos, rot and scale (not verified)
2014-02-10 14:00:14 +01:00
a3ba67e3c2
Fixed release compile and basic anim
2014-02-10 13:59:45 +01:00
05aa3cc9e9
Added on move functionality
2014-02-10 13:55:01 +01:00
4fb684019c
Added ScalingMatrix function
2014-02-10 13:41:37 +01:00
e5e99924d9
Updates for objects
2014-02-10 13:25:28 +01:00
0153be16d5
Added VS Filter Camera
2014-02-10 13:03:21 +01:00
800d5d0505
Camera_Basic stuff
2014-02-10 13:01:46 +01:00
ba0d6ca73a
Amazing merge with server
2014-02-10 12:42:31 +01:00
da58165645
Added Basic camera
2014-02-10 12:02:48 +01:00
abdb820b09
Added RotationMatrix for Float3x3
2014-02-10 11:59:35 +01:00
d0f36302cf
Fixed 2d render comment
...
Started on Anim API
2014-02-10 11:53:44 +01:00
c191c96ea8
Added bullet physics .lib
2014-02-10 11:24:38 +01:00
8c31c16e4d
Commented away
2014-02-10 11:21:57 +01:00
c16851f024
Using only lib and include
2014-02-10 11:14:45 +01:00
427ec3b716
Major overhaul fix
2014-02-10 10:52:08 +01:00
adb273bd5b
Fixed las bug in 2d rendering
2014-02-10 09:35:03 +01:00
e6e56ba21b
Done with 2D
2014-02-10 01:03:10 +01:00
99146430a4
Major overhaul
2014-02-09 21:24:09 +01:00
14bf3ede86
Merged with GameLogic and fixed merging errors, some minor justifications may be needed later on due to merging errors..
2014-02-09 18:58:14 +01:00
4abfdd70fe
Merged with GameLogic and fixed merging errors, some minor justifications may be needed later on due to merging errors..
2014-02-09 18:58:07 +01:00
310ed3dfc5
GameServer - Multiplayer now working properly
2014-02-09 16:42:26 +01:00
fb9e33fc9b
Fixed warnings
2014-02-08 14:26:18 +01:00
1121bbdebf
TODO::
...
Fix Pixel Data to Post Pass
2014-02-07 16:51:35 +01:00
92447a6352
Very cool stuff
2014-02-07 16:01:43 +01:00
1de325c5a6
Fixed cleaning up Deffered.cpp
2014-02-07 15:52:07 +01:00
ab9f81ac60
Collisions work better
...
Still needs polishing
2014-02-07 15:38:53 +01:00
0c4f70e400
GL - Updated loadLevelHeader() .Added Cylinder bounding volume.
2014-02-07 15:20:34 +01:00
fef40f58f9
GL - Fixed memory leaks in LevelLoader.
2014-02-07 14:44:25 +01:00
9bdf258c5d
GL - Updated LevelLoader 2.0. Bounding volume 1.0
...
The ObjectSpecialType enum is not correct. It has to be updated.
2014-02-07 14:12:54 +01:00
898fc883e9
Merge branch 'Graphics2D' into Graphics
2014-02-07 13:48:46 +01:00
d9133f459a
2d Almost working
2014-02-07 13:47:09 +01:00
016bf37459
First commit save jebuz
2014-02-07 13:46:55 +01:00
9a0f363146
framerate double
2014-02-07 13:15:38 +01:00
1633129a2c
Commit to Dennis
2014-02-07 13:09:44 +01:00
5119b287d6
Small progress
2014-02-07 11:52:51 +01:00
b225c53611
More cool stuff
2014-02-07 11:43:18 +01:00
bab3ab0a78
Shader Restructure
2014-02-07 11:09:59 +01:00
a7480ebf70
Proper Animation
2014-02-07 08:34:01 +01:00
f372d3e05b
Some cool stuff
2014-02-06 21:15:28 +01:00
bfa54b9ccd
Fixed Anim
2014-02-05 17:13:23 +01:00
aafbfa01f3
Calculate Graphics Memory Usage
2014-02-05 16:54:57 +01:00
51711b86e3
Fixed Animate Skeleton, TODO Fix Skinning
2014-02-05 16:00:28 +01:00
81d43b59c0
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-05 15:54:56 +01:00
91db71fe0e
GL - 20 boxes and a house
2014-02-05 15:54:48 +01:00
a3cea997ba
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-05 15:47:00 +01:00
b39a670347
GL - Updated LevelLoader, works with Fredricks level editor.
2014-02-05 15:46:45 +01:00
201a07f0dc
GameServer - Merged with GameLogic
2014-02-05 15:16:31 +01:00
70a2cf27e3
GL - almost ok, at least on the top of the world
2014-02-05 11:53:38 +01:00
426444ca34
GL - added more boxes and weaponfunctionality
2014-02-05 11:46:04 +01:00
30c89ed330
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-02-05 09:06:44 +01:00
6818dda2b9
GL - testing
2014-02-05 09:06:33 +01:00
60736c52fe
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameServer
2014-02-04 22:34:07 +01:00
db822fa832
GameServer - Merged with gamelogic
2014-02-04 22:33:39 +01:00
b7f550859d
GameServer - Merge with GameLogic
2014-02-04 22:13:07 +01:00
98644e3fa0
Minimised to potential skinning problem
2014-02-04 17:59:04 +01:00
fb4025eb1a
bug fix
2014-02-04 16:56:31 +01:00
ac278555ea
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-02-04 16:39:21 +01:00
b43902d31e
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-04 16:39:11 +01:00
ec4d34b131
GL - added error checking
2014-02-04 16:39:01 +01:00
c8e8d3510d
Added debug traps
2014-02-04 16:38:42 +01:00
68dc5be9cb
added lost rebound deltatime compensation
2014-02-04 16:33:52 +01:00
168539da08
Gameserver - Fixed minor merging isues
2014-02-04 16:27:18 +01:00
4ad86ae83b
GL - Added jumppad(implemented but not tested)
2014-02-04 16:24:48 +01:00
4de809a952
Added Resource support
2014-02-04 16:20:42 +01:00
6e0dd63d64
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-02-04 16:11:01 +01:00
1952ff9aba
more fixes of potential bugs in Physics collision handling
2014-02-04 16:10:18 +01:00
d364456189
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-04 16:08:53 +01:00
d8c7220569
GL - added some testing things in player and more objects to the world
2014-02-04 16:08:28 +01:00
de8c76f051
GameServer - Fixed bugg where threads touched same data, n players should now be able to connect
2014-02-04 16:07:10 +01:00
61178e2803
GameServer - Fixed bugg where threads touched same data, n players should now be able to connect
2014-02-04 16:06:59 +01:00
9622d37d3f
bug fixes in Physics collision handling
2014-02-04 15:43:17 +01:00
e13410dced
Fixed debug data, points in right direction
...
Matrix::m 0 index based, not math def
2014-02-04 15:06:50 +01:00
97a3792bff
Anim Test Not working Joints
2014-02-04 14:59:51 +01:00
b810fa1586
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-04 14:31:00 +01:00
8834f6a2ec
GL - LevelLoader update.
2014-02-04 14:30:45 +01:00
502d0c8586
GL - actually fixed respawning(turned off)
2014-02-04 14:07:13 +01:00
ad16d51f75
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-02-04 14:02:03 +01:00
15798bfca9
minor bug found and fixed in rebound
2014-02-04 14:00:33 +01:00
bd9e4599cb
GL - fixed respawning and also fixed weapon
2014-02-04 13:58:48 +01:00
9efa4fcb23
Commit error fix
...
for some odd reason Player.cpp change followed the last one
2014-02-04 13:08:03 +01:00
54deef7f2b
Project file fixes for GL
2014-02-04 13:06:10 +01:00
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
2314935f48
linear coll. resp. fix add
...
fix didn't cover all cases. Now it do
2014-01-20 11:29:35 +01:00
ee5e5ff8ce
linear collision response fix
...
moved improved version of Robin's implementation
2014-01-20 11:29:34 +01:00
727b2acb82
angular collision response fix
...
Incorrect formula found and corrected
2014-01-20 11:29:33 +01:00
502513d4f8
Work asssignment split line
2014-01-20 11:29:33 +01:00
7834264e5f
Physics proj .. show all files should be set to false
...
That is how we in Physics rolls
2014-01-20 11:29:32 +01:00
ce4c57bab3
GL - player inherits dynamicobject instead of object
2014-01-20 08:40:41 +01:00
b85439bd5e
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
2014-01-18 18:01:23 +01:00
f660a5c64e
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-17 16:07:25 +01:00
7c448792dd
Gravity normal fix
...
Forgot to update that value. Done
2014-01-17 13:30:07 +01:00
893934dcf4
Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics
...
Conflicts:
Code/Tester/MainTest.cpp
2014-01-17 09:07:42 +01:00
ab0b9a925a
/Graphics Fixed stable pipeline with no warnings
2014-01-17 09:05:18 +01:00
61b8baed1b
Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics
...
Conflicts:
Code/OysterGraphics/Shader/HLSL/Deffered Shaders/GBufferHeader.hlsli
Code/Tester/MainTest.cpp
2014-01-17 08:58:49 +01:00
eaf0ae1479
GL - can now compile
2014-01-17 08:52:34 +01:00
c48f640cdf
Loading .Dan geometry and material
2014-01-17 08:51:12 +01:00
7b2be02113
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-01-16 12:26:33 +01:00
a168328a44
GL - movement with physics working!!
2014-01-16 12:26:14 +01:00
d08e999f07
Create level and initiate it with a rigidbody etc
2014-01-16 12:08:24 +01:00
df7801336a
Merge remote-tracking branch 'origin/Physics' into GameLogic
2014-01-16 11:40:58 +01:00
225d8912da
GL - make rigidbody level
2014-01-16 11:40:29 +01:00
36a8372072
Merge branch 'Gravity' into Physics
2014-01-16 11:36:31 +01:00
2e32ac02fa
Merge remote-tracking branch 'origin/CollisionResponse' into Physics
2014-01-16 11:36:18 +01:00
27b6affd6a
BoxVsBox pointOfContact fix
...
it was not translated
2014-01-16 11:28:07 +01:00
0080a9f6f2
small name changes
2014-01-16 11:17:19 +01:00
8f3befecf4
Merge remote-tracking branch 'origin/Physics' into GameLogic
2014-01-16 11:16:26 +01:00
567fa229eb
small name changes
2014-01-16 11:07:45 +01:00
a070e4d459
Merge remote-tracking branch 'origin/Physics' into GameLogic
2014-01-16 09:30:30 +01:00
aac92bc20e
GL- send new player pos to client
2014-01-16 09:30:16 +01:00
483236801f
Fixed compile warnings and crash on non existing models
2014-01-16 09:30:01 +01:00
0c8783ba84
GL - merge done
2014-01-15 12:02:52 +01:00
8557559b9b
GL - going to merge
2014-01-15 11:57:36 +01:00
5f00aa7af7
GL - Merge with origin/Gamelogic
2014-01-15 11:45:34 +01:00
208482b0ce
GL merge error
2014-01-15 11:25:59 +01:00
ceac5ce31d
Modified namespace around Threadsafe queue and IQueue. Added TCP_NODELAY to sockets. Implemented some functionality to gamelogic
2014-01-15 11:03:25 +01:00
44e071fba9
Gravity implemented
2014-01-15 10:44:31 +01:00
7a48e058da
Added Equal operators to Gravity struct
...
== & !=
2014-01-15 10:44:20 +01:00
e9ad87507f
Obsolete code removed
...
More commentated out than deleted actually
2014-01-15 09:06:57 +01:00
9a32c44e49
GL - Merge branch 'GameLogic'
2014-01-15 08:19:35 +01:00
0ffe26c134
GL - Merge client with gameserver
2014-01-15 08:18:06 +01:00
8c7a17ff8f
Added missing mass and inertia
2014-01-14 11:58:53 +01:00
8f630125b4
AngularVelocity fix
2014-01-14 11:42:54 +01:00
89ef3b830a
Revert "Inertia tensor fix"
...
This reverts commit 23dab9dea6
2014-01-14 11:40:47 +01:00
23dab9dea6
Inertia tensor fix
...
should produce radian anglevelocities
2014-01-14 11:32:02 +01:00
54babfc7c7
Gameserver - Merged with Gamelogic
2014-01-14 10:38:35 +01:00
01e7614a5c
Tangiential formula fixes
2014-01-14 10:34:22 +01:00
4c1be4d807
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
...
Conflicts:
Code/Game/GameLogic/Game.cpp
2014-01-14 10:33:08 +01:00
87b8c0c7bb
Gameserver - Merged with Gamelogic
2014-01-14 10:29:39 +01:00
54240b217c
GameLogic - game interface updated(not finnished)
...
förlåt dennis
2014-01-14 10:28:12 +01:00
32e64c0dbb
GL - moved reciever struct to a separate file
2014-01-14 10:25:49 +01:00
82de85d1ac
Fixed minor server network bug, modified shader to get visual
2014-01-14 10:15:50 +01:00
844aa37906
Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameServer
2014-01-14 09:25:39 +01:00
97cba4248d
GameServer - Added more protocols. Divided the code in gamesession into several .cpp files
2014-01-14 09:25:22 +01:00
eb6ed13cce
Merge remote-tracking branch 'origin/Graphics' into GameLogic
2014-01-14 09:25:16 +01:00
04c5898f4e
GL - sending string and createOBJ working
2014-01-14 09:24:55 +01:00
8aa5ad7723
Revert "Work asssignment split line"
...
This reverts commit 8ecd263318
2014-01-14 09:16:54 +01:00
cc68088298
linear coll. resp. fix add
...
fix didn't cover all cases. Now it do
2014-01-14 09:14:17 +01:00
50b5b2dbf9
linear collision response fix
...
moved improved version of Robin's implementation
2014-01-14 09:12:37 +01:00
c1c3b5e6af
angular collision response fix
...
Incorrect formula found and corrected
2014-01-14 09:02:46 +01:00
eb9360377d
GameServer - Merged with other half of GameLogic
2014-01-13 12:50:27 +01:00
ce89e6bc98
GameServer - Fixed some minor bugs, one that made server crash on exit. Also integrated some of GameLogics new API functions
2014-01-13 12:44:33 +01:00
792f78c34a
GL- adding client UML, trying AddObj protocol with down-button. Problem with sending char*
2014-01-13 12:11:45 +01:00
Pontus Fransson
Dander7BD
Erik Persson
lanariel
Sam Mario Svensson
lindaandersson
Robin Engman
dean11
Tobias Grundel
bladdidoo