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

3787 Commits

Author SHA1 Message Date
libraryaddict
72adf21bff Gadget Paintball: Add particles on impact, change block break effect to stone break sound. 2015-08-12 06:23:13 +12:00
fooify
07bdbdde46 minor grammar issue 2015-08-11 09:55:10 -07:00
fooify
ddc663cc75 remove duplicate method 2015-08-11 09:52:04 -07:00
fooify
10f979772b Merge remote-tracking branch 'origin/master' into foo 2015-08-11 09:51:13 -07:00
Mini-Chiss
18843c2cc6 Merge branch 'Bonus' 2015-08-11 17:05:59 +02:00
Mini-Chiss
83a010c215 enabled summer sale msg 2015-08-11 17:05:41 +02:00
Mini-Chiss
89dab7ec85 some little fixes 2015-08-11 16:33:32 +02:00
Sarah
f7d9476191 Hidden egg fix 2015-08-11 13:53:36 +02:00
Sarah
5c7d140521 Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus 2015-08-11 13:49:53 +02:00
Sarah
e25558fc91 Animation improvements. 2015-08-11 13:49:06 +02:00
Mini-Chiss
cfcfbbed3b removed double gem 2015-08-11 13:34:32 +02:00
Mini-Chiss
49d54d4dd3 doesnt count rank thingy as reward if no rank. yknow 2015-08-11 13:22:58 +02:00
Mini-Chiss
b348c62a3f Merge branch 'EventGameUpdates' 2015-08-11 13:01:33 +02:00
Sarah
2d7d7f6dde Improving messages, animations and some Items. 2015-08-11 13:01:20 +02:00
Sarah
f3558b144c Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus 2015-08-11 12:05:23 +02:00
Sarah
c821523240 removed vote broadcast. 2015-08-11 12:04:54 +02:00
Shaun Bennett
1c484367a1 Add hasPoll 2015-08-11 04:57:45 -05:00
Shaun Bennett
3eb7e91fbb Removing the magical 3 2015-08-11 04:38:37 -05:00
Sarah
8abefaf856 The magical +3. 2015-08-11 11:31:51 +02:00
Mini-Chiss
4c32f32ced removed game reward type 2015-08-11 11:17:20 +02:00
Mini-Chiss
74b83d6851 fixed! 2015-08-11 10:56:07 +02:00
Mini-Chiss
184feec875 cleany and logic 2015-08-11 10:54:24 +02:00
Mini-Chiss
f66a0439e8 no need to gen so many 2015-08-11 10:34:33 +02:00
Mini-Chiss
a1c10a7ec5 clean up 2015-08-11 10:33:44 +02:00
Mini-Chiss
1c40478e6e SPIN DOGGY SPIN 2015-08-11 10:32:49 +02:00
Shaun Bennett
fe153bee11 Fix revert issues 2015-08-11 03:19:27 -05:00
Shaun Bennett
184c592786 Merge remote-tracking branch 'origin/Bonus' into Bonus 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
	Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/VoteButton.java
 2015-08-11 03:12:55 -05:00
