NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,110 Commits 1 Branch 0 Tags 38 MiB
Commit Graph

1029 Commits

Author SHA1 Message Date
lindaandersson 398be8361b Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic 2014-02-11 13:36:49 +01:00
Robin Engman 7075e6add6 Gravity well 2014-02-11 13:36:14 +01:00
lanariel f0df377bcd Basic 2d Render + Anim Updates 2014-02-11 13:29:19 +01:00
Dander7BD 03ab4affb7 Minor fixes 2014-02-11 13:27:33 +01:00
dean11 7c0a597ed3 GameServer - Merge with Gamelogic 2014-02-11 13:26:51 +01:00
lindaandersson 289439b768 Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic 2014-02-11 13:22:17 +01:00
Dander7BD 322f752deb Merge remote-tracking branch 'origin/GameServer' into Camera 
Conflicts:
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
 2014-02-11 13:21:44 +01:00
Robin Engman 70c388779e Lib change for bullet 2014-02-11 13:21:22 +01:00
lindaandersson f9a4fce5aa Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic 2014-02-11 13:12:35 +01:00
Robin Engman 462413b527 Added support for gravity change 2014-02-11 13:09:46 +01:00
dean11 de4ea0a830 GameServer - Merged with GameLogic, some stuff is broken 2014-02-11 13:03:37 +01:00
lindaandersson b883e2de39 Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic 2014-02-11 11:46:17 +01:00
lindaandersson 528a591fab GL - almost rotating 2014-02-11 11:46:06 +01:00
Robin Engman b5631457d3 Fixed up functions again 2014-02-11 11:45:16 +01:00
lindaandersson 2d22d5d274 Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic 2014-02-11 10:50:12 +01:00
Robin Engman ee1dc530fa Fixed up functions 2014-02-11 10:49:37 +01:00
dean11 3274727923 GameServer - Added more gameplay protocols and structured the old mess 2014-02-11 10:21:47 +01:00
lindaandersson dc5783ad4f Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic 2014-02-11 10:21:11 +01:00
lindaandersson 071624779e Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-11 10:11:57 +01:00
lindaandersson d16d223c2b GL - player moving 2014-02-11 10:11:38 +01:00
Dander7BD 5ddafc7fc2 Merge remote-tracking branch 'origin/GameLogic' into Camera 2014-02-11 09:34:17 +01:00
Dander7BD d5e85b4258 minor refractoring 2014-02-11 09:32:49 +01:00
Pontus Fransson 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
lindaandersson 489115840d GL - base for lvl loading 2014-02-11 09:17:16 +01:00
Pontus Fransson 9a82b70020 Misc - Button system working. (Logic) 2014-02-11 09:16:01 +01:00
Robin Engman 985dcf9691 Set up and stop angular movement support added 2014-02-11 09:15:21 +01:00
Dennis Andersen 399e0d049c GameServer - Merged with Graphics 2014-02-10 23:10:31 +01:00
Dennis Andersen 450f4249f3 Documentation - Updated uml diagrams 2014-02-10 22:25:31 +01:00
Dander7BD 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
Dander7BD 1e70640d6e Premerge 
not compilable
 2014-02-10 16:30:47 +01:00
lindaandersson f473136ae1 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-10 16:29:04 +01:00
lindaandersson 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
Sam Mario Svensson 26755f8b0b GL- level format more updates.... 2014-02-10 16:24:05 +01:00
lanariel cc55a3471f Fixed Const View Proj 2014-02-10 16:22:23 +01:00
lanariel e0f3031187 Pointlight no pointer Model render pointer 2014-02-10 16:08:03 +01:00
lindaandersson a12146215d Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-10 15:54:46 +01:00
lindaandersson b731c206f4 GL - physics merge 2 2014-02-10 15:54:38 +01:00
Robin Engman 26e151f9b4 Fixed state problem 2014-02-10 15:46:55 +01:00
Dander7BD b435818567 Added Camera_FPS 2014-02-10 15:19:55 +01:00
Dander7BD 77eceaf285 Camera_Basic edits 2014-02-10 15:19:42 +01:00
Dander7BD 1a86ed23cc Float3 SnapAngular compile error fix 2014-02-10 15:19:06 +01:00
lanariel b80f594440 Changed Animated model 2014-02-10 15:11:33 +01:00
Sam Mario Svensson c75493b6ce GL - Levelformat updated 3.0 with new format! 2014-02-10 14:59:12 +01:00
lanariel 8ff81fb06a Fixed compatability with Gamelogic 2014-02-10 14:54:54 +01:00
lindaandersson 1b5e8e11cb Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic 2014-02-10 14:52:46 +01:00
lindaandersson 6d7893c6e9 GL - merge with physics 2014-02-10 14:52:34 +01:00
Robin Engman 55a2c6593c Added states 2014-02-10 14:50:40 +01:00
lindaandersson 49d29d87a5 GL - merge with bullet physics and updated server 2014-02-10 14:41:43 +01:00
lanariel 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
Robin Engman bd8722f107 Options for rigid bodies are now set directly 2014-02-10 14:39:45 +01:00
lanariel 77c3ba06aa Framerate fix in release 2014-02-10 14:39:26 +01:00
Dander7BD 30196aebc2 Float3 SnapAngularAxis fix 2014-02-10 14:30:15 +01:00
Robin Engman 8547d17d0f Friction and restitution is now set 2014-02-10 14:22:10 +01:00
Robin Engman c18eb668aa Added more data for bodies and added cylinder 2014-02-10 14:18:45 +01:00
lindaandersson eb39008529 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-10 14:00:24 +01:00
lindaandersson 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
lanariel a3ba67e3c2 Fixed release compile and basic anim 2014-02-10 13:59:45 +01:00
Robin Engman 05aa3cc9e9 Added on move functionality 2014-02-10 13:55:01 +01:00
Dander7BD 4fb684019c Added ScalingMatrix function 2014-02-10 13:41:37 +01:00
Robin Engman e5e99924d9 Updates for objects 2014-02-10 13:25:28 +01:00
Dander7BD 0153be16d5 Added VS Filter Camera 2014-02-10 13:03:21 +01:00
Dander7BD 800d5d0505 Camera_Basic stuff 2014-02-10 13:01:46 +01:00
Robin Engman ba0d6ca73a Amazing merge with server 2014-02-10 12:42:31 +01:00
Dander7BD da58165645 Added Basic camera 2014-02-10 12:02:48 +01:00
Dander7BD abdb820b09 Added RotationMatrix for Float3x3 2014-02-10 11:59:35 +01:00
lanariel d0f36302cf Fixed 2d render comment 
Started on Anim API
 2014-02-10 11:53:44 +01:00
