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

1367 Commits

Author SHA1 Message Date
Mysticate 1e1cf6403d Added achievements 2015-07-14 13:31:41 -04:00
Sarah a224e5937d Merge branch 'EventGameUpdates' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams 2015-07-14 07:11:48 +02:00
Sarah e72d612379 Implementing the mapSource parameter in GameType and setting up SkywarsTeams and SurvivalGamesTeams. 2015-07-14 05:25:08 +02:00
Cheese f2cc2a2c86 youtubers wont get kicked by mac 2015-07-14 10:16:42 +10:00
Cheese cb05049c4a youtubes can turn off vel in hubs 2015-07-14 10:08:41 +10:00
Mysticate 0a09ae29f3 Merge remote-tracking branch 'origin/master' into BombLobbers 2015-07-12 18:14:25 -04:00
Mysticate 1b3d7f1c20 Fixed and added things 2015-07-08 23:57:48 -04:00
Cheese 7d073fdc0d fixed skywars icon 
changed LOSSES to GAMESPLAYED for consistency
 2015-07-09 12:47:40 +10:00
Cheese e36b0440a4 Merge branch 'bench' 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
	Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
	Plugins/Mineplex.StaffServer/.classpath
 2015-07-08 13:55:01 +10:00
Cheese cca26165cd swapped sale back to 50% 2015-07-06 11:42:54 +10:00
libraryaddict 2c249e37b5 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-06 07:07:56 +12:00
libraryaddict e16cb4cef7 Disguise: Initite armorstand vector 2015-07-06 07:07:41 +12:00
Shaun Bennett abaa0ddee8 Level for Bobby 2015-07-05 13:30:16 -05:00
Cheese 7182205fde Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-05 15:13:33 +10:00
Cheese 8d2b1650af world component for MCPE 2015-07-05 15:13:18 +10:00
libraryaddict e002e4af18 Disguises: Added ArmorStandDisguise, removed unused DisguiseType and added ability to add fake armor to disguises 2015-07-05 13:37:07 +12:00
Cheese 556e524e18 changed notifications back to 75% sale 2015-07-02 16:14:47 +10:00
Jonathan Williams 2069524f15 Merge remote-tracking branch 'remotes/origin/foo' 2015-06-29 18:14:07 -04:00
Jonathan Williams bbb661d686 Fixed up BenefitManager. 2015-06-29 18:07:06 -04:00
fooify 4ff456b722 Merge remote-tracking branch 'origin/master' into foo 2015-06-29 11:29:22 -07:00
Jonathan Williams d426c24970 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-29 06:14:30 -04:00
Cheese da3c5eeaaf 40k b enefit 2015-06-29 20:14:15 +10:00
Jonathan Williams 9f384b0d3e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-29 06:02:57 -04:00
Cheese 48f5fa118a fixed a few sky bugs 2015-06-29 14:26:00 +10:00
Cheese 0ea388379a reduced win req for skywars ach 
enabled beenfit for 40k reward
 2015-06-28 15:16:05 +10:00
Jonathan Williams 65a10461cd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/donation/command/CoinCommand.java
 2015-06-27 02:29:07 -05:00
Jonathan Williams 9a4bcd29a1 Fixed Sparks problems... 2015-06-27 02:26:29 -05:00
fooify 333c54cff9 Merge branch 'master' into foo 2015-06-26 10:07:13 -07:00
Shaun Bennett 8ef52ea103 Mineplex Gold Rush 2.0 2015-06-26 10:50:37 -05:00
Cheese c0bc522614 split achievement text over 2 lines 2015-06-26 19:32:18 +10:00
Cheese 1aa0832bb9 SkyWars to Skywars 2015-06-26 17:55:49 +10:00
Jonathan Williams f906f08a18 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 02:34:36 -05:00
Shaun Bennett 7c698f65cf Quick Menu, and Stats adjustments for SkyWars. Updated Private server page to show game icon instead of player heads 2015-06-26 02:31:35 -05:00
Jonathan Williams c78ef9d93d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 02:30:01 -05:00
Cheese 2498f7756c skyawrs stats icon 2015-06-26 17:16:16 +10:00
Cheese 027efe02fc skywars! 2015-06-26 16:38:44 +10:00
Jonathan Williams efa06d370b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 01:13:42 -05:00
Jonathan Williams 86e2514e37 Fixed callbacks for gem/coin rewards. 2015-06-26 01:13:28 -05:00
Cheese caa51d0e89 Merge branch 'SkyWars' 2015-06-26 16:04:46 +10:00
Cheese 338797f4a6 skywars update 2015-06-26 15:57:47 +10:00
Cheese aef8a00017 update! 2015-06-26 15:25:43 +10:00
Cheese 2d1d65b239 skywars fixes 2015-06-26 13:15:03 +10:00
Jeremiah Bishop 0342a5ac61 Fixed Achievements 
Reordered Kits
Added new Kit
etc, etc, etc...
 2015-06-25 19:03:25 -04:00
