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

1029 Commits

Author SHA1 Message Date
lanariel 77c3ba06aa Framerate fix in release 2014-02-10 14:39:26 +01:00
Dander7BD 30196aebc2 Float3 SnapAngularAxis fix 2014-02-10 14:30:15 +01:00
Robin Engman 8547d17d0f Friction and restitution is now set 2014-02-10 14:22:10 +01:00
Robin Engman c18eb668aa Added more data for bodies and added cylinder 2014-02-10 14:18:45 +01:00
lindaandersson eb39008529 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-10 14:00:24 +01:00
lindaandersson c87bab8808 GL - started using the lvl format. Objects on client have pos, rot and scale (not verified) 2014-02-10 14:00:14 +01:00
lanariel a3ba67e3c2 Fixed release compile and basic anim 2014-02-10 13:59:45 +01:00
Robin Engman 05aa3cc9e9 Added on move functionality 2014-02-10 13:55:01 +01:00
Dander7BD 4fb684019c Added ScalingMatrix function 2014-02-10 13:41:37 +01:00
Robin Engman e5e99924d9 Updates for objects 2014-02-10 13:25:28 +01:00
Dander7BD 0153be16d5 Added VS Filter Camera 2014-02-10 13:03:21 +01:00
Dander7BD 800d5d0505 Camera_Basic stuff 2014-02-10 13:01:46 +01:00
Robin Engman ba0d6ca73a Amazing merge with server 2014-02-10 12:42:31 +01:00
Dander7BD da58165645 Added Basic camera 2014-02-10 12:02:48 +01:00
Dander7BD abdb820b09 Added RotationMatrix for Float3x3 2014-02-10 11:59:35 +01:00
lanariel d0f36302cf Fixed 2d render comment 
Started on Anim API
 2014-02-10 11:53:44 +01:00
Robin Engman c191c96ea8 Added bullet physics .lib 2014-02-10 11:24:38 +01:00
Robin Engman 8c31c16e4d Commented away 2014-02-10 11:21:57 +01:00
Robin Engman c16851f024 Using only lib and include 2014-02-10 11:14:45 +01:00
Robin Engman 427ec3b716 Major overhaul fix 2014-02-10 10:52:08 +01:00
lanariel adb273bd5b Fixed las bug in 2d rendering 2014-02-10 09:35:03 +01:00
lanariel e6e56ba21b Done with 2D 2014-02-10 01:03:10 +01:00
Robin Engman 99146430a4 Major overhaul 2014-02-09 21:24:09 +01:00
Dennis Andersen 14bf3ede86 Merged with GameLogic and fixed merging errors, some minor justifications may be needed later on due to merging errors.. 2014-02-09 18:58:14 +01:00
Dennis Andersen 4abfdd70fe Merged with GameLogic and fixed merging errors, some minor justifications may be needed later on due to merging errors.. 2014-02-09 18:58:07 +01:00
Dennis Andersen 310ed3dfc5 GameServer - Multiplayer now working properly 2014-02-09 16:42:26 +01:00
Robin Engman fb9e33fc9b Fixed warnings 2014-02-08 14:26:18 +01:00
lanariel 1121bbdebf TODO:: 
Fix Pixel Data to Post Pass
 2014-02-07 16:51:35 +01:00
Robin Engman 92447a6352 Very cool stuff 2014-02-07 16:01:43 +01:00
lanariel 1de325c5a6 Fixed cleaning up Deffered.cpp 2014-02-07 15:52:07 +01:00
Robin Engman ab9f81ac60 Collisions work better 
Still needs polishing
 2014-02-07 15:38:53 +01:00
Pontus Fransson 0c4f70e400 GL - Updated loadLevelHeader() .Added Cylinder bounding volume. 2014-02-07 15:20:34 +01:00
Pontus Fransson fef40f58f9 GL - Fixed memory leaks in LevelLoader. 2014-02-07 14:44:25 +01:00
Pontus Fransson 9bdf258c5d GL - Updated LevelLoader 2.0. Bounding volume 1.0 
The ObjectSpecialType enum is not correct. It has to be updated.
 2014-02-07 14:12:54 +01:00