Shaun Bennett
13e7e58986 Creeper visual! 2015-08-11 03:09:21 -05:00
Shaun Bennett
c177307f70 Votifier fixes 2015-08-11 02:53:54 -05:00
Sarah
2c30d20cb1 changing OP method, setHost permissions and /e command. 2015-08-11 09:26:01 +02:00
Sarah
b99c526169 Implementing Carl message. 2015-08-11 09:09:16 +02:00
Shaun Bennett
5d3503b733 Carl rewards 2015-08-11 01:55:27 -05:00
Sarah
d457e3a955 changing the setOP Event. 2015-08-11 08:36:39 +02:00
Shaun Bennett
d2983b831e Merge remote-tracking branch 'origin/Bonus' into Bonus 2015-08-11 00:35:44 -06:00
Shaun Bennett
d833385df4 Fix carl spinner and ticket command, Fix polls not displaying in available count, Visual fixes 2015-08-11 00:35:02 -06:00
Mini-Chiss
66f2a5df5e renamed GAME 2015-08-11 08:32:12 +02:00
Mini-Chiss
b4e8b4f1ac cant go spinnin while its a countin! 2015-08-11 08:24:28 +02:00
Sarah
3bedc4ce84 Improving animation timing. 2015-08-11 05:37:58 +02:00
Sarah
fef269b856 Fixing /e set. 2015-08-10 17:28:27 +02:00
Sarah
186e3028c2 removing temp fix "there was an error processing your request" for the Spinner. 2015-08-10 17:15:56 +02:00
Sarah
3be811e480 Fixing Spinner announcements. 2015-08-10 17:08:03 +02:00
Sarah
ed7b8949bb Adding SpinnerFiller and SpinnerRewards. 2015-08-10 17:04:47 +02:00
Sarah
2253a63e96 Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus 2015-08-10 16:43:05 +02:00
Sarah
c6beb122e3 Adding firework animations for spinner. 2015-08-10 16:42:43 +02:00
Mini-Chiss
ad8781fd84 Merge branch 'Bonus' of ssh://184.154.0.242:7999/min/mineplex into Bonus 2015-08-10 16:14:24 +02:00
Mini-Chiss
18d11f7d68 new enums 2015-08-10 16:13:17 +02:00
Sarah
7492ed310e Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus 2015-08-10 15:33:26 +02:00
Sarah
65fc81a2aa improving animations again. 2015-08-10 15:33:00 +02:00
Mini-Chiss
db70df1bf4 Merge branch 'Bonus' of ssh://184.154.0.242:7999/min/mineplex into Bonus 2015-08-10 14:51:39 +02:00
Mini-Chiss
65b51a137c new party tute room 2015-08-10 14:50:44 +02:00
Sarah
aea081c292 Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus 2015-08-10 14:01:12 +02:00
Sarah
5781009f4e Improving animations and some text. 2015-08-10 14:00:40 +02:00
Mini-Chiss
bd2c9aa5e6 hub stuff 2015-08-10 14:00:02 +02:00
Shaun Bennett
aa13bcf5c6 Bug fix! 2015-08-10 04:54:01 -05:00
Shaun Bennett
adb76b0681 Fix giving out gold 2015-08-10 04:51:46 -05:00
Shaun Bennett
8745884153 Various fixes 2015-08-10 04:51:11 -05:00
Shaun Bennett
b8b19ed4a5 Merge remote-tracking branch 'remotes/origin/master' into Bonus 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-08-10 03:24:59 -05:00
Shaun Bennett
6f8d6f8a40 Move Bonus and Poll to core 2015-08-10 01:55:50 -05:00
Shaun Bennett
a0be3fa964 Use atomic mysql operations for modifying tickets 2015-08-10 01:19:10 -05:00
Shaun Bennett
511cc76bef Allow servers to process votifier votes, redis command gets sent to all servers (Until I can figure out why EU playertracker isnt working) 2015-08-10 00:47:36 -05:00
Shaun Bennett
28806aaf0a Update Bonus amounts, Attempting to fix Votifier plugin for EU/US 2015-08-10 00:33:54 -05:00
Shaun Bennett
d20fe54010 Disable carl features when carl can't be found 2015-08-09 16:36:48 -05:00
Mysticate
f8a6a25b46 Various Fixes. 
• Merged w/ master
• Changed to William's method of Projectile limiting.
- Prevented TNT hitting Teammates
• Fixed gem count for Sniper
• Added gems for direct hits + TNT Thrown
• Removed assists counting for kills in 6 kill.
 2015-08-09 15:01:27 -04:00
Mini-Chiss
c2d066a576 ui fixes 2015-08-09 19:31:24 +02:00
Mini-Chiss
41dcc564c9 polish polish polish 
MAKE IT SHINE!
 2015-08-09 19:02:07 +02:00
