Shaun Bennett
|
fe153bee11
|
Fix revert issues
|
2015-08-11 03:19:27 -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 |
|
Sarah
|
8c66ef7f15
|
changing Hub items and adding Profile GUI.
|
2015-08-09 18:33:44 +02:00 |
|
Mini-Chiss
|
5a7de8ef3d
|
hub fixes
|
2015-08-09 17:21:56 +02:00 |
|
Sarah
|
941e746ca9
|
Finalizing Poll GUI in Carl's GUI.
|
2015-08-09 16:47:03 +02:00 |
|
Mini-Chiss
|
328c31de88
|
hub Update
fixed bad gameid
|
2015-08-08 13:47:09 +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 |
|
Morten
|
f37e25e9d7
|
Finish push for today <3
|
2015-08-07 07:03:15 +02: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
|
9e9f9862d0
|
Bonus bonus bonus!
|
2015-08-06 05:47:32 -05:00 |
|
Sarah
|
16a8164030
|
Fixing last bugs and disabling coin bombs while diguised.
|
2015-08-06 08:42:09 +02:00 |
|
Shaun Bennett
|
e200ddd777
|
Merge branch 'master' into Bonus
# Conflicts:
# Plugins/.idea/misc.xml
|
2015-08-03 08:32:45 -05:00 |
|
Aaron Brock
|
971908d38b
|
Stuff
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-28 17:52:43 -04: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 |
|
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
|
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 |
|
Cheese
|
0ea388379a
|
reduced win req for skywars ach
enabled beenfit for 40k reward
|
2015-06-28 15:16:05 +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 |
|
Cheese
|
8a224950b3
|
Added sale notifications
Added 3s chat delay
|
2015-06-19 13:27:59 +10:00 |
|
libraryaddict
|
37c6593753
|
Hub: Fix rulebook
|
2015-06-10 05:27:19 +12:00 |
|
libraryaddict
|
574dd16022
|
Hub: Modify rulebook
|
2015-05-30 10:20:28 +12:00 |
|
Mini-Chiss
|
2c3116a7a6
|
removed firework and sound from legend join
|
2015-05-13 15:45:29 -05:00 |
|
Mini-Chiss
|
f9735006b8
|
removed hub uhc hourly announcements
|
2015-05-13 00:05:00 -05:00 |
|
Mini-Chiss
|
822718095d
|
cannot PM from spawn
first push of cards game
|
2015-05-09 12:23:07 -05:00 |
|
Cheese
|
ed35d2a992
|
April Fools update
|
2015-04-01 16:56:13 +11:00 |
|
Shaun Bennett
|
50c38dc467
|
April Fools Additions, Fix some errors in Clans code, Add PlayerCache to IntellIJ IDEA
|
2015-03-31 17:22:50 -04:00 |
|
Cheese
|
c5d48a82a3
|
Fixed invisibility bug
|
2015-03-13 11:34:45 +11:00 |
|
Shaun Bennett
|
efce714375
|
DEVP-66 Refactor commonly used classes to Java conventions
Refactoring + testing jira
|
2015-02-26 00:07:07 -05:00 |
|
libraryaddict
|
d29b43d645
|
Parties now persist cross-server, staff messages now display on the sending server for other staff for staff cross-messages.
|
2015-02-17 15:17:14 +13:00 |
|
libraryaddict
|
8851cccff4
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-02-07 03:53:17 +13:00 |
|
libraryaddict
|
68d1ba4507
|
Add API to create walls of maps to create a giant image. Please use responsibly.
|
2015-02-07 03:52:19 +13:00 |
|
Shaun Bennett
|
922f2d5ee9
|
Merge remote-tracking branch 'origin/master'
|
2015-02-05 23:20:45 -05:00 |
|
Shaun Bennett
|
fcb3d20778
|
Move tablist stuff to portal, show current server on tablist
|
2015-02-05 23:20:39 -05:00 |
|
Chiss
|
14fc6f2145
|
Chest Update
|
2015-02-06 14:16:10 +11:00 |
|
Chiss
|
c7d4b14f4c
|
Revert "Revert "Work on treasure............""
This reverts commit 49bfe385bf.
|
2015-02-05 11:34:29 +11:00 |
|
Jonathan Williams
|
49bfe385bf
|
Revert "Work on treasure............"
This reverts commit 50a8fb03a9.
REVERT ALL SHAUNS CRAP.
|
2015-01-29 22:28:41 -08:00 |
|
Shaun Bennett
|
50a8fb03a9
|
Work on treasure............
|
2015-01-29 18:37:29 -05:00 |
|
Jonathan Williams
|
78cd5e7070
|
Changed hub to normal.
|
2015-01-15 00:39:07 -08:00 |
|
Jonathan Williams
|
c83643564b
|
Fixed scoreboards reading from file.
Fixed scoreboard server name length
Changed how we pull server group on startup.
|
2015-01-13 12:22:47 -08:00 |
|
Jonathan Williams
|
ac709d09ce
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-01-11 00:42:55 -08:00 |
|
Jonathan Williams
|
8e04a2a5f2
|
Portal now checks server status and player's rank before sending them to a server to prevent login spam.
Refactored portal method names.
|
2015-01-11 00:42:31 -08:00 |
|
Chiss
|
8ce097d837
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-01-04 13:21:35 +11:00 |
|
Jonathan Williams
|
aca7fd6849
|
Removed all create calls
|
2014-12-31 09:38:41 -05:00 |
|
Chiss
|
5f36c8e424
|
minor scoreboard changes
legend loot bonus
|
2014-12-30 08:50:37 +11:00 |
|