12
Merge branch 'McLeodLaptop'

Conflicts:
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene$1.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene$2.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene$3.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene.class
Missing class added
Basic game over screen
Merge of my stats screen commit and the shop commit. Basic stats screen
opened when a base is destroyed. Still needs restart/menu button.

Merge remote-tracking branch 'origin/master'

Conflicts:
	CageFight/bin/CageFight.apk
	CageFight/bin/classes.dex
	CageFight/bin/classes/co/nz/splashYay/cagefight/entities/AIUnit.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/entities/Player.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene$1.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene$2.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene$3.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene.class
	CageFight/bin/resources.ap_
	CageFight/src/co/nz/splashYay/cagefight/scenes/GameScene.java
Shop stage 2
Shop update
12
Merge branch 'ai3'

Conflicts:
	CageFight/bin/CageFight.apk
	CageFight/bin/classes.dex
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene$1.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene$2.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene$3.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene$4.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene.class
	CageFight/bin/resources.ap_
	CageFight/src/co/nz/splashYay/cagefight/scenes/GameScene.java
Tower and bases attack, Base and tower refactor now child class of
Building
123
explosion
Tower and base attacks
Sound volume changes depending on distance between sound source and
player
update woo
An update to the UI, player health and exp bars are now on the bottom of
the screen, with level, gold, and kd (to be added) visible above them.
Gold is yellow, level is green, kd is red. Target bar is now centered to
compensate.
123
Added kill/death count
Merge branch 'master' of https://github.com/guy101100/cageFight.git

Conflicts:
	CageFight/bin/CageFight.apk
	CageFight/bin/classes.dex
12