Cheese
|
f668ae6082
|
ms smoke
|
2015-11-25 17:49:18 +11:00 |
|
Cheese
|
360f3db2ed
|
fixed grenade vertical rebound bug
|
2015-11-25 17:48:32 +11:00 |
|
Cheese
|
8ceb6ccfca
|
minestrike update!
|
2015-11-25 17:41:00 +11:00 |
|
NewGarbo
|
7e9dc7968e
|
gear gui fixes and legendaries changes
|
2015-11-25 01:32:05 +00:00 |
|
NewGarbo
|
bbdbb209c5
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-25 00:55:37 +00:00 |
|
NewGarbo
|
3a6dab7224
|
stuff
|
2015-11-25 00:55:11 +00:00 |
|
NewGarbo
|
3cb22c8cb7
|
uuid bug fixed finally!
|
2015-11-25 00:47:35 +00:00 |
|
libraryaddict
|
ecf42803f9
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
|
2015-11-25 13:42:31 +13:00 |
|
libraryaddict
|
ca81265b9e
|
Readded PacketHandler debug message
|
2015-11-25 13:42:11 +13:00 |
|
NewGarbo
|
aa52c1be27
|
custom item stuff
|
2015-11-25 00:14:34 +00:00 |
|
NewGarbo
|
6220ce14fe
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-24 23:04:24 +00:00 |
|
NewGarbo
|
98edd0a452
|
dissallow chests, doors, furnaces, etc. from being accessed in territories that are not yours
|
2015-11-24 23:03:19 +00:00 |
|
NewGarbo
|
81c2d2a11f
|
*just pushing my current changes so that i can start fresh on recoding custom item serialization stuff*
|
2015-11-24 22:49:28 +00:00 |
|
NewGarbo
|
31afe9f886
|
removed debug message from undead camp
|
2015-11-24 22:29:20 +00:00 |
|
Shaun Bennett
|
57302221df
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-24 17:27:46 -05:00 |
|
Shaun Bennett
|
cb7422b4fe
|
Re-enable world events
|
2015-11-24 17:27:35 -05:00 |
|
NewGarbo
|
befe4d129d
|
formatted PlayerGear.java (to avoid further confusion)
|
2015-11-24 22:21:01 +00:00 |
|
NewGarbo
|
459e1beeff
|
clans buggy fixers
|
2015-11-24 22:18:48 +00: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 |
|
Cheese
|
d66bad572f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-24 22:19:59 +11:00 |
|
libraryaddict
|
5799edae50
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-11-24 23:45:42 +13:00 |
|
libraryaddict
|
ddf7528796
|
Updated CB
|
2015-11-24 23:45:22 +13:00 |
|
Cheese
|
837be048a6
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-24 21:38:47 +11:00 |
|
Jonathan Williams
|
f8d8b75586
|
Changed how timings is used.
|
2015-11-24 04:36:18 -06:00 |
|
Cheese
|
7e2f5f0657
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-24 21:30:45 +11:00 |
|
Cheese
|
11a60a86a9
|
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
|
2015-11-24 21:30:17 +11:00 |
|
Jonathan Williams
|
fbea0e702b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-24 02:56:40 -06:00 |
|
Cheese
|
c5b5d07627
|
evade timing
|
2015-11-24 16:07:11 +11:00 |
|
Cheese
|
913d079623
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-24 15:23:53 +11:00 |
|
Cheese
|
7454cf7443
|
MS + Champs bugs, balance and more
|
2015-11-24 15:23:37 +11:00 |
|
fooify
|
f8401e0eeb
|
fixed shield smash and fissure affecting spectators
|
2015-11-23 17:08:24 -08:00 |
|
fooify
|
f300fd2c98
|
Merge remote-tracking branch 'origin/master' into foo
|
2015-11-23 15:34:27 -08:00 |
|
NewGarbo
|
8559a63887
|
Added all rank names to Clans name blacklist
|
2015-11-23 22:10:29 +00:00 |
|
NewGarbo
|
3fa0beceb7
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-23 21:39:53 +00:00 |
|
Shaun Bennett
|
ef7c26c04c
|
Clans changes
|
2015-11-23 15:57:13 -05:00 |
|
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 |
|
Sarah
|
66598ce97e
|
adding teleport flag.
|
2015-11-23 16:16:33 +01: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 |
|