Jonathan Williams
5281558cdb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-28 14:01:49 -07:00
Jonathan Williams
409e2c6141
Tweaked menus for quick game, Cosmetic menu.
...
Removed debug for Hub
Output a little debug info in LobbyBalancer
Added duplicate check to ServerMonitor
updated Customer SUpport server to have changeable password, added logging of command executors, added lifetime perks for hero/ultra
2014-08-28 14:01:37 -07:00
CoderTim
cc57ddf4bc
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-28 06:54:36 -04:00
CoderTim
bdef9acecd
Fixed DragonEscape win stat tracker
2014-08-28 00:53:54 -04:00
Chiss
ec4cb91a1c
Poll changes
...
Achievement output double space fix
2014-08-28 11:50:09 +10:00
Jonathan Williams
7829188c32
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-27 12:48:35 -07:00
Jonathan Williams
526ca42add
Fixed Gem booster problem.
...
FIxed stat problem.
2014-08-27 12:48:24 -07:00
Shaun Bennett
b67e127902
Merge remote-tracking branch 'origin/master'
2014-08-27 14:08:47 -05:00
Shaun Bennett
573f71164f
Add a way to view poll statistics in game, load polls that aren't enabled for stat tracking
2014-08-27 14:07:22 -05:00
Chiss
311711f2f0
Disabled fireworks for non-gadget enderpearls.
2014-08-27 15:24:10 +10:00
Chiss
9cde497a5c
Fixed ethereal pearl text
2014-08-27 15:20:55 +10:00
Chiss
4e43a2ca73
Extended range of snake parkour, ensuring people tp back to it when they fall.
2014-08-27 15:19:08 +10:00
Chiss
9439daa852
Fixed bug where spectators could trigger anti-cheat in bridges
2014-08-27 15:16:20 +10:00
Chiss
d9ef5f50be
disabled minestrike
2014-08-27 14:23:31 +10:00
Chiss
596bcbfae6
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-27 14:23:01 +10:00
Chiss
da5f953212
Fixed BlockMorph leaving blocks behind when player was teleported.
2014-08-27 14:22:35 +10:00
CoderTim
5ef2772abd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-26 20:27:51 -04:00
CoderTim
7d6572ff4d
Fixed SheepGame Selfish achievement
2014-08-26 20:27:39 -04:00
Shaun Bennett
8e89dfa1ab
Merge remote-tracking branch 'origin/master'
2014-08-26 19:02:08 -05:00
Shaun Bennett
8439838328
After years of research and experimenting, we settled on an achievement icon
2014-08-26 19:01:59 -05:00
Chiss
f25f7d3aa2
Fixed 1v3 achievement not giving achievement if players quit (required 4 at END)
2014-08-27 09:52:33 +10:00
Shaun Bennett
48ed5e2cba
Merge remote-tracking branch 'origin/master'
2014-08-26 18:39:10 -05:00
Shaun Bennett
78eee68592
Change achievement icons, fix another typo
2014-08-26 18:39:01 -05:00
Shaun Bennett
b508cd036c
Lazy fix so that polls award gems instead of coins
2014-08-26 18:36:40 -05:00
Chiss
5540835052
removed micro debug
...
fixed a bug in achievement output
2014-08-27 09:09:06 +10:00
Chiss
dbf441dd0d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-27 08:57:24 +10:00
Chiss
f9ce0d353c
Achievements now need 75%+ players at START of game
2014-08-27 08:57:11 +10:00
Shaun Bennett
c04319345a
Merge remote-tracking branch 'origin/master'
2014-08-26 17:41:07 -05:00
Shaun Bennett
507d356346
Fix last achievement typo
2014-08-26 17:40:58 -05:00
CoderTim
d9e1f35985
Fixed BadHiderStatTracker and limited stat recording to when games are at least 75% full
2014-08-26 16:30:55 -04:00
Jonathan Williams
232785a7dd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-26 04:56:34 -07:00
Jonathan Williams
417d398195
Swapped Morph and Pet active slot.
...
Fixed a couple things on Staff server.
2014-08-26 04:56:23 -07:00
Chiss
17649ce36c
Fixed bug where desc for past-completed achievements was still showing
2014-08-26 21:51:59 +10:00
Shaun Bennett
99951bc573
Fix achievement typos
2014-08-26 04:20:33 -05:00
Jonathan Williams
5fdf466722
Fixed bug in server monitor.
...
re-enabled animal spawn in hub.
2014-08-26 02:02:31 -07:00
Jonathan Williams
064b0e8b36
Removed sheep mount and fixed up server monitor.
2014-08-26 01:31:57 -07:00
Chiss
81e92c0e8e
changed wording in achi GUI
2014-08-26 18:24:20 +10:00
Chiss
6f1204c844
Set gem reward for all achievements
2014-08-26 18:20:33 +10:00
Chiss
ab29a5fa29
Fixed text output in Achi GUI for completed
2014-08-26 18:06:01 +10:00
Chiss
3eae26ef80
Updated Achievement Output
2014-08-26 18:03:29 +10:00
Chiss
d62b59776f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-26 17:54:50 +10:00
Chiss
116fe496a8
Changed post game achievement output
...
Added Reward to Achi GUI
2014-08-26 17:53:54 +10:00
Jonathan Williams
7a8ab5c96a
Comment for weirdness.
2014-08-26 00:53:41 -07:00
Jonathan Williams
a4cf9e2f4b
Fixed stat bugs.
2014-08-26 00:52:51 -07:00
Chiss
7e7906865f
Fixed some stats being added after send-off
2014-08-26 17:45:35 +10:00
Jonathan Williams
526b5c333a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-26 00:34:00 -07:00
Jonathan Williams
137b8692e4
Added Gem booster use.
2014-08-26 00:33:48 -07:00
Chiss
0546c9e175
Fixed so only Supply drop chests trigger achievement
2014-08-26 17:33:23 +10:00
Chiss
1b15a57fc8
Added Gem Rewards for Achievements
2014-08-26 17:10:20 +10:00
Jonathan Williams
162a86d4b2
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/CosmeticShop.java
2014-08-25 23:58:54 -07:00