 Jace
|
d0ee438c4c
|
Loading screen that preloads the entire game based on what's in the "PreloadResources" file. The file is filled automatically with resources that are hot-loaded to make the next launch load more complete.
|
2015-10-22 14:51:34 +02:00 |
|
|
Jace
|
17c30ff610
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
|
2015-10-21 15:38:46 +02:00 |
|
|
Jace
|
52f7e3f64b
|
Control over animation looping and event on animation completion
|
2015-10-21 15:38:34 +02:00 |
|
|
Jace
|
2df78e011a
|
Fixed Renderer trying to play animations when there is no animation component
|
2015-10-21 15:35:57 +02:00 |
|
 tleety
|
e9942dad4a
|
Merge branch 'Tobias'
|
2015-10-21 14:48:33 +02:00 |
|
|
tleety
|
11b792c85a
|
Merge remote-tracking branch 'origin' into Tobias
|
2015-10-21 14:39:38 +02:00 |
|
 Stiffly
|
d0668effea
|
Merge remote-tracking branch 'origin/master' into Sound
|
2015-10-21 13:18:42 +02:00 |
|
 PlatinumSkink
|
2954e2cbb3
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
|
2015-10-20 16:14:55 +02:00 |
|
|
Jace
|
9b8546abb2
|
Fixed your score frames
|
2015-10-20 16:13:33 +02:00 |
|
|
Stiffly
|
c23c7e4d8e
|
Story sound. Tom could be improved.
|
2015-10-20 16:12:55 +02:00 |
|
|
PlatinumSkink
|
c1e4e6c0bd
|
KrakenHit event includes max health, current, and new.
|
2015-10-20 15:58:02 +02:00 |
|
|
tleety
|
0f506bfe35
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias
|
2015-10-20 15:57:40 +02:00 |
|
|
PlatinumSkink
|
e26156c093
|
Kraken Battle Implemented. Feel free to comment.
To get to battle faster, change CurrentCluster to 0.
|
2015-10-20 15:57:06 +02:00 |
|
|
tleety
|
9ffa8e9609
|
Kraken arm shows up when you take the powerup
|
2015-10-20 15:57:02 +02:00 |
|
|
Jace
|
14b4fd9813
|
fixup! CMAKE Conditional compilation against DirectX and OpenGL targets
|
2015-10-20 15:39:12 +02:00 |
|
|
Jace
|
d197ec07ad
|
Merge branch 'master' into directx
Conflicts:
include/Core/Engine.h
|
2015-10-20 15:13:20 +02:00 |
|
|
Jace
|
80f34b27b9
|
OpenGL renderer back in working condition
|
2015-10-20 14:31:12 +02:00 |
|
|
Stiffly
|
ec509358b1
|
Powerup sound, not done
|
2015-10-20 14:20:46 +02:00 |
|
|
Jace
|
aacc194358
|
Passthrough shader for DirectX GUI
|
2015-10-20 13:52:07 +02:00 |
|
|
Jace
|
4175b29653
|
DirectX GUI rendering
|
2015-10-20 12:07:40 +02:00 |
|
|
PlatinumSkink
|
b4f098c80d
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
|
2015-10-20 11:53:05 +02:00 |
|
|
PlatinumSkink
|
b38fdf2183
|
Merge branch 'master' into LevelSystemAndSuch
|
2015-10-20 11:44:57 +02:00 |
|
|
PlatinumSkink
|
fbdd3536f3
|
Kraken shows up on last stage. Created WaterSystem for possible future use.
|
2015-10-20 11:43:39 +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 |
|
|
Jace
|
4a3575190f
|
DX sprites and stuff I guess
|
2015-10-19 17:48:07 +02:00 |
|
|
viktorljung
|
9e8d176999
|
Animation models and stuff
|
2015-10-19 16:48:42 +02:00 |
|
|
tleety
|
dd6c5443eb
|
Fixed an upper case E into a lowercase so linux hopefully wont have a shitfit
|
2015-10-19 16:42:39 +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
|
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 |
|
|
Stiffly
|
5802c7f7c4
|
Merge remote-tracking branch 'origin/master' into water
|
2015-10-19 15:25:16 +02:00 |
|
|
Stiffly
|
0688de9dd2
|
LifeBuoy particle effect on hit.
|
2015-10-19 15:24:40 +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 |
|
|
PlatinumSkink
|
7aa7e7cbf0
|
Pause and Resume events completed and game-crashing bug fixed. I think.
|
2015-10-19 14:56:44 +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 |
|
|
Stiffly
|
dc2ec46cfa
|
Playing sound on EGameStart. Menu sounds.
|
2015-10-19 13:53:42 +02:00 |
|
|
Jace
|
d423239320
|
All vertex attributes now present in DX shaders
|
2015-10-19 13:53:12 +02:00 |
|
|
Jace
|
e195e69408
|
Working DirectX textures
|
2015-10-19 13:39:00 +02:00 |
|
|
Jace
|
a782e6b40a
|
Successful DirectX context through GLFW, praise Gaben!
|
2015-10-19 13:39:00 +02:00 |
|
|
Jace
|
0be663be11
|
Created interface class for Renderer
|
2015-10-19 13:38:58 +02:00 |
|
|
Jace
|
0666e8513f
|
Split model file loading and buffer creation into separate classes
|
2015-10-19 13:38:46 +02:00 |
|
|
Jace
|
00f537bc03
|
Removed OpenGL specifics from RenderQueue
|
2015-10-19 13:38:12 +02:00 |
|
|
Jace
|
13360856f9
|
Separated OpenGL specific code into its own "compilation unit"
|
2015-10-19 13:37:59 +02:00 |
|
|
PlatinumSkink
|
3fb741335e
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch.
|
2015-10-19 13:37:10 +02:00 |
|