box2d weapon impulse
physics finally works
save
Merge branch 'ad_parabole'

Conflicts:
	src/com/tdt4240/A6/junglearena/controller/WorldController.java
Conflict resolved
Added stub user interface, character selection needs improvement
LIBGDX ON ANDRODI DOESN'T SUPPORT JAVA 7!
game controls
added tweening functionalities
select the position of the target
Screens style
Merge pull request #9 from gonch/mh_factory2

oook
Penso de si
Merge branch 'master' of https://github.com/gonch/JungleArena

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
	src/com/tdt4240/A6/junglearena/screens/TitleScreen.java
Merge branch 'ch_screens'
Merge pull request #10 from gonch/mh_factory2

Mh factory2
Merge branch 'master' of https://github.com/gonch/JungleArena

Conflicts:
	src/com/tdt4240/A6/junglearena/controller/factories/CharacterFactory.java
	src/com/tdt4240/A6/junglearena/controller/factories/WeaponFactory.java
JUNIT
commit again
+
For my friend gonzalo