fed3d31374
MineStrike fixes
2014-09-18 15:44:48 +10:00
6c4479298d
Fix RewardManager bug, fooling around with animations
2014-09-18 00:41:56 -05:00
9d0b99b7fc
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
2014-09-17 23:56:42 -05:00
09a3cc16b0
Reward stuffs
2014-09-18 14:36:22 +10:00
bb8e481c7f
More Reward stuff
2014-09-18 14:25:39 +10:00
c625fb4121
Restructured rewards for Post-Game rewards
2014-09-18 13:21:30 +10:00
33d33f84b4
More treasure animation touches + fixes
2014-09-17 15:22:54 -05:00
da680359d0
Change formatting of treasure announcements
2014-09-17 14:50:34 -05:00
90e402bf69
Fix menu slots
2014-09-17 14:43:58 -05:00
0139e40957
Re-enable Coin Party Bomb reward for rare treasures
2014-09-17 14:35:43 -05:00
cc5db5939d
Add Music and Costume pages to cosmetic menu
2014-09-17 14:34:57 -05:00
8780d5e4ee
MS fixes
2014-09-17 11:18:59 +10:00
16214613fe
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-17 08:59:23 +10:00
e6797582f9
Minor fixes
2014-09-17 08:59:09 +10:00
50fa8b02f1
Use explosion particles instead of createExplosion
2014-09-16 17:57:34 -05:00
918a817283
More treasure bug fixes and animation touches
2014-09-16 15:04:42 -05:00
d5313540d7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-15 23:32:04 -04:00
c5ff9da552
Record basic game stats (game type, timestamp, duration, winners, losers)
2014-09-15 23:31:53 -04:00
5b77fa09a4
Merge remote-tracking branch 'origin/master'
2014-09-15 19:37:28 -05:00
1b416d3e6f
Added database tables to record basic game stats
2014-09-15 16:36:59 -04:00
63b3621ae3
Fix treasure open chest bug, added some animation touches
2014-09-15 13:34:21 -05:00
abea4223ab
Recommit up-time checking to prevent brand new empty servers from being prematurely killed by ServerMonitor.
2014-09-15 13:22:11 -04:00
7c18e89249
Send chest open packets for new players that join in the middle of a treasure
2014-09-15 10:37:40 -05:00
c7e0ebefd1
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-13 20:52:13 -10:00
a395cae764
Fixes for Custom tag
...
Fix for Bridge time
Fix for tournament auto whitelist.
Added UI stuf for tourney
Added build files for arcade.
2014-09-13 20:50:27 -10:00
c1bc9fca2e
Small treasure tweaks
2014-09-14 00:29:30 -05:00
fc44592edf
Merge remote-tracking branch 'origin/master'
2014-09-13 23:07:21 -05:00
228cca4805
fix bug with reward amounts
2014-09-13 23:07:15 -05:00
7ad7dd939d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-12 22:00:18 -10:00
1c3326333d
Fix for crash.
2014-09-12 21:59:12 -10:00
4f5430e390
Added tournament stuff.
2014-09-12 21:52:44 -10:00
e31ab1b37a
disabled treasure again!
2014-09-13 16:44:51 +10:00
054709a859
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
2014-09-13 16:44:11 +10:00
31c4a95da5
Disabled Treasure Chests
2014-09-13 16:43:18 +10:00
1e7ed8d491
Treasure rewards + some minor fixes
2014-09-13 01:25:14 -05:00
a196e43fde
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
2014-09-12 19:46:19 -10:00
0afb0f061c
Changes to fireworks animation
2014-09-12 23:43:38 -05:00
aafdc555b1
Oops, accidentally removed some code!
2014-09-12 23:41:50 -05:00
0f44850367
Treasure stuff
2014-09-12 23:30:00 -05:00
5e9cbcef75
Merge remote-tracking branch 'origin/master'
2014-09-12 23:15:58 -05:00
71f42c6e7b
Treasure updates
2014-09-12 23:15:53 -05:00
a31e20d709
treasure styles
2014-09-13 14:09:50 +10:00
4454627b32
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-13 13:41:48 +10:00
e511df4605
Merge treasure
2014-09-13 13:41:37 +10:00
fc6a2633c9
Remove debug message, make sure player is far enough from spawn to open treasure
2014-09-12 22:41:10 -05:00
a8eeef02dd
Adjustments to how treasure rewards are selected
2014-09-12 22:33:22 -05:00
14c4152248
Fixed CustomTagFix.
...
Updated ServerData ServerGroup and SErverMonitor for new flags in Arcade.
2014-09-12 10:03:33 -10:00
20680acea0
More treasure rewards + tweaks
2014-09-12 14:24:30 -05:00
dea6c98fc9
Merge remote-tracking branch 'origin/master'
2014-09-12 14:08:22 -05:00
4ea786a1a5
Fix fireworks for 1.8 client, a bunch more treasure stuff
2014-09-12 14:08:10 -05:00
5de59b6e0e
Hub UHC countdown basics
...
UHC MOTD timer stuff
2014-09-12 18:06:51 +10:00
0dff0412d1
Fixed game flag for not allowing inventory opens
...
Removed some redundant flags in game
Lots of MineStrike updates
Fixed NPE in WinWithoutLosingTeammateStatTracker
2014-09-12 11:47:39 +10:00
b910c5098c
Cross version Holograms (Alignment might be a tad off)
...
A bunch of stuff for Treasure Chests
2014-09-10 12:16:31 -05:00
32bbecd01a
Merge remote-tracking branch 'origin/master'
2014-09-09 19:27:16 -05:00
c4ad00bef1
add armor stand hologram, just to send code to laptop
2014-09-09 19:27:05 -05:00
652075138e
More treasure rewards work
2014-09-08 13:26:18 -05:00
347e2b1bf5
Changed FIRE items to Blaze Powder
2014-09-08 10:14:55 +10:00
3e5b827a7f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-07 18:10:31 -04:00
201782a7cd
Added leaderboard.php
2014-09-07 18:09:46 -04:00
6441b110b4
Treasure stuff from laptop
2014-09-07 13:35:49 -05:00
558231457c
Fixed disguises leaving extra tags
...
Fixed memory problem in Arcade.
2014-09-06 03:39:20 -07:00
86d063dafb
Merge remote-tracking branch 'origin/master'
2014-09-06 01:07:49 -05:00
15b46e8f96
Fix displaying on stats on achievement gui
2014-09-06 01:07:40 -05:00
644d3da050
JOOQ for Eclipse
2014-09-06 11:31:55 +10:00
eb27c1dfbe
Add Util class for sending titles to players
2014-09-05 19:46:11 -05:00
2f8b53f771
Fix for customer support server.
...
Fix for Boss bar junk.
Fix for Disguises.
2014-09-05 14:36:10 -07:00
d01529a344
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2014-09-05 04:38:23 -07:00
1c6790b611
Fixed for DisguiseManager
...
Rewrote packet handling
Fixed up CustomTagFix
Removed swapping kits in Block Hunt
Removed Stacked entities for 1.8 players.
2014-09-05 04:36:01 -07:00
91a2266a04
Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking
2014-09-05 04:00:51 -04:00
b28fc8ee6b
Added custom name tag fix for mobs for 1.8 players
...
Worked on boss bar display.
Bug with <=50% hp.
2014-09-04 11:33:51 -07:00
e7f79aa5bf
Update IntelliJ files for latest changes
2014-09-03 11:42:50 -05:00
92191dc19a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R4/PlayerConnection.java
2014-09-03 03:47:15 -07:00
a4871b5509
Updated to latest spigot with 1.8 support.
...
Tweaked disguise manager for 1.8 support.
Work on CUstomer support server + admin stuff.
2014-09-03 03:46:24 -07:00
08e6b73b1f
Disable Treasure stuff for now
2014-09-02 19:04:43 -05:00
2b3f6c9dbc
Prevent minecart mounts from being broken by others
2014-09-02 19:03:14 -05:00
2d5c676e1b
Merge remote-tracking branch 'origin/master'
2014-09-02 18:57:35 -05:00
4ad034b8d9
more treasure stuff, really basic holograms
2014-09-02 18:33:40 -05:00
05623b7522
Initial MineStrike push
...
fixed frames being breakable in games
2014-09-01 21:37:39 +10:00
8198bb31c8
Added sneaking to player disguise.
...
Did work on DDoSProtectionSwitcher
Work on AccountAdministrator to fix rank issues.
2014-09-01 00:56:32 -07:00
5905ef5ef7
Treasure Stuff
2014-08-30 14:27:11 -05:00
c8bc697888
Fixed mounts and gadgets for rank messages...no Purchase.
2014-08-30 02:37:27 -07:00
f6dcebc3dc
Fixed extra spacing in cosmetic menu.
2014-08-30 02:33:37 -07:00
72aa05f73e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-30 02:26:16 -07:00
829736ed07
Fixed purchase info.
2014-08-30 02:26:07 -07:00
e52f6deab4
Merge remote-tracking branch 'origin/master'
2014-08-30 04:24:34 -05:00
6a58b86a19
Don't display wins and losses to other players on Achievement Gui
2014-08-30 04:24:25 -05:00
b07670f6af
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-30 02:04:32 -07:00
1bd0209b39
Added multi-server tags for npcs
...
Fixed Customer support packages.
Fixed Account rank expire for Hero
Added SNR mod to update Rank
Changed SNR mod color to gray.
2014-08-30 02:04:04 -07:00
41daba98c4
Background work for Minestrike
...
Admins no longer have OP in hubs. They have /gm command to gamemode.
2014-08-29 18:21:08 +10:00
1f6b9374eb
disable le minestrike
2014-08-29 11:55:06 +10:00
c3bb0ddbcb
Chest example gadget for shauny
2014-08-29 11:00:16 +10:00
409e2c6141
Tweaked menus for quick game, Cosmetic menu.
...
Removed debug for Hub
Output a little debug info in LobbyBalancer
Added duplicate check to ServerMonitor
updated Customer SUpport server to have changeable password, added logging of command executors, added lifetime perks for hero/ultra
2014-08-28 14:01:37 -07:00
526ca42add
Fixed Gem booster problem.
...
FIxed stat problem.
2014-08-27 12:48:24 -07:00
311711f2f0
Disabled fireworks for non-gadget enderpearls.
2014-08-27 15:24:10 +10:00
9cde497a5c
Fixed ethereal pearl text
2014-08-27 15:20:55 +10:00
9439daa852
Fixed bug where spectators could trigger anti-cheat in bridges
2014-08-27 15:16:20 +10:00
596bcbfae6
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-27 14:23:01 +10:00
da5f953212
Fixed BlockMorph leaving blocks behind when player was teleported.
2014-08-27 14:22:35 +10:00
8439838328
After years of research and experimenting, we settled on an achievement icon
2014-08-26 19:01:59 -05:00
78eee68592
Change achievement icons, fix another typo
2014-08-26 18:39:01 -05:00
c04319345a
Merge remote-tracking branch 'origin/master'
2014-08-26 17:41:07 -05:00
507d356346
Fix last achievement typo
2014-08-26 17:40:58 -05:00
232785a7dd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-26 04:56:34 -07:00
417d398195
Swapped Morph and Pet active slot.
...
Fixed a couple things on Staff server.
2014-08-26 04:56:23 -07:00
99951bc573
Fix achievement typos
2014-08-26 04:20:33 -05:00
064b0e8b36
Removed sheep mount and fixed up server monitor.
2014-08-26 01:31:57 -07:00
81e92c0e8e
changed wording in achi GUI
2014-08-26 18:24:20 +10:00
6f1204c844
Set gem reward for all achievements
2014-08-26 18:20:33 +10:00
ab29a5fa29
Fixed text output in Achi GUI for completed
2014-08-26 18:06:01 +10:00
d62b59776f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-26 17:54:50 +10:00
116fe496a8
Changed post game achievement output
...
Added Reward to Achi GUI
2014-08-26 17:53:54 +10:00
7a8ab5c96a
Comment for weirdness.
2014-08-26 00:53:41 -07:00
a4cf9e2f4b
Fixed stat bugs.
2014-08-26 00:52:51 -07:00
526b5c333a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-26 00:34:00 -07:00
137b8692e4
Added Gem booster use.
2014-08-26 00:33:48 -07:00
0546c9e175
Fixed so only Supply drop chests trigger achievement
2014-08-26 17:33:23 +10:00
1b15a57fc8
Added Gem Rewards for Achievements
2014-08-26 17:10:20 +10:00
162a86d4b2
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/CosmeticShop.java
2014-08-25 23:58:54 -07:00
b8b6c031cd
Re-did and added a game to the quick game menu.
...
Fixed npc triggers with non npcs named the same.
Fixed naming pet longer than 16 chars.
Added sugar cane to restricted block type for paintball gun
Properly hooked in gadget block event for paitnball gun.
Added auto purchase page on item gadget ammo empty.
Added check on rank for customer support command.
Fixed ConcurrentModificationException problem with spigot.
2014-08-25 23:56:58 -07:00
95e7517a9e
disabled debug cmd for rave suit
2014-08-26 16:17:38 +10:00
8fc6013ff3
Disabled Chest GUI
2014-08-26 16:12:01 +10:00
dd61077850
Added missing Achievements
2014-08-26 14:46:10 +10:00
1b3e32ca26
Added Arcade Achievements
2014-08-26 14:42:17 +10:00
f0e01aa257
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-26 13:42:54 +10:00
28d523d696
Added Achievements
2014-08-26 13:42:42 +10:00
905d4db6f1
Use emerald instead of bed
2014-08-25 21:32:30 -05:00
2e0b074053
More achievement gui changes
2014-08-25 20:56:21 -05:00
07ee44508e
Missing Gadgets
2014-08-26 08:17:41 +10:00
0e3cf67402
Some new cosmetics
2014-08-25 12:59:29 +10:00
13eb3da0fa
Achievment gui changes
2014-08-25 09:26:01 +10:00
ff441f2262
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2014-08-24 16:14:29 -05:00
2cb87b23e6
Stat Gui, Start of Treasure Gui (disabled)
2014-08-24 16:08:19 -05:00
642f8b46b9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-23 18:01:35 +10:00
af9bf0727a
Fixed damage taken stat NPE
...
Added tournament team auto-rejoin
2014-08-23 17:55:28 +10:00
fd0c4745f8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-23 00:40:17 -05:00
931cb5ece8
Removed MineKart code.
...
Fixed up DisguisePlayer
Added ProfileLoader
Fixed up Notch gadget.
2014-08-23 00:40:07 -05:00
0700b9df12
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-23 15:04:55 +10:00
3ec43f90e8
GameAchievementManager now utilises TaskManager to record whether or not people have previously completed Achievements
2014-08-23 15:04:43 +10:00
a84468157c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-22 18:21:38 -05:00
ebb4c44bdc
Tweaked player disguise.
2014-08-22 18:21:23 -05:00
9fad775f73
More cosmetics
2014-08-23 07:50:07 +10:00
11597285b8
Changed so it music will never be 'active'.
2014-08-23 05:36:57 +10:00
2e031f1e4a
Added Music Gadget
2014-08-23 05:35:07 +10:00
b67b2f04b7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-22 13:32:50 -05:00
13b90e1142
Preliminary work on help desk integration with Customer Support server.
...
Updated DisguiseSheep with values from craftbukkit.jar
2014-08-22 13:32:22 -05:00
a159f04d50
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-23 04:30:52 +10:00
231ef2bbe1
Cosmetic Update
2014-08-23 04:30:41 +10:00
83b3e49151
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-22 10:48:27 -05:00
70217fe957
Finished first release of Customer Support plugin.
2014-08-22 10:47:46 -05:00
0022586e3e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-22 17:08:29 +10:00
Chiss
Shaun Bennett
CoderTim
MrTwiggy
Jonathan Williams
Shaun Bennett