JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,854 Commits 1 Branch 0 Tags 481 MiB
e4eb286225
Commit Graph

1825 Commits

Author SHA1 Message Date
Chiss
f1ba5947a4 Some more wither updates 2014-11-21 16:32:12 +11:00
Chiss
0d78433bd2 updated mapparser 
buffed withers a little
 2014-11-21 10:36:41 +11:00
Chiss
7a8759dfba updated disguisemanager so it uses player arg 
fixed invisibility bug on disguises for specific players
updated champs skills
made some hard achievements a bit easier
 2014-11-21 09:42:05 +11:00
Chiss
972911fe05 set achievement skills 2014-11-20 18:01:46 +11:00
Jonathan Williams
d1a4080cbd Added GUI support for achievement skills. 2014-11-19 22:47:10 -08:00
Chiss
450cc9ada2 Champions achievement update 
Wither update
 2014-11-20 17:21:22 +11:00
Chiss
4961b55986 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-18 16:43:53 +11:00
Chiss
f5022ecf16 Fixed dupe glitch (all games) 
Some champions skill fixes
created GameSpectatorManager to handle spec stuffz
 2014-11-18 16:43:39 +11:00
Shaun Bennett
e99a3f6544 Merge remote-tracking branch 'origin/master' 2014-11-17 18:19:06 -06:00
Shaun Bennett
f071d2e727 Fix for TNT explosion in Bridges 2014-11-17 18:09:58 -06:00
Chiss
cd890e6c6c disabled spec menu in minestrike - fixes shop bug. 2014-11-16 14:40:50 +11:00
Chiss
4c3610c3ac fixed DMT silence 2014-11-16 10:46:26 +11:00
Chiss
454deb03db fixed SG crash bug 2014-11-16 09:31:03 +11:00
Chiss
057594205e Only closing CREATIVE Inv for non-ops. 2014-11-15 22:40:56 +11:00
Chiss
ca58f11174 specs should be able to view stats now 2014-11-15 22:32:00 +11:00
Chiss
fb70b76d29 FINGERS CROSSED 2014-11-15 22:29:53 +11:00
Shaun Bennett
d16896e493 Merge remote-tracking branch 'origin/master' 2014-11-15 05:04:57 -06:00
Shaun Bennett
1ca23390cc Fix my derp 2014-11-15 05:04:48 -06:00
Chiss
41b6296788 Wither no longer shoots in pregame lobby 2014-11-15 20:16:18 +11:00
Chiss
51bc53262d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-15 19:32:08 +11:00
Chiss
ca4eec20ed Wither Assault update 2014-11-15 19:31:56 +11:00
Shaun Bennett
521b1e5f3b Merge remote-tracking branch 'origin/master' 2014-11-13 21:54:15 -06:00
Chiss
8ab0116a27 initial push of Wither Assault 2014-11-14 14:14:31 +11:00
Shaun Bennett
223bc2d0c0 Remove some debug messages that we no longer need 2014-11-13 19:34:55 -06:00
Shaun Bennett
6038c72e86 Add cleaner page for when there is only 1 team 2014-11-13 19:33:39 -06:00
Shaun Bennett
ea8b8dca15 Disable spectator menu for castle siege and uhc until I work out a better way to show that many players 2014-11-13 19:18:28 -06:00
Shaun Bennett
af31f4cd42 Add Tab handling for MultiCommandBase and "game set" command 2014-11-13 18:22:00 -06:00
Shaun Bennett
48c09aa311 Making spectator gui look better 2014-11-13 18:05:28 -06:00
Shaun Bennett
eb4b451e12 Fixing some spectator gui bugs 2014-11-13 16:41:42 -06:00
Shaun Bennett
8b73b89a17 Merging spectator gui with main branch 2014-11-13 16:03:14 -06:00
Chiss
112f76a29a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-13 18:10:10 +11:00
Chiss
9eaacd20ab fixed slime healing 
fixed sheep quest brute not dropping sheep
updated punish page
 2014-11-13 18:09:54 +11:00
CoderTim
09ca2234c4 Fixed survival games death match bug: https://trello.com/c/jNGSUUGI 2014-11-13 01:49:14 -05:00
CoderTim
7667aa25a8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-13 00:26:53 -05:00
Jonathan Williams
7cad40044a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
	Plugins/Mineplex.Core/src/mineplex/core/report/ReportPlugin.java
 2014-11-12 19:36:00 -08:00
Jonathan Williams
1372f74921 Refactored some names in MiniPlugin 
Work on clans.
 2014-11-12 19:21:12 -08:00
CoderTim
d363637015 Achievement bug fixes 2014-11-12 20:56:57 -05:00
Chiss
71a93bead5 Updated punish to be even less confuse. 2014-11-12 09:49:03 +11:00
Chiss
debf8ebcba fixed chat not being unsilenced when someone picks word 2014-11-11 18:52:00 +11:00
Chiss
c37026e4df SSM Dom changes 2014-11-11 18:36:32 +11:00
Chiss
a1eff92bbb fixed achievement kit for sneaky not being accessible 2014-11-11 12:25:36 +11:00
Chiss
d2301337d2 fixed non-charged block toss not having any velocity. 2014-11-10 19:28:36 +11:00
Chiss
d362fb3b1c fixed punish error 2014-11-10 19:15:56 +11:00
Chiss
0252db5a05 Punish simplification update 2014-11-10 18:40:39 +11:00
Chiss
d6ade5a15b ensured that exp cannot be given multiple times for a game 2014-11-09 14:43:06 +11:00
Chiss
b65d2f491e exp gives less for losing 2014-11-09 10:33:50 +11:00
Chiss
2a04ed6eda losing games no longer gives exp 2014-11-09 10:30:26 +11:00
Chiss
ad933400b9 Sheep Quest update 
lowered exp on loss
removed Participation exp
 2014-11-09 10:06:04 +11:00
Chiss
7e26def6a1 centralised SneakyAssassins module cleanup 2014-11-08 18:40:23 +11:00
Chiss
5ce38c3030 removed final from npcManager 2014-11-08 18:37:18 +11:00
Chiss
c0ec9f92fc nulled reference too, just to be safe :D 2014-11-08 18:36:05 +11:00
Chiss
2b0befdc13 fixed listener leak in SneakyAssassins 2014-11-08 18:35:34 +11:00
Chiss
fc2bba7eeb reverted idlemanager stuff for dmt(had already made talking in chat count as action) 2014-11-08 11:08:13 +11:00
Chiss
8c74022996 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-08 11:04:06 +11:00
Chiss
601c1912f5 may have fixed sheep teams not working. 2014-11-08 11:03:53 +11:00
CoderTim
80226a20fa Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 18:55:20 -05:00
CoderTim
4c98d833e0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 18:33:46 -05:00
Chiss
e286bec777 added a little msg for people in UHC, informing that it will start soon 2014-11-08 10:30:32 +11:00
CoderTim
5b1a185a5f Fixed Bad Hider achievement 2014-11-07 18:28:28 -05:00
CoderTim
ae35e82e22 Disabled AFK kick in Draw My Thing 2014-11-07 18:28:06 -05:00
Chiss
75c07588a5 UHC wont start for 2 minutes after creation 2014-11-08 10:22:23 +11:00
Chiss
c61ad8907a set minimum MP level for staff 2014-11-08 09:15:27 +11:00
Chiss
5da0c53997 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-08 08:56:52 +11:00
Chiss
e773d44564 limited max exp so UHC doesnt give you a billion exp. 2014-11-08 08:56:30 +11:00
Jonathan Williams
4ac70281d4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 13:54:22 -08:00
Jonathan Williams
3309c0406b Added ∞ for admin/owners as player level. 
Fixed customer support issue where it wasn't totaling coins correctly.
Fixed Recharge memory leak.
 2014-11-07 13:54:11 -08:00
Chiss
bd730b1e5a Fixed OITQ not giving wins. 
Added silence during word selection in DMT
 2014-11-08 08:46:26 +11:00
Chiss
c64e4e3b5f fixed winners/losers for death tag. 2014-11-07 23:35:43 +11:00
Chiss
908a8506a7 fixed broken OITQ kit 2014-11-07 23:21:30 +11:00
Chiss
519e63a1c1 re-unlocked kits for single game ultra chaps. 2014-11-07 23:10:33 +11:00
Chiss
c93862f299 updated player level 
added /givestat command for owners (must use full string; Global.ExpEarned)
 2014-11-07 22:10:41 +11:00
Chiss
9c80103d6e completely disabled gamehost manager (double safe) 2014-11-07 21:32:44 +11:00
Jonathan Williams
2c098e531a Added error catching for arcade configuration. 2014-11-07 02:14:34 -08:00
Chiss
fadaa59526 added mineplex level 
removed ability to go into negative gems as villager morph
 2014-11-07 19:20:15 +11:00
Chiss
6ded835ba4 MAC will no longer false positive on people standing blocks from block morph. 2014-11-07 14:14:43 +11:00
Chiss
a67842b504 returned hub to normal 
removed flaming pumpkins from arcade
 2014-11-07 12:54:38 +11:00
Chiss
b7ce12165e game host stuff 2014-11-07 12:14:33 +11:00
Chiss
4c675cca9c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2014-11-07 11:54:14 +11:00
Chiss
91e0b42de8 Added start of MPS stuff 
Some new gadgets
 2014-11-07 11:52:58 +11:00
Jonathan Williams
f931bd26e6 Updated ServerConfiguration to support resourcepack and Arcade settings. 2014-11-06 00:25:49 -08:00
Jonathan Williams
6f2a6a6ebd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-05 14:45:54 -08:00
Jonathan Williams
1a09c14642 Reverted database connection pooling because it caused severe login delays. 2014-11-05 14:39:22 -08:00
Chiss
f3b9ad8adf Chatting will reset Idle Timer in games (for DMT) 
Minor kit changes
 2014-11-05 14:46:49 +11:00
Chiss
b00fb0952a Updated Sheep Quest to be 1.8 comptible. 
Fixed fissure not working on slabs
Fixed a bug in recharge
Added ability for admins to give other people creative (they lose it when the admin quits)
 2014-11-05 11:26:39 +11:00
Chiss
f6df7705b1 - Added 3 kits for DMT 
- Added achievement kit for OITQ/Sneaky Assassins/DMT
- Fixed stats/achievements not working (Keen Eye, I See You, Incompetence, DMT Wins)
- Various improvements/fixes for Champions
- Nerfed trollability of Digger kit in DE
 2014-11-04 19:17:06 +11:00
Chiss
ab62708883 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-03 16:34:20 +11:00
Chiss
20fe69b596 added skills to lore of custom builds 
fixed skeleton not having enough arrows
 2014-11-02 11:09:20 +11:00
CoderTim
f3770933b6 Merge branch 'feature/database-pool' 2014-11-01 01:59:07 -04:00
Chiss
da88d68513 UHC does not record team stats 2014-11-01 15:42:52 +11:00
Chiss
7f642673bc fixed deathbomber achievement 2014-11-01 11:25:08 +11:00
Chiss
0095a03df7 returned bridges to normal 2014-11-01 11:11:35 +11:00
Chiss
de28906aa5 restored 10 min timer for bridges 2014-11-01 09:18:44 +11:00
Chiss
d0a8a86698 disabled tnt water damage before bridges drop 2014-11-01 09:18:25 +11:00
Chiss
58d6cf199b fixed foodformassesstat kind of? doesnt update db still 2014-11-01 08:59:57 +11:00
Chiss
83d182db2e Fixed Villager exploit! oops 
Some balance stuff in champs
 2014-11-01 08:38:36 +11:00
Chiss
bf6e788f36 1 more fix for sheepy 2014-10-31 16:47:20 +11:00
Chiss
c4264dcea1 fixed sheep skill trigger names 2014-10-31 15:58:11 +11:00
Chiss
aca18bb2e7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-31 10:36:06 +11:00
Chiss
aa45f031ac 3 new achievement Kits 
SSM Balance patch
Champs balance
tons of bug fixes
 2014-10-31 10:35:47 +11:00
CoderTim
5244f65d8f All connections to db.mineplex.com/Account use database pool 2014-10-29 17:54:40 -04:00
CoderTim
08f0eb9252 Achievement bug fixes 2014-10-29 01:40:34 -04:00
CoderTim
cd5e4234b7 Fixed a couple more achievement bugs 
Track damage mods in combat log
 2014-10-27 19:00:34 -04:00
CoderTim
f0ba562265 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-27 18:11:29 -04:00
CoderTim
9f8b119fb7 Bug fixes 2014-10-27 18:09:23 -04:00
Chiss
66b446f1e6 Added some start-game invis to players. 2014-10-25 15:48:49 +11:00
Chiss
cfcfad610f Improved recruit/prepare countdown timers 2014-10-25 13:56:23 +11:00
Chiss
bd2e7faf3e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-25 13:40:53 +11:00
Chiss
4002528c51 Updated GUI text. 
- recharges/etc now use bottom text
- uses appropriate bottom/top for 1.7 or 1.8
- fixed 1.7 dragon bar so it works as it did pre-1.8
- dragon bar in 1.8 will now send dragon+wither, for more reliability
- renamed utils to be more clear
 2014-10-25 13:40:34 +11:00
