Commit Graph

4 Commits

Author SHA1 Message Date
AEtHeLsYn
9db45c0ffb Merge remote-tracking branch 'refs/remotes/tvdzwan/master'
# Conflicts:
#	include/hyperion/Hyperion.h
#	libsrc/hyperion/CMakeLists.txt
#	libsrc/hyperion/Hyperion.cpp


Former-commit-id: 1144520581d4531952038d2118cb11e01bebc10e
2016-03-09 19:25:04 +01:00
redpanther
de5b284975 modify effects
- snake has a nice tail
- random is not so fast anymore
- merge sparks and sparks-color
- make more params available in json files


Former-commit-id: fc2a4f6f6ce2b44a35a75a9c0dbe36504b790be9
2016-01-20 22:36:21 +01:00
redpanther
7dfe8ae8cf all effects has same lineendings
Former-commit-id: c2586f57ce03c20a7a1083a5d62c8ddde7359b84
2016-01-20 14:45:17 +01:00
tostadora
faee31c83f new effect!
Former-commit-id: e19975e298fd6b11e7012739ac37ee3047d2c184
2014-02-04 23:51:11 +01:00