 viktorljung
|
2051c8186c
|
Background fixes
|
2015-10-22 14:13:38 +02:00 |
|
|
viktorljung
|
c6071e95c3
|
Kraken brick and ink brick done
|
2015-10-22 11:49:08 +02:00 |
|
|
viktorljung
|
f41e126bd6
|
Merge remote-tracking branch 'origin/master' into Physics
|
2015-10-21 15:40:43 +02:00 |
|
|
viktorljung
|
f4ffead4f2
|
Animations and stuff
|
2015-10-21 15:40:19 +02:00 |
|
 tleety
|
e9942dad4a
|
Merge branch 'Tobias'
|
2015-10-21 14:48:33 +02:00 |
|
 Stiffly
|
d0668effea
|
Merge remote-tracking branch 'origin/master' into Sound
|
2015-10-21 13:18:42 +02:00 |
|
|
Stiffly
|
c23c7e4d8e
|
Story sound. Tom could be improved.
|
2015-10-20 16:12:55 +02:00 |
|
|
tleety
|
0f506bfe35
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias
|
2015-10-20 15:57:40 +02:00 |
|
 Jace
|
d197ec07ad
|
Merge branch 'master' into directx
Conflicts:
include/Core/Engine.h
|
2015-10-20 15:13:20 +02:00 |
|
|
Stiffly
|
ec509358b1
|
Powerup sound, not done
|
2015-10-20 14:20:46 +02:00 |
|
|
tleety
|
ce61de1d5c
|
Merge remote-tracking branch 'origin/Physics' into Tobias
|
2015-10-20 11:03:45 +02:00 |
|
|
viktorljung
|
a85a703991
|
animations!
|
2015-10-20 11:02:03 +02:00 |
|
|
viktorljung
|
f5957fc91a
|
Merge remote-tracking branch 'origin/master' into Physics
Conflicts:
include/Core/Engine.h
|
2015-10-20 11:01:42 +02:00 |
|
|
tleety
|
b4486c6bf3
|
Added cheat and water changes to the defaul commit
|
2015-10-20 10:36:11 +02:00 |
|
|
viktorljung
|
9e8d176999
|
Animation models and stuff
|
2015-10-19 16:48:42 +02:00 |
|
|
Stiffly
|
71521b5b02
|
Added squid-bounce wav
|
2015-10-19 16:41:57 +02:00 |
|
|
tleety
|
970201520e
|
Fixed so oilshooter shoots the new particle
|
2015-10-19 16:32:14 +02:00 |
|
|
tleety
|
13a5af837b
|
Added a oilshot sprite
|
2015-10-19 16:15:36 +02:00 |
|
|
tleety
|
c1df5d69a9
|
Merge remote-tracking branch 'origin' into Tobias
|
2015-10-19 15:57:41 +02:00 |
|
|
tleety
|
7b428f2b54
|
Added a cheatmode setting in config
|
2015-10-19 15:56:26 +02:00 |
|
|
Stiffly
|
3f2a1c8d90
|
Merge branch 'master' into Sound
|
2015-10-19 15:36:01 +02:00 |
|
|
tleety
|
36947611d3
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias
# Conflicts:
# include/Core/Engine.h
|
2015-10-19 15:14:14 +02:00 |
|
 PlatinumSkink
|
c83aee9b5d
|
Merge branch 'LevelSystemAndSuch'
|
2015-10-19 15:05:50 +02:00 |
|
|
Stiffly
|
cda75de366
|
Subarashii... Subarashiiiii ~
|
2015-10-19 14:59:05 +02:00 |
|
|
tleety
|
55232a4ec2
|
water radius now changeable in config file, also improved the look of the water
|
2015-10-19 14:50:26 +02:00 |
|
|
Stiffly
|
f2dab5bd1b
|
Merge branch 'master' into Sound
|
2015-10-19 13:54:16 +02:00 |
|
|
Jace
|
e195e69408
|
Working DirectX textures
|
2015-10-19 13:39:00 +02:00 |
|
|
PlatinumSkink
|
3fb741335e
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch.
|
2015-10-19 13:37:10 +02:00 |
|
|
PlatinumSkink
|
c5d88301ad
|
Implemented a Kraken State Machine that can grab the player, and the Generating Bricks option.
|
2015-10-19 13:31:38 +02:00 |
|
|
tleety
|
05f54b5ff9
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias
|
2015-10-16 12:36:08 +02:00 |
|
|
tleety
|
84c3a78275
|
Kraken texture and model added
|
2015-10-16 12:32:55 +02:00 |
|
|
Stiffly
|
0180b29544
|
Merge remote-tracking branch 'origin/master' into Sound
Conflicts:
src/game/Sound/SoundSystem.cpp
|
2015-10-16 11:53:38 +02:00 |
|
|
Jace
|
862396e0fa
|
Improved config loading to read default options from one file and overrides from another and merge differences properly
|
2015-10-15 17:55:56 +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 |
|
|
Jace
|
b754fff9e3
|
Added volume settings to config file
|
2015-10-15 14:10:22 +02:00 |
|
|
Jace
|
a35d72cac3
|
Working skeletal animations!!!
|
2015-10-15 12:48:28 +02:00 |
|
|
Stiffly
|
bb23d5a8c4
|
Added hover and click sounds. Cleanup in SoundSystem.
|
2015-10-15 12:33:49 +02:00 |
|
|
tleety
|
52fe2e697e
|
Added a config file and implemented code for it
|
2015-10-15 12:15:53 +02:00 |
|
|
tleety
|
471fbacfd6
|
Changed how the score background is rendered and added some combo numbers
|
2015-10-14 17:16:16 +02:00 |
|
|
tleety
|
ccda769116
|
Added a texture for the score background
|
2015-10-14 15:46:13 +02:00 |
|
|
viktorljung
|
40054cb40f
|
Merge remote-tracking branch 'origin/master' into Physics
Conflicts:
src/game/Game/LevelSystem.cpp
|
2015-10-13 17:32:07 +02:00 |
|
|
tleety
|
4857e387ad
|
Added some new fonts
|
2015-10-13 17:02:20 +02:00 |
|
|
viktorljung
|
b8e1f6fcde
|
Added brick break, needs more work with the removal code and particles
|
2015-10-13 16:18:46 +02:00 |
|
|
tleety
|
52e2ce567a
|
Power up sprites now show when you hit powerup bricks
|
2015-10-12 16:48:04 +02:00 |
|
|
tleety
|
3fef91b8a9
|
Added RealeaseTheKraken sprite
|
2015-10-12 15:29:34 +02:00 |
|
|
tleety
|
88df747741
|
Added Sticky sprite
|
2015-10-12 15:12:53 +02:00 |
|
|
tleety
|
577dad7dad
|
Added lifedonut sprite
|
2015-10-12 15:04:30 +02:00 |
|
|
tleety
|
8cc0b70776
|
Added Ink blaster sprite
|
2015-10-12 14:48:33 +02:00 |
|
|
tleety
|
2e8cfe0a92
|
Friends sprite
|
2015-10-12 14:47:36 +02:00 |
|