Shaun Bennett
6138da5f93 Merge remote-tracking branch 'origin/master' 2014-10-24 19:43:06 -05:00
Shaun Bennett
5cf3e6c3a1 Fix for arcade custom tags 2014-10-24 19:36:22 -05:00
Chiss
7dbba0a1f9 Added teleport for map parser 
Fixed new method in UtilFirework always being BALL_LARGE
Updated lazer
 2014-10-25 11:17:32 +11:00
Chiss
92d9fc4ca0 Deleted deprecated firework module and converted to Util 2014-10-25 11:03:45 +11:00
Chiss
01f311a3d6 Added missing requirements for SG Achievement Kit 
fixed a parkour exploit
 2014-10-25 10:38:47 +11:00
Chiss
95937db83a changed firework color 2014-10-24 19:10:10 +11:00
Chiss
25fc3c0645 Achievement Kits (3 games) 
Halloween Pumpkins
Youtube command (allows kits)
 2014-10-24 19:05:57 +11:00
Chiss
d4512e464a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-23 14:05:54 +11:00
Chiss
c2bb53c887 Halloween pumpkins 
Minestrike balance
bug fixes
 2014-10-23 14:05:35 +11:00
CoderTim
0472870e78 Fixed bug that prevented the Necromancer purchase menu from displaying 2014-10-21 20:06:13 -04:00
Shaun Bennett
a47be7a2f6 Merge remote-tracking branch 'origin/master' 2014-10-19 00:08:13 -05:00
Shaun Bennett
1394e33056 Fix for Arcade Kit NPC Names in 1.8 2014-10-18 21:15:53 -05:00
Jonathan Williams
8630a1ba4c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-17 23:39:21 -05:00
Jonathan Williams
e3cd6f0e69 Fixed Mem leak in CustomTagFix 
Changed to ServerGameMenu
Fix for overfilling HH servers
Added staff ability to join all servers.
 2014-10-17 23:29:24 -05:00
Chiss
68009d3013 A little more time to handle wave 5 2014-10-18 13:51:25 +11:00
Chiss
02ea14bcd1 Damaging Boss restores all hunger 2014-10-18 10:50:17 +11:00
Chiss
651791ad83 HH FOod update 2014-10-18 10:40:08 +11:00
Chiss
af0daf4a3d HH Hunger Update 2014-10-18 10:29:00 +11:00
Chiss
727e137cc4 Final HH Update 2014-10-17 12:12:22 +11:00
Chiss
5db2c072a0 Halloween update 2014-10-16 16:27:09 +11:00
Chiss
eb5af41323 Added halloween reward pet 
minor bug fixes
 2014-10-15 15:44:26 +11:00
Chiss
15b6a80613 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-14 13:02:17 +11:00
Chiss
bf1f28318b fix for UHC not ending 2014-10-14 13:02:04 +11:00
Chiss
ed9dd6e894 Minor patches 2014-10-14 12:42:53 +11:00
CoderTim
127e12b7c7 Added missing dependency in intellij 2014-10-13 20:49:35 -04:00
CoderTim
8f90c96019 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-13 20:45:55 -04:00
CoderTim
2016ea09cb Added achievements to games and Achievement enum 2014-10-13 20:38:58 -04:00
Chiss
e41b10ccb8 minor UHC fix 2014-10-13 14:09:58 +11:00
Chiss
9b1c4783ce lowered UHC win to 8k 2014-10-13 09:57:38 +11:00
Chiss
6e6e0e2ae0 added flags to disable gem multipliers per-game. UHC was giving too much :O 2014-10-13 09:44:30 +11:00
Chiss
a8d1cef933 Minestrike, ensure bomb does not get overridden. 2014-10-12 18:31:05 +11:00
Chiss
623cdb0f2c Allowed players to rejoin if disconnect within first 10 minutes of UHC. 2014-10-12 18:27:49 +11:00
Chiss
603c0cb66e Staggered UHC game teleports to help reduce lag. 2014-10-12 18:26:18 +11:00
Chiss
28285ab999 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-12 14:19:52 +11:00
Chiss
9cc28d1ad8 MAC Update 2014-10-12 14:19:35 +11:00
Jonathan Williams
3e92b02bab Fixed max slot bug with ultra/hero 2014-10-11 05:56:47 -07:00
Chiss
1d3b792ed8 UHC head apple fixes 2014-10-11 23:09:56 +11:00
Chiss
9c8ed5360d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-11 21:01:52 +11:00
Chiss
8e071f59d6 missing file 2014-10-11 20:59:36 +11:00
Jonathan Williams
797dd002ad Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-11 02:43:56 -07:00
Chiss
a2df64787f remove players from closed game, on update 2014-10-11 20:30:40 +11:00
Chiss
961163c135 delaying return to hub 2014-10-11 20:26:08 +11:00
Chiss
a7ceb24b15 Hub UHC time log 2014-10-11 20:10:48 +11:00
Chiss
dc0709f17e HH Update 
Added UHC to skytext for hub
 2014-10-11 19:43:28 +11:00
Jonathan Williams
19afebe53d Added in mysql hooks for coins/gems/ranks for database conversion preperation. 
Added in failover database calls in CoreClient/DonationManager
 2014-10-11 01:32:22 -07:00
Chiss
e2c72a3ae2 HH update 2014-10-11 14:28:00 +11:00
CoderTim
3422f48325 New acheivements 2014-10-10 21:49:03 -04:00
Chiss
b61979a31f UHC anti-xray; veins can now contain multiple ores. prevents veins occluded by other veins being removed. 2014-10-10 19:05:04 +11:00
Chiss
7d1a62e810 UHC anti-xray visibility update 2014-10-10 18:58:12 +11:00
Chiss
0acaf2e426 removed anti-xray on coal 2014-10-10 18:56:21 +11:00
Chiss
d0d2622ecc added UHC on-the-fly anti-xray 2014-10-10 18:54:38 +11:00
Chiss
a739712dca fixed game autostart flag bug. 
added UHC gem rewards
 2014-10-10 15:26:04 +11:00
Chiss
e3747b5183 Minestrike fixes 
Hub UHC announcer
 2014-10-10 13:07:59 +11:00
Chiss
232dd231d0 UHC joinability/MOTD 
Minestrike spec shop bug fix
 2014-10-10 10:49:39 +11:00
Chiss
ffc2ff5058 Modifided output of friends list 
- buttons to left side for alignment
- sorted by sent>offline>pending>online
- improved 'no friends' message
 2014-10-09 12:15:45 +11:00
Chiss
8701f9ddcc Added TabTitle 
Converted MineStrike to use scoreboard name hiding
 2014-10-09 10:35:54 +11:00
Chiss
7a345dce95 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-05 13:40:15 +11:00
Chiss
d3f87dff46 MineStrike update 2014-10-05 13:37:27 +11:00
Jonathan Williams
9033843a31 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-03 01:50:35 -07:00
Jonathan Williams
c641eab3c7 Fixed up friends. 2014-10-03 01:50:23 -07:00
Chiss
cda9234ad3 Fixed TimeInGame stat not recording sometimes 2014-10-03 11:17:36 +10:00
Chiss
17e34e2060 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-03 10:49:42 +10:00
Chiss
31ceaad7fe MineStrike audio update 2014-10-03 10:49:26 +10:00
CoderTim
ce306e88ed Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-30 02:45:28 -04:00
CoderTim
70fd8835ac Added GamesPlayed and TimeInGame stats 2014-09-30 02:45:20 -04:00
Shaun Bennett
c7d34e70ef Merge remote-tracking branch 'origin/master' 2014-09-29 17:42:13 -05:00
Shaun Bennett
7892c442d0 Add show mac reports user pref for mod+ 2014-09-29 11:14:20 -05:00
Chiss
79e808814a Minestrike cleans up incendiary at the end of rounds 2014-09-25 20:52:13 +10:00
Chiss
969c7c0fde Music gadget fixes 
Tournament point tally
Removed snow from frosty HorseMount
Added Tournament hub invite messages
 2014-09-24 15:46:55 +10:00
Chiss
5774de552d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-22 17:53:39 +10:00
Chiss
a58335d906 Added GameStatManager.java 2014-09-22 17:46:36 +10:00
CoderTim
77e21c0d99 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-22 02:53:55 -04:00
CoderTim
1949de4fd7 Database implementation of NpcManager partially complete 2014-09-21 15:45:15 -04:00
Chiss
7ca4b6830b added in GameStatManager 2014-09-21 09:28:12 +10:00
Chiss
9fce0b1926 Added small cooldown to be able to click hub clock after your gamestate changes. (prevents accidental clicking) 
Moved stat stuff to gamemanager.
 2014-09-21 09:26:34 +10:00
Chiss
767a0247a6 More change to end game title :) 2014-09-20 16:36:30 +10:00
Chiss
6e60c301cf fixed Title for end game 2014-09-20 16:33:24 +10:00
Chiss
d9677ddda2 Disabled saving game player log for non-tournament 2014-09-20 16:28:45 +10:00
Chiss
a830c72d22 Jukebox will be removed. 2014-09-20 15:29:59 +10:00
Chiss
0d090d7bdc fixed issue with MASSSSSSSSSIVE PLANET SIZED gui scale 
added lore to coins in GUI, to help new players and sell more ranks
slightly lowered hitbox for headshots in minestrike
 2014-09-20 09:10:55 +10:00
Chiss
9bbac7578e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
 2014-09-20 08:29:06 +10:00
Jonathan Williams
96498af626 Fixed parkour bug with gadget blocks. 
Removed a ton of debug messages with inventory close.
 2014-09-19 09:06:42 -10:00
Chiss
21c131273e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-19 18:01:52 +10:00
Chiss
91037384f9 Loot tweaks 
Music fixes
some bug fixes
 2014-09-19 18:01:38 +10:00
CoderTim
edce1c9f90 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-19 02:46:12 -04:00
CoderTim
8cb836d5b3 Fixed some achievement bugs 2014-09-19 02:46:04 -04:00
Shaun Bennett
5d643c00d5 treasssssurreeeeees 2014-09-18 21:03:46 -05:00
Shaun Bennett
88a8e3a896 Hackyish way to log rewards given out in a database 2014-09-18 14:35:59 -05:00
Chiss
ed59e03795 Loot update 2014-09-18 17:05:56 +10:00
CoderTim
8b14c85572 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-18 01:57:04 -04:00
CoderTim
f8ee20c433 Record server name in basic game stats 2014-09-18 01:56:46 -04:00
Chiss
fed3d31374 MineStrike fixes 2014-09-18 15:44:48 +10:00
Chiss
09a3cc16b0 Reward stuffs 2014-09-18 14:36:22 +10:00
Chiss
bb8e481c7f More Reward stuff 2014-09-18 14:25:39 +10:00
Chiss
8780d5e4ee MS fixes 2014-09-17 11:18:59 +10:00
Chiss
e6797582f9 Minor fixes 2014-09-17 08:59:09 +10:00
CoderTim
6eed36f0ee Accidentally committed with line of code commented out 2014-09-15 23:46:44 -04:00
CoderTim
d3b541dc27 Updated Arcade .classpath 2014-09-15 23:43:13 -04:00
CoderTim
c5ff9da552 Record basic game stats (game type, timestamp, duration, winners, losers) 2014-09-15 23:31:53 -04:00
Jonathan Williams
c7e0ebefd1 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-13 20:52:13 -10:00
Jonathan Williams
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
Chiss
26a51f4ef2 Re-allowed opening of chests (for GUIs) during games. 2014-09-14 15:28:43 +10:00
Chiss
f3df86a5a9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-14 14:10:51 +10:00
Chiss
7e3b9b4b3a some 1.8 title stuff 2014-09-14 14:10:40 +10:00
Jonathan Williams
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
Chiss
e36f843feb Fixed bug in MineStrike 2014-09-13 12:29:35 +10:00
Jonathan Williams
14c4152248 Fixed CustomTagFix. 
Updated ServerData ServerGroup and SErverMonitor for new flags in Arcade.
 2014-09-12 10:03:33 -10:00
Chiss
5de59b6e0e Hub UHC countdown basics 
UHC MOTD timer stuff
 2014-09-12 18:06:51 +10:00
Chiss
b5152bd621 removed some redundant repeated color stuff 2014-09-12 11:59:32 +10:00
Chiss
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
Chiss
092e9ba479 Modified UHC borders for release 2014-09-11 17:44:57 +10:00
CoderTim
235cf8cae7 Fixed win stats on solo games 2014-09-09 02:18:20 -04:00
CoderTim
b341089cfe Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-08 16:28:50 -04:00
CoderTim
90d88ebd0b Fixed "The Longest Shot" achievement bug 2014-09-08 16:27:09 -04:00
Chiss
347e2b1bf5 Changed FIRE items to Blaze Powder 2014-09-08 10:14:55 +10:00
Chiss
f138a4108b Deregister stat trackers from listener 2014-09-06 22:01:05 +10:00
Jonathan Williams
558231457c Fixed disguises leaving extra tags 
Fixed memory problem in Arcade.
 2014-09-06 03:39:20 -07:00
