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

1129 Commits

Author SHA1 Message Date
Dander7BD d60fd65805 Overhaul LanMenuState 2014-02-13 10:14:44 +01:00
Erik Persson bd6b531418 GL - added Portal and started on crystalformation 2014-02-13 09:58:25 +01:00
Dander7BD 6c667f32cd some fixes 2014-02-13 09:45:45 +01:00
Dander7BD c2f67f6f77 Merge branch 'Camera-test-merge' into Camera 
Conflicts:
	Code/Misc/EventHandler/EventHandler.cpp
 2014-02-13 08:49:45 +01:00
Dander7BD 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
Dander7BD 8744c751a8 resized buttons 2014-02-13 08:43:47 +01:00
Dander7BD 5d4d66cf06 stuff 2014-02-12 17:20:42 +01:00
Dander7BD 63bc360645 stuff 2014-02-12 16:31:15 +01:00
lanariel 5fbb901c69 Model Tint added 2014-02-12 16:21:46 +01:00
Pontus Fransson 74d28d1f62 Misc - Changed to MouseInput struct in EventHandler update. 2014-02-12 15:44:27 +01:00
Pontus Fransson 7a218c61d8 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 15:12:28 +01:00
Pontus Fransson b9c4fe1849 GL - Eventhandler does not delete collections any more. 2014-02-12 15:12:01 +01:00
Dander7BD 587fe62b8e Removed obosolete functions 2014-02-12 15:06:08 +01:00
Sam Mario Svensson 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
lanariel 492205b24a Merge branch 'Camera' of https://github.com/dean11/Danbias into Camera 2014-02-12 15:02:57 +01:00
lanariel 20c4833126 Fix start render 2014-02-12 15:02:29 +01:00
Dander7BD 9d9481b87a stuff 2014-02-12 14:52:31 +01:00
Sam Mario Svensson 64b2d688bd Försök till merge men det är cp 2014-02-12 14:48:58 +01:00
Erik Persson 6cbec3e2ac GL - jumppad testing 2014-02-12 14:45:10 +01:00
Dander7BD 5ff8661843 Bugs and Compilation errors dealt with 2014-02-12 14:33:56 +01:00
Erik Persson 14d492f22e changes in massdriver 2014-02-12 14:12:48 +01:00
lindaandersson 7c44e8ba17 GL - added jumppad model and rigidbody 2014-02-12 14:12:47 +01:00
Robin Engman 5e1bc2264c Fixed set position 2014-02-12 14:10:17 +01:00
Erik Persson b95e1d6b7a changes in massdriver 2014-02-12 14:00:53 +01:00
Erik Persson 8f627f8a71 Merge remote-tracking branch 'origin/GamePhysics' into GameLogic 2014-02-12 13:57:01 +01:00
Robin Engman 777c1183c5 Fixed set transformation 2014-02-12 13:55:43 +01:00
lanariel 11b6f6eddc Fixed Spec coefficient 2014-02-12 13:53:52 +01:00
lindaandersson 97c3097fc7 GL - added jumppad model and rigidbody 2014-02-12 13:37:21 +01:00
Dander7BD d7102fe7e6 Merge remote-tracking branch 'origin/GamePhysics' into Camera-test-merge 2014-02-12 13:30:03 +01:00
Dander7BD 3e181cd34e post merge 2014-02-12 13:27:34 +01:00
Dander7BD 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
Robin Engman d4fa29e8a8 Fixed project files 2014-02-12 13:21:59 +01:00
lindaandersson 14077c6d4e GL - moved camera for testing 2014-02-12 13:17:27 +01:00
Dander7BD 88341eaff7 Fixed incorrect settings for vld in some projects 
Now links well with x64 as well
 2014-02-12 13:14:28 +01:00
