Shaun Bennett
523378aae7
Clans War updates
2015-10-17 22:55:21 -04:00
Shaun Bennett
589c05f8c0
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
2015-10-16 14:25:31 -04:00
Ty Sayers
590b8e4d25
Merge pull request #69 in MIN/mineplex from clans_custom_gear to clans-beta
...
* commit '36050b41bccf1fac5f5631c84db6fee37b02bc48':
Fix bug where players could retrieve teleport items out of the Travel Hub shop and later use them in their inventory. Implement a safe zone region of one chunk around all administrative clans (excluding Wilderness), to prevent players from building/claiming next to admin clans. Disable pistons throughout the server to prevent griefing. Fix left-over merge issue with donation manager.
2015-10-14 15:09:50 -05:00
Ty Sayers
36050b41bc
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-10-14 16:08:22 -04:00
Ty Sayers
98ec99cffc
Fix bug where players could retrieve teleport items out of the Travel Hub shop and later use them in their inventory. Implement a safe zone region of one chunk around all administrative clans (excluding Wilderness), to prevent players from building/claiming next to admin clans. Disable pistons throughout the server to prevent griefing. Fix left-over merge issue with donation manager.
2015-10-14 16:06:34 -04:00
Shaun Bennett
f683e932ae
Clans merge fixes
2015-10-13 22:24:15 -04:00
Shaun Bennett
88709f85b6
Merge with master
2015-10-13 18:13:01 -04:00
Shaun Bennett
cb0d82174e
Apply botspam to chat messages as well
2015-10-13 17:41:25 -04:00
Jonathan Williams
a292fdb3c5
Added failsafe for ServerMonitor.
2015-10-12 22:26:24 -05:00
Shaun Bennett
1aecc9505c
Add region to titan, new MOTD
2015-10-12 01:30:31 -04:00
Jonathan Williams
e6485a9009
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-10 23:02:36 -06:00
Jonathan Williams
5866e0cce6
Reducing max connections for the DBPool to 3.
2015-10-10 23:02:08 -06:00
Cheese
f23bf18928
adhering to mysts OCD
2015-10-11 14:50:57 +11:00
Cheese
f3e2f3c145
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-11 14:48:17 +11:00
Cheese
cb9e8f8e0b
pumpkin smasher achievement
2015-10-11 14:48:02 +11:00
Jonathan Williams
998d5f6984
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-10 21:25:29 -06:00
Jonathan Williams
061a7b7c73
Fixed Pet FK errors.
...
Added SUPPORT to acceptable updateRank command.
2015-10-10 21:24:47 -06:00
Cheese
8b75664627
queued holiday transactions
2015-10-11 12:54:35 +11:00
Cheese
6860fa608a
titan placeholder perks
...
art
fixed pumpkin gem count
2015-10-11 11:26:09 +11:00
Cheese
da6b1316d3
removed pumpkins from MPS
2015-10-10 22:47:19 +11:00
Cheese
323842c693
fixed mods staying in flight
2015-10-10 19:36:38 +11:00
Cheese
6f14c75f70
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-10 19:28:26 +11:00
Cheese
6cf786eb8c
Merge branch 'Myst_HALLOWEEN'
2015-10-10 19:28:08 +11:00
Cheese
1026a2ae22
fixed explosions
2015-10-10 19:27:54 +11:00
Shaun Bennett
a242c6b592
Halloween Update finishes
2015-10-10 03:23:37 -04:00
Cheese
e9207acd7f
Merge branch 'alex-halloween'
2015-10-10 17:38:09 +11:00
Cheese
7bc3b4970b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java
2015-10-10 17:34:17 +11:00
AlexTheCoder
67a1f4ce8d
Titan Giveaway:
...
- Added Titan pumpkin animation
Titan Perks (For later, Removed from Menu):
- Added Kronos Particle
2015-10-10 02:31:52 -04:00
Mysticate
930cfa5cb8
DONE
2015-10-10 02:30:11 -04:00
Shaun Bennett
f1e9acbb58
Titan giveaway
2015-10-10 02:19:05 -04:00
Mysticate
245a42c8e0
animation is sexi
2015-10-10 02:13:04 -04:00
Mysticate
30a9196430
Done with animation.
2015-10-10 01:43:31 -04:00
Mysticate
9a7357e484
Work
2015-10-10 01:00:49 -04:00
Shaun Bennett
36fabf93b6
Merge remote-tracking branch 'origin/master'
2015-10-09 23:14:13 -04:00
Shaun Bennett
bc7bf8a2e2
fixes/debug
2015-10-09 23:13:39 -04:00
Jonathan Williams
512e08af19
Removed all create table statements.
2015-10-09 21:02:35 -06:00
Mysticate
1127764cc3
Secsi
2015-10-09 22:44:49 -04:00
Mysticate
7851cb451a
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
2015-10-09 22:34:05 -04:00
Shaun Bennett
aa9fd1abf3
Titan giveaway work
2015-10-09 22:14:10 -04:00
Mysticate
90c685617d
Animation
2015-10-09 22:14:01 -04:00
Peter Miller
611fb88f15
Commented out unnecessary table creation statements (tables already exist in database and these statements are causing database lag under high player load).
2015-10-09 20:40:50 -04:00
Cheese
ed89f5f4cc
anim example for myst
2015-10-10 10:46:12 +11:00
Cheese
43f38c18ee
animation
2015-10-10 10:40:44 +11:00
Cheese
d99c64e45d
fixed merge error
2015-10-10 10:37:20 +11:00
Cheese
02c6eccfda
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
2015-10-10 10:36:42 +11:00
Cheese
7dbd9da582
dragon sale Bar
2015-10-10 10:35:48 +11:00
Shaun Bennett
ba36ff565d
Merge remote-tracking branch 'origin/master'
2015-10-09 18:23:55 -04:00
Shaun Bennett
97ef4a4252
Pushing titan giveaway stuff for laptop
2015-10-09 18:23:47 -04:00
Jonathan Williams
586cc6e3e0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-09 09:40:58 -06:00
Mysticate
ff1431b652
Fixed players glitching to chests before game starts.
2015-10-09 10:21:35 -04:00