lanariel 898fc883e9 Merge branch 'Graphics2D' into Graphics 2014-02-07 13:48:46 +01:00
lanariel d9133f459a 2d Almost working 2014-02-07 13:47:09 +01:00
Tobias Grundel 016bf37459 First commit save jebuz 2014-02-07 13:46:55 +01:00
lanariel 9a0f363146 framerate double 2014-02-07 13:15:38 +01:00
Robin Engman 1633129a2c Commit to Dennis 2014-02-07 13:09:44 +01:00
lanariel 5119b287d6 Small progress 2014-02-07 11:52:51 +01:00
Robin Engman b225c53611 More cool stuff 2014-02-07 11:43:18 +01:00
lanariel bab3ab0a78 Shader Restructure 2014-02-07 11:09:59 +01:00
lanariel a7480ebf70 Proper Animation 2014-02-07 08:34:01 +01:00
Robin Engman f372d3e05b Some cool stuff 2014-02-06 21:15:28 +01:00
lanariel bfa54b9ccd Fixed Anim 2014-02-05 17:13:23 +01:00
lanariel aafbfa01f3 Calculate Graphics Memory Usage 2014-02-05 16:54:57 +01:00
lanariel 51711b86e3 Fixed Animate Skeleton, TODO Fix Skinning 2014-02-05 16:00:28 +01:00
lindaandersson 81d43b59c0 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-05 15:54:56 +01:00
lindaandersson 91db71fe0e GL - 20 boxes and a house 2014-02-05 15:54:48 +01:00
Pontus Fransson a3cea997ba Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-05 15:47:00 +01:00
Pontus Fransson b39a670347 GL - Updated LevelLoader, works with Fredricks level editor. 2014-02-05 15:46:45 +01:00
Dennis Andersen 201a07f0dc GameServer - Merged with GameLogic 2014-02-05 15:16:31 +01:00
lindaandersson 70a2cf27e3 GL - almost ok, at least on the top of the world 2014-02-05 11:53:38 +01:00
lindaandersson 426444ca34 GL - added more boxes and weaponfunctionality 2014-02-05 11:46:04 +01:00
lindaandersson 30c89ed330 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-05 09:06:44 +01:00
lindaandersson 6818dda2b9 GL - testing 2014-02-05 09:06:33 +01:00
Dennis Andersen 60736c52fe Merge branch 'Physics' of https://github.com/dean11/Danbias into GameServer 2014-02-04 22:34:07 +01:00
Dennis Andersen db822fa832 GameServer - Merged with gamelogic 2014-02-04 22:33:39 +01:00
Dennis Andersen b7f550859d GameServer - Merge with GameLogic 2014-02-04 22:13:07 +01:00
Robin Engman 98644e3fa0 Minimised to potential skinning problem 2014-02-04 17:59:04 +01:00
Dander7BD fb4025eb1a bug fix 2014-02-04 16:56:31 +01:00
lindaandersson ac278555ea Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 16:39:21 +01:00
lindaandersson b43902d31e Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 16:39:11 +01:00
lindaandersson ec4d34b131 GL - added error checking 2014-02-04 16:39:01 +01:00
Dander7BD c8e8d3510d Added debug traps 2014-02-04 16:38:42 +01:00
Dander7BD 68dc5be9cb added lost rebound deltatime compensation 2014-02-04 16:33:52 +01:00
Dennis Andersen 168539da08 Gameserver - Fixed minor merging isues 2014-02-04 16:27:18 +01:00
Erik Persson 4ad86ae83b GL - Added jumppad(implemented but not tested) 2014-02-04 16:24:48 +01:00
lanariel 4de809a952 Added Resource support 2014-02-04 16:20:42 +01:00
lindaandersson 6e0dd63d64 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 16:11:01 +01:00
Dander7BD 1952ff9aba more fixes of potential bugs in Physics collision handling 2014-02-04 16:10:18 +01:00
lindaandersson d364456189 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 16:08:53 +01:00
lindaandersson d8c7220569 GL - added some testing things in player and more objects to the world 2014-02-04 16:08:28 +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
Dennis Andersen 61178e2803 GameServer - Fixed bugg where threads touched same data, n players should now be able to connect 2014-02-04 16:06:59 +01:00
Dander7BD 9622d37d3f bug fixes in Physics collision handling 2014-02-04 15:43:17 +01:00
lanariel e13410dced Fixed debug data, points in right direction 
Matrix::m 0 index based, not math def
 2014-02-04 15:06:50 +01:00
