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 |
|
Sarah
|
6a29d2a2d6
|
adding some getters.
|
2015-11-21 17:01:17 +01:00 |
|
Sarah
|
d0b5f6d8ac
|
starting implementation of Type wars tutorial.
|
2015-11-21 16:56:56 +01:00 |
|
Sarah
|
01f67e9d3e
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-11-21 16:37:49 +01:00 |
|
Cheese
|
91e40d0e61
|
hide testing server MOTD
|
2015-11-21 13:37:19 +11:00 |
|
Cheese
|
9ef99cee20
|
fixed merge issues
|
2015-11-21 11:21:54 +11:00 |
|
Cheese
|
6eb1bef1c6
|
Merge branch 'master' into minestrike-update
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
|
2015-11-21 11:09:28 +11:00 |
|
Cheese
|
87a30513de
|
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
|
2015-11-21 11:08:23 +11:00 |
|
Cheese
|
4a0cc79abf
|
fixed silence not working in non-champs servers
|
2015-11-21 11:08:09 +11:00 |
|
AlexTheCoder
|
8b480cc32b
|
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
|
2015-11-20 18:40:42 -05:00 |
|
AlexTheCoder
|
1274dc860d
|
- Stuff for chiss
|
2015-11-20 18:40:20 -05:00 |
|
Cheese
|
2f91ca5a8a
|
fixed errors
|
2015-11-21 10:35:17 +11:00 |
|
Cheese
|
4a70e4da90
|
more fixies
|
2015-11-21 10:34:08 +11:00 |
|
Cheese
|
4d128d9c7a
|
fixed some skills and wierd hitbox error
|
2015-11-21 10:29:48 +11:00 |
|
Cheese
|
c7297a7a38
|
fixed invalid proxies exploding
|
2015-11-21 09:45:01 +11:00 |
|
Cheese
|
d5076b1c47
|
CTF fix
|
2015-11-21 09:41:02 +11:00 |
|
Cheese
|
e0885feea6
|
Merge branch 'master' into alex-ctf
|
2015-11-21 09:40:07 +11:00 |
|
Cheese
|
04be896ff6
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-21 09:39:50 +11:00 |
|
Sarah
|
97471b0d9c
|
Finalizing Game Tutorials.
|
2015-11-20 23:38:02 +01:00 |
|
Cheese
|
0bc64fec16
|
Proxy limit fixes
|
2015-11-21 09:28:15 +11:00 |
|
Sarah
|
6f7d49b71b
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-11-20 19:04:51 +01:00 |
|
Sarah
|
2a4d20650a
|
Saving for branch switching.
|
2015-11-20 19:04:11 +01:00 |
|
AlexTheCoder
|
386032a4f5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
|
2015-11-20 06:03:30 -05:00 |
|
AlexTheCoder
|
f51358552a
|
-B
|
2015-11-20 05:57:29 -05:00 |
|