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

72 Commits

Author SHA1 Message Date
PlatinumSkink c63ec035a7 HitLagSystem implemented. 2015-09-30 16:42:35 +02:00
PlatinumSkink c31ff4cfcb P-button pauses, H-button does 0.3 second HitLag. 2015-09-30 15:19:45 +02:00
PlatinumSkink 2fb16357fa Moved pad-creation to PadSystem. Pad now stops at sides. 2015-09-30 10:32:17 +02:00
PlatinumSkink 45e68c51a3 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-09-29 14:44:50 +02:00
PlatinumSkink c3b54ef030 Implemented Combos which multiply score. Adjusted pad a bit. 2015-09-29 14:42:01 +02:00
Stiffly cb70cdfc5d Merge remote-tracking branch 'origin/master' into Sound 2015-09-29 12:04:52 +02:00
PlatinumSkink 94fc7c1ce6 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch. 2015-09-29 11:21:35 +02:00
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
PlatinumSkink 90424b8d68 Merge branch 'master' into LevelSystemAndSuch 2015-09-28 15:06:37 +02:00
viktorljung cb48b881b7 cool fixes and stuff 2015-09-25 05:33:10 +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
viktorljung cfb6d1e4b5 Falling bricks and collision filters 2015-09-25 04:28:46 +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
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
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
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
PlatinumSkink 62b17e3dbf Adjusted for merge. 10:16 works. Physics works. Game works. Safety copy made before this merge. 2015-09-23 20:46:57 +02:00
PlatinumSkink bbec676683 Merged master into LevelSystemAndSuch. Now let's see if it works. 2015-09-23 16:05:07 +02:00
PlatinumSkink edc25e59f0 Start of Rescaling 10:16 2015-09-23 15:59:48 +02:00
viktorljung 4e429bc48c Fixed remove ball bug 2015-09-23 15:55:50 +02:00
viktorljung 08d653b0b0 Merge remote-tracking branch 'origin/master' into Physics 2015-09-23 15:14:16 +02:00
viktorljung 03e2078cfb Pad modifies ball path and ball facing its direction 2015-09-23 15:12:18 +02:00
PlatinumSkink 1b0d87e862 Adjusted Power-Up Code 2015-09-23 14:23:41 +02:00
PlatinumSkink f6b6f05c37 CPowerUpBrick + CPowerUp exists. Can drop from brick and be grabbed for MultiBall. 2015-09-22 17:55:12 +02:00
tleety 1e70e151ee Continued work on water, can now get 1 particle? maybe? Gotta get rendering to work so i can test it. 2015-09-21 16:00:20 +02:00
PlatinumSkink dbb04c83af Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-09-21 13:27:54 +02:00
PlatinumSkink 460c7042bf MultiBalls appear depending on pad's position 2015-09-21 13:25:20 +02:00
PlatinumSkink 761631c4a6 m-button is MultiBall powerup. Still needs fine-tuning. 2015-09-17 18:09:22 +02:00
tleety b32934dba6 Merge remote-tracking branch 'origin/physics' into water 
# Conflicts:
#	include/Core/Engine.h
#	include/Physics/PhysicsSystem.h
#	src/game/Game/PadSystem.cpp
#	src/game/Physics/PhysicsSystem.cpp
 2015-09-17 17:37:58 +02:00
viktorljung 8ca01ae9c7 Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	include/Core/Engine.h
	src/game/Game/PadSystem.cpp
	src/game/Physics/PhysicsSystem.cpp
 2015-09-17 17:11:37 +02:00
viktorljung c0155b7900 collisions remade 2015-09-17 16:52:43 +02:00
Stiffly 4dd8ac8445 Added Component to bricks to emitt sound. Improved code for playing a sound 2015-09-17 15:41:08 +02:00
viktorljung 442554812d Collisions kind of working 2015-09-17 14:11:09 +01:00
PlatinumSkink bc5a5e5e92 Adjusted model and position of displayed lives. 2015-09-16 16:49:52 +02:00
PlatinumSkink bdba34e8e1 Reset ball is also octopus. 2015-09-16 16:35:41 +02:00
PlatinumSkink 30ee6c2430 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-09-16 16:29:57 +02:00
tleety c311408346 Ball size fix 2015-09-16 16:23:59 +02:00
tleety 12273f66af Ball size fix 2015-09-16 16:17:02 +02:00
tleety 825f6dc991 Models now get a standard normal and specular map if they dont have one 2015-09-16 16:09:20 +02:00
tleety 20fc1232d6 Merge remote-tracking branch 'origin/master' into GLrenderer 2015-09-16 14:42:38 +02:00
PlatinumSkink 5ee5400a28 StyleGuide Fix 2015-09-15 18:48:26 +02:00