lanariel 97a3792bff Anim Test Not working Joints 2014-02-04 14:59:51 +01:00
Pontus Fransson b810fa1586 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 14:31:00 +01:00
Pontus Fransson 8834f6a2ec GL - LevelLoader update. 2014-02-04 14:30:45 +01:00
Erik Persson 502d0c8586 GL - actually fixed respawning(turned off) 2014-02-04 14:07:13 +01:00
lindaandersson ad16d51f75 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 14:02:03 +01:00
Dander7BD 15798bfca9 minor bug found and fixed in rebound 2014-02-04 14:00:33 +01:00
Erik Persson bd9e4599cb GL - fixed respawning and also fixed weapon 2014-02-04 13:58:48 +01:00
Dander7BD 9efa4fcb23 Commit error fix 
for some odd reason Player.cpp change followed the last one
 2014-02-04 13:08:03 +01:00
Dander7BD 54deef7f2b Project file fixes for GL 2014-02-04 13:06:10 +01:00
lindaandersson f88e16c581 GL - merge 2014-02-04 11:53:40 +01:00
lindaandersson e2bac798c4 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 11:50:51 +01:00
lindaandersson fa02814ca0 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 11:50:40 +01:00
lindaandersson d54cffee8e GL - camera follows player 2014-02-04 11:50:15 +01:00
Dander7BD e39eb5fb4b RigidBody update adjusted 
Spherical and Simple
 2014-02-04 11:48:50 +01:00
Pontus Fransson 2897305dd0 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 11:36:24 +01:00
Pontus Fransson 1261ed734f GL - Updated level loader. 2014-02-04 11:36:10 +01:00
Erik Persson 3bf9f59f5a GL - Player dies and respawns 2014-02-04 11:13:16 +01:00
lindaandersson 07e8624807 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 10:39:09 +01:00
lindaandersson 00400a7d32 GL - camera testing 2014-02-04 10:38:59 +01:00
Dander7BD 42cb1dab1d API::SimpleBodyDescription API::SphericalBodyDescription fix 
3 coeffs were not saved in factory constructor
 2014-02-04 10:32:43 +01:00
lindaandersson fcadd5b4c3 GL - testing physics 2014-02-04 10:29:02 +01:00
Dander7BD 9817f844ef Rebound adjustment trial 
Rebound had a strong friction-like effect. Testing to see if it works
better if applied before the leapfrog update
 2014-02-04 10:23:14 +01:00
lindaandersson 6e9423670f Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 08:56:32 +01:00
Dander7BD d4bd72bb4a Friction fix 
special case; no movement
special case; movement directly into surface
.. dealt with
 2014-02-04 08:55:57 +01:00
Pontus Fransson 50d28a5784 Misc - Still having problems with template with eventhandler. 2014-02-04 08:46:20 +01:00
lindaandersson 1f28c05983 GL - added jump 2014-02-03 16:30:47 +01:00
lindaandersson 03385f486b Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-03 16:22:11 +01:00
lindaandersson cf73524e3b Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-03 16:21:57 +01:00
lindaandersson e21cfe4cd4 GL - merge with Erik 2014-02-03 16:21:48 +01:00
Erik Persson 2c3b1e5038 GL - using real dmg algorithm 2014-02-03 16:20:50 +01:00
Dander7BD 358cddfd9a SnapAngularAxis fix 
floating point error there acos param could be slightly higher than 1.
Caused it to return undefined.
A clamp ought to fix it.
 2014-02-03 16:20:16 +01:00
lindaandersson ab962eea99 GL - added error check 2014-02-03 16:20:05 +01:00
Erik Persson 7f29b62c6f GL - YOU CAN NOW SHOOT STUFF YAAAAY 2014-02-03 16:19:24 +01:00
lindaandersson c08c3d2b53 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-03 15:52:15 +01:00
lindaandersson a3886c4f1f GL - added models and started to fix camera movement 2014-02-03 15:52:00 +01:00
Dander7BD 8b0e1b2426 Big patch! New feature :) 
Objects will now rebound back when colliding.
 2014-02-03 15:48:55 +01:00
Erik Persson d77b3d92d8 GL - using movetolimbo in massdriver pickup functionallity 2014-02-03 15:45:48 +01:00
Erik Persson f1f56fc769 Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-02-03 15:38:36 +01:00
Erik Persson 99b041f165 GL - first implementation of weapons forcepull with pickup functionallity 2014-02-03 15:32:58 +01:00
Pontus Fransson dc5b408196 Network - Updated network api with comment. 2014-02-03 15:32:20 +01:00
Robin Engman f527d329a2 Added limbo functionality 2014-02-03 15:15:47 +01:00
Pontus Fransson e7fee8b2e7 GL - Updated LevelLoader. Added lights. 
Added lights.

