jancoow ba0482ee0a Merge remote-tracking branch 'origin/developer' into feature/weaponCollision ...

Added waeponswitch to backbutton of controller

# Conflicts:
#	Enemy.cpp
#	Player.cpp
#	Weapon.cpp
#	Weapon.h

2016-06-21 23:10:58 +02:00

..

fire.json

Added Rock world. Updated others

2016-06-10 12:09:16 +02:00

hell.pdn

Lord and Savior Johan

2016-05-26 12:53:22 +02:00

hell.png

Bugfix/performance improvement

2016-05-30 13:12:51 +02:00

helltexture.png

Added heightmap

2016-05-25 11:31:37 +02:00

hmcs.png

Bugfix/performance improvement

2016-05-30 13:12:51 +02:00

hmcstexture.png

Added heightmap

2016-05-25 11:31:37 +02:00

ice.json

Added Rock world. Updated others

2016-06-10 12:09:16 +02:00

rock.json

Merge branch 'developer' into musicInclude

2016-06-21 19:16:12 +02:00

rockHeightmap.pdn

Added Rock world. Updated others

2016-06-10 12:09:16 +02:00

rockHeightmap.png

Added Rock world. Updated others

2016-06-10 12:09:16 +02:00

rockStone2.png

Added Rock world. Updated others

2016-06-10 12:09:16 +02:00

small.json

Merge remote-tracking branch 'origin/developer' into feature/weaponCollision

2016-06-21 23:10:58 +02:00

small.png

picking up crystal(sphere)

2016-06-08 12:41:33 +02:00

worlds.json

Bugfixes, added sound to portal and enemy in JSON

2016-06-21 13:51:16 +02:00