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

1064 Commits

Author SHA1 Message Date
Pontus Fransson 06ae4d29dd GL - Fixed some warnings. 2014-02-14 09:44:31 +01:00
lindaandersson 2dee9dd084 GL - initiating ccc map from folder ../Content/Worlds. Sync with graphics content. 2014-02-13 16:33:26 +01:00
Pontus Fransson d01acbcbe0 Misc - Added text and textcolor to buttons, seperate render function. 2014-02-13 15:21:19 +01:00
Pontus Fransson 95e08e84c3 Network - Overloaded Connect in NetworkClient to use std::wstring. 2014-02-13 15:21:19 +01:00
Erik Persson bd6b531418 GL - added Portal and started on crystalformation 2014-02-13 09:58:25 +01:00
Pontus Fransson 74d28d1f62 Misc - Changed to MouseInput struct in EventHandler update. 2014-02-12 15:44:27 +01:00
Pontus Fransson 7a218c61d8 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 15:12:28 +01:00
Pontus Fransson b9c4fe1849 GL - Eventhandler does not delete collections any more. 2014-02-12 15:12:01 +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
Robin Engman 5e1bc2264c Fixed set position 2014-02-12 14:10:17 +01:00
Erik Persson b95e1d6b7a changes in massdriver 2014-02-12 14:00:53 +01:00
Erik Persson 8f627f8a71 Merge remote-tracking branch 'origin/GamePhysics' into GameLogic 2014-02-12 13:57:01 +01:00
Robin Engman 777c1183c5 Fixed set transformation 2014-02-12 13:55:43 +01:00
lindaandersson 97c3097fc7 GL - added jumppad model and rigidbody 2014-02-12 13:37:21 +01:00
Robin Engman d4fa29e8a8 Fixed project files 2014-02-12 13:21:59 +01:00
lindaandersson 14077c6d4e GL - moved camera for testing 2014-02-12 13:17:27 +01:00
lindaandersson 25590566d1 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 13:13:40 +01:00
Erik Persson b34df93e49 GL - Massdriver updates 2014-02-12 13:12:51 +01:00
lindaandersson 57ef395bd2 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 13:11:43 +01:00
lindaandersson e8536cc5d4 GL - removed before collision event, sending look and right dir to server 2014-02-12 13:11:35 +01:00
Erik Persson 26a6bde42a Merge remote-tracking branch 'origin/GamePhysics' into GameLogic 2014-02-12 12:43:08 +01:00
Erik Persson 93453529b7 Merge remote-tracking branch 'origin/GamePhysics' into GameLogic 2014-02-12 12:39:11 +01:00
Robin Engman 15cc7cb85e Fixed collision for object not in world 2014-02-12 12:38:52 +01:00
Erik Persson 6bbb988268 Merge remote-tracking branch 'origin/GamePhysics' into GameLogic 2014-02-12 12:37:02 +01:00
Robin Engman 1841685edb Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GamePhysics 2014-02-12 12:34:04 +01:00
lindaandersson cc4e3f947c GL - playermovement fixed, can walk in diagonal directions 2014-02-12 12:16:16 +01:00
Dander7BD 295568d5e7 Fixed incorrect project settings 2014-02-12 11:54:47 +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
Pontus Fransson f2a444507c GL - FIxed Button state flickering, added flag resizeToScreenAspectRatio. 2014-02-12 11:35:57 +01:00
lindaandersson c1757eef21 GL - moving character 2014-02-12 11:35:34 +01:00
Erik Persson 3a80a71143 GL - working on weapon 2014-02-12 11:32:30 +01:00
Erik Persson 9f64a1b441 Merge remote-tracking branch 'origin/GamePhysics' into GameLogic 2014-02-12 11:03:33 +01:00
Robin Engman 5d29979875 Fixed which body to send 2014-02-12 10:58:05 +01:00
Erik Persson 7394f68769 GL - fixed what some asshole did in weapon 2014-02-12 10:57:43 +01:00
Erik Persson 1db41a863b Merge remote-tracking branch 'origin/GamePhysics' into GameLogic 2014-02-12 10:44:13 +01:00
Erik Persson 0d643a890d GL - massdriver 2014-02-12 10:43:41 +01:00
Erik Persson 5e4532d50e Merge remote-tracking branch 'origin/GamePhysics' into GameLogic 2014-02-12 10:34:56 +01:00
Robin Engman 2a214f5305 Added cone to apply effect 2014-02-12 10:31:50 +01:00
Robin Engman f0178cf558 Added apply effect functionality 2014-02-12 10:23:17 +01:00
Erik Persson 3324da528d GFERIK - added icollideable cone 2014-02-12 10:16:00 +01:00
Pontus Fransson 8e07475434 GL - Buttons is now using one texture per button type. Fixed button state when spamming the button. 2014-02-12 10:02:52 +01:00
Pontus Fransson d4b7fbf1b4 Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 09:52:46 +01:00
Pontus Fransson 0bae7b9c6b Misc - Fixed a few errors that can occur 2014-02-12 09:50:09 +01:00
lindaandersson 8c1f1e6608 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 09:32:22 +01:00
lanariel e6316f3239 removed some old stuff, respect animation looping state 2014-02-12 09:32:15 +01:00