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

1133 Commits

Author SHA1 Message Date
Dander7BD c5c0047b5c some minor temporary button edits 2014-02-14 12:20:58 +01:00
Dander7BD e6c5f1f6e5 Merge errors dealt with 2014-02-14 12:09:59 +01:00
Pontus Fransson 4c4693e890 Lagt till alla funktion, inte en aning om det fungerar. 2014-02-14 12:09:30 +01:00
Robin Engman f8e68b95b2 Temporary jump 2014-02-14 12:07:49 +01:00
Erik Persson 9fc8a8840f GL - fixed movement(pretty unstable but its working) 2014-02-14 12:03:29 +01:00
Robin Engman 61c49cf352 Merge with game logic 2014-02-14 11:54:28 +01:00
Robin Engman a42dfe96f1 Jump implemented 2014-02-14 11:52:44 +01:00
Dander7BD 66d4fcef3a Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer 
Conflicts:
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
	Code/Game/DanBiasGame/GameClientState/LoginState.cpp
 2014-02-14 11:44:49 +01:00
lanariel ff6a4a0d47 Build Launcher 2014-02-14 11:38:43 +01:00
Dander7BD 36c6689c7a bug fixes 2014-02-14 11:37:20 +01:00
Erik Persson 3c928f497f Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-14 11:34:59 +01:00
Erik Persson 8bbdb1156a Merge remote-tracking branch 'origin/GamePhysics' into GameLogic 2014-02-14 11:34:47 +01:00
Dander7BD 2bfcda3b50 MousePos available in all relevant states 2014-02-14 11:32:16 +01:00
lindaandersson 9dd7aa2b5d Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-14 11:28:02 +01:00
lindaandersson 53f4848ea1 GL - merge with graphics. no SSAO. no TextRendering 2014-02-14 11:27:52 +01:00
Dander7BD 22f8a6c9ea Revert "Revert this" 
This reverts commit 76f0b712b1.
 2014-02-14 11:27:23 +01:00
Dander7BD 6f9483041b Temporary mouse pos add + other stuff 2014-02-14 11:26:50 +01:00
lanariel 431faff684 Merge Conficts btween projects 2014-02-14 11:17:30 +01:00
Erik Persson 7791dc076e GL - static and dynamic objects can now set extraDamageOnCollision in constructor 2014-02-14 11:16:15 +01:00
lindaandersson 975894b037 GL - init objects 2014-02-14 11:11:49 +01:00
lindaandersson 9038277a2c Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-14 11:07:11 +01:00
lindaandersson 1a01dbd760 GL - initiating objects 2014-02-14 11:07:03 +01:00
Erik Persson 8d8fa78da0 GL - fixed portal constructor 2014-02-14 11:04:01 +01:00
Erik Persson c5e4580ada GL - include error fixed 2014-02-14 10:59:33 +01:00
Pontus Fransson 30317ec365 Moved project to Stand alone server folder. 2014-02-14 10:59:01 +01:00
Erik Persson f14a83aef2 GL - Explosivebox now takes a float forceMagnitude instead of a vector 2014-02-14 10:57:24 +01:00
Pontus Fransson 5579b8a73c Merge branch 'StandaloneServer' of https://github.com/dean11/Danbias into StandaloneServer 2014-02-14 10:49:04 +01:00
Pontus Fransson e7cd44e75e Server - Added CLI project 2014-02-14 10:48:49 +01:00
lanariel 4f849bddb3 Folder and Launcher Added 2014-02-14 10:46:23 +01:00
Dander7BD 78f47cd3ae Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer 
Conflicts:
	Code/Game/GameLogic/Portal.cpp
 2014-02-14 10:34:00 +01:00
Dander7BD de6c5a1185 Merge remote-tracking branch 'origin/Camera' into Camera-Merge-buffer 2014-02-14 10:32:56 +01:00
lindaandersson 50d07a102d GL - initiate lvl 2014-02-14 10:32:41 +01:00
Dander7BD 76f0b712b1 Revert this 
added printout of mouse state values in MainState
 2014-02-14 10:32:25 +01:00
Dander7BD 5eec9fdd75 compilation fix 2014-02-14 10:11:39 +01:00
lindaandersson 1fc6f16409 GL - rotation testing 2014-02-14 10:09:03 +01:00
lanariel 8e78308820 New Vertex format NOT STABLE UNTIL NEW MODELS 2014-02-14 10:08:39 +01:00
Erik Persson 5defe7c0f7 GL - fixed compile errors 2014-02-14 10:08:29 +01:00
Dander7BD 14661a86f8 Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer 
Conflicts:
	Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
 2014-02-14 10:02:25 +01:00
Erik Persson 59697bfcea GL - fixed constructors to ease creation of objects, also fixed weapon crash on destruction 2014-02-14 09:59:26 +01:00
Dander7BD b9895f8c7f All states fix 
All new compilation errors dealt with
 2014-02-14 09:54:05 +01:00
Dander7BD d4139e265e MainState fix 
new compilation errors dealt with
 2014-02-14 09:46:17 +01:00
Pontus Fransson 06ae4d29dd GL - Fixed some warnings. 2014-02-14 09:44:31 +01:00
Dander7BD 49fc55be60 Textfield and Bunch of fixes 2014-02-14 09:40:53 +01:00
Robin Engman 063f57133f Set mass added 2014-02-14 08:29:49 +01:00
Robin Engman ff951d2183 Moving fixed 
Jumping and waiting for camera is next
 2014-02-13 19:49:33 +01:00
lindaandersson 2dee9dd084 GL - initiating ccc map from folder ../Content/Worlds. Sync with graphics content. 2014-02-13 16:33:26 +01:00
lanariel e71264b806 New text render 2014-02-13 16:27:53 +01:00
Dander7BD 3b225ea054 Merge 2014-02-13 15:32:54 +01:00
lanariel 491dc88bd1 Fixed Glow Mapping 2014-02-13 15:24:19 +01:00
Dander7BD 3139d6d409 Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer 2014-02-13 15:21:49 +01:00
Pontus Fransson d01acbcbe0 Misc - Added text and textcolor to buttons, seperate render function. 2014-02-13 15:21:19 +01:00
Pontus Fransson 95e08e84c3 Network - Overloaded Connect in NetworkClient to use std::wstring. 2014-02-13 15:21:19 +01:00
Dander7BD cccaf68672 premerge 2014-02-13 15:21:02 +01:00
Dander7BD d705e73dc5 Added LobbyAdminState + other stuff 2014-02-13 13:30:14 +01:00
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