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

64 Commits

Author SHA1 Message Date
dean11 89b73cdf01 GameLogic - fixed wrong pointer cast 2014-02-19 15:52:16 +01:00
dean11 61350572c7 GameLogic - Merge with origin gamelogic 2014-02-19 10:47:14 +01:00
dean11 0e23bcfc82 GameLogic - Modified some names and cleand up some junk 2014-02-19 10:36:45 +01:00
Erik Persson be8b7537b5 GL - merging 2014-02-18 13:47:40 +01:00
lindaandersson 25b0162b59 GL - explosive crate testing 2014-02-14 13:54:50 +01:00
Erik Persson f14a83aef2 GL - Explosivebox now takes a float forceMagnitude instead of a vector 2014-02-14 10:57:24 +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
lindaandersson 2dee9dd084 GL - initiating ccc map from folder ../Content/Worlds. Sync with graphics content. 2014-02-13 16:33:26 +01:00
Erik Persson bd6b531418 GL - added Portal and started on crystalformation 2014-02-13 09:58:25 +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
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
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
Erik Persson b95e1d6b7a changes in massdriver 2014-02-12 14:00:53 +01:00
lindaandersson 97c3097fc7 GL - added jumppad model and rigidbody 2014-02-12 13:37:21 +01:00
lindaandersson e8536cc5d4 GL - removed before collision event, sending look and right dir to server 2014-02-12 13:11:35 +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
Erik Persson 3a80a71143 GL - working on weapon 2014-02-12 11:32:30 +01:00
Robin Engman ba0d6ca73a Amazing merge with server 2014-02-10 12:42:31 +01:00
Robin Engman 99146430a4 Major overhaul 2014-02-09 21:24:09 +01:00
Dennis Andersen 310ed3dfc5 GameServer - Multiplayer now working properly 2014-02-09 16:42:26 +01:00
Dennis Andersen 201a07f0dc GameServer - Merged with GameLogic 2014-02-05 15:16:31 +01:00
lindaandersson 426444ca34 GL - added more boxes and weaponfunctionality 2014-02-05 11:46:04 +01:00
lindaandersson 6818dda2b9 GL - testing 2014-02-05 09:06:33 +01:00
Dennis Andersen b7f550859d GameServer - Merge with GameLogic 2014-02-04 22:13:07 +01:00
Erik Persson 4ad86ae83b GL - Added jumppad(implemented but not tested) 2014-02-04 16:24:48 +01:00
Dennis Andersen de8c76f051 GameServer - Fixed bugg where threads touched same data, n players should now be able to connect 2014-02-04 16:07:10 +01:00
Erik Persson bd9e4599cb GL - fixed respawning and also fixed weapon 2014-02-04 13:58:48 +01:00
Erik Persson 3bf9f59f5a GL - Player dies and respawns 2014-02-04 11:13:16 +01:00
Erik Persson 2c3b1e5038 GL - using real dmg algorithm 2014-02-03 16:20:50 +01:00
Erik Persson d77b3d92d8 GL - using movetolimbo in massdriver pickup functionallity 2014-02-03 15:45:48 +01:00
Erik Persson 99b041f165 GL - first implementation of weapons forcepull with pickup functionallity 2014-02-03 15:32:58 +01:00
Erik Persson 16f535bfa3 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 
Conflicts:
	Code/Game/GameLogic/AttatchmentMassDriver.cpp
	Code/Game/GameLogic/Game_PlayerData.cpp
	Code/Game/GameLogic/Level.cpp
 2014-01-31 14:16:32 +01:00
Erik Persson 16a342da49 GL - adjusting in GL, added forcepushData struct for passing args when shooting. connect changes in network 2014-01-31 14:05:52 +01:00
lindaandersson fa7f400c71 GL - test this robin 2014-01-31 10:58:03 +01:00
lindaandersson 4df6b849a6 GL - working with new models and server 2014-01-31 09:39:44 +01:00
Erik Persson 31feccf284 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 
Conflicts:
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
	Code/Game/GameLogic/Game.cpp
 2014-01-31 09:17:54 +01:00
Erik Persson c30db71e94 GL - more testing and changes to the level and using the physics API 2014-01-31 09:12:15 +01:00
Erik Persson ae6a570a12 GL - trying to make walking nice 2014-01-30 15:12:53 +01:00
lindaandersson 2a69af5c9f GL - merge 2014-01-30 12:01:48 +01:00
Erik Persson 323b7322fa GL - testing 2014-01-30 11:11:45 +01:00
lindaandersson 09693c7f35 GL - merge 2014-01-30 09:40:58 +01:00
lindaandersson 446bdd412b GL - updated constructors to set before and after collision response functions 2014-01-29 14:33:21 +01:00
lindaandersson 3b552d5361 GL - change gamelogic to use the new physics 2014-01-28 15:44:32 +01:00
lindaandersson a56fcbcb9b GL - can send object position from level objects, gravity and frustrum problems. 2014-01-28 15:04:25 +01:00
lindaandersson a8dbf2a4c9 GL - added test box to level 2014-01-27 14:43:39 +01:00
Erik Persson 1ed1bab751 Created test box that should now be shot at by the player 2014-01-27 13:55:09 +01:00
Erik Persson 74ac5e2d31 Updated creation of objects 2014-01-27 08:54:25 +01:00