Chiss
644d3da050 JOOQ for Eclipse 2014-09-06 11:31:55 +10:00
Chiss
892b67beb2 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-05 21:43:33 +10:00
Jonathan Williams
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
Jonathan Williams
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
Chiss
4064c5238c bridges volcano fix 
minestrike npe fix
 2014-09-05 21:35:26 +10:00
CoderTim
3830ab8e0f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-05 06:06:13 -04:00
CoderTim
91a2266a04 Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking 2014-09-05 04:00:51 -04:00
Chiss
4e94bcfd98 Block Hunt winners fix (team/solo) 2014-09-05 17:29:23 +10:00
Chiss
abc95853f7 sulhpur bomb fix 2014-09-05 15:47:35 +10:00
Chiss
8c1e0c3e9e Fletcher data fix 
Minestrike stuff
 2014-09-05 15:45:14 +10:00
Chiss
b691b1bad0 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-05 12:51:59 +10:00
Chiss
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
Jonathan Williams
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
CoderTim
74e012a811 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-03 16:54:41 -04:00
CoderTim
39b46bc8f5 Fixed some NPEs 2014-09-03 16:53:29 -04:00
Shaun Bennett
e7f79aa5bf Update IntelliJ files for latest changes 2014-09-03 11:42:50 -05:00
Jonathan Williams
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
Jonathan Williams
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
Chiss
21225d7b65 Minor Fixes 2014-09-03 15:09:14 +10:00
Chiss
50140ef92d Minestrike update 2014-09-03 14:49:38 +10:00
Chiss
246f2e91d9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-03 12:38:57 +10:00
Chiss
58f98881f2 Minestrike Update 2014-09-03 12:38:44 +10:00
Chiss
1dec79c0fa Minestrike update 2014-09-03 12:28:45 +10:00
Shaun Bennett
2d5c676e1b Merge remote-tracking branch 'origin/master' 2014-09-02 18:57:35 -05:00
Chiss
d5766d62ae nerf p90 2014-09-02 16:49:45 +10:00
Chiss
449281501f MineStrike Update 2014-09-02 16:49:15 +10:00
Chiss
5d6834633f MineStrike update 2014-09-02 11:16:17 +10:00
Shaun Bennett
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
Chiss
05623b7522 Initial MineStrike push 
fixed frames being breakable in games
 2014-09-01 21:37:39 +10:00
Jonathan Williams
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
Chiss
2b333859d1 PUUSH 2014-08-30 19:24:04 +10:00
Chiss
3767911718 updated game desc output 2014-08-30 19:07:43 +10:00
Chiss
7696349187 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-30 16:34:10 +10:00
Chiss
2c30cc3ef4 Implemented new servers flags 
Removed OP from Admisn in HUB, gave them /gm command instead
 2014-08-30 16:33:56 +10:00
CoderTim
b7baa1b2f4 Count disconnecting from the server as a loss 2014-08-30 02:30:07 -04:00
CoderTim
34f04ad4e3 Fixed Champions Assassination and Longshot achievements 2014-08-29 21:09:51 -04:00
Chiss
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
Chiss
1f6b9374eb disable le minestrike 2014-08-29 11:55:06 +10:00
Chiss
c3bb0ddbcb Chest example gadget for shauny 2014-08-29 11:00:16 +10:00
CoderTim
cc57ddf4bc Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-28 06:54:36 -04:00
CoderTim
bdef9acecd Fixed DragonEscape win stat tracker 2014-08-28 00:53:54 -04:00
Chiss
ec4cb91a1c Poll changes 
Achievement output double space fix
 2014-08-28 11:50:09 +10:00
Jonathan Williams
526ca42add Fixed Gem booster problem. 
FIxed stat problem.
 2014-08-27 12:48:24 -07:00
Chiss
9439daa852 Fixed bug where spectators could trigger anti-cheat in bridges 2014-08-27 15:16:20 +10:00
Chiss
d9ef5f50be disabled minestrike 2014-08-27 14:23:31 +10:00
Chiss
596bcbfae6 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-27 14:23:01 +10:00
Chiss
da5f953212 Fixed BlockMorph leaving blocks behind when player was teleported. 2014-08-27 14:22:35 +10:00
CoderTim
5ef2772abd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-26 20:27:51 -04:00
CoderTim
7d6572ff4d Fixed SheepGame Selfish achievement 2014-08-26 20:27:39 -04:00
Chiss
f25f7d3aa2 Fixed 1v3 achievement not giving achievement if players quit (required 4 at END) 2014-08-27 09:52:33 +10:00
Chiss
5540835052 removed micro debug 
fixed a bug in achievement output
 2014-08-27 09:09:06 +10:00
Chiss
f9ce0d353c Achievements now need 75%+ players at START of game 2014-08-27 08:57:11 +10:00
CoderTim
d9e1f35985 Fixed BadHiderStatTracker and limited stat recording to when games are at least 75% full 2014-08-26 16:30:55 -04:00
Chiss
17649ce36c Fixed bug where desc for past-completed achievements was still showing 2014-08-26 21:51:59 +10:00
Chiss
ab29a5fa29 Fixed text output in Achi GUI for completed 2014-08-26 18:06:01 +10:00
Chiss
3eae26ef80 Updated Achievement Output 2014-08-26 18:03:29 +10:00
Chiss
d62b59776f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-26 17:54:50 +10:00
Chiss
116fe496a8 Changed post game achievement output 
Added Reward to Achi GUI
 2014-08-26 17:53:54 +10:00
Chiss
7e7906865f Fixed some stats being added after send-off 2014-08-26 17:45:35 +10:00
Jonathan Williams
526b5c333a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-26 00:34:00 -07:00
Jonathan Williams
137b8692e4 Added Gem booster use. 2014-08-26 00:33:48 -07:00
Chiss
0546c9e175 Fixed so only Supply drop chests trigger achievement 2014-08-26 17:33:23 +10:00
Chiss
1b15a57fc8 Added Gem Rewards for Achievements 2014-08-26 17:10:20 +10:00
Chiss
dd61077850 Added missing Achievements 2014-08-26 14:46:10 +10:00
Chiss
1b3e32ca26 Added Arcade Achievements 2014-08-26 14:42:17 +10:00
Chiss
28d523d696 Added Achievements 2014-08-26 13:42:42 +10:00
Chiss
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
Chiss
07ee44508e Missing Gadgets 2014-08-26 08:17:41 +10:00
CoderTim
933d32d8f8 Fixed team death/kills stats 2014-08-25 18:06:50 -04:00
CoderTim
9acc7d8496 Added team kill and death achievement trackers 2014-08-25 17:43:49 -04:00
CoderTim
4ce537a3a7 Fixed some NPEs and achievement bugs 2014-08-25 16:27:02 -04:00
Chiss
13eb3da0fa Achievment gui changes 2014-08-25 09:26:01 +10:00
Chiss
7669998ad3 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-25 08:38:29 +10:00
Shaun Bennett
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
Shaun Bennett
2cb87b23e6 Stat Gui, Start of Treasure Gui (disabled) 2014-08-24 16:08:19 -05:00
Chiss
23f6d0ae1a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-24 16:46:00 +10:00
Chiss
3f5cff3e21 Killing cheaters for a few things in bridges 2014-08-24 16:45:47 +10:00
CoderTim
c89461628b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-23 16:00:26 -04:00
CoderTim
fb90336d4e Finished stats/achievements 2014-08-23 16:00:15 -04:00
Chiss
642f8b46b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-23 18:01:35 +10:00
Chiss
7348a26951 fixed damage dealt npe 2014-08-23 18:00:23 +10:00
Chiss
af9bf0727a Fixed damage taken stat NPE 
Added tournament team auto-rejoin
 2014-08-23 17:55:28 +10:00
Jonathan Williams
70beb58bd6 Enabled debugging in Hub/Arcade 2014-08-23 01:49:48 -05:00
Chiss
3ec43f90e8 GameAchievementManager now utilises TaskManager to record whether or not people have previously completed Achievements 2014-08-23 15:04:43 +10:00
CoderTim
4afafe2d51 Some stats fixes 2014-08-22 21:54:08 -04:00
CoderTim
b2b208bdba Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-22 17:30:08 -04:00
CoderTim
02bb53578a Registered stat listeners with each game 2014-08-22 17:20:02 -04:00
Chiss
231ef2bbe1 Cosmetic Update 2014-08-23 04:30:41 +10:00
Chiss
0022586e3e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-22 17:08:29 +10:00
Chiss
97c087a28d Allowed commands to specify specific ranks 
allowed youtube/build to start/set games
 2014-08-22 17:05:14 +10:00
CoderTim
591b5c026c Almost all achievements done 2014-08-21 18:55:40 -04:00
Jonathan Williams
5e47a12531 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-21 15:56:02 -05:00
CoderTim
94f2aade08 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-21 15:01:22 -04:00
Jonathan Williams
1398543490 Fixed bug with Projectile 
Changed tp out of game to 1 per tick.
 2014-08-21 02:07:54 -05:00
Chiss
ac088e85b2 Added some game flags 
Dragon escape changes
 2014-08-21 13:35:31 +10:00
CoderTim
f266f4e016 More achievements 2014-08-20 19:20:11 -04:00
Chiss
60869d114e Dragon Escape changes 2014-08-20 15:45:10 +10:00
Shaun Bennett
a7bb84be0b Revert chris' revert 2014-08-19 21:24:49 -05:00
Shaun Bennett
f60a818e6a Update craftbukkit to remove the extra _INVALID mappings 2014-08-19 21:22:04 -05:00
CoderTim
18ca7d5656 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-19 21:16:44 -04:00
CoderTim
599277b88e More work on achievements 2014-08-19 21:16:28 -04:00
Chiss
94e5eb03da Fixed errors for new getPlayers method. 2014-08-20 10:43:56 +10:00
Chiss
7535f39d18 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-20 10:39:58 +10:00
Chiss
afea0ba87f Parser Merge 2014-08-20 10:39:41 +10:00
CoderTim
09c01d90ad Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-19 19:07:37 -04:00
Shaun Bennett
e1a57a673e Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors 2014-08-19 16:58:55 -05:00
CoderTim
05686cb584 Work on achievements 2014-08-18 16:41:16 -04:00
Chiss
d8123795aa changed the way disguises show rank. 2014-08-16 16:33:18 +10:00
Chiss
508ef65fcf Added missing file 2014-08-16 14:17:15 +10:00
CoderTim
19222c6815 Updated IntelliJ environment to be compatible with latest changes 2014-08-15 15:51:29 -04:00
Chiss
29db90837d Spleef Update 
Map parser block stuff
 2014-08-15 15:28:50 +10:00
Chiss
85522cddca Debug (will clean once fixed) 
Game stats
 2014-08-15 09:49:00 +10:00
Chiss
74435bac12 fixed bug where players kept inventory open, to be able to enable morphs ingame. 2014-08-14 17:31:14 +10:00
Chiss
5f80d9c57a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
 2014-08-14 11:24:51 +10:00
Chiss
b6ba142c5a Mineplex in scoreboard is fancier. 2014-08-14 11:23:48 +10:00
Shaun Bennett
b9534bd245 Merge remote-tracking branch 'origin/master' 2014-08-13 20:07:01 -05:00
Shaun Bennett
cfe45139b6 Adjust lobby text for the removal of premium kits 2014-08-13 19:56:47 -05:00
Shaun Bennett
83f04273fa Sort kits properly when a game uses NullKit 2014-08-13 19:45:38 -05:00
Chiss
b21ae8ef72 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-14 10:32:52 +10:00
Chiss
7a3bba45a7 Mergey! 2014-08-14 10:32:41 +10:00
Jonathan Williams
6039168601 Updated code base to build #1604 spigot 2014-08-13 18:57:37 -05:00
Chiss
95394c51cc Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-12 11:24:12 +10:00
Chiss
2d67d4ce36 Achievement fix + active 2014-08-12 11:23:53 +10:00
Shaun Bennett
d63137ead2 Merge remote-tracking branch 'origin/master' 2014-08-11 12:44:28 -05:00
Shaun Bennett
7e93ed657f Display boss bar properly while a dragon mount is spawned in arcade 2014-08-11 12:26:56 -05:00
Chiss
02270a9d25 TNT effect only triggers off self tnt. 2014-08-11 15:33:45 +10:00
Chiss
7191d48bd0 fixed paintball pre-game bug 2014-08-11 14:25:11 +10:00
Chiss
e4871c4988 Disabling cosmetics 5s before game starts, was having some carryover due to lag. 2014-08-11 11:55:00 +10:00
Chiss
d81b32bd3a Sneaky Assassins balance+polish 2014-08-10 21:05:41 +10:00
Chiss
06bcf5079b Disabled Gem hunter (bugged?) 
Disabled chicken morph letting people fly
 2014-08-10 18:36:18 +10:00