fooify 2679d19a81 Missed a spot. 2015-06-25 08:19:12 -07:00
fooify ba9e4ba5d9 Fix staff server not hiding in friends list 2015-06-25 08:17:28 -07:00
Cheese 2179795677 Merge branch 'SkyWars' of ssh://184.154.0.242:7999/min/Mineplex into SkyWars 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SkyWars.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
 2015-06-25 20:48:34 +10:00
Cheese 2bf1faa70d fixed a few skywars bugs 
added ore generation (but theres some wierd bug, still working on it)
 2015-06-25 20:24:31 +10:00
Jeremiah Bishop ed667fedee Added more achievements 2015-06-24 22:59:28 -04:00
Cheese b77279a160 fixed notif msg 2015-06-25 11:22:23 +10:00
Jeremiah Bishop cd10a2ad79 Fixed both kits 
Added game achievements.
 2015-06-24 20:08:31 -04:00
fooify ea3c04b8c1 Add fooify to list of AFKers 2015-06-24 10:24:08 -07:00
Jeremiah Bishop 7583e4170b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars 2015-06-22 21:40:43 -04:00
Cheese 3a06b54b7f Changed notifications to 50% off sale 2015-06-22 17:10:03 +10:00
Jeremiah Bishop a05c2d085d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars 2015-06-21 16:17:51 -04:00
Aaron Brock 3532dea892 Allowed Helper+ to bypass anti-hackusating 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 10:01:50 -04:00
Jonathan Williams 90e13b4b9e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-20 03:37:33 -05:00
Jonathan Williams dbde6890a0 Add fallback to load by name if no uuid. 2015-06-20 03:36:55 -05:00
Aaron Brock 9cedb3b742 Rewrote how hackusations are detected. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 01:10:26 -04:00
Cheese 478a3c8591 some champs fixes/balance 
duplicate message improvement
 2015-06-20 15:00:16 +10:00
Cheese 77bf332c29 level 25 is uneffected by chat delay 2015-06-20 11:18:31 +10:00
Cheese 2c43dc76c9 DMT no longer effected by 3s chat delay 
Minestrike no longer has 'terrorists'
Jr.Dev rank up!
 2015-06-20 11:12:24 +10:00
Cheese cf152c4897 fixed notifs being sent to people who didnt need them 2015-06-19 13:46:56 +10:00
Cheese de83e58e75 removed debug 2015-06-19 13:29:32 +10:00
Cheese 8a224950b3 Added sale notifications 
Added 3s chat delay
 2015-06-19 13:27:59 +10:00
Jeremiah Bishop dd9e6a6866 Started adding SkyWars game mechanics 2015-06-18 14:54:26 -04:00
libraryaddict b0c026e67c Mineware: Commit what I have, fix DisguiseVillager not extending agable and adding new option to disable auto respawn 2015-06-16 14:01:52 +12:00
Jonathan Williams 47099a0b20 Changed default redis ip to new us redis. 
Changed previous server to gold text when sending to new server.
 2015-06-12 15:45:54 -05:00
