Commit Graph

13 Commits

Author SHA1 Message Date
Sarah
40259a26f1 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-26 16:12:51 +01:00
Sarah
a653f053a5 Adding 2 Seconds delay. 2015-11-26 16:12:13 +01:00
Sarah
3128a6005b Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-26 16:06:53 +01:00
Sarah
eddbde5ebd Changing length formula. 2015-11-26 16:06:15 +01:00
Sarah
de9262882a fixing "enemy's" and some merge isssues. 2015-11-25 16:03:13 +01:00
Sarah
fac7d152ae Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialPhase.java
2015-11-24 16:25:44 +01:00
Sarah
2a64d06bdd removing some debug. 2015-11-24 16:24:22 +01:00
Sarah
95b4ad74e8 fixed silencing and adding possibilty to change text. 2015-11-24 16:23:03 +01:00
Sarah
49f6679537 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
2015-11-24 15:43:59 +01:00
Sarah
66598ce97e adding teleport flag. 2015-11-23 16:16:33 +01:00
Sarah
e10a63254a saving typewars state 2015-11-21 18:16:24 +01:00
Sarah
6a29d2a2d6 adding some getters. 2015-11-21 17:01:17 +01:00
Sarah
97471b0d9c Finalizing Game Tutorials. 2015-11-20 23:38:02 +01:00