Chiss
25b525837f Fixed TNT blowing up lobby when it changed to prepare. 2014-08-10 11:07:05 +10:00
Chiss
9057246ab8 Arcade Inventory fixes 2014-08-10 10:50:31 +10:00
Chiss
3533ce1b7e Particles dont play in stealth games. 2014-08-10 01:04:53 +10:00
Chiss
616a0ecf11 Staff get all kits unlocked. 2014-08-10 00:32:50 +10:00
Chiss
38fd85335f Fixes disguises being disabled. 2014-08-10 00:21:45 +10:00
Chiss
62cc422f42 FINAL FIX 2014-08-10 00:13:04 +10:00
Chiss
c95cf79aa6 fxied more 2014-08-10 00:10:08 +10:00
Chiss
a43a5b2c0e bacon brawl fix 
signel game ultra shows in hub scoreboard
 2014-08-10 00:09:39 +10:00
Chiss
3d1ddecffb Smash Kit fix 
Gem Booster (dragons) fix
 2014-08-09 23:25:13 +10:00
Chiss
cac7f85410 Single game ultra kit unlock 2014-08-09 23:10:40 +10:00
Chiss
23f93e55cf fixed dragons destroying pregame lobby 2014-08-09 22:59:54 +10:00
Chiss
ff6ea3c798 Added Cosmetics to Arcade 
Set prices on cosmetics
 2014-08-09 19:55:05 +10:00
Jonathan Williams
8fe4e39207 Split up Cosmetic shop and Inventory 
Added Ammo purchase for item gadgets.
 2014-08-09 03:57:56 -05:00
Chiss
91a79f0345 Pig Morph 
Morphs have tags/
 2014-08-09 14:57:01 +10:00
Chiss
fb19e93992 Gem text 2014-08-09 13:46:41 +10:00
Chiss
c93a49add2 More gem boosty! 2014-08-09 13:42:29 +10:00
Chiss
2e95548b6e Gem Boosters! 2014-08-09 13:39:57 +10:00
Chiss
3a220b6f1c Micro Update 
SGTeams inv click fix.
 2014-08-09 13:11:32 +10:00
Jonathan Williams
6bd9273edf Refactored getting item count for ClientInventory 
Fixed up Arcade gem boosters so they are hooked into inventory.
Cleaned up unused code.
 2014-08-08 22:10:02 -05:00
Chiss
313f675ae4 Hub Parkour update 
Smash kit prices
 2014-08-09 12:16:37 +10:00
Chiss
b36b1cb007 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-08 17:05:23 +10:00
Chiss
fa3695be4e Gem Booster In Lobby 
Achievement Stuff
 2014-08-08 17:05:11 +10:00
Shaun Bennett
9395711dcb Merge remote-tracking branch 'origin/master' 2014-08-08 01:51:50 -05:00
Shaun Bennett
b7ecf5eb04 GET MINEPLEX ULTRA FOR AMAZING FUN TIMES 2014-08-08 01:51:11 -05:00
Chiss
1a33dbb5ee Achievement Module 
Gem Booster/Achivement
 2014-08-08 13:46:35 +10:00
Shaun Bennett
2fd7621a81 Display proper team in Arcade Lobby (Fixes bug where a player connecting will break scoreboards) 2014-08-07 18:44:27 -05:00
Jonathan Williams
c01fbd279d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/GadgetManager.java
 2014-08-07 00:48:32 -07:00
Jonathan Williams
6d86f403ac Added coins Currency to web api 
Added coins purchase for all cosmetic items
Added Stats manager
Added Inventory Manager

Redesigned gadgets/morph/particle/pets/mounts page and inventory.
 2014-08-07 00:33:24 -07:00
CoderTim
8a74b08b0d Fixed silly mistake I made 2014-08-06 23:59:52 -04:00
CoderTim
f7f9d3e703 Sneaky assassin power-up maximum is 5 and hanging entities cannot be damaged 2014-08-06 21:35:11 -04:00
Chiss
c647e6b48d Missing morphs 
Bacon brawl knockback increase over time
Parse color error fix
 2014-08-07 09:47:11 +10:00
Chiss
a737aa8624 Game desc 2014-08-06 19:16:17 +10:00
Chiss
c4768a8a9c Smokebomb doesnt end instantly :o 2014-08-06 19:13:25 +10:00
Chiss
f68586cca4 Micro Battle 2014-08-06 19:00:18 +10:00
Chiss
248111749f Sneaky Changes 2014-08-06 17:14:07 +10:00
CoderTim
bea6eabb95 Sneaky Assassins: Revealed players have wither effect. Fireworks are yellow. Additional announce messages 2014-08-06 01:41:50 -04:00
CoderTim
16353c4bc9 Changes to Sneaky Assassin power-ups, including addition of compass power-up. 2014-08-06 01:23:06 -04:00
Chiss
9e047847c2 scoreboard fix 2014-08-06 12:42:07 +10:00
Chiss
4108a02f50 Sneaky scoreboard order 2014-08-06 12:37:41 +10:00
Chiss
a0010668c6 Sneaky Assassins changes 2014-08-06 12:23:02 +10:00
Chiss
f09506e436 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/SneakyAssassins.java
 2014-08-06 11:09:16 +10:00
Chiss
c8dfb2f02e Parser Fixes 
Sneaky Stuff
 2014-08-06 11:07:49 +10:00
CoderTim
3ee0b271b6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-05 01:23:37 -04:00
CoderTim
0240d50029 Sneaky Assassins Changes: 
- when you get a kill, give an armor upgrade and 1 smoke bomb
 - Revealer range increased to 12 blocks
 - NPC dies once every 2 seconds
 - Lose 1 hunger every second. Gain 8 when damaging player or NPC
 - Reveal all players every 60 seconds, for 2 seconds
 - Added cloaking back to smoke bomb
 - Power-up is always green and type alternates per player. Power-ups always include smoke bomb and mushroom soup.
 - NPC speed slightly decreased
 - Corrected sword power-up progression
 2014-08-05 01:23:24 -04:00
Shaun Bennett
e8d14e9fbf Remove created by comment 2014-08-04 00:33:34 -05:00
Shaun Bennett
1c5b3919e1 Merge remote-tracking branch 'origin/master' 2014-08-04 00:31:56 -05:00
Shaun Bennett
0edb0d74a7 Fix bugs with kit sorting + cost of kits 2014-08-04 00:31:46 -05:00
CoderTim
e7d3cf9e02 Sneaky Assassins previous commit bug fix 2014-08-04 01:06:11 -04:00
CoderTim
012382ec48 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-04 01:02:27 -04:00
CoderTim
8a727e1365 Smarter Sneaky Assassins AI 2014-08-04 01:02:05 -04:00
Shaun Bennett
e4662ab563 Update my SneakyAssassinKit change to work with Tim's changes 2014-08-03 23:41:54 -05:00
Shaun Bennett
34dfe8dacd Merge remote-tracking branch 'origin/master' 2014-08-03 23:32:37 -05:00
Shaun Bennett
fe32cf5444 Remove KitAvailability.Blue 2014-08-03 23:31:55 -05:00
CoderTim
39e23c16f0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-04 00:00:12 -04:00
CoderTim
482f48f994 Prevent players in Sneaky Assassins from breaking paintings and item frames 2014-08-04 00:00:04 -04:00
CoderTim
ec48a59301 Added option DISGUISE_TYPE:<ENTITY_TYPE> in WorldConfig.dat for Sneaky Assassins to configure which entity players are disguised as. 2014-08-03 23:59:10 -04:00
Shaun Bennett
35b16e026c Blue kits cost gems instead of being premium kits 2014-08-03 22:44:01 -05:00
Chiss
07fe476fd3 fix for stuff that jon broke 2014-08-01 17:45:22 +10:00
Chiss
b6fe33e6fb Ultra/hero gems removed 2014-08-01 17:03:07 +10:00
Chiss
0f9e72d623 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-01 14:06:13 +10:00
Chiss
599a6eb1f7 Changed kit availability to be based on free/premium. 2014-08-01 14:05:53 +10:00
CoderTim
c36242cc47 Added stained glass around power-up beacon base in sneaky assassins to identify power-up more easily. 
Added workaround to make revealer fireworks explode consistently
Power-ups use UtilPlayer.message and have a sound effect is player when a power-up is aqcuired
Power-up bug fixes
 2014-07-31 23:35:50 -04:00
CoderTim
6ac00cde99 Move Sneaky Assassins NPCs during Prepare and Live 2014-07-31 23:32:26 -04:00
CoderTim
22748eb225 Updated KitRevealer description 2014-07-31 23:31:42 -04:00
CoderTim
77b6f0250e Play zombie_unfect sound when PerkRevealer explodes 
PerkSmokeBomb also applies effects to NPCs
PerkSmokeBomb now uses HUGE_EXPLOSION effect
Set Sneaky Assassins PrepareFreeze flag to false
 2014-07-30 23:56:40 -04:00
Chiss
308c2e1b91 Kit availability 2014-07-31 13:00:05 +10:00
Chiss
a4d579789c Sneaky Assassins changes :) 2014-07-31 12:58:33 +10:00
Jonathan Williams
4d397438be Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-29 21:11:15 -07:00
CoderTim
0382afecd8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-29 20:24:04 -04:00
CoderTim
fa91bf0a00 Disable dropping hunger in Sneaky Assassins 2014-07-29 20:22:46 -04:00
Jonathan Williams
46cc2576dd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-26 10:41:04 -07:00
Jonathan Williams
4e1a05e9bd Fixed whitelist issue with tournament mode. 2014-07-26 10:40:49 -07:00
Chiss
78b3d3b35c restored original bridge timer :) 2014-07-26 21:05:12 +10:00
Chiss
3f4e4b6607 fixed -1 not working 2014-07-26 21:03:50 +10:00
Chiss
802415be8f -1 team kills for suicide (only after bridge drop) 2014-07-26 20:57:40 +10:00
Chiss
f090ed9313 end game fixes 2014-07-26 20:53:48 +10:00
Chiss
4f46ccc8aa Winner is decided on bridge tourney timeout 2014-07-26 20:29:01 +10:00
Chiss
fa73ab5335 Bridges Tourney stuff 2014-07-26 17:40:17 +10:00
Chiss
21314afabe Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-26 17:03:30 +10:00
Chiss
107388baa3 Added game flag to allow clicking in inventory during games 2014-07-26 17:03:03 +10:00
Jonathan Williams
a455042c07 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-25 23:38:38 -07:00
Jonathan Williams
12b42cad29 Made tournament changes: 
Staff can't see team chat
Bridge tournament time is 90 min
Kits are not all free
Removed twitch charity text/motd
If team not picked, you go to spec.
 2014-07-25 23:38:21 -07:00
CoderTim
fe46355130 Added missing description to Sneak Assassin revealer items 2014-07-24 21:25:59 -04:00
CoderTim
fe356add41 Restore original blocks when Sneaky Assassin power-up beacon is removed 2014-07-23 15:45:30 -04:00
CoderTim
a6a274069c Prevent power-up message spam when player is fully powered-up 2014-07-21 17:26:45 -04:00
CoderTim
4460f2e651 Prevent fully powered-up Sneaky Assassin players from using additional power-ups 2014-07-21 16:29:15 -04:00
CoderTim
efa74f509a Fixed bug where revealer doesn't always work 
Prevent players from trading with sneaky assassin npcs
Display message when user powers up
 2014-07-18 02:48:06 -04:00
CoderTim
64feaf63ed Implemented Sneaky Assassin Revealer kit 2014-07-15 00:36:38 -04:00
CoderTim
c547801b7b Added Sneaky Assassin NPC movement 2014-07-11 22:55:48 -04:00
CoderTim
b15534e1b2 Some work on Sneak Assassins NPCs 
Added /game start <seconds> to start a game faster
Optimized GameTeam.GetSpawn() by avoiding unnecessary square root calculations
 2014-07-11 00:56:25 -04:00
Mini-Chiss
bd6b9b8888 so many fix 2014-07-08 17:35:27 -07:00
Mini-Chiss
c5e05523d3 sneakyfix 2014-07-08 17:34:47 -07:00
Mini-Chiss
dd0040086d Parser Permissions 
Sneaky Assasssin thingy.
 2014-07-08 17:33:22 -07:00
Mini-Chiss
1455b4001f Parser Update 2014-07-08 15:13:30 -07:00
Jonathan Williams
963c71f128 Fixed internet status stuff for bungees. 
Fixed new portal arg req.
 2014-07-08 12:44:17 -07:00
Mini-Chiss
cf25bdc44f Bridges fix being able to break mid chests before gamestart 
Map parser Updates
 2014-07-07 19:04:44 -07:00
Mini-Chiss
ef86fe6948 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-07 16:24:43 -07:00
Mini-Chiss
62f6ea815d Champs Balance Update 
Map Parser Update
 2014-07-07 16:23:55 -07:00