Changed the return type to vector<SmartPointer<ObjectTypeHeader>>

Hid the LevelParser from the outside.
 2014-02-03 14:50:27 +01:00
lanariel 34f58d4140 Anim Testing 2014-02-03 12:09:11 +01:00
Robin Engman b8e6b83148 Momentum "fall-off" added 
Temporary till real fluid drag is implemented.
 2014-02-03 11:10:04 +01:00
Erik Persson 8f234611d2 GL - mergeissues fixed 2014-02-03 10:48:12 +01:00
Robin Engman 50d895d37c Applied friction 
Needs to be tested.
 2014-02-03 10:45:25 +01:00
Erik Persson ef71b365ab asd 2014-02-03 10:42:40 +01:00
Pontus Fransson 9671eb8ee9 Misc - Having problems with template with events. 2014-02-03 10:41:54 +01:00
Dennis Andersen a673e64694 GameServer - Pre-merge with graphic 2014-01-31 22:52:52 +01:00
Dennis Andersen 5aede62af6 Gameserver - Merge with gamelogic 2014-01-31 22:36:43 +01:00
lindaandersson 83ca3c2ff2 GL - remove buttons from GL branch 2014-01-31 16:43:18 +01:00
lindaandersson 5b263caccd GL - merge with GL 2014-01-31 16:42:25 +01:00
lindaandersson 89a538e887 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-01-31 16:33:32 +01:00
lindaandersson e327f64702 GL - can play with two characters 2014-01-31 16:33:16 +01:00
lanariel 069acee8cc Anim Error 2014-01-31 16:29:50 +01:00
Dander7BD fabf471e76 Removed malign obsolete hack fix 2014-01-31 15:58:02 +01:00
Pontus Fransson 6f264f5e7b Misc - EventHandler fixed all errors. 2014-01-31 15:38:12 +01:00
lindaandersson 0ae551f2d8 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-01-31 15:31:03 +01:00
Dander7BD 8f576c9a75 Removed malign obsolete hack fix 2014-01-31 15:30:23 +01:00
lindaandersson e82e61374a Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-01-31 15:18:19 +01:00
lindaandersson 7b503bcb52 GL - working with snap 2014-01-31 15:17:09 +01:00
Dander7BD b3656a0527 Gravity fix 2014-01-31 15:15:08 +01:00
Pontus Fransson e7d592e71a Merge branch 'GameLogic-MessageHandler' of https://github.com/dean11/Danbias into GameLogic-MessageHandler 
Conflicts:
	Code/Misc/EventHandler/EventButton.h
 2014-01-31 15:07:55 +01:00
Pontus Fransson dbe8b4706b Misc - Changed to no template/template 2014-01-31 15:06:30 +01:00
Sam Mario Svensson e76dfc73f2 Misc - EventButton changed to inheritance 2014-01-31 15:06:25 +01:00
lindaandersson c318223bcf Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-01-31 14:41:24 +01:00
Dander7BD 2a816469d5 SnapAngularAxis fix 2014-01-31 14:40:09 +01:00
Pontus Fransson d5f285c089 Misc - Test 2014-01-31 14:31:27 +01:00
lindaandersson 26fed11910 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-01-31 14:30:53 +01:00
Sam Mario Svensson 8f83dcd413 GL- Eventbutton implemented 2014-01-31 14:29:49 +01:00
Dander7BD 22d0722dfa SnapAngularFix 
compilation fix
forgot to remove a copy pasted comma
 2014-01-31 14:29:49 +01:00
Dander7BD 79872a45ee SnapAngularAxis fix + added overload 
compilation error fix
+ Float3 version
 2014-01-31 14:27:33 +01:00
Pontus Fransson a864ad81e7 Misc - EventHandler, EventCollection updated. 2014-01-31 14:16: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 b753387649 asd 2014-01-31 14:14:20 +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 57c230d458 GL - will merge with physics 2014-01-31 13:56:22 +01:00
Dander7BD 7a62121fa0 SnapAngularAxis fix 
accidently used asin instead of acos
 2014-01-31 13:49:09 +01:00
Dander7BD ac635ccaef SnapAngularAxis fix 2014-01-31 13:47:40 +01:00
Dander7BD 190f7e2882 SnapAngularAxis introduced 2014-01-31 13:42:55 +01:00
Robin Engman c7bc7281d8 Prefix for "sinking" objects 2014-01-31 13:41:06 +01:00
Pontus Fransson d6769ac62f Misc - EventHandler, EventCollection 2014-01-31 13:06:11 +01:00
Pontus Fransson 8ee8374169 Misc - EventHandler 2014-01-31 11:28:01 +01:00
Pontus Fransson e3376eba7c Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-31 11:11:48 +01:00
Pontus Fransson da9b615994 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 
Conflicts:
	Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
 2014-01-31 11:10:35 +01:00
