 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
|
f732687347
|
Fixed huge memory leak reading textures
|
2015-10-15 17:54:42 +02:00 |
|
|
Jace
|
4a031147a6
|
Added log level to config
|
2015-10-15 14:57:33 +02:00 |
|
|
Jace
|
4182ba52b8
|
Changed default log level to INFO
|
2015-10-15 14:57:33 +02:00 |
|
|
Jace
|
0e4cbf4009
|
Custom libpng error handlers
|
2015-10-15 14:57:32 +02:00 |
|
|
Jace
|
6a6960bd7c
|
Moved LOG_LEVEL_INFO before WARNING
|
2015-10-15 14:49:48 +02:00 |
|
|
Jace
|
218de4b02e
|
Custom error functions for PNG
|
2015-10-15 14:47:08 +02:00 |
|
|
Jace
|
8ecb1aa8c5
|
Fixed LOG_LEVEL not being defined correctly and therefore unchangable
|
2015-10-15 14:36:56 +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
|
2ddb1847c5
|
Added ability to save to ConfigFile
|
2015-10-15 14:10:22 +02:00 |
|
 Stiffly
|
e719a342f2
|
Master volume init values depends on configfile.
|
2015-10-15 14:03:06 +02:00 |
|
|
Stiffly
|
00f804a5f3
|
Moved default value for config parameters to be a function argument to support other types too...
|
2015-10-15 14:00:11 +02:00 |
|
|
Jace
|
cf5b465e0b
|
Fixed ambiguous definition
|
2015-10-15 12:56:57 +02:00 |
|
|
Jace
|
a35d72cac3
|
Working skeletal animations!!!
|
2015-10-15 12:48:28 +02:00 |
|
|
Jace
|
1e3536e060
|
Taking the root node transform into account when loading model formats containing scene graph information. Needs more work.
|
2015-10-15 12:48:16 +02:00 |
|
|
Jace
|
af8fc118b7
|
World initialization refactored to register system components and resources BEFORE initializing them all
because apparently we create entities in system initialization functions now and need all components to be registered and available.
|
2015-10-15 12:48:16 +02:00 |
|
 tleety
|
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 |
|
|
tleety
|
52fe2e697e
|
Added a config file and implemented code for it
|
2015-10-15 12:15:53 +02:00 |
|
|
tleety
|
5da96f40f3
|
Fixed so 42+ combo particle is shown when you have 42+ combo
|
2015-10-14 18:19:45 +02:00 |
|
|
tleety
|
6c41911233
|
Combos now show up as a particle when it is reset
|
2015-10-14 18:07:15 +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 |
|
 PlatinumSkink
|
8e32574692
|
Removed unnecessary Cout to avoid annoying others.
|
2015-10-13 18:37:46 +02:00 |
|
|
PlatinumSkink
|
b94eeac2cd
|
Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut
|
2015-10-13 18:34:46 +02:00 |
|
|
PlatinumSkink
|
ffea58d41f
|
ScreenShake works as intended at the press of E and upon calling the event.
|
2015-10-13 18:34:21 +02:00 |
|
 viktorljung
|
e6cffcb217
|
Merge remote-tracking branch 'origin/master' into Physics
|
2015-10-13 18:03:15 +02:00 |
|
|
PlatinumSkink
|
8762fe3513
|
Fixed minor sticky bug.
|
2015-10-13 18:01:10 +02:00 |
|
|
PlatinumSkink
|
1b4c38c292
|
Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut
|
2015-10-13 17:52:30 +02:00 |
|
|
viktorljung
|
8b218a0103
|
Next level now working
|
2015-10-13 17:51:37 +02:00 |
|
|
viktorljung
|
a5cb1ed77a
|
Spin fixed
|
2015-10-13 17:47:53 +02:00 |
|
|
PlatinumSkink
|
f773458654
|
Merge branch 'LevelSystemAndSuch'
|
2015-10-13 17:45:34 +02:00 |
|
|
tleety
|
1e4e278ef6
|
Added score background stuff
|
2015-10-13 17:45:15 +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 |
|
|
PlatinumSkink
|
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 |
|
|
viktorljung
|
f86dc9a530
|
Needs some spinfixing
|
2015-10-13 17:20:32 +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
|
c20b9a35b3
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
|
2015-10-13 15:09:33 +02:00 |
|
|
tleety
|
c431193764
|
Some debug code
|
2015-10-13 15:09:00 +02:00 |
|
|
PlatinumSkink
|
40343744c1
|
Adjustments to Sticky and Inkblaster made, in addition made StickyAimer partly transparent green.
|
2015-10-13 14:02:18 +02:00 |
|
|
PlatinumSkink
|
1a070d8ce8
|
Merge branch 'master' into LevelSystemAndSuch
|
2015-10-13 13:37:08 +02:00 |
|
|
PlatinumSkink
|
32bbf282c9
|
Aimer for Sticky Works, though stuff.
|
2015-10-12 18:18:37 +02:00 |
|
|
tleety
|
cd64531307
|
Merged with master and fixed some small variable things
|
2015-10-12 17:18:44 +02:00 |
|
|
tleety
|
c2b1211be8
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
|
2015-10-12 16:53:08 +02:00 |
|
|
tleety
|
52e2ce567a
|
Power up sprites now show when you hit powerup bricks
|
2015-10-12 16:48:04 +02:00 |
|
|
PlatinumSkink
|
02d724fedd
|
Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut
|
2015-10-12 16:47:24 +02:00 |
|
|
PlatinumSkink
|
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 |
|
|
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 |
|