BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
353 Commits 15 Branches 0 Tags
3fef91b8a99ec45be0c187b151b9fb9a9b12370c
Commit Graph

353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jace edd87ddf58 Fixed critical warnings for Linux build 2015-09-28 20:40:28 +02:00
Stiffly a97dae542d Merge remote-tracking branch 'origin/master' into Sound 
Conflicts:
	src/game/Sound/SoundSystem.cpp
 2015-09-28 18:14:06 +02:00
PlatinumSkink 7b7277509e CreateBall clones the original ball rather than create new balls. 2015-09-28 18:09:55 +02:00
Stiffly f10749d220 Refactoring SoundSystem and its events, components 2015-09-28 17:59:57 +02:00
PlatinumSkink fc41727a5d Transferred Ball-stuff into BallSystem. 2015-09-28 17:24:58 +02:00
viktorljung 22c7663cc5 Merge branch 'master' into Physics 2015-09-28 17:21:08 +02:00
viktorljung 1a0201ee98 Style guide fixes 2015-09-28 17:20:23 +02:00
Jace 2d7703afad Header definitions added to style guide 2015-09-28 17:17:24 +02:00
PlatinumSkink 90424b8d68 Merge branch 'master' into LevelSystemAndSuch 2015-09-28 15:06:37 +02:00
Jace 7d9e3e00a4 Fixed out-of-range error in NumberFrame 2015-09-25 08:23:41 +02:00
Jace be60464bb5 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-09-25 05:47:37 +02:00
Jace 17f8905696 Removed the HUD from the menu screen 2015-09-25 05:47:20 +02:00
viktorljung c459560bfa Fixed score not accumulating correctly 2015-09-25 05:39:09 +02:00
viktorljung ad299ad2e5 Merge remote-tracking branch 'origin/master' into Physics 2015-09-25 05:34:00 +02:00
viktorljung cb48b881b7 cool fixes and stuff 2015-09-25 05:33:10 +02:00
Jace 7b47385674 Working NumberFrame and score indicator 2015-09-25 05:30:59 +02:00
viktorljung a730a1ce16 Merge remote-tracking branch 'origin/master' into Physics 2015-09-25 05:16:58 +02:00
viktorljung 96511c63b1 Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	include/Core/Engine.h
	include/Physics/PhysicsSystem.h
	src/game/Game/LevelSystem.cpp
	src/game/Physics/PhysicsSystem.cpp
 2015-09-25 05:16:32 +02:00
tleety 2af9567722 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-09-25 04:40:51 +02:00
viktorljung cfb6d1e4b5 Falling bricks and collision filters 2015-09-25 04:28:46 +02:00
tleety b77c357990 Changed some lighting and the background pipe scale 2015-09-25 03:33:30 +02:00
Jace 186e06bc22 Fixed bug where render queue wouldn't get cleared if the world wasn't running 2015-09-25 03:23:42 +02:00
Jace c0f77dd32a fixup! Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-09-25 03:10:47 +02:00
Jace 8b3d9eb842 WIP HUD 2015-09-25 03:04:37 +02:00
Jace ecfa666a22 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 
# Conflicts:
#	include/Core/Engine.h
 2015-09-25 03:04:13 +02:00
Stiffly b0c19c74f2 Merge remote-tracking branch 'origin/master' into EGameStart 
Conflicts:
	include/Core/Engine.h
 2015-09-25 02:49:50 +02:00
Stiffly 650c7ec47c EStartGame up and running. Moved BGM-play from soundsystem init to EGameStart. 2015-09-25 02:43:34 +02:00
Jace d2bc91be48 Merge remote-tracking branch 'origin/master' into gui 
Conflicts:
	include/Core/Engine.h
	include/Core/RenderQueue.h
	include/Core/Renderer.h
	src/game/Core/Renderer.cpp
 2015-09-25 02:27:00 +02:00
Jace c9854d2b83 Working volume sliders! 2015-09-25 02:19:37 +02:00
tleety f79d5ec68b Merge remote-tracking branch 'origin/water' 2015-09-25 01:51:33 +02:00
tleety effc9ff781 Merge and some small fixes 2015-09-25 01:49:08 +02:00
Jace 5f1963b8bc Complete main menu without event bindings. 2015-09-25 01:29:14 +02:00
Jace b83de44715 Working GUI Button 2015-09-25 01:29:14 +02:00
Jace 8e00b76036 Error texture for texture frames when texture is missing 2015-09-25 01:29:13 +02:00
Jace e0b1747ca9 EventBroker::Clear renamed to Swap to cause less confusion 2015-09-25 01:29:13 +02:00
Jace 1d500eb4f6 First iteration of GUI code. GUI is rendered on top of everything, world still separate. 2015-09-25 01:29:13 +02:00
Stiffly 0e6fcfb2ba Merge remote-tracking branch 'origin/master' into Sound 2015-09-25 01:03:28 +02:00
tleety c624c5bcf3 Merge master 2015-09-25 00:03:28 +02:00
viktorljung d2301594ce Gravity scale per entity 2015-09-25 00:01:24 +02:00
Stiffly 181ac60bd0 MasterVolume now working due to previous refactoring. 
TODO: Make it depend on individual volume value.
 2015-09-24 23:41:41 +02:00
PlatinumSkink 118c0b3a24 Merge branch 'LevelSystemAndSuch' of https://github.com/teamfisk/AgileBreakOut into LevelSystemAndSuch 2015-09-24 23:23:48 +02:00
Stiffly 0d521cdcc9 Refactoring. Splitting up storage and handling into SFX- and BGM sources. 2015-09-24 23:21:55 +02:00
tleety fa198cf953 Water now rendered in forward rendering 2015-09-24 23:21:46 +02:00
Stiffly e867722d9a Added logic for mastervolume. And a coresponding event. 
(sources need to be updated for it to be fully working)
 2015-09-24 22:55:24 +02:00
Stiffly 1f73201943 Merge remote-tracking branch 'origin/master' into Sound 2015-09-24 21:03:57 +02:00
viktorljung bc6b037923 Added submarine pad 2015-09-24 20:54:57 +02:00
viktorljung e7806165b4 Merged Master into Sound. 2015-09-24 20:54:32 +02:00
viktorljung 72413dc0a9 Added submarine model and texture files 2015-09-24 20:31:47 +02:00
PlatinumSkink 8bf10d4517 Removed Stage Reset and Life Display. 2015-09-24 18:58:34 +02:00
PlatinumSkink 4e4ba29666 Remove Components upon removing entities, a lot of strange experimenting to remove frozen squid bug. 2015-09-24 18:14:39 +02:00