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

1111 Commits

Author SHA1 Message Date
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 33b69525e0 GameServer - 1 file was missed on commit... 2014-01-31 22:53:33 +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