CoderTim
38e4240a61 Fully implemented Sneaky Assassins Power-Ups 2014-07-07 19:10:29 -04:00
CoderTim
fe1bf95342 Fixed code style and updated IntelliJ code style settings 2014-07-07 14:45:02 -04:00
Mini-Chiss
df8562e69a Tourney mode for UHC 2014-07-04 23:11:13 -07:00
Mini-Chiss
c65712c260 UHC fixes 
Sneaky Assassin listener leak fix
Some map parser stuffs.
 2014-07-04 23:04:46 -07:00
CoderTim
6365ec5351 Started on Sneaky Assassins kits and power-ups 2014-07-04 11:14:34 -04:00
CoderTim
2fb2aadf66 Merge remote-tracking branch 'origin/master' 2014-07-04 11:12:52 -04:00
CoderTim
46c979e088 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-04 11:12:33 -04:00
Mini-Chiss
d19b34b0e4 Removed debug 2014-07-02 17:14:52 -07:00
Mini-Chiss
22ceba9841 Fixed Scoreboards! 2014-07-02 17:12:52 -07:00
Jonathan Williams
d0fafce585 Reverted change to helper only joining full, now ultras can. 
Added check so BETA servers cannot be joined by less than Helper.

Fixed message in AccountAdministrator for rankUpdate
 2014-07-02 16:59:31 -07:00
Jonathan Williams
8eaad57516 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-02 16:05:37 -07:00
Jonathan Williams
f1393ffb33 Fixed rankUpdate changing existing higher ranked players. 
Fixed join limits in arcade and hub.
 2014-07-02 16:05:26 -07:00
Mini-Chiss
bea6902198 Spectators can use /tp 2014-07-02 13:09:47 -07:00
Mini-Chiss
82dd94de9b Scoreboard fix 
Unbreakable boats in hub
 2014-07-02 12:50:04 -07:00
Mini-Chiss
05e116ea0d Scoreboard flicker fixed! 2014-07-02 12:38:41 -07:00
Mini-Chiss
558f79fe34 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-02 10:58:34 -07:00
Mini-Chiss
17c36026f6 fixed bug where player who comes first was not being added to ranks. (get nothing) 2014-07-02 10:57:30 -07:00
Peter Miller
6c67ff9106 Resolving issues from Portal.java conflict resolution 2014-07-02 04:09:41 -04:00
Jonathan Williams
9514f6391e Fixed bug in Arcade with client manager. 2014-07-01 21:42:00 -07:00
CoderTim
44a57a485f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 21:39:03 -04:00
Jonathan Williams
081260757d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 18:31:26 -07:00
Mini-Chiss
31772196a9 More scoreboard stuff (TDM) 
New Tug game
 2014-07-01 18:30:04 -07:00
Jonathan Williams
b627e8fdf5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 10:25:12 -07:00
Jonathan Williams
9fd3f14248 Added RankUpdate command. 
Fixed Lobby joinable issue with server monitor.
Changed server monitor to be fully dynamic for us.
 2014-07-01 10:23:22 -07:00
CoderTim
7ea818c0c8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 02:20:45 -04:00
Mini-Chiss
8c461b3e1b Cooldown on Spec Compass 
Hub Forcefield Update
Scoreboard MINEPLEX refactor
 2014-06-30 16:12:42 -07:00
CoderTim
ccb17d5ac3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-27 19:33:34 -04:00
Mini-Chiss
f10b081473 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-06-26 18:38:28 -07:00
Mini-Chiss
3d12196b17 Merge 
UHC Public
Small refactor for player ranks in games.
Trimed scoreboard teams to 16 chars.
 2014-06-26 18:38:11 -07:00
Jonathan Williams
f6ad5c5549 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-25 12:07:49 -07:00
Jonathan Williams
4f3ffde892 Added timing/debugging code. 2014-06-25 12:06:24 -07:00
Mini-Chiss
46849745c4 Champions TDM Update 2014-06-23 16:20:50 -07:00
Jonathan Williams
f2c82cbf95 Refactored TimeUtil and added totalling option. 2014-06-20 20:42:36 -07:00
Jonathan Williams
6cac04d399 Optimized create scoreboards. 2014-06-19 00:48:04 -07:00
Jonathan Williams
231ffd7234 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-15 17:21:47 -07:00
Jonathan Williams
93fbe70e9c Added more loggingggggg. 2014-06-15 17:21:40 -07:00
Chiss
c386023a6f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-06-16 10:18:30 +10:00
Chiss
fd17c1b254 More staggered teleports on game end 
Logging teleports.
 2014-06-16 10:18:10 +10:00
Jonathan Williams
6515dd13a0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-15 16:25:40 -07:00
Jonathan Williams
0f7885d911 Added safety checks in ClientManager 
Added logging and teampreference swap fix in arcade.
 2014-06-15 16:25:32 -07:00
Chiss
a756bb88a2 NPE log 2014-06-16 09:25:14 +10:00
Chiss
9a79d0ede7 Fixed CME 
Gadget cost fix
MapParser fix
 2014-06-15 15:10:19 +10:00
Chiss
d5c96f95c0 Fixed bug that gave items while respawning. 2014-06-15 12:01:58 +10:00
Jonathan Williams
be8fea8ca9 Changed Chat API key. 
Fixed PreferenceManager not saving asynchronously.
 2014-06-12 08:02:47 -07:00
Chiss
661a869116 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2014-06-10 13:02:17 +10:00
Chiss
7fc2fbe564 Scoreboard Refactor 2014-06-10 12:51:47 +10:00
Chiss
6cba6b9b9e merge 2014-06-10 10:27:25 +10:00
Jonathan Williams
3ae119d88a Fixed hub package unlock bug. 
Fixed Champions build page open bug.

MOved some code around because i'm a boss.
 2014-06-08 11:27:14 -05:00
Chiss
967ff44d0a gamecreation fix 2014-06-05 10:15:22 +10:00
Chiss
644f946f69 error debug 2014-06-04 17:56:21 +10:00
Chiss
4c72651f86 game creation 2014-06-04 17:55:13 +10:00
Chiss
1d549e38ff Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-05-30 15:02:22 +10:00
Chiss
d4465fd8f2 merge 2014-05-30 15:01:08 +10:00
CoderTim
1b5b2d21b2 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-28 17:51:38 -04:00
Jonathan Williams
48975d02c7 Adding some missing files for website. 2014-05-28 11:20:13 -07:00
CoderTim
94e31e36f8 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-27 21:42:01 -04:00
CoderTim
e101c027ce Created Sneaky Assassins and started work on the kits 2014-05-27 21:38:22 -04:00
Jonathan Williams
449fa13cc3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 
Conflicts:
	.gitignore
 2014-05-27 02:23:22 -07:00
Jonathan Williams
0634ee5543 Removed unused global stuff in Mineplexer. 
Did some edits in GroupManager...need to pick that up.

Changed TimeUtil to pop last entry when stopping.
Fixed WorldUtil's dimension thing for UHC.
Fixed Exception with AntihackRepository and no static lock object on _connection

Work on Elo manager.
Work on Queue.

Added checking for player to server transfer records.

Added option for rejoin time in TeamGame (UHC...yay)
 2014-05-27 02:10:29 -07:00
CoderTim
49de140f41 Configured eclipse to use UTF-8 2014-05-25 21:04:14 -04:00
CoderTim
c45e7d2a80 Converted file encoding from ISO-8859-1 to UTF-8 2014-05-25 19:42:39 -04:00
CoderTim
3859a42f1d Removed broken and obsolete shifter code 
Set up more intellij stuff
 2014-05-25 19:11:58 -04:00
CoderTim
aa6b5324eb Set up IntelliJ IDEA 2014-05-20 00:39:50 -04:00
Jonathan Williams
6d19c80af2 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-13 22:15:55 -05:00
Jonathan Williams
6af5d9205b Added TimeUtil.java 
Removed double gems.

Removed extra world uninitialize.

Changed AccountAdministrator to use UUID.
 2014-05-13 22:13:48 -05:00
Chiss
002260dce8 better date 2014-05-14 12:57:43 +10:00
Jonathan Williams
12041b0d72 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-13 21:54:58 -05:00
Chiss
8ea344cacd fixed a NPE 2014-05-14 12:38:06 +10:00
Jonathan Williams
40ba1a64f8 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-13 14:46:15 -05:00
Chiss
fbb0031dc1 fixed bug in dom where endCheck was being called multiple times 
logging for world stuff
 2014-05-13 11:18:17 +10:00
Jonathan Williams
b1514fef5a Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-09 21:18:48 -07:00
Jonathan Williams
0ec08d5208 Fixed chunk load outside borders (disabled for testing right now) 2014-05-09 21:18:38 -07:00
Chiss
208a78b070 respawning players are tp'd if leave area. 2014-05-10 14:01:02 +10:00
Chiss
d9225c003e CS Update 2014-05-10 09:55:27 +10:00
Jonathan Williams
eae2d41fad Fixed party out of bounds exception. 
Fixed tnt in wrong place in dom shop.
 2014-05-08 20:01:21 -07:00
Jonathan Williams
b72bcadbf4 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-06 22:38:50 -07:00
Jonathan Williams
ebf40afe75 Fix dom bow shoot in lobby bug. 
Work on preventing illegal builds.
 2014-05-06 22:38:27 -07:00
Peter Miller
e0dd0116a2 Beginning changes for stats from PlayerName to PlayerUUID 2014-05-06 17:06:19 -04:00
Jonathan Williams
5f2b2c251d Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-06 09:06:49 -07:00
Jonathan Williams
8110506ac4 Fixed duplicate login issue with CoreClientManager 
Added EloRanking and EloStart for elo games in Game.java

Refactored Elo code in Arcade to be based off of above values in Game

Changed Lobby scoreboard in Arcade to just Players at top current/max.
 2014-05-06 09:06:39 -07:00
Chiss
f79b3b147c Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-05-06 15:59:20 +10:00
Chiss
223da7bf4d ResetAll for class skills 2014-05-06 15:55:14 +10:00
Jonathan Williams
2f397e7d2a Work on elo manager. 
implemented coreclient cleanup.
 2014-05-04 22:40:44 -07:00
Jonathan Williams
f079333d3b Optimized ChunkBlockChange. 
Still no dead chunks!

Fixed LobbyManager advertising to an empty lobby.
 2014-05-04 18:29:19 -07:00
Jonathan Williams
97e083c1e7 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-04 12:52:14 -07:00
Jonathan Williams
f623026dfc Fixed projectile order issue..check for dead before collision. 
Fixed dead chunks in Aracde.
 2014-05-04 12:52:04 -07:00
Chiss
6e8bdfa769 disabled hub clock for tournament 2014-05-03 17:26:21 +10:00
Chiss
0ce3b3fb2d Disabled AFK kick during Tournament 2014-05-03 17:23:10 +10:00
Jonathan Williams
fe7ed5c96a Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-02 23:19:05 -07:00
Chiss
b432c094d9 Misisng ifles 2014-05-03 16:16:52 +10:00
Jonathan Williams
0101531291 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2014-05-02 23:15:08 -07:00
Jonathan Williams
484ba97b23 Updated file delete mechanism so there is no reflection. 
Removed list block on deleting players from coreclient quit.
 2014-05-02 23:12:39 -07:00
Chiss
4304327bf9 Disallowed /spec during games. 2014-05-03 13:06:15 +10:00
Chiss
395a5d2c08 MAC disabled with Tournament Mode 
Bridges TM game desc fix
 2014-05-03 11:47:15 +10:00
Chiss
e818662161 Added /spec toggle, to allow players to not partake in games. 
Added TeamArmorAddon for games to use, to mark team colors easier.
Minor other changes.
 2014-05-03 11:23:10 +10:00
Chiss
1d4d98b910 Twitch Prep 
MAC changes
 2014-05-02 14:35:41 +10:00
Chiss
8240101d60 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
 2014-05-01 09:33:59 +10:00
Chiss
423a355057 Helpers+ wont be kicked yb MAC 2014-05-01 09:31:47 +10:00
Jonathan Williams
f4a92ec07a Implemented Logger 
Logger now catches all uncaught exceptions and logs them to DB.

Put in some preventative checks in Hub/Party as they threw a lot of the same errors.

Added autoreconnect to AntiHack as it was spamming errors in DB
 2014-04-30 10:57:19 -07:00
Jonathan Williams
7637d94ae0 Added mysql logger. 
Hooked it up in a few places.

Fixed Asynch crap with AntiHack.
 2014-04-30 00:31:22 -07:00
Jonathan Williams
e958a922fe Fixed Hub chat so it goes through filter. 
Added back in server name so it tracks correctly.

Fixed PlayerCount in Mineplexer AGAIN.
 2014-04-29 12:53:22 -07:00
Jonathan Williams
3ec1653532 Added in chat filtering command and finished up filtration. 2014-04-29 11:54:20 -07:00
Jonathan Williams
66aa7223cc Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-27 21:59:35 -07:00
Jonathan Williams
47417dea6b Implemented initial SafeChat. 2014-04-27 21:59:18 -07:00
Chiss
dc6a3da0fa Added more DMT words 2014-04-28 14:08:40 +10:00
Chiss
77809b409d MAC Update 2014-04-28 12:28:48 +10:00
Chiss
40ef432211 Cannot use skills/items in HubManager 
Dom CP score rate lowered
Dom items dont use energy
 2014-04-28 09:41:00 +10:00
