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

8465 Commits

Author SHA1 Message Date
LCastr0 324a967135 Merge pull request #118 from Mineplex-LLC/develop 
Merge develop into project-cosmetics
 2016-06-28 18:13:09 -03:00
LCastr0 24186d9992 More fixes for gadget persistence 2016-06-28 18:11:00 -03:00
Thanos Paravantis 04cb0fb0b0 Use updated ProjectileUser method names 2016-06-28 23:09:52 +03:00
Thanos Paravantis 4436ba0710 Merge branch 'develop' into thanos-mineware 2016-06-28 23:05:11 +03:00
Thanos Paravantis c5c08562c3 Merge branch 'master' into thanos-mineware 2016-06-28 23:01:42 +03:00
Thanos Paravantis 42ebb95db1 Fix NPE on zombie infection 2016-06-28 21:57:32 +03:00
Thanos Paravantis 973666a42f Improve challenge selection system 
- Game will no longer end unexpectedly, when all challenges are played.
- Challenges are now marked correctly as played.
 2016-06-28 21:57:17 +03:00
Thanos Paravantis 5e9f16424c Add shouldDie method, update zombie wrapper name 2016-06-28 20:38:32 +03:00
Thanos Paravantis 43f375fd86 Reset team data on team challenges 2016-06-28 20:37:26 +03:00
Thanos Paravantis eea980b354 Apply smoother knockback on volley pig 2016-06-28 18:41:50 +03:00
Thanos Paravantis c5367d4510 Remove double plants entire from spawn locations 2016-06-28 12:15:49 +03:00
Thanos Paravantis cf434b92de Modify punch the pig description 2016-06-28 11:47:47 +03:00
Thanos Paravantis dc250d4bf2 Store locations after game start (fix NPE) 2016-06-28 11:47:25 +03:00
Thanos Paravantis 7218dc710f Retrieve scoreboard data only when possible 2016-06-28 11:46:38 +03:00
xXVevzZXx c966620808 Change resourcepack links 2016-06-25 19:52:22 +02:00
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