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

85 Commits

Author SHA1 Message Date
Erik Persson ecad24450f GL - Normal gun implemented(not tested yet) 2014-02-27 15:15:55 +01:00
Dander7BD 2592e4d3e3 Picked box should be dropped when impacted by any dynamic object 2014-02-27 14:36:15 +01:00
Erik Persson 8111e9f51e GL - M,L controls activating/deactivating the window. lower threshhold for dmg 2014-02-27 13:09:57 +01:00
Erik Persson 978d071c90 GL - blablafixes 2014-02-27 12:09:51 +01:00
Erik Persson 44ec232310 GL - correction of dmg and jumppad foce 2014-02-27 11:01:55 +01:00
Dennis Andersen ffa6da1a2f GameLogic - Fixed drop on secondary, Modified how keys are sent 2014-02-27 08:19:50 +01:00
Erik Persson 15df481dd3 GL - merge stuff 2014-02-26 12:00:30 +01:00
Pontus Fransson dbbc7a9769 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-26 10:24:42 +01:00
Pontus Fransson 925f05b3b0 Health pickups is now working! 2014-02-26 10:23:38 +01:00
Linda Andersson 13d6a062fc Added collision and weapon events and send them to client 2014-02-26 10:05:07 +01:00
Pontus Fransson 2052f60ea4 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-25 14:37:07 +01:00
Pontus Fransson 0369d8cf19 Not finished Pickup system. 2014-02-25 14:36:54 +01:00
Erik Persson 8a359bd1ba GL - only 1 player can manipulate a object at a time 2014-02-25 11:20:46 +01:00
Erik Persson bc17a9f09e merge 2014-02-25 10:37:33 +01:00
lindaandersson 1d147004a2 small fixes and explosive crate do 90 dmg 2014-02-21 15:54:43 +01:00
Erik Persson ed3152057c GL - fixing with explosivecrate and massdriver 2014-02-21 15:02:42 +01:00
Erik Persson a4a531264f GL - second draft damage 2014-02-21 11:56:48 +01:00
Erik Persson 1776601961 GL - damage first draft 2014-02-21 11:35:38 +01:00
Erik Persson 3178f08bf0 GL - player can shoot, lookdir is now sent 2014-02-21 11:10:47 +01:00
dean11 641442854e GameServer - Added debug traps 2014-02-20 09:23:33 +01:00
dean11 d93d900d40 GameServer - Misc 2014-02-20 09:14:42 +01:00
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