Jace
13360856f9
Separated OpenGL specific code into its own "compilation unit"
2015-10-19 13:37:59 +02:00
116cfb5759
Merge branch 'water'
2015-10-16 13:11:02 +02:00
2c6ac49e15
Added particle event for each brick debris. poof!
2015-10-16 13:05:33 +02:00
bf82e549aa
Added VectorInterpolation function. Fixed time bug for particles.
2015-10-16 12:43:40 +02:00
05f54b5ff9
Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias
2015-10-16 12:36:08 +02:00
84c3a78275
Kraken texture and model added
2015-10-16 12:32:55 +02:00
0600230ed4
Merge remote-tracking branch 'origin/master' into water
2015-10-16 11:59:17 +02:00
Jace
f335955396
Animation system now listens to pause events
2015-10-15 18:39:47 +02:00
Jace
a9eb3197de
Updated deploy scripts to include DefaultConfig.ini
2015-10-15 17:56:30 +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
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
e719a342f2
Master volume init values depends on configfile.
2015-10-15 14:03:06 +02:00
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
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
46f3a9f72e
Refactored CParticle->Radius to CParticle->Scale. Reviewed by Tobias Dahl aka Tleety.
2015-10-14 18:29:43 +02:00
5da96f40f3
Fixed so 42+ combo particle is shown when you have 42+ combo
2015-10-14 18:19:45 +02:00
6c41911233
Combos now show up as a particle when it is reset
2015-10-14 18:07:15 +02:00
cbb6e7a04f
Trail to individual brick debris.
...
Counter the particle spawn bug.
The bug occurs when the position is read as (0, 0) from the emitter. Similar particle removal bug appears when particles are deleted. Counterered by deleting particle entities a little time before b2particles.
2015-10-14 17:40:24 +02:00
471fbacfd6
Changed how the score background is rendered and added some combo numbers
2015-10-14 17:16:16 +02:00
ccda769116
Added a texture for the score background
2015-10-14 15:46:13 +02:00
e9ca58de64
Merge branch 'master' into water
...
Conflicts:
src/game/Game/LevelSystem.cpp
src/game/Physics/PhysicsSystem.cpp
2015-10-14 15:43:34 +02:00
8e32574692
Removed unnecessary Cout to avoid annoying others.
2015-10-13 18:37:46 +02:00
b94eeac2cd
Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut
2015-10-13 18:34: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
e6cffcb217
Merge remote-tracking branch 'origin/master' into Physics
2015-10-13 18:03:15 +02:00
8762fe3513
Fixed minor sticky bug.
2015-10-13 18:01:10 +02:00
1b4c38c292
Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut
2015-10-13 17:52:30 +02:00
8b218a0103
Next level now working
2015-10-13 17:51:37 +02:00
a5cb1ed77a
Spin fixed
2015-10-13 17:47:53 +02:00
f773458654
Merge branch 'LevelSystemAndSuch'
2015-10-13 17:45:34 +02:00
1e4e278ef6
Added score background stuff
2015-10-13 17:45:15 +02:00
5955a888d2
Merge remote-tracking branch 'origin/master' into water
...
Conflicts:
src/game/Physics/PhysicsSystem.cpp
2015-10-13 17:44:05 +02:00
5040ff4649
added a radius distribution to randomize the scale.
2015-10-13 17:39:40 +02:00
40054cb40f
Merge remote-tracking branch 'origin/master' into Physics
...
Conflicts:
src/game/Game/LevelSystem.cpp
2015-10-13 17:32:07 +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
f86dc9a530
Needs some spinfixing
2015-10-13 17:20:32 +02:00
Jace
Stiffly
tleety
PlatinumSkink
viktorljung