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

8450 Commits

Author SHA1 Message Date
xXVevzZXx fbd9b17ba0 fix playeringametime being 0 2016-06-25 12:35:59 -05:00
xXVevzZXx 8d4f5f0f93 Modularize Minestrike and add Strike Games 2016-06-25 19:11:08 +02:00
Thanos Paravantis a714144159 Implement new challenge selection system 
The new challenge selection system stores only one instance of each
challenge, instead of creating new ones when the next challenge is
selected. In addition to that, challenge data is now reset every time
the challenge ends to be able to reuse the same resources.

In a future commit, I might as well only generate the spawnpoints once
in an attempt to make things as quick as possible. The new system may have
some bugs, since it's not fully tested with QA yet.
 2016-06-25 13:19:09 +03:00
Thanos Paravantis bc229c44aa Apply small changes to Zombie Infection 2016-06-25 11:56:55 +03:00
xXVevzZXx 7a55b131d4 Add SmasgDom, Smash Glags, Tiny Smash, Smash Sheep, Sky Smash, Changing Kits and OP Sheep 2016-06-25 09:11:42 +02:00
LCastr0 30f413d04e Fixes for persistence: 
No longer save items after they are disabled
No longer keep the particle effect after a staff vanishes
 2016-06-25 02:22:20 -03:00
TadahTech 50759661cf Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-06-24 23:52:27 -05:00
xXVevzZXx b34d652617 Add Lucky Bridges, CookieFight and OP MB 2016-06-25 06:35:08 +02:00
LCastr0 d75abe3aea Persistence fixes 2016-06-25 00:36:00 -03:00
LCastr0 83f4b25887 Testing persistence fixes 2016-06-25 00:33:36 -03:00
LCastr0 a18976649b Merge pull request #116 from Mineplex-LLC/develop 
Merge develop into project-cosmetics
 2016-06-25 00:27:01 -03:00
xXVevzZXx 285d94a2ca Fill hotbar editor with glass panes 2016-06-25 04:48:59 +02:00
cnr c430566c6d Never reset a player's YouTube click time locally 2016-06-24 16:59:27 -05:00
Shaun Bennett 94fe9f57d2 Add missing imports 2016-06-24 12:36:56 -07:00
Kenny Goodin dc9145c707 Hotfix, disable youtube and twitter buttons in BonusGUI 2016-06-24 15:33:07 -04:00
TadahTech 0cda8ab7a3 Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-06-24 04:11:59 -05:00
TadahTech 8fbb06ae3d Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2016-06-24 04:11:38 -05:00
cnr 14542d7dac Close open UIs except for Champions kits 2016-06-24 04:10:08 -05:00
Shaun Bennett 95f7c757cb Fix booster group naming for the quick menu 2016-06-24 04:07:27 -05:00
cnr c40e07695c Only close open UIs when choosing SSM kits 2016-06-24 04:06:28 -05:00
TadahTech e71fc291d1 Fix cross server invites / joining servers. 2016-06-24 04:01:51 -05:00
Shaun Bennett 560abc933c Replace underscores with spaces in booster group 2016-06-24 03:16:42 -05:00
Shaun Bennett b4caf5125b Adjust tip amounts 2016-06-24 03:16:42 -05:00
Shaun Bennett d708c478d7 Dont display other boosters, fix typo 2016-06-24 03:16:42 -05:00
Shaun Bennett 348cb9efba Fix remaining booster message 2016-06-24 02:23:09 -05:00
cnr b58ff8c066 Add YouTube and Twitter buttons to UI 2016-06-24 01:30:10 -05:00
Shaun Bennett def57e2c0b Fix HubManager, add failsafe for BoosterManager 2016-06-23 23:19:02 -07:00
Shaun Bennett fd843b88cb Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/inventory/GemBooster.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
#	Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java
 2016-06-23 23:02:26 -07:00
Shaun Bennett 043f9576dd Fix smash mobs booster group 2016-06-23 22:50:31 -07:00
Shaun Bennett a9f291338f Amplifiers GM Candidate 2016-06-23 22:49:12 -07:00
TadahTech c204562eb3 Fix cross server invites / joining servers. 2016-06-23 23:25:26 -05:00
TadahTech eeaf9fa49a Fix chat in arcade 2016-06-23 23:24:50 -05:00
TadahTech ce1aab5e11 Fixes and changes 2016-06-23 21:53:12 -05:00
cnr 3433e0e3bc Merge branch 'project-cosmetics' into develop 2016-06-23 18:42:47 -05:00
xXVevzZXx e09df7ccfd fix chests being opened by specs 2016-06-23 16:46:54 -05:00
xXVevzZXx 399ab5c363 fix supply chest protection, absorbtion effect, tnt and level bugs 2016-06-23 16:46:45 -05:00
Sam f8080d2663 PC-574 
Another fix for the minestrike vanish problem, this one fixes staff
being assigned teams on join.
 2016-06-23 22:40:15 +01:00
xXVevzZXx dc57f7b4e6 add testrank command for SR.Mods 2016-06-23 22:05:26 +02:00
samczsun a33b070ae7
Deny placing skulls 2016-06-23 15:34:29 -04:00
LCastr0 c1b7be6363 Fix merge problems 2016-06-23 16:33:20 -03:00
LCastr0 7749314e64 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-06-23 16:11:49 -03:00
LCastr0 a441727e09 Freedom update: 
Freedom chests
Freedom Aura
Shock and Awe
Leap of Freedom
Price of Freedom
Uncle Sam Morph
Freedom Mount
Uncle Sam Hat
Persistence update:
Items will still be enabled after player leaves the server
 2016-06-23 16:09:31 -03:00
TadahTech 69c7c9edc8 Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-06-23 03:13:10 -05:00
TadahTech a29b22b8be Undo comments. 2016-06-23 03:12:49 -05:00
TadahTech 33cce620be Update UI and fix typos 2016-06-23 03:11:45 -05:00
TadahTech df53021f7c Fix Party Redis. Improve Party UI. General testing and fixing. (Funny enough, again. 2016-06-23 02:56:42 -05:00
TadahTech fb6a772eb0 Fix Party Redis. Improve Party UI. General testing and fixing. 2016-06-23 02:39:05 -05:00
Shaun Bennett 6e2c751be1 Adjust amplifiers queue message 2016-06-22 21:09:09 -07:00
Shaun Bennett 1ea680cd20 Return to an invisible armor stand name 2016-06-22 21:01:37 -07:00
Shaun Bennett bcf82ad513 Remove debug messages 2016-06-22 21:00:50 -07:00