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

455 Commits

Author SHA1 Message Date
dean11 fb48b0b34c Merge branch 'Camera' of https://github.com/dean11/Danbias into GameServer 2014-02-17 09:11:08 +01:00
Dander7BD 509fdb5572 Merge remote-tracking branch 'origin/GameLogic' into Camera-merge-buffer 
Conflicts:
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
 2014-02-17 09:07:27 +01:00
dean11 d96825816d Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameServer 2014-02-17 09:01:41 +01:00
dean11 bb8d3549dc Cleanup 2014-02-17 09:01:01 +01:00
Dennis Andersen 5119af8127 Gameserver - Added more features to standalone srver 2014-02-17 08:53:15 +01:00
Robin Engman a90f33d20e Jumpy jump 2014-02-17 06:44:29 +01:00
Dennis Andersen 85ebe3a7ca GameServer - Merged with Input, Added some athur info in headers 2014-02-16 01:38:03 +01:00
Dennis Andersen 97f9bfcb96 GameServer - merged with Camera 2014-02-16 01:28:34 +01:00
Dennis Andersen 9d0148c5c2 GameServer - Merged with Standalone Server and modified some stuff, still compile errors, will try to merge with other 2014-02-16 01:12:27 +01:00
Dennis Andersen 21c640c6e1 GameServer - Merged with Standalone Server and modified some stuff, still compile errors, will try to merge with other 2014-02-16 01:12:03 +01:00
Dennis Andersen deb173bc46 GameServer - Merged with gamephysics 2014-02-15 22:49:13 +01:00
Dennis Andersen b834f1fb9b GameServer - Merged with GameServer 2014-02-15 22:33:40 +01:00
Dennis Andersen 359c208f57 GameServer - Some minor changes 2014-02-15 09:29:54 +01:00
Dander7BD 2dde8547b7 Server poking 2014-02-14 17:12:38 +01:00
lindaandersson d32e614b00 GL - Hax to get the world model initiated. reading spawnpoints 2014-02-14 16:03:46 +01:00
Dander7BD 2de045524a Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer 2014-02-14 15:42:46 +01:00
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
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
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
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
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
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
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