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

1435 Commits

Author SHA1 Message Date
Dander7BD ba7f9aaa38 Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer 
Conflicts:
	Code/Game/DanBiasGame/GameClientState/C_Object.h
	Code/Game/DanBiasGame/GameClientState/C_obj/C_Player.cpp
	Code/Game/DanBiasGame/GameClientState/C_obj/C_Player.h
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
 2014-02-14 15:38:01 +01:00
Sam Mario Svensson 26fb7a5664 GL- Compile fel med spawnpoint fixat 2014-02-14 15:36:19 +01:00
Dander7BD 73e9629832 Removed incorrect Quaternion to AngAxis conversion 
use Float3 AngularAxis( const Quaternion &rotation ) in ::Oyster::Math3D
instead
 2014-02-14 15:33:17 +01:00
lanariel 9096e548a1 Text Culling Fix 2014-02-14 15:31:38 +01:00
Dander7BD 911700676c human error fix 2014-02-14 15:24:19 +01:00
Dander7BD c85cecd05a som more stuff 
created another version of Quaternion to Angular Axis conversion.
 2014-02-14 15:19:10 +01:00
Sam Mario Svensson 3051621f30 GL- levelLoader can now load a correct spawnpoint 2014-02-14 15:19:07 +01:00
lanariel 655f48017c Anim Fix 2014-02-14 15:11:12 +01:00
lindaandersson bfb9864be9 GL - handle if the model dose not exist 2014-02-14 15:07:55 +01:00
Dander7BD c1d63a1477 new state: NetLoadState 2014-02-14 14:32:17 +01:00
Dander7BD fe6742f9e2 Tweaks and a new state: NetLoadState 2014-02-14 14:31:01 +01:00
lanariel adcac0ec12 Random Updates 2014-02-14 14:27:38 +01:00
Pontus Fransson 1dd36eaace Changed from ref to value struct. Forgot a System::. 2014-02-14 14:18:16 +01:00
lindaandersson 68dfd2e324 Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic 2014-02-14 13:55:03 +01:00
lindaandersson 25b0162b59 GL - explosive crate testing 2014-02-14 13:54:50 +01:00
lindaandersson bab3af787c GL - merge with new physics movement 2014-02-14 13:54:28 +01:00
Pontus Fransson 75201d4c6d Removed some using namespaces from .h to .cpp. 2014-02-14 13:52:44 +01:00
lindaandersson 8110b677ff GL - added spawnpoint array 2014-02-14 13:09:55 +01:00
Erik Persson 8b92c015ea Merge remote-tracking branch 'origin/GamePhysics' into GameLogic 
Conflicts:
	Code/Game/GameLogic/Player.cpp
 2014-02-14 12:46:27 +01:00
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