Chiss
82afefd11a Quick fix for respawning players not being able to get stuff from creative inventory 2014-04-27 01:09:25 +10:00
Chiss
95d6ec7f50 Barrage fix 2014-04-26 17:25:35 +10:00
Chiss
b86b014058 Fixed a whole bunch of bugs 2014-04-26 11:59:11 +10:00
Jonathan Williams
ac1c081bc8 Fixed scoreboard issues. 2014-04-25 17:52:04 -07:00
Jonathan Williams
a37ace7576 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-25 00:44:27 -07:00
Jonathan Williams
9136fa0b15 Upgraded to latest spigot. 
Fixed npcs being so loud.
Npcs are now ghosted automatically.

Added UUID on login.
 2014-04-25 00:44:14 -07:00
Chiss
9495630bf2 CP rate increase 2014-04-25 11:10:37 +10:00
Jonathan Williams
7fef4adbee Fixed resupply resetting skills. 2014-04-22 22:19:03 -07:00
Chiss
7ea601e94b Cant open bridge chests until bridges are down. 2014-04-23 10:38:59 +10:00
Chiss
0325892e2a Champs water fixes 
First push for Twitch games
 2014-04-23 10:21:01 +10:00
Jonathan Williams
e62dfb0dd2 Fix skill/item packs not deducting gems. 
Fix players not getting spectating flag when dying.
 2014-04-22 16:50:44 -07:00
Chiss
bddc36271d fixed gems for capture 2014-04-21 17:16:35 +10:00
Chiss
0f31052d00 cannot shoot arrow in water. 
less gems for capping
 2014-04-21 17:14:23 +10:00
Chiss
a150249f4f game will not announce winner multiple times 2014-04-21 17:01:50 +10:00
Chiss
adf8821a26 more CP changes 2014-04-21 12:55:24 +10:00
Chiss
b1e082b73a fixed riposte bug 
tweaked capture effects
 2014-04-21 11:56:14 +10:00
Chiss
0eaa3110f5 Risposte nerf 2014-04-21 11:18:14 +10:00
Chiss
b8e573e8f8 redid capture display. much less annoying. 2014-04-21 11:15:49 +10:00
Chiss
07098b0b82 fixed no damage on weapons 
items not usable until game is live
fixed proxies not triggering
some skill balance/fixes
players with null kit are now given default knight
 2014-04-21 10:48:04 +10:00
Chiss
ddc8e435e8 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java
 2014-04-21 08:49:13 +10:00
Chiss
3281eb2ed7 Merge 2014-04-21 08:47:07 +10:00
Jonathan Williams
1f225f05ff Custom build fixes. 2014-04-20 00:27:32 -07:00
Jonathan Williams
dc625726c4 Item Custom Build Fixes. 2014-04-19 22:54:52 -07:00
Jonathan Williams
458f5741d7 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-19 20:54:04 -07:00
Jonathan Williams
e5e9cc7284 Custom Items in custom Builds for dom. 2014-04-19 20:53:55 -07:00
Chiss
845d45bd4d fixed some skill bugs 
players quitting during recruit will no longer remain on a team, caused unbalance
GiveClock flag added to game, to stop giving clock.
 2014-04-20 13:50:15 +10:00
Chiss
de2b42e190 fixed tnt bug 2014-04-19 15:18:13 +10:00
Chiss
b720a6433c Explosions crack carved stone brick 2014-04-19 15:10:30 +10:00
Chiss
1bf1f04d53 Champs Stuff 2014-04-19 14:50:14 +10:00
Chiss
424f915388 Champs Merge 2014-04-18 13:24:30 +10:00
Chiss
5ac48a02fb Stripped indicator func out of Condition 
Class Combat skills arent usable before game starts
Silence re-enabled for class combat skills
 2014-04-15 17:53:24 +10:00
Chiss
e5ea7483db Merge 2014-04-14 09:27:31 +10:00
Chiss
5df8d34426 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java
 2014-04-13 18:01:55 +10:00
Chiss
9874dae60f Merge 2014-04-13 18:00:53 +10:00
Jonathan Williams
5efaf9bd36 Fixed inf loop. 2014-04-13 00:59:55 -07:00
Chiss
85aa748218 Champs Bug Fixes 2014-04-13 17:20:49 +10:00
Chiss
f25a6c26c9 Champs Update 2014-04-13 11:06:10 +10:00
Chiss
154479d1b7 Fixed TDM health 2014-04-13 09:29:22 +10:00
Chiss
f73d4d3e23 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-13 09:29:12 +10:00
Chiss
2e4bc587b1 Champs Update 2014-04-13 09:26:31 +10:00
Jonathan Williams
98430be09e Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-12 01:45:01 -07:00
Jonathan Williams
8f42d91d8a Fixed ban kick bug. 
Fixed Hub right click mount crash bug.
Fix for custom builds not saving.
Fixed Bridges not starting/hanging.

Updated to 1.7.8 spigot support.

Removed logging on HS.
 2014-04-12 01:28:33 -07:00
Chiss
ecc40bda47 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-12 18:25:59 +10:00
Chiss
ba1c6ae35f Champs Balance 2014-04-12 18:22:53 +10:00
Jonathan Williams
eb1d1c1ed2 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-11 03:10:02 -07:00
Jonathan Williams
c8af89dded Fixed BH and GRavity. 2014-04-11 03:09:21 -07:00
Chiss
80df2c2944 Bux fixes for 1.7 
Champions TDM
SSM Domination
 2014-04-11 15:33:31 +10:00
Chiss
71b2931936 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-11 10:34:51 +10:00
Chiss
2adf0395a1 Merge 2014-04-11 10:33:56 +10:00
Jonathan Williams
0375384fb5 Converted to Spigot's latest 1.7.5 2014-04-10 17:15:44 -07:00
Chiss
b64acf524c Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-09 19:07:22 +10:00
Chiss
b868db0f22 Fixed so you can now charge bow skills in air. 2014-04-09 19:07:12 +10:00
Jonathan Williams
e4ca9084cc Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-09 02:03:41 -07:00
Jonathan Williams
ec29c66d1c Added arrows sticking in you. 
Removed bouncing arrows.
 2014-04-09 02:03:19 -07:00
Chiss
146202a52c Champs Balance + Red Arrow Fix 2014-04-09 18:50:38 +10:00
Chiss
0ecd38c656 Champs Balance 2014-04-09 16:48:01 +10:00
Jonathan Williams
bedabd84cc Added silence to kits (UtilEnt.silence) 
Cleaned up a ton of unused code....
 2014-04-08 23:31:32 -07:00
Chiss
2eaaa85e04 Fixed /game stop trapping players in dead world. 2014-04-08 12:08:59 +10:00
Chiss
bb3f2c6281 CHAMPS 2014-04-08 10:53:41 +10:00
Chiss
85c57f2942 IButton now has Left/Right 
Added right-click skill removal.
 2014-04-06 12:45:52 +10:00
Jonathan Williams
88131836d7 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-05 16:01:07 -04:00
Chiss
8214e3b8f4 Lots of little bug fixes 2014-04-05 16:52:23 +11:00
Jonathan Williams
05d916de3c Fixed custombuild selection not applying armor 2014-04-04 15:57:56 -04:00
Chiss
13b8f1e7ea Champs Update 2014-04-04 13:26:00 +11:00
Chiss
26fe974b00 More CHamps 2014-04-03 15:48:58 +11:00
Chiss
80c153095b Cooldown bar 2014-04-02 22:03:56 +11:00
Chiss
2f0167ea09 Champs Update 2014-04-02 21:22:21 +11:00
Chiss
2aaf749414 Champions Update 2014-04-02 15:19:58 +11:00
Jonathan Williams
d227a6bd06 Changed full server message 2014-03-29 18:45:44 -04:00
Chiss
fce249d7d8 fixed some desc stuff 
castle seige removed OP kit
 2014-03-28 18:50:38 +11:00
Chiss
4386ce0b96 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/ISkill.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java
 2014-03-28 14:55:13 +11:00
Jonathan Williams
aae40d3899 Changed up Skills and SkillsPage for Dom 2 changeover. 
Fixed CustomBuild stuff.
 2014-03-27 22:17:31 -04:00
Chiss
e4a86e0600 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-03-22 10:45:01 +11:00
Chiss
fe09c3fc49 More CS Update 2014-03-22 10:44:31 +11:00
Jonathan Williams
8bf78fe14d Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-21 15:30:06 -07:00
Jonathan Williams
33d342b049 updated 1.7 stuff. 2014-03-21 10:57:31 -07:00
Chiss
ab2a72ba16 CS Update 2014-03-21 11:59:56 +11:00
Jonathan Williams
f24f81b7c3 Finished conversion. 2014-03-19 04:09:40 -07:00
Jonathan Williams
7042159f46 Updated to 1.7 and changed namespaces to 1.7 2014-03-19 02:24:26 -07:00
Chiss
a7888b0c02 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-03-19 17:51:48 +11:00
Chiss
7714ff4a09 CS Update 2014-03-19 17:51:37 +11:00
Jonathan Williams
9715f5454a Removed double gems. 
Removed unused code for ssm time
 2014-03-18 12:55:04 -07:00
