9e8d176999
Animation models and stuff
2015-10-19 16:48:42 +02:00
f2dab5bd1b
Merge branch 'master' into Sound
2015-10-19 13:54:16 +02:00
dc2ec46cfa
Playing sound on EGameStart. Menu sounds.
2015-10-19 13:53:42 +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
0600230ed4
Merge remote-tracking branch 'origin/master' into water
2015-10-16 11:59:17 +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
Jace
f335955396
Animation system now listens to pause events
2015-10-15 18:39:47 +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
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
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
64f903a6b6
WIP
2015-10-15 13:48:05 +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
bb23d5a8c4
Added hover and click sounds. Cleanup in SoundSystem.
2015-10-15 12:33:49 +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
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
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
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
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
1065d3abc3
Merge remote-tracking branch 'origin/master' into water
...
Conflicts:
src/game/Game/LevelSystem.cpp
src/game/Physics/PhysicsSystem.cpp
2015-10-13 17:02:31 +02:00
b8e1f6fcde
Added brick break, needs more work with the removal code and particles
2015-10-13 16:18:46 +02:00
94cac38cc6
"Lightening" particle bugg fixed. Scale and alpha interpolation implemented through ScalarInterpolation-funtion
2015-10-13 15:22:11 +02:00
c20b9a35b3
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
2015-10-13 15:09:33 +02:00
c431193764
Some debug code
2015-10-13 15:09:00 +02:00
40343744c1
Adjustments to Sticky and Inkblaster made, in addition made StickyAimer partly transparent green.
2015-10-13 14:02:18 +02:00
1a070d8ce8
Merge branch 'master' into LevelSystemAndSuch
2015-10-13 13:37:08 +02:00
32bbf282c9
Aimer for Sticky Works, though stuff.
2015-10-12 18:18:37 +02:00
cd64531307
Merged with master and fixed some small variable things
2015-10-12 17:18:44 +02:00
c2b1211be8
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
2015-10-12 16:53:08 +02:00
viktorljung
Stiffly
Jace
tleety
PlatinumSkink