Jonathan Williams c6352445cf Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-08 23:18:06 -05:00
libraryaddict 8cf10afb1b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-06-06 18:31:08 +12:00
libraryaddict 6c9963e1b3 CommandCenter: Cancel command event straight after verifying that its been registered 2015-05-30 05:44:49 +12:00
Shaun Bennett 7d43b146b7 [Core] Display Games Played instead of Losses for a bunch of the arcade games where losses will be greater than wins 2015-05-28 19:05:45 -05:00
Jonathan Williams 2c5471cb34 Added ability to see which server you were sent from. 2015-05-28 09:33:49 -05:00
libraryaddict d84bd4ffe4 Messaging: Now with censors! 2015-05-28 10:13:31 +12:00
Jonathan Williams 96b1df4ee0 Fixed global player count. 
Fixed tasks.
 2015-05-22 14:33:25 -07:00
Jonathan Williams f0c7f2fe76 Merge branch 'MSSQL_Conversion' 
Conflicts:
	Website/LOCWebsite.suo
 2015-05-17 23:11:50 -07:00
Shaun Bennett 0d2157b4f3 [Core] Fix /stats lava bucket bug 2015-05-13 23:23:43 -05:00
Jonathan Williams a6cf1309ff Fix for ranks not applying. 2015-05-13 14:33:31 -07:00
Jonathan Williams 1c6a12528c Added ability for LT to modify Admin ranks. 
Added Twithc rank to the updateRank list.

Fixed server sorting issues with UHC Generating servers.
 2015-05-13 00:58:45 -07:00
Shaun Bennett aa5898e1db Merge remote-tracking branch 'origin/master' 2015-05-12 18:43:48 -05:00
Shaun Bennett f9269b534f [Core] Add look AI to NPC's 2015-05-12 18:43:26 -05:00
Shaun Bennett d703070810 [Core] Shrink stat page 2015-05-12 17:20:58 -05:00
Shaun Bennett 53555a42cd [Core] Add MB Stats in gui, Add MB Achievement, Update stat gui layout, add ability to display combined stats 2015-05-12 17:14:50 -05:00
Mini-Chiss e1dd3a318e UHC!!!!! 2015-05-12 15:52:19 -05:00
Shaun Bennett 90fc4656fa [Core] Attempt at mitigating spam bots without hurting normal players 2015-05-12 08:09:13 -05:00
Shaun Bennett 5d13b6a144 [Core] Disable writing on signs for muted players 2015-05-12 07:11:35 -05:00
Shaun Bennett 87f495e376 [Core] Filter text on placed signs with Chat Module 2015-05-12 07:02:34 -05:00
Shaun Bennett 06a0f3d0d5 Merge remote-tracking branch 'origin/master' 2015-05-12 00:37:40 -05:00
Shaun Bennett 9d959ee7a3 Fix/Enable Look at me Button 2015-05-11 20:46:37 -05:00
Mini-Chiss 643ed2c047 Fixed most enchants not working 
added commands to event
minor update to snowfight to make it more fun
 2015-05-11 19:55:26 -05:00
Mini-Chiss 8d585ce807 admins can giveitem 2015-05-11 17:59:13 -05:00
Mini-Chiss 55b6d29468 Just shufflin some location 2015-05-11 17:57:21 -05:00
Mini-Chiss 123af16bd2 UHC map gen 2015-05-11 13:25:05 -05:00
Jonathan Williams b1a46d0f0d Converted TaskManager 2015-05-11 01:21:27 -07:00
Mini-Chiss 6e2b437e55 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-09 12:28:16 -05:00
Mini-Chiss 822718095d cannot PM from spawn 
first push of cards game
 2015-05-09 12:23:07 -05:00
libraryaddict 29c4a033a7 Achievement: Fix wizards 10 win to 50 wins, change wizards to blaze rod, change stats layout 2015-05-08 18:56:00 +12:00
libraryaddict 5ec04263d4 Map stuff: First commit (or second?) 2015-05-08 07:31:03 +12:00
Jonathan Williams e999f943b5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-06 20:20:07 -07:00
Jonathan Williams d3e5dd9c8a Fixed so name searching only returns the last account logged in with that name. 2015-05-06 20:19:58 -07:00
libraryaddict 3e02806b75 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-07 02:57:20 +12:00