Robin Engman c191c96ea8 Added bullet physics .lib 2014-02-10 11:24:38 +01:00
Robin Engman 8c31c16e4d Commented away 2014-02-10 11:21:57 +01:00
Robin Engman c16851f024 Using only lib and include 2014-02-10 11:14:45 +01:00
Robin Engman 427ec3b716 Major overhaul fix 2014-02-10 10:52:08 +01:00
lanariel adb273bd5b Fixed las bug in 2d rendering 2014-02-10 09:35:03 +01:00
lanariel e6e56ba21b Done with 2D 2014-02-10 01:03:10 +01:00
Robin Engman 99146430a4 Major overhaul 2014-02-09 21:24:09 +01:00
Dennis Andersen 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
Dennis Andersen 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
Dennis Andersen 310ed3dfc5 GameServer - Multiplayer now working properly 2014-02-09 16:42:26 +01:00
Robin Engman fb9e33fc9b Fixed warnings 2014-02-08 14:26:18 +01:00
lanariel 1121bbdebf TODO:: 
Fix Pixel Data to Post Pass
 2014-02-07 16:51:35 +01:00
Robin Engman 92447a6352 Very cool stuff 2014-02-07 16:01:43 +01:00
lanariel 1de325c5a6 Fixed cleaning up Deffered.cpp 2014-02-07 15:52:07 +01:00
Robin Engman ab9f81ac60 Collisions work better 
Still needs polishing
 2014-02-07 15:38:53 +01:00
