36947611d3
Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias
...
# Conflicts:
# include/Core/Engine.h
2015-10-19 15:14:14 +02:00
c83aee9b5d
Merge branch 'LevelSystemAndSuch'
2015-10-19 15:05:50 +02:00
55232a4ec2
water radius now changeable in config file, also improved the look of the water
2015-10-19 14:50:26 +02:00
3fb741335e
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch.
2015-10-19 13:37:10 +02:00
0180b29544
Merge remote-tracking branch 'origin/master' into Sound
...
Conflicts:
src/game/Sound/SoundSystem.cpp
2015-10-16 11:53:38 +02:00
bd59cd4108
Implimented the basis for Kraken encounter.
2015-10-15 15:08:05 +02:00
Jace
4a031147a6
Added log level to config
2015-10-15 14:57:33 +02:00
Jace
00cac42094
Added video options to config
2015-10-15 14:19:12 +02:00
e719a342f2
Master volume init values depends on configfile.
2015-10-15 14:03:06 +02:00
64f903a6b6
WIP
2015-10-15 13:48:05 +02:00
Jace
a35d72cac3
Working skeletal animations!!!
2015-10-15 12:48:28 +02:00
46f6289720
Fixed so the game does not crash if it cant find data in the config file
2015-10-15 12:35:58 +02:00
52fe2e697e
Added a config file and implemented code for it
2015-10-15 12:15:53 +02:00
4abce7b17f
CTravels replaces Sticky = true. Put "Travels" component on anything that should be moved down during travel sequences.
2015-10-15 11:11:06 +02:00
0650e7c061
Basis of RaiseWater implemented in a way that doesn't work with our amount of lag.
2015-10-15 10:20:05 +02:00
8e32574692
Removed unnecessary Cout to avoid annoying others.
2015-10-13 18:37:46 +02:00
ffea58d41f
ScreenShake works as intended at the press of E and upon calling the event.
2015-10-13 18:34:21 +02:00
36d0601dfd
Added TravellingSystem for travelling to the next stage. Added incomplete ScreenShake. Ball now starts on pad.
2015-10-13 17:28:31 +02:00
5630771272
Fixed Sticky after Ink bug, fixed directions on Squid after sticky, laser direction is in background. Brick Components implemented, though they do nothing.
2015-10-12 16:45:59 +02:00
Jace
db1baad3c1
After merge fixes
2015-10-08 23:59:26 +02:00
96ccef6ed8
Merge remote-tracking branch 'origin/master' into water
...
Conflicts:
src/game/Game/LevelSystem.cpp
2015-10-08 21:44:50 +02:00
706e720ae8
Merge remote-tracking branch 'origin/master' into water
...
Conflicts:
src/game/Physics/ContactListener.cpp
src/game/Physics/PhysicsSystem.cpp
2015-10-08 21:39:48 +02:00
3793515968
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
2015-10-08 20:08:10 +02:00
5c2844c137
InkBlaster functions as intended! It just needs ink!
2015-10-08 20:02:51 +02:00
143bff2d9e
Added two new particle sprites.
2015-10-08 18:19:15 +02:00
87fd73f249
Merge remote-tracking branch 'origin/master' into Physics
...
Conflicts:
src/game/Game/BallSystem.cpp
src/game/Game/LevelSystem.cpp
src/game/Physics/PhysicsSystem.cpp
2015-10-08 17:28:28 +02:00
b93013fcd8
Lifebuoy working
2015-10-08 17:22:19 +02:00
3ac6fdce5f
Fixes smaller problems
2015-10-08 16:53:51 +02:00
210c6a003b
Merge branch 'master' into LevelSystemAndSuch. Fixed so scrolling to next level works again.
2015-10-08 16:11:47 +02:00
f147778d4d
Merge remote-tracking branch 'origin/master' into Physics
...
Conflicts:
src/game/Physics/PhysicsSystem.cpp
2015-10-08 14:29:29 +02:00
c57181fb83
working on Lifebuoy
2015-10-08 14:25:20 +02:00
566b440d80
Lifebuoy added. Incomplete, but it appears.
2015-10-08 14:00:26 +02:00
3f0f45f509
Merge remote-tracking branch 'origin/master' into water
...
Conflicts:
include/Core/Engine.h
src/game/Physics/PhysicsSystem.cpp
2015-10-08 11:16:31 +02:00
66feadfd04
Fixed physics wrong error message
2015-10-08 11:04:35 +02:00
07e59bd0e2
Scroll to next stage works!
2015-10-07 19:19:55 +02:00
ef5882ffbf
Vattnet fungerar nu igen.
2015-10-07 19:18:49 +02:00
1a1b94477e
Merge remote-tracking branch 'origin/master' into water
...
Conflicts:
include/Core/Engine.h
include/Physics/PhysicsSystem.h
include/Sound/SoundSystem.h
src/game/Physics/PhysicsSystem.cpp
src/game/Sound/SoundSystem.cpp
PS:min teori i förra commiten var sann
2015-10-07 18:34:36 +02:00
db2d6ad6e4
Eventbaserade partiklar. Fick nån krasch i physicssystem efter ett tags spelande, men det hoppas jag löser sig när jag mergar in Viktors senaste fysikfixar :3
2015-10-07 17:22:45 +02:00
9bb50067fc
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
2015-10-07 17:13:05 +02:00
3814c25931
Squid does not move until space is pressed. Experimenting with scroll. This shouldn't really be committed, but Visual Studio.
2015-10-07 17:09:55 +02:00
71fe786b04
even more bug fixes
2015-10-07 15:45:50 +02:00
8b12c1036d
Partycles.
2015-10-06 21:42:54 +02:00
b036357e3b
Merge branch 'Physics'
...
Conflicts:
include/Core/Engine.h
include/Physics/CPhysics.h
include/Physics/PhysicsSystem.h
src/game/Game/BallSystem.cpp
src/game/Physics/PhysicsSystem.cpp
2015-10-06 20:16:57 +02:00
a2dc76051f
Bodies are now removed properly
2015-10-06 18:32:22 +02:00
fb8d6f210a
Merge remote-tracking branch 'origin/LevelSystemAndSuch' into Physics
...
Conflicts:
include/Core/Engine.h
include/Physics/PhysicsSystem.h
src/game/Game/BallSystem.cpp
src/game/Game/LevelSystem.cpp
src/game/Physics/PhysicsSystem.cpp
2015-10-06 16:13:17 +02:00
791c3ce69c
Some fixes to the brick models
2015-10-06 15:30:11 +02:00
Jace
7173fdf396
MSVC12 compiler compability fixes
2015-10-06 15:27:11 +02:00
ca810743b2
Angle and spread on particle system. Need to make them not collide.
2015-10-06 13:38:40 +02:00
43e0a5b699
Rectangle shape now has the size of the rigidbody, not scale
2015-10-06 13:31:23 +02:00
1d42e107de
Merge remote-tracking branch 'origin/master' into Physics
...
Conflicts:
include/Core/Engine.h
include/Physics/PhysicsSystem.h
src/game/Game/PadSystem.cpp
src/game/Physics/PhysicsSystem.cpp
2015-10-05 17:02:42 +02:00
tleety
PlatinumSkink
Stiffly
Jace
viktorljung