Chiss
6830033d8a PLEASE JUST WORK :( 2014-03-16 10:52:34 +11:00
Chiss
d6e3f076cd PLEASE JUST WORK MR TORTOISE 2014-03-16 10:42:30 +11:00
Chiss
3277a0a2f8 Making sure puushed 2014-03-16 10:35:58 +11:00
Chiss
d695ec72ca Added SSM Team Game 2014-03-16 10:28:46 +11:00
Jonathan Williams
3603d3ef8b Removed afk kick from arcade. 2014-03-14 21:49:01 -07:00
Jonathan Williams
0094c0ebeb Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-14 02:20:01 -07:00
Jonathan Williams
246f28a464 Enabled DoubleGem weekend. 
Added 3 new maps
updated news
 2014-03-14 02:19:52 -07:00
Chiss
aa206d9c91 Gravity fixes 2014-03-14 20:17:06 +11:00
Chiss
24efe3d0d8 SQ kit restrictions 2014-03-14 13:24:38 +11:00
Jonathan Williams
de1365b5cf Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-13 17:56:16 -07:00
Jonathan Williams
efee9fdcbf Fixed Hub class shop. 
Added chat logging.
Added message with file updater.
 2014-03-13 17:56:05 -07:00
Chiss
f4cd2fcbb9 Staggered game teleports/start 2014-03-13 18:18:22 +11:00
Chiss
82644002c5 A little bit o dem ol bug fixles. yknow what im sayin? 2014-03-13 16:32:48 +11:00
Jonathan Williams
c4b7cd19c8 Added default builds for kits in Champions/Dominate 
Added default build selection in lobby when only hitting kit and not selecting a build.
 2014-03-11 03:29:11 -07:00
Chiss
105b210afa mob spawnin' 2014-03-10 13:42:05 +11:00
Chiss
464fdb1e5e Renamed Champions to Dominate 2014-03-10 13:35:36 +11:00
Chiss
8593eb326e Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-03-10 13:32:52 +11:00
Chiss
1bc5fef625 Kit npc location change 2014-03-10 13:32:39 +11:00
Jonathan Williams
a565da45e4 Added classes to champions. 
Added ability to open direct classes page.
 2014-03-09 19:32:27 -07:00
Jonathan Williams
f51a6747fd Moved files into Mineplex.core 
Removed references to Core project.
 2014-03-09 00:50:13 -08:00
Jonathan Williams
2cc50d5725 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-03-06 02:15:46 -08:00
Jonathan Williams
d05c2f906c Fix for ServerNpc page beta join. 
Work on Dom 2.0

Added sheep quest map.
 2014-03-06 02:15:16 -08:00
Chisstop
60bc3f15bb Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-03-05 14:35:01 -08:00
Chisstop
c9a938d2c5 Sheep Quest Fixes 2014-03-05 14:34:51 -08:00
Jonathan Williams
a09a2aaa30 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-03-05 00:40:51 -08:00
Jonathan Williams
f0b347f97f Changed beta testing to Ultra and up. 
Did some work on DOM 2.0
 2014-03-05 00:34:20 -08:00
Chisstop
af2cf4e7a9 this is the one change i needed to push 2014-03-04 23:27:37 -08:00
Chisstop
2b56b970fa Sheep Game? 2014-03-04 22:39:48 -08:00
Jonathan Williams
d99a3c9253 Optimized mysql queries with server status' address/updated fields. 
Removed double gems.
Added BETA check for Hero only beta games.
 2014-03-03 12:47:57 -08:00
Jonathan Williams
b3f10b9d62 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-03-01 01:59:25 -08:00
Jonathan Williams
750fff32c7 Added Skeletal horse. 2014-03-01 01:58:58 -08:00
Chiss
b54e4dfbc4 hunger 2014-03-01 11:29:01 +11:00
Chiss
18880a00f4 fletcher doesnt give to specs 2014-03-01 11:09:15 +11:00
Chiss
dfa4ea0edc fix 2014-03-01 11:06:01 +11:00
Chiss
bfaa138526 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2014-03-01 10:35:20 +11:00
Chiss
7cf6391ddd Sheep Quest 
Double Gem Weekend
 2014-03-01 10:35:06 +11:00
Jonathan Williams
c2044f7e8a Added horse disguise. 
Added Hub redirect on full.
Fixed Repo for ServerMonitor.
Fixed Bridge QuitOut/AutoBalance issue.

Removed unnecessary region folder create in dominate.
 2014-02-28 01:18:32 -08:00
Jonathan Williams
f2570caad5 Swapped default connections to new dns names. 
Fixed bug with LobbyBalancer and retrieving no lobbies.
 2014-02-21 13:32:14 -08:00
Jonathan Williams
525df6c2b0 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-02-07 09:46:54 -08:00
Jonathan Williams
516e5f7f99 Moved Rejoin ability into TeamGame. 
Added autobalance flag for game.
Punish only does exact name lookup.
 2014-02-07 08:50:13 -08:00
Chiss
b776c1bf60 spacehelemettts 2014-01-22 08:28:06 +11:00
Chiss
d868c9b73d fixed gold blocks being destroyed. 2014-01-22 08:02:01 +11:00
Chiss
567b7c4a7b minor fixes 2014-01-21 23:14:23 +11:00
Chiss
9118e79d9a Minor fixes 2014-01-21 22:57:49 +11:00
Chiss
e124dde006 Finished Gravity 
INcluded map
 2014-01-21 22:48:18 +11:00
Chiss
bdb7f3cc28 UHC season 5 2014-01-21 11:56:35 +11:00
Chiss
76b2baf626 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2014-01-21 11:28:37 +11:00
Chiss
7bbfdd1a42 Gravity Update 2014-01-21 11:28:12 +11:00
Jonathan Williams
dea96a9e65 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-01-18 09:08:12 -06:00
Jonathan Williams
177f4a878b Removed bad eventhandler line 
Refactored StatsManager
Removed Pvp Table add for StatsManager
Added commented out hooks for HG stats
 2014-01-18 09:02:56 -06:00
Chiss
75669e2333 Hub News Changes 
AntiHack Autokick for Severe Hackers
 2014-01-18 20:33:38 +11:00
Chiss
1333f2ee9f SSM Horse Disabled 2014-01-18 12:56:00 +11:00
Chiss
1031846198 SSM Update 
Gravity game start
 2014-01-18 12:34:24 +11:00
Jonathan Williams
6904f9cf3d Minor verbage "Starting in 1 Second." 
Fixed NPE in client cleanup.
 2014-01-03 05:50:05 -05:00
Jonathan Williams
faea1072a1 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-01-03 01:37:49 -05:00
Jonathan Williams
93c0575fe2 Fixed naming in some hub modules. 
Fixed StatusManager ip and DynamicServer comparison.

Tweaked Bungee Lobby selection so it doesn't select a Lobby with < 10 slots left
Added client cleanup in CoreClientManager
Added Paintball cleanup
Added AntiHack ignore list cleanup.
Added clearDisguises call in DisguiseManager
Added ServerMonitor tracking based on Private Address.
 2014-01-03 01:37:39 -05:00
Chiss
fa2e24d686 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
 2013-12-25 09:08:03 +11:00
Chiss
375d689cc6 fixed visual bug with hero gems 2013-12-25 09:06:22 +11:00
Jonathan Williams
3fefc8fa73 Fixed Hero message in Arcade. 2013-12-24 04:13:52 -05:00
Chiss
74e49a3ff1 Hero Rank stuff 
New SSM Kit
 2013-12-24 19:14:40 +11:00
Chiss
200504ec8b made snowman boss a little tougher. 2013-12-22 00:10:15 +11:00
Chiss
b895c66005 snake even more easy 2013-12-22 00:02:38 +11:00
Chiss
2f063e9f8e wave 3 snowman invul fix 2013-12-21 23:54:10 +11:00
Chiss
d6c37055da cleaner leak fix. 2013-12-21 23:06:27 +11:00
Chiss
1c3d90a70f leak fixes 2013-12-21 23:00:51 +11:00
Chiss
58e049acf9 snake bit is easier :) 2013-12-21 22:34:04 +11:00
Chiss
a6eb7ea665 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-21 20:07:04 +11:00
Chiss
0585116e78 Hub Gadgets 
Hub Dragon (Hero Only)
XMAS block efficiency
 2013-12-21 20:05:42 +11:00
Jonathan Williams
7574a5972b Prevented sounds from silenced vegetables. 2013-12-21 03:22:58 -05:00
Jonathan Williams
5fffcf89b6 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-21 02:44:20 -05:00
Jonathan Williams
70c14268e1 Fixed Leash issue. 
Added invis for utilent.ghost
 2013-12-21 02:44:12 -05:00
Chiss
f50ae06dff NPE fix 2013-12-21 16:52:59 +11:00
Chiss
50c2b10b50 25% easier boss 2013-12-21 15:10:17 +11:00
Chiss
c52a7d2fe1 Christmas update 
Hub Update
 2013-12-21 15:06:01 +11:00
Chiss
bc9c309aa1 Xmas Game 2013-12-21 10:17:22 +11:00
Chiss
ac723c14bd Push so i can pull :O 
just some xmas stuff
 2013-12-21 08:42:49 +11:00
Chiss
f4edcedce3 push so i can pull :\? 2013-12-18 21:17:28 +11:00
Jonathan Williams
e054b06cc2 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-13 21:01:08 -08:00
Jonathan Williams
6b92b6c4a8 Added stats manager. 
Added lots of missing files.
 2013-12-13 21:00:56 -08:00
Chiss
1eebed737e Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
 2013-12-13 18:05:08 +11:00
Chiss
5f2e457362 Minor HG Stuffs ;o 2013-12-13 16:21:39 +11:00
Jonathan Williams
d6544202f0 Added ghost ability for mobs. 2013-12-12 02:19:58 -08:00
Chiss
2fb4bc4fbc UHC stuff 2013-12-07 23:04:10 +11:00
Chiss
db7b4f3a40 more draw words 2013-12-04 15:25:18 +11:00
Chiss
00bccdc1f7 More draw words 
UHC complete! probably not :'(
 2013-12-04 13:31:23 +11:00
Chiss
a29cc4664f Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
 2013-12-04 12:48:12 +11:00
Chiss
28c928b4c3 Xmas + UHC changes 2013-12-04 12:45:17 +11:00
Jonathan Williams
8984309c56 Cleaned up portal cancellation. 2013-12-03 17:41:58 -08:00
Jonathan Williams
022c343a98 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
 2013-12-03 13:58:28 -08:00
Jonathan Williams
09a77e98cc Prevent Enderdragon from creating portal. 2013-12-03 13:57:43 -08:00
Chiss
36a98d5e41 UHC changes 2013-12-03 21:31:02 +11:00
Chiss
f972418fd1 UHC! 2013-12-03 17:13:29 +11:00
Chiss
d10871abd9 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-03 16:27:12 +11:00
Chiss
43196dd7af UHC Update 2013-12-03 16:26:47 +11:00
Jonathan Williams
ce4eb43145 UHC end transfer. 2013-12-02 21:20:28 -08:00
Chiss
c8fc792fdd UHC prep for s4 
Draw updates
 2013-11-30 20:40:09 +11:00
Chiss
8807854b57 Added Draw 2013-11-29 23:38:38 +11:00
Chiss
f927f2c1be wolf tackle fix 
HG furnace no use
 2013-11-27 12:48:16 +11:00
Chiss
0d811272cc final HG fix :D 2013-11-27 11:52:20 +11:00
Chiss
6f06ac2018 HG lag fixes 
item frames cannot be broken
creep damage messages
 2013-11-26 23:54:02 +11:00
Jonathan Williams
25782813f4 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-26 02:35:05 -08:00
Jonathan Williams
9a7a815a21 Added multiblock packets only for sg. 
RE-tweaked loot.
Fixed blocks pawns in lobby.
 2013-11-26 02:34:54 -08:00
Chiss
e57722ed0b HG snowball fix 2013-11-26 12:02:03 +11:00
Chiss
48e392fdf0 HG; 
-compass
-deathmatch
-various fixes
 2013-11-25 20:59:46 +11:00
Chiss
e469c5705b Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-25 10:23:28 +11:00
Chiss
b941359840 HG 2013-11-25 10:23:10 +11:00
Jonathan Williams
2ebf13aba6 Added commented out chunk change stuff. 2013-11-24 15:22:29 -08:00
Jonathan Williams
e2646a982f Added MultiBlock packet. 
Tweaked performance for chunks that are < 64 changes for HungerGames.
 2013-11-24 04:54:41 -08:00
Jonathan Williams
0a1f4ecfd5 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-24 03:04:07 -08:00
Chiss
276898dced HG 2013-11-24 21:58:55 +11:00
Jonathan Williams
8d19f3ecac Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-24 02:44:59 -08:00
Jonathan Williams
dbd7820279 Loot tweak. 2013-11-24 02:44:52 -08:00
Chiss
4c7e42760b debugz 2013-11-24 21:44:43 +11:00
Chiss
83bec39aef game not end 2013-11-24 21:36:35 +11:00
Chiss
c9e1c0a0f4 HG lag fix 2013-11-24 21:29:49 +11:00
Chiss
2a41979277 HG Lag Fixes! 2013-11-23 23:58:51 +11:00
Chiss
0d7444f35a TNT Damage off 2013-11-23 19:38:58 +11:00
Chiss
e6080c9192 drop fixes 2013-11-23 18:39:26 +11:00
Chiss
d5ae42910f OOPDOOTS 2013-11-23 18:19:26 +11:00
Chiss
11bd4804f4 skeleton/wolf removal on death 2013-11-23 11:03:52 +11:00
Chiss
8752a7a6ac HG Ice Speed + TNT Delay 2013-11-23 10:21:06 +11:00
Chiss
3a3ac9f8ce redblockstore 2013-11-23 10:04:37 +11:00
Chiss
189b22ab4c Pushed fixes 2013-11-23 09:55:48 +11:00
Chiss
42cab3a39c HG STUFF 2013-11-23 09:28:27 +11:00
Chiss
a5a80378f7 Loot fixes 2013-11-23 09:15:13 +11:00
Chiss
3d13fb0dc9 HG Fixes 2013-11-22 23:12:39 +11:00
Chiss
0a683416ff SG Update 2013-11-22 18:40:38 +11:00
Chiss
18c70901ca gem kit fix 2013-11-17 21:04:27 +11:00
Chiss
fff13a14bf Gem lowered on firework/meow 2013-11-17 12:31:13 +11:00
Chiss
0aae7d24ed BH Gem Fixes 2013-11-17 12:30:14 +11:00
Chiss
630281c663 SSM Hunger Fix 2013-11-17 09:53:53 +11:00
Jonathan Williams
3f93e6daf1 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/CreatureForm.java
 2013-11-16 01:56:22 -08:00
Jonathan Williams
75c2a5fd6e Added sound disguises 
Removed purchasable batgun.
 2013-11-16 01:55:10 -08:00
Chiss
9c6ebcea52 shocking nerf 2013-11-16 18:25:19 +11:00
Chiss
37ed58cea9 axe boost nerf 2013-11-16 17:57:21 +11:00
Chiss
690811dd05 cased SG debug properly 2013-11-16 17:54:30 +11:00
Chiss
b8e1c22967 BH updates 2013-11-16 17:53:42 +11:00
Chiss
ea8d28abc1 Formula 2013-11-16 17:10:54 +11:00
Chiss
ef54732531 DISGUISE THEM CATS 2013-11-16 16:43:03 +11:00
Chiss
2e6758e23c BH Updates 2013-11-16 13:15:16 +11:00
Chiss
29ce493f64 Hide and SEEEEEEK (block honts) 2013-11-15 18:52:46 +11:00
Chiss
99c97d1ecd Block Hunt changes 2013-11-14 16:28:29 +11:00
Chiss
6ebda931fd Fixed bug where backtracking players could be in the scoreboard twice. 2013-11-11 07:27:41 +11:00
Chiss
3c5b1fe74f H&S Updates 
some punish fixes
hub toggles no longer pulse on pressure plate
 2013-11-09 09:48:40 +11:00
Chiss
dc062c7bb6 H&S Push 2013-11-07 19:49:21 +11:00
Chiss
6b577af7b4 Punish Update 
H&S Additions
 2013-11-07 15:25:46 +11:00
Chiss
9f11352f10 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-07 10:19:30 +11:00
Chiss
03731de7f8 Rank changes 
MAC no longer kicks lag/fly
some H&S stuff :O
 2013-11-07 10:18:36 +11:00
Jonathan Williams
ff6488b371 safe file separators 2013-11-05 16:10:14 -08:00
Jonathan Williams
43d5b6441b Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-05 10:19:17 -08:00
Chiss
bcb86fc911 PB gem for healing remove 2013-11-04 09:46:09 +11:00
Chiss
e14bc76639 arcade map directory up up right left down up right update! 
some paintball fixes
H&S start
 2013-11-04 08:59:29 +11:00
