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

988 Commits

Author SHA1 Message Date
Pontus Fransson d4b7fbf1b4 Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 09:52:46 +01:00
Pontus Fransson 0bae7b9c6b Misc - Fixed a few errors that can occur 2014-02-12 09:50:09 +01:00
lindaandersson 8c1f1e6608 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 09:32:22 +01:00
lanariel e6316f3239 removed some old stuff, respect animation looping state 2014-02-12 09:32:15 +01:00
lindaandersson bdc5b5e736 GL - fixed graphics, collision with house, locked to 30 fps on client, jump added 2014-02-12 09:32:13 +01:00
lanariel f92bed35f5 Colored Text and Tinted Gui elements 2014-02-12 09:24:37 +01:00
Erik Persson d7c381cc85 GL- fixed subscription 2014-02-12 09:23:25 +01:00
Pontus Fransson 291e60d7b4 Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 09:11:11 +01:00
Pontus Fransson d0955b2f4e GL - Button delete update. 2014-02-12 09:08:38 +01:00
lindaandersson 4c9d62b163 Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 08:56:39 +01:00
Robin Engman 7541994419 Added support for applying impulse 2014-02-12 08:50:10 +01:00
lanariel ebf313ccd6 2D transparancy 2014-02-12 08:35:21 +01:00
lindaandersson 4a6cd390eb Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 08:26:56 +01:00
lanariel 474744c72a Fixed wierd ambience, 2DText Render and Lighting 2014-02-12 08:24:24 +01:00
Pontus Fransson 6fc110c2e8 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-11 15:07:10 +01:00
Pontus Fransson 1725f05c4b GUI - GUI testing. 2014-02-11 15:06:46 +01:00
lindaandersson 56205ff774 GL - mergeerror with button handling 2014-02-11 15:03:27 +01:00
lindaandersson 5ebac80ec1 GL - animated character and some textrendering 2014-02-11 15:00:52 +01:00
Pontus Fransson a99a9b3e2e Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-11 14:13:49 +01:00
Pontus Fransson 696d6997f6 GL - Button system done, only need to add 2d rendering to it. 2014-02-11 14:13:35 +01:00
Erik Persson 89189f93d8 asd 2014-02-11 14:03:14 +01:00
Robin Engman 5d245d7151 Added quaternion to angular axis in Math 2014-02-11 14:00:38 +01:00
Robin Engman 1aa66dc79f Quaternion to angular axis complete 2014-02-11 13:53:44 +01:00
lindaandersson d771a5181d GL - rotation and gravity fixed 2014-02-11 13:41:38 +01:00
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
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
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
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
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
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
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
Robin Engman e5e99924d9 Updates for objects 2014-02-10 13:25:28 +01:00
Robin Engman ba0d6ca73a Amazing merge with server 2014-02-10 12:42:31 +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