Pontus Fransson 0c4f70e400 GL - Updated loadLevelHeader() .Added Cylinder bounding volume. 2014-02-07 15:20:34 +01:00
Pontus Fransson fef40f58f9 GL - Fixed memory leaks in LevelLoader. 2014-02-07 14:44:25 +01:00
Pontus Fransson 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
lanariel 898fc883e9 Merge branch 'Graphics2D' into Graphics 2014-02-07 13:48:46 +01:00
lanariel d9133f459a 2d Almost working 2014-02-07 13:47:09 +01:00
Tobias Grundel 016bf37459 First commit save jebuz 2014-02-07 13:46:55 +01:00
lanariel 9a0f363146 framerate double 2014-02-07 13:15:38 +01:00
Robin Engman 1633129a2c Commit to Dennis 2014-02-07 13:09:44 +01:00
lanariel 5119b287d6 Small progress 2014-02-07 11:52:51 +01:00
Robin Engman b225c53611 More cool stuff 2014-02-07 11:43:18 +01:00
lanariel bab3ab0a78 Shader Restructure 2014-02-07 11:09:59 +01:00
lanariel a7480ebf70 Proper Animation 2014-02-07 08:34:01 +01:00
Robin Engman f372d3e05b Some cool stuff 2014-02-06 21:15:28 +01:00
lanariel bfa54b9ccd Fixed Anim 2014-02-05 17:13:23 +01:00
lanariel aafbfa01f3 Calculate Graphics Memory Usage 2014-02-05 16:54:57 +01:00
lanariel 51711b86e3 Fixed Animate Skeleton, TODO Fix Skinning 2014-02-05 16:00:28 +01:00
lindaandersson 81d43b59c0 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-05 15:54:56 +01:00
lindaandersson 91db71fe0e GL - 20 boxes and a house 2014-02-05 15:54:48 +01:00
Pontus Fransson a3cea997ba Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-05 15:47:00 +01:00
Pontus Fransson b39a670347 GL - Updated LevelLoader, works with Fredricks level editor. 2014-02-05 15:46:45 +01:00
Dennis Andersen 201a07f0dc GameServer - Merged with GameLogic 2014-02-05 15:16:31 +01:00
lindaandersson 70a2cf27e3 GL - almost ok, at least on the top of the world 2014-02-05 11:53:38 +01:00
lindaandersson 426444ca34 GL - added more boxes and weaponfunctionality 2014-02-05 11:46:04 +01:00
lindaandersson 30c89ed330 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-05 09:06:44 +01:00
lindaandersson 6818dda2b9 GL - testing 2014-02-05 09:06:33 +01:00
Dennis Andersen 60736c52fe Merge branch 'Physics' of https://github.com/dean11/Danbias into GameServer 2014-02-04 22:34:07 +01:00
Dennis Andersen db822fa832 GameServer - Merged with gamelogic 2014-02-04 22:33:39 +01:00
Dennis Andersen b7f550859d GameServer - Merge with GameLogic 2014-02-04 22:13:07 +01:00
Robin Engman 98644e3fa0 Minimised to potential skinning problem 2014-02-04 17:59:04 +01:00
Dander7BD fb4025eb1a bug fix 2014-02-04 16:56:31 +01:00
lindaandersson ac278555ea Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 16:39:21 +01:00
lindaandersson b43902d31e Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 16:39:11 +01:00
lindaandersson ec4d34b131 GL - added error checking 2014-02-04 16:39:01 +01:00
Dander7BD c8e8d3510d Added debug traps 2014-02-04 16:38:42 +01:00
Dander7BD 68dc5be9cb added lost rebound deltatime compensation 2014-02-04 16:33:52 +01:00
Dennis Andersen 168539da08 Gameserver - Fixed minor merging isues 2014-02-04 16:27:18 +01:00
Erik Persson 4ad86ae83b GL - Added jumppad(implemented but not tested) 2014-02-04 16:24:48 +01:00
lanariel 4de809a952 Added Resource support 2014-02-04 16:20:42 +01:00
lindaandersson 6e0dd63d64 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 16:11:01 +01:00
Dander7BD 1952ff9aba more fixes of potential bugs in Physics collision handling 2014-02-04 16:10:18 +01:00
lindaandersson d364456189 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 16:08:53 +01:00
lindaandersson d8c7220569 GL - added some testing things in player and more objects to the world 2014-02-04 16:08:28 +01:00
Dennis Andersen 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
Dennis Andersen 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
Dander7BD 9622d37d3f bug fixes in Physics collision handling 2014-02-04 15:43:17 +01:00
lanariel e13410dced Fixed debug data, points in right direction 
Matrix::m 0 index based, not math def
 2014-02-04 15:06:50 +01:00
lanariel 97a3792bff Anim Test Not working Joints 2014-02-04 14:59:51 +01:00
Pontus Fransson b810fa1586 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 14:31:00 +01:00
Pontus Fransson 8834f6a2ec GL - LevelLoader update. 2014-02-04 14:30:45 +01:00
Erik Persson 502d0c8586 GL - actually fixed respawning(turned off) 2014-02-04 14:07:13 +01:00
lindaandersson ad16d51f75 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 14:02:03 +01:00
Dander7BD 15798bfca9 minor bug found and fixed in rebound 2014-02-04 14:00:33 +01:00
Erik Persson bd9e4599cb GL - fixed respawning and also fixed weapon 2014-02-04 13:58:48 +01:00
Dander7BD 9efa4fcb23 Commit error fix 
for some odd reason Player.cpp change followed the last one
 2014-02-04 13:08:03 +01:00
Dander7BD 54deef7f2b Project file fixes for GL 2014-02-04 13:06:10 +01:00
lindaandersson f88e16c581 GL - merge 2014-02-04 11:53:40 +01:00
lindaandersson e2bac798c4 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 11:50:51 +01:00
lindaandersson fa02814ca0 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 11:50:40 +01:00
lindaandersson d54cffee8e GL - camera follows player 2014-02-04 11:50:15 +01:00
Dander7BD e39eb5fb4b RigidBody update adjusted 
Spherical and Simple
 2014-02-04 11:48:50 +01:00
Pontus Fransson 2897305dd0 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 11:36:24 +01:00
Pontus Fransson 1261ed734f GL - Updated level loader. 2014-02-04 11:36:10 +01:00
Erik Persson 3bf9f59f5a GL - Player dies and respawns 2014-02-04 11:13:16 +01:00
lindaandersson 07e8624807 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 10:39:09 +01:00
lindaandersson 00400a7d32 GL - camera testing 2014-02-04 10:38:59 +01:00
Dander7BD 42cb1dab1d API::SimpleBodyDescription API::SphericalBodyDescription fix 
3 coeffs were not saved in factory constructor
 2014-02-04 10:32:43 +01:00
lindaandersson fcadd5b4c3 GL - testing physics 2014-02-04 10:29:02 +01:00
Dander7BD 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
lindaandersson 6e9423670f Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 08:56:32 +01:00