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
|
3260550368
|
adding proper forcefield for minions and giants.
|
2015-12-06 19:38:23 +01:00 |
|
Sarah
|
114ae33d89
|
fixing spawns and monster slowdown.
|
2015-12-06 00:00:50 +01:00 |
|
Sarah
|
90c6d0a83f
|
spelling fixes, disabling Particles, fixing mob limit.
|
2015-12-05 22:17:45 +01:00 |
|
Sarah
|
4c4b997453
|
fixing giant facing.
|
2015-12-05 19:00:44 +01:00 |
|
Sarah
|
a3d6af884d
|
spawns after tutorial and Giants facing each other.
|
2015-12-05 00:57:27 +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
|
9e1d522876
|
Increase Render distance on particles, Don't spawn mob until "protect him from evil minions" title appears and changing some timings.
|
2015-11-26 16:47:31 +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
|
efc05803ac
|
Minion spawn.
|
2015-11-26 16:25:44 +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
|
9f3c3589b2
|
Particle render distance.
|
2015-11-26 16:09:29 +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
|
32ee1c285a
|
merging pregametutorial into type wars.
|
2015-11-26 00:29:28 +01:00 |
|
Sarah
|
063299ab3a
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-11-26 00:23:02 +01:00 |
|
Sarah
|
809faf3098
|
changing teleport mechanic.
|
2015-11-26 00:14: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
|
7708f879dc
|
Fixing attack damage.
|
2015-11-24 16:15:07 +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
|
46362a3d5f
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
|
2015-11-24 15:38:52 +01:00 |
libraryaddict
|
c48c743ebf
|
Merge pull request #79 in MIN/mineplex from WitherAssault-Fix to master
* commit '19803a00ab50658b33b79ac4f2909932c9e4161b':
Added the Wither Assault fixes to it's own Branch
|
2015-11-23 10:11:30 -06:00 |
|
Sarah
|
66598ce97e
|
adding teleport flag.
|
2015-11-23 16:16:33 +01:00 |
Morten
|
19803a00ab
|
Added the Wither Assault fixes to it's own Branch
|
2015-11-22 19:06:24 +01:00 |
libraryaddict
|
cfeafff2f6
|
EntityDismountEvent stuff
|
2015-11-22 14:44:32 +13:00 |
|
Sarah
|
171696ff0d
|
final tutorial implementation.
|
2015-11-21 18:24:17 +01:00 |
|
Sarah
|
15032ac7ff
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-11-21 18:19:12 +01:00 |
|
Sarah
|
cba5aef9f1
|
small fix
|
2015-11-21 18:18:13 +01:00 |
|
Sarah
|
e10a63254a
|
saving typewars state
|
2015-11-21 18:16:24 +01:00 |
|
Sarah
|
746cc597ab
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-11-21 17:02:27 +01:00 |