NewGarbo
|
91067535db
|
changed getting started tutorial gold reward to be proper (5000 now)
|
2015-11-23 18:09:50 +00:00 |
|
NewGarbo
|
175a6bc31a
|
cleaned up world event times stuff
|
2015-11-23 17:24:17 +00:00 |
|
NewGarbo
|
9bae314278
|
fixed null pointer exception when interacting with a block when your clan home is null
|
2015-11-23 17:19:00 +00:00 |
|
NewGarbo
|
6ca4d12d98
|
fixed potential nofall exploit with logout npc
|
2015-11-23 17:09:51 +00:00 |
|
NewGarbo
|
ce2e616c74
|
fixed /skiptutorial bugs, removed safe log out command, fixed tutorial bugs, and much more i can't remember ;-;
|
2015-11-23 16:57:50 +00: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 |
|
NewGarbo
|
da2c7d84a4
|
tutorial code cleanup. removed qa reset command
|
2015-11-23 11:19:23 +00:00 |
|
NewGarbo
|
a551e89310
|
fixed clans tips preferences, and changed World Event commands perms from being ALL to EVENT
|
2015-11-23 09:44:35 +00:00 |
|
NewGarbo
|
58ed9e586c
|
turned ClansTips into it's own miniplugin, as it doesn't fit as a subclass of Tutorial
|
2015-11-23 09:04:30 +00:00 |
Jonathan Williams
|
875b87e0e4
|
Fixed memory leak crashing servers.
|
2015-11-23 02:41:38 -06:00 |
|
NewGarbo
|
47abbfbedf
|
implemented skip tutorial being permanent
|
2015-11-22 20:01:54 +00:00 |
Morten
|
19803a00ab
|
Added the Wither Assault fixes to it's own Branch
|
2015-11-22 19:06:24 +01:00 |
|
NewGarbo
|
2e047b54c2
|
removed stone weapons from loot
|
2015-11-22 11:54:38 +00:00 |
|
NewGarbo
|
0cdee95b87
|
formatted some classes
|
2015-11-22 11:23:19 +00:00 |
libraryaddict
|
cfeafff2f6
|
EntityDismountEvent stuff
|
2015-11-22 14:44:32 +13: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 |
|
Cheese
|
0bc64fec16
|
Proxy limit fixes
|
2015-11-21 09:28:15 +11:00 |
|
NewGarbo
|
17e62f1f5a
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-20 18:31:37 +00:00 |
|
NewGarbo
|
fb04fac0f6
|
removed debug message
|
2015-11-20 18:31:14 +00: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 |
|
NewGarbo
|
521aa8d965
|
fixed furnaces in undead camp
|
2015-11-20 09:14:57 +00:00 |
|
NewGarbo
|
08f683aa98
|
gave Archers in undead camps the barbed arrows effect
|
2015-11-20 07:49:28 +00:00 |
|
Jonathan Williams
|
700e4c9a1f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-19 22:12:08 -06:00 |
|
Jonathan Williams
|
411d6fdb22
|
Made PlayerTracker use existing code for determining region.
|
2015-11-19 22:11:45 -06:00 |
|
Cheese
|
e14f5a36bd
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-20 08:34:19 +11:00 |
|
Cheese
|
f33eedf36d
|
text fix
|
2015-11-20 08:33:51 +11:00 |
Shaun Bennett
|
c29fd242ca
|
Forgot to remove the unnecessary check
|
2015-11-19 14:46:01 -05:00 |
|
Shaun Bennett
|
f47a61e38e
|
Use bounds for energy tracker messages aren't displayed multiple times
|
2015-11-19 14:44:03 -05:00 |
|
Shaun Bennett
|
63e580404c
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyTracker.java
|
2015-11-19 14:36:08 -05:00 |
|
Shaun Bennett
|
3820035762
|
Cleaning up duplicate code/small optimizations (untested)
|
2015-11-19 14:35:59 -05:00 |
|
NewGarbo
|
b0c60fd1f4
|
sparkly rare items! woo. and fixed gold dropping waaayyy too much
|
2015-11-19 19:03:51 +00:00 |
|
NewGarbo
|
7d8e1b517d
|
Fixed dropped gold stacking...
|
2015-11-19 08:56:07 +00:00 |
|
NewGarbo
|
f262a22913
|
Fixed loot dropping in King of the Hill not dropping correct items/
|
2015-11-19 08:54:59 +00:00 |
|
NewGarbo
|
6372dfd629
|
fixed ArithmeticException / 0 in ClansEnergyTracker.
|
2015-11-19 08:29:50 +00:00 |
|
NewGarbo
|
0a667afeb1
|
finally fixed beds. major cleanup of code, much more organized now, thank you, Me!!!! oh my god both of my eyes are twitching
|
2015-11-18 22:27:01 +00:00 |
Sarah
|
d7d11e57e5
|
Merge pull request #76 in MIN/mineplex from william-global to master
* commit '4620a5a1626aaefb992ff62a14dc35ed9ae60a86':
Hub fix
testing excludes
|
2015-11-18 15:49:18 -06:00 |