Jonathan Williams
6999d7979f Added paintball to LobbyMenu 
Fixed Lobby count in lobby menu
Fixed ultra/green kits in Paintball
 2013-11-02 12:26:28 -07:00
Chiss
0cbefc1280 Paintball update! 2013-11-02 15:42:37 +11:00
Chiss
24723cd5e5 paintball update 2013-11-02 10:09:07 +11:00
Chiss
c72f1337e8 fixed memory leak in antihack 2013-11-01 10:40:33 +11:00
Chiss
08497e474d mobs no longer move as soon as they spawn. GET IN LINE BOYS! 2013-11-01 08:34:32 +11:00
Chiss
7dcd58ec2d HH debug prints 2013-11-01 08:27:45 +11:00
Chiss
d41338b76a Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/Champions.java
 2013-10-31 17:38:44 +11:00
Chiss
ae4bf75485 Champs update 2013-10-31 17:36:41 +11:00
Jonathan Williams
7b8608de95 Rah Rah, Custom Class Combat in Arcade! 2013-10-30 23:35:24 -07:00
Chiss
52ac670f3f More dom changes 2013-10-31 12:43:54 +11:00
Chiss
386e2e3067 Added Champs 
MAC update
 2013-10-31 09:45:11 +11:00
Chiss
33c7d594a0 robin hood regen nerf 2013-10-29 10:43:04 +11:00
Chiss
ad487e48bd THIS IS HALLOWEEN THIS IS HALLOWEEN 2013-10-29 10:41:53 +11:00
Chiss
91ec162c88 slightly easier 2013-10-28 22:30:51 +11:00
Chiss
3142bd517d Fixed regen aura... wasnt working at all 2013-10-28 21:35:16 +11:00
Chiss
f0f7a4156f saving heads to file 2013-10-28 17:53:25 +11:00
Chiss
09a8cbe558 re-enabled waves 2013-10-28 14:08:55 +11:00
Chiss
1d4f902298 HH CPU fixes 2013-10-28 13:54:10 +11:00
Chiss
4974fc17aa Halloween balance (slightly easier) 
Giant hitbox improved
 2013-10-27 15:24:28 +11:00
Chiss
7948fa6f71 cpu fix ;o 2013-10-27 06:21:43 +11:00
Chiss
c9a295d56e Halloween event changes final 2013-10-27 05:32:21 +11:00
Chiss
935599030b moved witch (so its not default kit) 2013-10-27 02:44:14 +11:00
Chiss
9a025eb540 Potion rename 2013-10-27 02:37:11 +11:00
Chiss
f838452b5c uncommented waves 2013-10-27 01:46:46 +11:00
Chiss
b4e2145ad7 giant speed decrease 
ghast teleports back if it flies too far away.
 2013-10-27 01:43:41 +11:00
Chiss
cd2c9dcdda more tips 2013-10-27 01:20:10 +11:00
Chiss
c672e68713 some help during boss fight. 2013-10-27 00:14:38 +11:00
Chiss
7eb1cc6519 Halloween game additions 2013-10-27 00:06:44 +11:00
Chiss
723b57cd46 Added paintball gun Gadget 
Added bat blaster Gadget

Halloween Game near-completed

Added SSM Witch
 2013-10-26 19:01:26 +11:00
Chiss
a52bd69558 Witch SSM 2013-10-26 11:34:05 +11:00
Chiss
e8ddfc266e fsd6gty72 tjn6g wgh 2013-10-25 22:20:46 +11:00
Chiss
61b7a86b67 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-25 21:25:36 +11:00
Chiss
b74b8e3915 Halloween event changes 2013-10-25 21:25:23 +11:00
Jonathan Williams
e5f99331dd Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-25 05:16:15 -05:00
Chiss
5563d94111 Halloween event update 
hub News
hub mounts
hub gadgets
 2013-10-25 19:20:14 +11:00
Jonathan Williams
21128eb153 Prepping filterChat and CoreClientManager for mysql 
Removed get all clients at server start.
 2013-10-23 16:36:13 -05:00
Chiss
1977572ced Added Halloween Minigame 
Updated gadgets and other minor things.
 2013-10-22 15:46:31 +11:00
Jonathan Williams
90fbc397ff Converted gem rewards to boolean return from website. 
Implemented gem transactions and source.
 2013-10-18 00:46:06 -07:00
Jonathan Williams
f88c202e07 Added AntiHack to Arcade/Hub 
Added AntiHack Offense uploading.
Fixed memory leaks in PreparedStatments
Added Ultra tag in hub chat.
 2013-10-17 00:37:57 -07:00
Chiss
2a836f3464 Added anti-hack 2013-10-16 12:23:23 +11:00
Chiss
40e49dd3d4 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-16 08:11:04 +11:00
Chiss
ec80d8a568 added AntiHack 
added dragonrider coolness
 2013-10-16 08:10:45 +11:00
Jonathan Williams
1cdb89f4bf Derp, missing arcade. 2013-10-13 21:51:38 -07:00
Chiss
9ffc793f61 added Dragon Rider 
anti-stack changes (dont anti-stack mined blocks)
 2013-10-14 10:29:20 +11:00
Chiss
36b825d36d Snake update (woo) 2013-10-13 10:33:16 +11:00
Chiss
d784a0b017 snake speed ramp up decrease 2013-10-13 09:38:03 +11:00
Chiss
e12477c4b6 snake max speed decrease 2013-10-13 08:46:02 +11:00
Chiss
1fd894934a Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-13 08:43:06 +11:00
Chiss
377f4b0680 Gem fix, now correctly displays scaled gems. 
UHC public changes
Snake fixes.
 2013-10-13 08:42:49 +11:00
Jonathan Williams
c5385ee7dc Fixed ultra join in arcade manager. 2013-10-12 02:53:22 -07:00
Chiss
c8386bbc40 blue kit for snake 2013-10-12 18:22:20 +11:00
Chiss
a315064a3f snake fix 
parkour radius increase
 2013-10-12 18:21:19 +11:00
Chiss
0564bd740a SSM wolf balance 2013-10-12 17:17:24 +11:00
Chiss
4eecca3063 Wolf fixes 2013-10-12 17:13:28 +11:00
Chiss
8766767d96 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-12 16:59:38 +11:00
Chiss
27fb3b4262 Snake changes 
SSM Wolf fixes
 2013-10-12 16:59:23 +11:00
Jonathan Williams
f2c295c391 Fixed global ultra joining full games. 2013-10-11 22:03:17 -07:00
Chiss
0b2dcc2617 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-12 09:34:59 +11:00
Chiss
8376316994 Added Paintball 
Added SSM Kit: Wolf
UPDATES.
 2013-10-12 09:34:46 +11:00
Jonathan Williams
fc18d0fbb1 Added null check logging to arcade custom kit name. 
Removed wolf kit in SSM for release
Cleaned up PlayerAccountController
Fixed connection leak for mysql connections.
Added server shutdown if server is empty for dominate.
 2013-10-10 09:01:48 -07:00
Chiss
ed804e3336 Dragon escape update 2013-10-09 21:50:39 +11:00
Chiss
1fc446ae13 Lobby text now displays map 2013-10-08 17:56:57 +11:00
Chiss
b64803e499 Smash Wolf 2013-10-08 17:44:04 +11:00
Chiss
e7de90c267 Bridge changes to allow for 12 team map 
Bridge timer fix
Smash wolf remove
World parser allows more than 4 teams.
 2013-10-05 22:14:57 +10:00
Chiss
ab45c717dd Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-10-05 07:49:21 +10:00
Chiss
3ba848567c paintball added 
hg additions
minor changes to other games
 2013-10-05 07:49:05 +10:00
Jonathan Williams
57b0d06786 Added DisguiseWolf 
Added lobby menu (disabled autogive for testing)
Removed unused commands.
 2013-10-02 22:23:01 -07:00
Chiss
34521eef8f minor game fixes 
portal method in StackerManager.java
 2013-09-27 17:08:32 +10:00
Chiss
2a3d7426d5 Some scoreboard fixes 2013-09-26 12:38:32 +10:00
Chiss
f0e6a7294e squid hitbox larger 2013-09-24 09:18:36 +10:00
Chiss
0390d4f63b desc update suqid 2013-09-24 08:56:51 +10:00
Chiss
064dd97d00 HitBox support for disguises 
Squid hitbox added
Changed squid swimming!
 2013-09-24 08:56:09 +10:00
Chiss
ea5cc7161a pigssss 2013-09-24 08:19:07 +10:00
Chiss
d8d4b69dda baby pig to pig 2013-09-24 08:15:48 +10:00
Chiss
82f5fcb963 Pig Fix! 2013-09-24 08:12:51 +10:00
Chiss
d4775a91a1 hitbox reduction 2013-09-23 17:45:14 +10:00
Chiss
0f9f28dcc2 fixed weapon names in pigs, + baby pig on platform 2013-09-23 17:36:53 +10:00
Chiss
5ba494c381 Made player names more visible in squid 2013-09-23 16:05:05 +10:00
Chiss
ce89108aea Fixed disguises in bacon brawl 2013-09-23 16:00:35 +10:00
Chiss
eae38dfa22 Merge branch 'master' of ssh://198.245.50.91:7999/min/master 
Conflicts:
	Plugins/Libraries/craftbukkit.jar
 2013-09-23 15:50:30 +10:00
Chiss
bf4dc35b5f Added pig Game 
added squid game
added recharged skill event
 2013-09-23 15:48:35 +10:00
Jonathan Williams
e098d93155 Added baby disguise ability. 
Added Stacker recharge.
Fixed issue with ServerGameMenu Champions button.
SuperSmash decreased hunger gain on attack.

Code cleanup.
 2013-09-22 20:53:24 -07:00
Jonathan Williams
cc63fdccfc Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-21 15:02:14 -07:00
Jonathan Williams
558d9b4cc6 Added shop link to kits. 
REmoved client cache.
Added random messages.
Fixed problem with Confirmation Page.
 2013-09-21 15:01:40 -07:00
Chiss
b3a78112be Fixed gem display bug 2013-09-21 13:53:12 +10:00
Chiss
eb6bbceecd Slowed hunger degen a little, increased regen to damage dealt. 2013-09-21 13:40:04 +10:00
Chiss
9064272a38 Prepared SSM for 200 player Game (added hunger) 2013-09-21 13:34:14 +10:00
Chiss
9da18ea43f Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-21 08:34:24 +10:00
Chiss
a92c74a28a HG Updates 
Other minor fixes
 2013-09-21 08:34:07 +10:00
Jonathan Williams
85cc6e5b2b Updated to 1.6.4 2013-09-20 01:50:56 -07:00
Chiss
91ce36d6e4 Hub refactor 
Hub parkour module
 2013-09-18 19:46:45 +10:00
Jonathan Williams
ae00d3df18 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-17 15:52:16 -07:00
Jonathan Williams
f31a734a0d Fixed server pages to show 5 servers. 
Added in creeper explode block list for UHC.java
Added task assignment/reward message only on return confirm call.
Hide players in hub when they have an inventory open.
Added gem command into donation manager.

Revamped bungee player count method.
Revamped server status method.
 2013-09-17 15:50:23 -07:00
Chiss
c6a9d4675f MTC changes 
Barbarians changes
OITQ enchanter desc improvement
renamed Turf Forts
Added 2.5x gems for bridges
 2013-09-17 10:37:45 +10:00
Chiss
c6b3a8a56c Added Minigames to hub TextCreator.java 
Milk the cow changes!
 2013-09-16 12:23:57 +10:00
Chiss
118d52e106 Slime Buff 2013-09-16 12:03:04 +10:00
Chiss
7bd13b416e Some turf forts fixes/changes 
Fixed SSM lobby
 2013-09-16 11:52:27 +10:00
Chiss
616ba6312c fixed bug with bomber not giving tnt 2013-09-15 15:27:50 +10:00
Chiss
6f03c57c22 Farmers lose 5 milk when dying. 2013-09-15 14:21:10 +10:00
Chiss
6b5373c20c Fixed Turf Forts arrow bug 2013-09-15 13:57:13 +10:00
Chiss
7894f95aab Milk Cow now has 3 cows 
dragon escape backtrack fix
 2013-09-15 13:43:56 +10:00
Chiss
d51599de28 HG start 
Added /hub and /leave to return to hub
 2013-09-15 11:12:11 +10:00
Chiss
cc39abfd7f UHC fixes 
IdleManager NPE fix
 2013-09-14 20:03:24 +10:00
Chiss
44b82f90b1 Shredder buff 2013-09-14 19:05:07 +10:00
Chiss
5ad627decb SSM Creeper shield nerf by 50% duration 2013-09-14 16:13:24 +10:00
Chiss
743c8e9978 SSM Blaze slight buff 
Dragons: Removed knockback (based on feedback)
Dragons: added 3 mroe dragons :D
 2013-09-14 16:09:30 +10:00