5de59b6e0e
Hub UHC countdown basics
...
UHC MOTD timer stuff
2014-09-12 18:06:51 +10:00
b5152bd621
removed some redundant repeated color stuff
2014-09-12 11:59:32 +10:00
b507571403
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Database/.classpath
2014-09-12 11:49:18 +10:00
fba1d0e430
Required for merge
2014-09-12 11:48:32 +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
f5f9ba6bdf
Added .project and .classpath for Mineplex.Database
2014-09-11 17:10:24 -04:00
092e9ba479
Modified UHC borders for release
2014-09-11 17:44:57 +10:00
2791d54040
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-11 13:43:34 +10:00
56263718d7
Fix for BossBar
2014-09-11 13:17:57 +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
235cf8cae7
Fixed win stats on solo games
2014-09-09 02:18:20 -04:00
7bbb7ca545
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-09 10:53:03 +10:00
1943dbeaab
Removing PermissionsEx dependency for MapParser
2014-09-09 10:52:51 +10:00
b341089cfe
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-08 16:28:50 -04:00
90d88ebd0b
Fixed "The Longest Shot" achievement bug
2014-09-08 16:27:09 -04: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
aa77821c20
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-06 22:01:17 +10:00
f138a4108b
Deregister stat trackers from listener
2014-09-06 22:01:05 +10: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
a3545d074d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-06 10:58:23 +10:00
eb27c1dfbe
Add Util class for sending titles to players
2014-09-05 19:46:11 -05:00
1ea660df3a
Update craftbukkit with new patch file
2014-09-05 16:59:29 -05:00
c0e4539e53
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-05 14:38:28 -07:00
2f8b53f771
Fix for customer support server.
...
Fix for Boss bar junk.
Fix for Disguises.
2014-09-05 14:36:10 -07:00
0ad844d1b5
Merge remote-tracking branch 'origin/master'
2014-09-05 16:35:26 -05:00
b96ba09857
Update CraftBukkit to latest spigot changes. Includes title and tab packets
2014-09-05 16:35:00 -05:00
892b67beb2
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-05 21:43:33 +10: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
4064c5238c
bridges volcano fix
...
minestrike npe fix
2014-09-05 21:35:26 +10:00
3830ab8e0f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-05 06:06:13 -04:00
91a2266a04
Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking
2014-09-05 04:00:51 -04:00
4e94bcfd98
Block Hunt winners fix (team/solo)
2014-09-05 17:29:23 +10:00
abc95853f7
sulhpur bomb fix
2014-09-05 15:47:35 +10:00
8c1e0c3e9e
Fletcher data fix
...
Minestrike stuff
2014-09-05 15:45:14 +10:00
b691b1bad0
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-05 12:51:59 +10:00
f6ce9abed8
Minestrike
...
- added mixed slow/instant mode
- added accurate hitboxes for slow bullets
- added many new weapons
- removed speed from knife
- adjusted gun balance
2014-09-05 12:28:29 +10: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
aae46bdeda
Removed unused intellij module
2014-09-03 16:58:53 -04:00
74e012a811
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-03 16:54:41 -04:00
39b46bc8f5
Fixed some NPEs
2014-09-03 16:53:29 -04: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
21225d7b65
Minor Fixes
2014-09-03 15:09:14 +10:00
50140ef92d
Minestrike update
2014-09-03 14:49:38 +10:00
246f2e91d9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-03 12:38:57 +10:00
58f98881f2
Minestrike Update
2014-09-03 12:38:44 +10:00
1dec79c0fa
Minestrike update
2014-09-03 12:28:45 +10:00
4dbe7003b2
Update Arcade Icon in the game menu
2014-09-02 21:09:12 -05:00
8d06cddfb2
Remove Chiss' debug message for shop
2014-09-02 20:36:25 -05:00
9168de20da
Update PlayerConnection method to latest spigot (Fixes right click bug, caused from old spigot code)
2014-09-02 20:33:00 -05: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
d5766d62ae
nerf p90
2014-09-02 16:49:45 +10:00
449281501f
MineStrike Update
2014-09-02 16:49:15 +10:00
006c7d1e65
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-01 20:04:02 -07:00
a568631df8
Work on AccountAdministrator
2014-09-01 20:03:08 -07:00
5d6834633f
MineStrike update
2014-09-02 11:16:17 +10:00
df882012e5
When items are dropped in The Bridges, only the player that broke the block can pickup the item for 8 seconds. (Only applies to specific item types)
2014-09-01 15:38:07 -05:00
05623b7522
Initial MineStrike push
...
fixed frames being breakable in games
2014-09-01 21:37:39 +10:00
492b3cc0a4
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-01 17:57:17 +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
116c54352b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-30 20:49:46 +10:00
207de0e67a
fixed MAC kicking players on lillypads
2014-08-30 20:49:32 +10: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
2b333859d1
PUUSH
2014-08-30 19:24:04 +10:00
f58aca7990
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-30 19:07:55 +10:00
3767911718
updated game desc output
2014-08-30 19:07:43 +10: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
7696349187
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-30 16:34:10 +10:00
2c30cc3ef4
Implemented new servers flags
...
Removed OP from Admisn in HUB, gave them /gm command instead
2014-08-30 16:33:56 +10:00
b7baa1b2f4
Count disconnecting from the server as a loss
2014-08-30 02:30:07 -04:00
34f04ad4e3
Fixed Champions Assassination and Longshot achievements
2014-08-29 21:09:51 -04: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
fa56aa0843
Fixed regular players not able to join Beta servers.
2014-08-28 14:02:55 -07:00
5281558cdb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-28 14:01:49 -07: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
cc57ddf4bc
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-28 06:54:36 -04:00
bdef9acecd
Fixed DragonEscape win stat tracker
2014-08-28 00:53:54 -04:00
ec4cb91a1c
Poll changes
...
Achievement output double space fix
2014-08-28 11:50:09 +10:00
7829188c32
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-27 12:48:35 -07:00
526ca42add
Fixed Gem booster problem.
...
FIxed stat problem.
2014-08-27 12:48:24 -07:00
b67e127902
Merge remote-tracking branch 'origin/master'
2014-08-27 14:08:47 -05:00
573f71164f
Add a way to view poll statistics in game, load polls that aren't enabled for stat tracking
2014-08-27 14:07:22 -05: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
4e43a2ca73
Extended range of snake parkour, ensuring people tp back to it when they fall.
2014-08-27 15:19:08 +10:00
9439daa852
Fixed bug where spectators could trigger anti-cheat in bridges
2014-08-27 15:16:20 +10:00
d9ef5f50be
disabled minestrike
2014-08-27 14:23:31 +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
5ef2772abd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-26 20:27:51 -04:00
7d6572ff4d
Fixed SheepGame Selfish achievement
2014-08-26 20:27:39 -04:00
8e89dfa1ab
Merge remote-tracking branch 'origin/master'
2014-08-26 19:02:08 -05:00
8439838328
After years of research and experimenting, we settled on an achievement icon
2014-08-26 19:01:59 -05:00
f25f7d3aa2
Fixed 1v3 achievement not giving achievement if players quit (required 4 at END)
2014-08-27 09:52:33 +10:00
48ed5e2cba
Merge remote-tracking branch 'origin/master'
2014-08-26 18:39:10 -05:00
78eee68592
Change achievement icons, fix another typo
2014-08-26 18:39:01 -05:00
b508cd036c
Lazy fix so that polls award gems instead of coins
2014-08-26 18:36:40 -05:00
5540835052
removed micro debug
...
fixed a bug in achievement output
2014-08-27 09:09:06 +10:00
dbf441dd0d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-27 08:57:24 +10:00
f9ce0d353c
Achievements now need 75%+ players at START of game
2014-08-27 08:57:11 +10: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
d9e1f35985
Fixed BadHiderStatTracker and limited stat recording to when games are at least 75% full
2014-08-26 16:30:55 -04: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
17649ce36c
Fixed bug where desc for past-completed achievements was still showing
2014-08-26 21:51:59 +10:00
99951bc573
Fix achievement typos
2014-08-26 04:20:33 -05:00
5fdf466722
Fixed bug in server monitor.
...
re-enabled animal spawn in hub.
2014-08-26 02:02:31 -07: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
3eae26ef80
Updated Achievement Output
2014-08-26 18:03:29 +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
7e7906865f
Fixed some stats being added after send-off
2014-08-26 17:45:35 +10: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
86930de23e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/AssistsStatTracker.java
2014-08-26 08:19:50 +10:00
07ee44508e
Missing Gadgets
2014-08-26 08:17:41 +10:00
933d32d8f8
Fixed team death/kills stats
2014-08-25 18:06:50 -04:00
9acc7d8496
Added team kill and death achievement trackers
2014-08-25 17:43:49 -04:00
4ce537a3a7
Fixed some NPEs and achievement bugs
2014-08-25 16:27:02 -04: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
7669998ad3
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-25 08:38:29 +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
23f6d0ae1a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-24 16:46:00 +10:00
3f5cff3e21
Killing cheaters for a few things in bridges
2014-08-24 16:45:47 +10:00
c89461628b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-23 16:00:26 -04:00
fb90336d4e
Finished stats/achievements
2014-08-23 16:00:15 -04:00
642f8b46b9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-23 18:01:35 +10:00
7348a26951
fixed damage dealt npe
2014-08-23 18:00:23 +10:00
af9bf0727a
Fixed damage taken stat NPE
...
Added tournament team auto-rejoin
2014-08-23 17:55:28 +10:00
70beb58bd6
Enabled debugging in Hub/Arcade
2014-08-23 01:49:48 -05: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
3a47a161c5
Enabled snake parkour
...
Updated servermanager/serverNpcPage to handle free and beta timers.
2014-08-22 22:53:15 -05:00
4afafe2d51
Some stats fixes
2014-08-22 21:54:08 -04: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
e40cb17e47
Updated tutorial locations
2014-08-23 08:52:50 +10:00
e5944ff872
Spawn location fix
2014-08-23 08:40:02 +10:00
340be68ef8
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-23 08:39:39 +10:00
9fad775f73
More cosmetics
2014-08-23 07:50:07 +10:00
b2b208bdba
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-22 17:30:08 -04:00
02bb53578a
Registered stat listeners with each game
2014-08-22 17:20:02 -04: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
97c087a28d
Allowed commands to specify specific ranks
...
allowed youtube/build to start/set games
2014-08-22 17:05:14 +10:00
591b5c026c
Almost all achievements done
2014-08-21 18:55:40 -04:00
5e47a12531
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-21 15:56:02 -05:00
99d15d3ece
Work on Customer support server.
2014-08-21 15:55:09 -05:00
Chiss
CoderTim
Shaun Bennett
Shaun Bennett
Jonathan Williams