Cheese
|
2ab1b51401
|
bug fixes
|
2016-02-07 14:09:02 +11:00 |
|
Cheese
|
a35a9ea31f
|
more valentines :)
|
2016-02-07 13:27:53 +11:00 |
|
Cheese
|
690c2acce8
|
many valentine, such wow
|
2016-02-05 13:25:57 +11:00 |
|
Sarah
|
f1188529f2
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-12-19 13:09:26 +01:00 |
|
Sarah
|
c56cd0d56e
|
adjusting some timings
|
2015-12-19 13:08:53 +01:00 |
|
Sarah
|
7327d9463f
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-12-19 13:00:49 +01:00 |
|
Sarah
|
8a54388480
|
fixing last commit
|
2015-12-19 13:00:12 +01:00 |
|
Sarah
|
152e759c10
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-12-19 12:56:05 +01:00 |
|
Sarah
|
7cb002ca86
|
Adding Tutorial notification
|
2015-12-19 12:55:28 +01:00 |
|
Sarah
|
dab2416ccd
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-12-19 00:49:16 +01:00 |
|
Sarah
|
6c5e3d7509
|
Fixing visibility.
|
2015-12-19 00:48:42 +01:00 |
|
Sarah
|
afa45c47ca
|
Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into pregametutorial
|
2015-12-14 14:23:42 +01:00 |
|
Sarah
|
a92361f2fe
|
some more descriptions for Tutorials
|
2015-12-12 20:03:35 +01:00 |
|
Sarah
|
09e5aed6e7
|
Adding some descriptions.
|
2015-12-11 22:06:23 +01:00 |
|
Shaun Bennett
|
2694787590
|
Reverting
|
2015-12-10 20:59:57 -05:00 |
|
Sarah
|
ffb75a7832
|
Adding CustomEnding
|
2015-12-11 01:44:19 +01:00 |
|
William Burns
|
8d7b03e3f6
|
Added the ability to have title AND subtitle per TutorialText.
|
2015-12-10 20:52:41 +00:00 |
|
Sarah
|
0f8028f6e6
|
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-12-10 12:24:11 +01:00 |
|
Sarah
|
0619fb857f
|
fixing invisibility.
|
2015-12-07 23:44:02 +01:00 |
|
Sarah
|
dfb1837e81
|
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-12-07 18:54:19 +01:00 |
|
Sarah
|
072856be7d
|
teleportations.
|
2015-12-06 23:19:53 +01:00 |
|
Sarah
|
10d26ca32b
|
timer fixes.
|
2015-12-06 22:41:04 +01:00 |
|
Sarah
|
64f8ee7280
|
fixing some timings.
|
2015-12-06 21:48:21 +01:00 |
|
Sarah
|
35534afd4a
|
overall runtime.
|
2015-12-04 19:54:02 +01:00 |
|
Sarah
|
1bb40b21d3
|
Tutorial/Phase Time.
|
2015-12-04 19:49:28 +01:00 |
|
Sarah
|
19254fc4a0
|
Prepare Timer flag.
|
2015-12-03 18:06:27 +01:00 |
|
Sarah
|
27f335779a
|
adding tutorial sounds and flag for it.
|
2015-12-02 19:39:44 +01:00 |
|
Sarah
|
b0e16f6612
|
Zombie smash Color.
|
2015-12-01 17:05:55 +01:00 |
|
Sarah
|
d335e58652
|
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-12-01 17:01:44 +01:00 |
|
Sarah
|
e2cfcef55b
|
RunTasksSync Flag.
|
2015-11-30 16:58:41 +01:00 |
|
Sarah
|
dc68375ec8
|
TimeBetweenPhase Flag.
|
2015-11-29 21:48:39 +01:00 |
|
Sarah
|
66fd85af1f
|
Adding Phase Event.
|
2015-11-28 23:32:09 +01:00 |
|
Sarah
|
ad54d28b0d
|
fixing teleportation issues.
|
2015-11-27 22:29:29 +01:00 |
|
Sarah
|
fd0c5cf273
|
Adding some more flags.
|
2015-11-27 20:47:57 +01:00 |
|
Sarah
|
33383af18a
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-11-26 16:37:57 +01:00 |
|
Sarah
|
c74732af39
|
One more fix.
|
2015-11-26 16:37:18 +01:00 |
|
Sarah
|
cb67e42f96
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-11-26 16:27:24 +01:00 |
|
Sarah
|
21f859f579
|
fixing 2 seconds delay.
|
2015-11-26 16:26:49 +01:00 |
|
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 |
|