Commit Graph

132 Commits

Author SHA1 Message Date
Jace f2de6025eb Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
	Escape-the-Dawn/Systems/PlayerSystem.cpp
2015-06-02 00:08:35 +02:00
Jace 074b2d6348 Pitch of swoosh based on obstacle scale. Light fading back to blue. 2015-06-02 00:06:52 +02:00
Tleety 66303dfd6a Merge with master branch 2015-06-01 23:30:40 +02:00
Tleety 076e1bba74 Merge branch 'master' of https://github.com/sippeangelo/Escape-the-Dawn
Conflicts:
	Escape-the-Dawn/Systems/CollisionSystem.cpp
2015-06-01 23:30:05 +02:00
Tleety c15a082e4f Sound when crashing into obstacle added 2015-06-01 23:28:31 +02:00
Jace b81d60799e Swoosh sound when passing close to obstacles 2015-06-01 23:26:59 +02:00
Jace cc1957a698 Sound system fixed to use absolute positions 2015-06-01 23:06:44 +02:00
Jace 982fce4a72 No ship shadow 2014-03-14 04:35:13 +01:00
Jace 829789d1ad Fulhack. 2014-03-14 04:23:49 +01:00
Jace 2d5ba34a1a "Better" lighting and stuff 2014-03-14 03:35:52 +01:00
ViktorLjung 9f2334bcb6 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-14 01:54:28 +01:00
ViktorLjung 03e7117d4c fixade hitboxes 2014-03-14 01:54:07 +01:00
Adam 7fdb035294 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
	Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
	Escape-the-Dawn/GameWorld.cpp
2014-03-14 01:53:22 +01:00
Adam 72c06231ad skybocks 2014-03-14 01:51:38 +01:00
ViktorLjung 143cb48a1f Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-14 01:17:53 +01:00
ViktorLjung c2ad1f9321 spawn 2014-03-14 01:17:46 +01:00
Tobias Dahl 55688888e2 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-14 01:11:10 +01:00
Tobias Dahl 00e9d64543 Fixade spinskiten 2014-03-14 01:11:03 +01:00
ViktorLjung 357f370e4f fixade de små objekten 2014-03-14 01:09:30 +01:00
ViktorLjung 34263dc9a6 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-14 00:57:59 +01:00
ViktorLjung 4b9cb71cca Fixad FOV
Levelgen Spawnfrequency
2014-03-14 00:57:52 +01:00
Jace 23701c4ac2 GLM... radians pls. 2014-03-14 00:37:09 +01:00
ViktorLjung d7313641fc Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-14 00:01:27 +01:00
ViktorLjung 3378e75313 Powerup FOV fixed 2014-03-14 00:00:36 +01:00
Jace 48f3553361 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
	Escape-the-Dawn/Systems/LevelGenerationSystem.cpp
2014-03-13 23:54:11 +01:00
Jace cbb8eac917 Children transforms relative to parents using TransformSystem::AbsolutePosition and TransformSystem::AbsoluteOrientation 2014-03-13 23:44:32 +01:00
ViktorLjung 18f7b977a3 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
	Escape-the-Dawn/Systems/PlayerSystem.cpp
2014-03-13 23:08:56 +01:00
Tobias Dahl 28b83905e9 [WIP] Collisions and sun stuff 2014-03-13 23:02:08 +01:00
ViktorLjung 7013546314 powerup bugfix 2014-03-13 23:01:55 +01:00
ViktorLjung c53913f63b Powerup timer fixed 2014-03-13 22:13:59 +01:00
Tobias Dahl fe1605a158 [WIP] Saker 2014-03-13 22:00:34 +01:00
Tobias Dahl e9b83fc070 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-13 21:51:43 +01:00
ViktorLjung e3153fe130 freecamfixed 2014-03-13 21:50:53 +01:00
ViktorLjung 759302b789 Powerups 2014-03-13 21:42:28 +01:00
Tobias Dahl 329262fe5a [WIP] Colliderar saker 2014-03-13 21:38:29 +01:00
Tobias Dahl d503a28045 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-13 20:59:34 +01:00
Adam 9a2bdf8c11 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-13 20:53:02 +01:00
Adam 6d3c564295 SS fix 2014-03-13 20:52:54 +01:00
ViktorLjung 3a57a18b4f Kameran följer spelaren :3 2014-03-13 20:51:47 +01:00
Tobias Dahl 53c7609e11 Smoothare acceleration 2014-03-13 20:13:28 +01:00
Adam d5ed8fc4f3 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
	Escape-the-Dawn/GameWorld.cpp
	Escape-the-Dawn/Systems/CollisionSystem.cpp
	Escape-the-Dawn/Systems/SoundSystem.h
	Escape-the-Dawn/Systems/SoundsSystem.cpp
2014-03-13 20:09:41 +01:00
Adam 5afb3932e9 Doppler effect 2014-03-13 20:00:41 +01:00
ViktorLjung d0320477a9 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-13 19:39:23 +01:00
ViktorLjung 01f2ebfa20 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
	Escape-the-Dawn/Systems/LevelGenerationSystem.cpp
	Escape-the-Dawn/Systems/PlayerSystem.cpp
2014-03-13 19:36:03 +01:00
Tobias Dahl 7398cf09dd Smooth axeleration 2014-03-13 19:34:28 +01:00
ViktorLjung 36069b2c3b :O 2014-03-13 17:15:43 +01:00
Jace 235e9648ad F3: Toggle drawing bounding boxes 2014-03-13 16:46:07 +01:00
Jace 4905c17ebf I Can't Believe It's Not Shadows!® 2014-03-13 16:29:34 +01:00
Jace a711ea7db8 Fancy sounds 2014-03-13 16:28:39 +01:00
Jace b34d2d3dd0 Optimizations 2014-03-13 14:01:15 +01:00