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

718 Commits

Author SHA1 Message Date
Sarah
85c8e42f53 Finalizing and improving the Carl spinner and adding creeper explosion animations. 2015-08-09 15:00:54 +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
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
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
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
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
Shaun Bennett
35d999d747 Remove some debug messages 2015-08-06 05:56:31 -05:00
Shaun Bennett
9e9f9862d0 Bonus bonus bonus! 2015-08-06 05:47:32 -05:00
Shaun Bennett
4cad99eb76 Lots of bonus work, start adding Votifier plugin 2015-08-06 00:45:39 -05:00
Shaun Bennett
bcd4f4f9e2 Open gui through npc 2015-08-05 00:41:50 -05:00
Shaun Bennett
b33b0ac935 More bonus work 2015-08-04 04:00:51 -05:00
Shaun Bennett
e200ddd777 Merge branch 'master' into Bonus 
# Conflicts:
#	Plugins/.idea/misc.xml
 2015-08-03 08:32:45 -05:00
Jonathan Williams
6c0666c59b Fix for server groups / teams. 2015-08-03 03:20:27 -05:00
Jonathan Williams
302252f193 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-03 02:56:31 -05:00
Jonathan Williams
af0d769d3d Fixed skywars quick shop. 
Fixed issue with skywars not opening.
Fixed chest size for MPS
 2015-08-03 02:56:24 -05:00
Mini-Chiss
5bb2f80b8e fixed text 2015-08-03 09:54:34 +02:00
Mini-Chiss
72c473ad6b removed annoying mineplex thing from subtext in news 2015-08-03 09:51:10 +02:00
Jonathan Williams
adcd91bf61 Servers with more than 40 max slots always send to largest server. 
Fixed space in Solo lore.
 2015-08-03 02:07:23 -05:00
Mini-Chiss
6a1e5d6bfc changed item text 2015-08-03 08:23:49 +02:00
Jonathan Williams
c32074e733 Fixed MPS/Event server guis so they open up like old. 
Changed sticks to player heads in solo/team selection.
 2015-08-03 00:53:06 -05:00
Jonathan Williams
bfaa0e6849 Fixed event/mps hardcode. 2015-08-02 23:51:43 -05:00
Ty Sayers
58933fc855 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-08-02 21:19:00 -04:00
Ty Sayers
944a4a9535 Fix accidental double-queueing bug when left clicking server NPCs and add two second cooldown before attempting to auto-join servers. Fix bug with server groups not properly loading server NPC names into shops. Fix bug with server key/name/npc name not being properly interchangeable during server selection and auto-joining process. 2015-08-02 21:18:24 -04:00
Jonathan Williams
a561bbbf12 Added hardcode for EVENT/MPS :D 2015-08-02 19:41:42 -05:00
Shaun Bennett
cadd21c18b More bonus work 2015-08-02 19:12:39 -05:00
Ty Sayers
32a2687991 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-08-02 20:00:15 -04:00
Jonathan Williams
d9a641fd92 Updated ServerManager to read server npc stuff from redis. 
Updated ServerGroup to have NPC name in it.
 2015-08-02 18:59:43 -05:00
Ty Sayers
4852e69991 Temporary un-finished changes for adding in team/solo UI pages and allowing players to select. 2015-08-02 19:19:40 -04:00
Ty Sayers
70c1b883db Fix bug with NPC server shops not properly calling the central method used for intervening and auto-joining. Also add in base for team/solo separation for specific server groups. 2015-08-02 18:20:52 -04:00
Ty Sayers
c2f6c402da Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-08-02 13:25:09 -04:00
Ty Sayers
612d967aa0 Add ability for auto-joining of gametypes to bypass manual server selection by player. 2015-08-02 13:24:59 -04:00
Shaun Bennett
db15ffad72 Bonus changes + Update jooq 2015-08-02 05:17:51 -05:00
Mini-Chiss
afc41c8831 converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity 2015-08-02 11:50:26 +02:00
Shaun Bennett
11e49b9678 Some updates 2015-08-02 04:28:57 -05:00
Mini-Chiss
ac4755a5a9 Fixed incorrect velocity 2015-08-02 11:24:34 +02:00
Shaun Bennett
fd65f27f0f Fix some typos/formatting issues 2015-07-31 10:01:19 -05:00
Aaron Brock
971908d38b Stuff 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-07-28 17:52:43 -04:00
Aaron Brock
832fb4638a More things 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-07-28 17:42:00 -04:00
Ben Sihota
7d9fd61c8e Display changes 2015-07-26 22:31:40 -07:00
Ben Sihota
0b53bca385 Needed permission changes for Jr Developers (Pending approval) 2015-07-26 18:58:35 -07:00
Ben Sihota
47d410370d Merge branch 'horus-bug-fixes' 2015-07-26 18:20:39 -07:00
Jonathan Williams
6d367e3cee Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-25 01:38:54 -07:00
Jonathan Williams
84be48f264 Updated MiniDbClientPlugin to include accountId in the processLoginResultSet method. 
Added conversion of stats to new stat table via StatHandler.

Changed stats value from int to long.
 2015-07-25 01:30:50 -07:00
Ben Sihota
fe80ed373a Fix numerous trello bugs 
- Stacker as Block morph
- Punish mistake
- Achievement mistake
- Stacking a chest opener
 2015-07-22 22:28:44 -07:00
Mysticate
e4ecc9e858 http://pastebin.com/BRhT7pZP 2015-07-22 23:31:07 -04:00
Mysticate
d38fc1a603 Reverted things 2015-07-20 16:40:37 -04:00
Mysticate
6addf00037 LOTS of tweaks :D 2015-07-20 14:27:10 -04:00