Mini-Chiss
ee65c72e86 and wizards! 2015-08-09 18:46:02 +02:00
Sarah
8c66ef7f15 changing Hub items and adding Profile GUI. 2015-08-09 18:33:44 +02:00
Mini-Chiss
fdfc9ae99d longer games wont announce stay msgs 2015-08-09 18:17:29 +02:00
Sarah
ac5ff08fad Git fix 2015-08-09 17:23:38 +02:00
Mini-Chiss
5a7de8ef3d hub fixes 2015-08-09 17:21:56 +02:00
Sarah
0d70fb6b96 removing deop of Admins and adding OP condition to setHost. 2015-08-09 16:55:10 +02:00
Sarah
941e746ca9 Finalizing Poll GUI in Carl's GUI. 2015-08-09 16:47:03 +02:00
Sarah
85c8e42f53 Finalizing and improving the Carl spinner and adding creeper explosion animations. 2015-08-09 15:00:54 +02:00
Mini-Chiss
b974fcf838 map parser fixes 2015-08-09 00:09:26 +02:00
Shaun Bennett
e6519206af Add event to be called when a player tries to buy a carl spin 2015-08-08 16:29:03 -05:00
Mini-Chiss
cbb0cb96c8 ensured white 2015-08-08 13:54:35 +02:00
Mini-Chiss
e030331565 fixed some bugs 2015-08-08 13:51:37 +02:00
Mini-Chiss
fa7f19bde5 removed debug 2015-08-08 13:47:30 +02:00
Mini-Chiss
328c31de88 hub Update 
fixed bad gameid
 2015-08-08 13:47:09 +02:00
Shaun Bennett
4f6dfdb856 Update carl spin button to consume tickets, Updates to Votifier Plugin, Redis Vote Command, Various bug fixes 2015-08-08 06:35:25 -05:00
Mini-Chiss
eab7aa59f2 hub update! 2015-08-08 09:27:49 +02:00
Mini-Chiss
47cb98066d Hub fixes 2015-08-08 08:19:07 +02:00
Mini-Chiss
33c96f51ae fixed some stuff 2015-08-07 22:59:50 +02:00
Mini-Chiss
090c1f135d Merge branch 'SarahsAwesomeBugFixes' 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
 2015-08-07 21:48:35 +02:00
Mini-Chiss
b22706e649 hub update part 1 2015-08-07 21:45:38 +02:00
Shaun Bennett
f76d9b0d37 Replace Consumers with Callbacks 2015-08-07 04:20:54 -05:00
Shaun Bennett
5ebc7080ee Push fixes 2015-08-07 04:13:09 -05:00
Jonathan Williams
fcfb63c47d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-07 02:23:10 -05:00
Jonathan Williams
320a3efe5b Remove some debug code. 2015-08-07 02:22:58 -05:00
Jonathan Williams
e8c60e6e84 Added storage of pets in mysql. Going to have live while backend process is copying data over. 
Updated ServerTypePage to resolve clicking issues with solo/team pages.
 2015-08-07 02:22:13 -05:00
Sarah
181b778a9c Fixing some bugs and disallow MPS while disguised. 2015-08-07 07:39:40 +02:00
Morten
f37e25e9d7 Finish push for today <3 2015-08-07 07:03:15 +02:00
Morten
608e8bf693 For Sarah <3 2015-08-07 05:40:16 +02:00
Shaun Bennett
5f435a079e Update vote button 2015-08-06 21:59:21 -05:00
Shaun Bennett
be18dc1bf5 Add experience rewards to reward manager 2015-08-06 21:41:56 -05:00
Shaun Bennett
6311ceaa0f Reward work for new Game reward rarity and setup for carl, work on carl spinner 2015-08-06 21:15:17 -05:00
Morten
1680b652db Added Hat layer skin 
Added Sneak animation

With love from Morten <3
 2015-08-07 03:10:17 +02:00
Shaun Bennett
44e30a0903 SimpleGui Improvements, Change daily timer to 20 hours, Add Carl Spin button, Starter code for Spin Gui 2015-08-06 15:34:56 -05:00
Sarah
d8041ba582 Fixing Players can disguise as disguised Players. 2015-08-06 20:57:56 +02:00
Mini-Chiss
ebbc13c0a4 lowered headshot damage 2015-08-06 17:07:52 +02:00