Dennis Andersen 21cb7731b7 Merge with GL 2014-01-31 11:03:45 +01:00
Dennis Andersen cac38decca MISC - Fixed a bug in ResourceLoader 2014-01-31 11:00:04 +01:00
lindaandersson fa7f400c71 GL - test this robin 2014-01-31 10:58:03 +01:00
Dennis Andersen c9c562fda6 GameServer - Added some functionality in windowshell 2014-01-31 10:50:38 +01:00
Pontus Fransson e718048f7f GL - Lan State 2014-01-31 10:49:52 +01:00
lindaandersson 4df6b849a6 GL - working with new models and server 2014-01-31 09:39:44 +01:00
Dennis Andersen 34b6b29fc4 GameLogic - Merged with GL 2014-01-31 09:24:16 +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
lindaandersson a6ff6eba42 GL - merge with server 2014-01-31 09:14:55 +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
Dennis Andersen 40f0fe61f0 GameServer - Fixed Protocols not recieveing properly and fixed the resource loader. 2014-01-31 08:41:08 +01:00
Pontus Fransson cec022b381 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-30 23:24:16 +01:00
Pontus Fransson 3c1eed0f3f GL - Added LanMenuState 2014-01-30 23:23:37 +01:00
Pontus Fransson 3b8a8e9c09 Network - Fixed receiving parts of packages. 2014-01-30 23:22:46 +01:00
lindaandersson bb8e92ec36 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-30 15:20:44 +01:00
lindaandersson 0aa39275e3 GL - only client with server update server. Update recieverfunction 2014-01-30 15:20:35 +01:00
Erik Persson ae6a570a12 GL - trying to make walking nice 2014-01-30 15:12:53 +01:00
Sam Mario Svensson 4167b6a93b GL- merge fix 2014-01-30 15:02:35 +01:00
lindaandersson 2bb2d0cd56 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-30 14:58:30 +01:00
Dander7BD 0a04c1c9f1 Added document 2014-01-30 14:52:40 +01:00
lindaandersson 713dc269d1 Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic 2014-01-30 14:18:00 +01:00
lindaandersson 05e24d0514 GL - uppdate server 2014-01-30 14:17:50 +01:00
Dennis Andersen 09f39ec26d GameServer - Added acces directly to clients in network session 2014-01-30 14:15:25 +01:00
Sam Mario Svensson 261421af21 Merge remote-tracking branch 'origin/GameLogic-LevelFormat' into GameLogic 2014-01-30 13:44:18 +01:00
Sam Mario Svensson c78bbba3eb GL- Removed commentet unnecessary code 2014-01-30 13:33:59 +01:00
lindaandersson 2a69af5c9f GL - merge 2014-01-30 12:01:48 +01:00
lindaandersson 1ccf98e3eb GL - added loginstate 2014-01-30 11:58:44 +01:00
lindaandersson d41ddca45d Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic 2014-01-30 11:13:42 +01:00
Erik Persson 323b7322fa GL - testing 2014-01-30 11:11:45 +01:00
Dennis Andersen 05740665da GameServer - Fixed a small error regarding not reaching some data 2014-01-30 11:11:04 +01:00
lindaandersson a249e7ede9 GL - merge with new serverAPI 2014-01-30 10:57:44 +01:00
lindaandersson 09693c7f35 GL - merge 2014-01-30 09:40:58 +01:00
lindaandersson 7d9d8e4615 GL - added jump 2014-01-30 09:07:56 +01:00
Dennis Andersen fa29cd7307 GameServer - Merged with GameLogic 2014-01-30 00:19:00 +01:00
lindaandersson c593fd2225 Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-01-29 16:02:11 +01:00
lindaandersson 44ba45bcc2 GL - added setCollisionfunc to object 2014-01-29 16:01:56 +01:00
Dennis Andersen 1e89bb4e30 Fixed protocol messaging. Known crash when recieveing protocol on server after a while... 2014-01-29 15:01:14 +01:00
Dander7BD 88e67ff876 Inertia big patch 
It's ali-..WORKS! It works!
 2014-01-29 14:57:39 +01:00