lindaandersson 25590566d1 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 13:13:40 +01:00
Erik Persson b34df93e49 GL - Massdriver updates 2014-02-12 13:12:51 +01:00
lindaandersson 57ef395bd2 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 13:11:43 +01:00
lindaandersson e8536cc5d4 GL - removed before collision event, sending look and right dir to server 2014-02-12 13:11:35 +01:00
Erik Persson 26a6bde42a Merge remote-tracking branch 'origin/GamePhysics' into GameLogic 2014-02-12 12:43:08 +01:00
Robin Engman 15cc7cb85e Fixed collision for object not in world 2014-02-12 12:38:52 +01:00
Erik Persson 6bbb988268 Merge remote-tracking branch 'origin/GamePhysics' into GameLogic 2014-02-12 12:37:02 +01:00
Robin Engman 1841685edb Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GamePhysics 2014-02-12 12:34:04 +01:00
lindaandersson cc4e3f947c GL - playermovement fixed, can walk in diagonal directions 2014-02-12 12:16:16 +01:00
Dander7BD 134994447f Fixed compilation error 2014-02-12 12:11:23 +01:00
lanariel da5b9c7306 Nomal Mapping For TA 2014-02-12 12:05:27 +01:00
Dander7BD d21a03f621 Merge remote-tracking branch 'origin/GamePhysics' into Camera 2014-02-12 11:56:02 +01:00
Dander7BD 295568d5e7 Fixed incorrect project settings 2014-02-12 11:54:47 +01:00
Dander7BD 377c752c46 Fixed Target Build table in solution file 2014-02-12 11:50:36 +01:00
Dander7BD 786c6bb3c1 Merge remote-tracking branch 'origin/GamePhysics' into Camera 2014-02-12 11:45:48 +01:00
lindaandersson 10c0019c02 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 11:36:19 +01:00
lindaandersson fa16f71a26 GL - forgot to commit files 2014-02-12 11:36:08 +01:00
Pontus Fransson f2a444507c GL - FIxed Button state flickering, added flag resizeToScreenAspectRatio. 2014-02-12 11:35:57 +01:00
lindaandersson c1757eef21 GL - moving character 2014-02-12 11:35:34 +01:00
Erik Persson 3a80a71143 GL - working on weapon 2014-02-12 11:32:30 +01:00
Dander7BD 6becd58833 DanBiasGame_Impl overhauled 
+ compilation errorfixes
 2014-02-12 11:19:25 +01:00
Erik Persson 9f64a1b441 Merge remote-tracking branch 'origin/GamePhysics' into GameLogic 2014-02-12 11:03:33 +01:00
Robin Engman 5d29979875 Fixed which body to send 2014-02-12 10:58:05 +01:00
Erik Persson 7394f68769 GL - fixed what some asshole did in weapon 2014-02-12 10:57:43 +01:00
Erik Persson 1db41a863b Merge remote-tracking branch 'origin/GamePhysics' into GameLogic 2014-02-12 10:44:13 +01:00
Erik Persson 0d643a890d GL - massdriver 2014-02-12 10:43:41 +01:00
Dander7BD af85a6efdc Compiler fixes in State classes 2014-02-12 10:43:06 +01:00
Erik Persson 5e4532d50e Merge remote-tracking branch 'origin/GamePhysics' into GameLogic 2014-02-12 10:34:56 +01:00
Robin Engman 2a214f5305 Added cone to apply effect 2014-02-12 10:31:50 +01:00
Robin Engman f0178cf558 Added apply effect functionality 2014-02-12 10:23:17 +01:00
Erik Persson 3324da528d GFERIK - added icollideable cone 2014-02-12 10:16:00 +01:00
Pontus Fransson 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
Dander7BD fdb7a7e1b6 Added General Protocol to DataRecieved overloads 2014-02-12 09:54:33 +01:00
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
Dander7BD 6bf7bc898e some more of those overhauls 2014-02-12 09:49:08 +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
Dander7BD 8dc22c854c Overhaul of LobbyState 2014-02-12 09:15:41 +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
Dander7BD 4d78e30fb8 Overhaul of GameState 2014-02-12 09:02:44 +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
Dander7BD 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
Dander7BD 0f3c5af04a pre merge 2014-02-11 14:47:57 +01:00
Dander7BD 813a97cfbf Merge remote-tracking branch 'origin/GamePhysics' into Camera 2014-02-11 14:15:00 +01:00
Dander7BD 46d1fa13e1 premerge 2014-02-11 14:14:06 +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
Dander7BD c3b2c1e912 premerge 2014-02-11 14:13:24 +01:00
Dander7BD 058eada44c Added missing include lines 2014-02-11 14:12:14 +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
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