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

1440 Commits

Author SHA1 Message Date
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
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