Cheese
|
02c6eccfda
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
|
2015-10-10 10:36:42 +11:00 |
|
Cheese
|
7dbd9da582
|
dragon sale Bar
|
2015-10-10 10:35:48 +11:00 |
|
Shaun Bennett
|
97ef4a4252
|
Pushing titan giveaway stuff for laptop
|
2015-10-09 18:23:47 -04:00 |
|
Cheese
|
c03c8163c5
|
fixed exploision stuff
|
2015-10-09 14:01:58 +11:00 |
|
Mysticate
|
598ea84e7a
|
Fixed explosions and cleaned up.
|
2015-10-08 22:52:57 -04:00 |
|
Mysticate
|
1011c36c43
|
Fixed lobby being destroyed.
|
2015-10-08 22:41:45 -04:00 |
|
Mysticate
|
082b16fe0d
|
Stuff and things to help make mounts be cool.
|
2015-10-08 22:28:07 -04:00 |
|
Cheese
|
3c437925f1
|
halloween prep
|
2015-10-08 12:36:00 +11:00 |
|
Mysticate
|
a0d0590777
|
Merge remote-tracking branch 'origin/master' into Myst_EVO
|
2015-10-06 21:04:49 -04:00 |
|
AlexTheCoder
|
32a257fa55
|
Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts
|
2015-08-31 15:11:57 -04:00 |
|
Mysticate
|
becfbe1f13
|
Fixed possible game breaking bug :S
|
2015-08-30 20:09:47 -04:00 |
|
Mysticate
|
33d78a5efd
|
Fixed eating spider eye. Yay!
|
2015-08-30 18:39:07 -04:00 |
|
Jonathan Williams
|
c98a85c2ba
|
Added local storage of login time.
Hooked in onlineTime bonus feature to real values.
|
2015-08-28 22:09:42 -07:00 |
|
Mini-Chiss
|
829c1d2ae8
|
Merge branch 'Myst_EVO'
|
2015-08-28 21:30:10 -07:00 |
|
Mysticate
|
c40fecb03f
|
Removed warning from private servers
|
2015-08-28 22:06:13 -06:00 |
|
Mini-Chiss
|
88ca205474
|
fixes
|
2015-08-28 20:31:29 -07:00 |
|
Mini-Chiss
|
8238a199d5
|
gem stuff
|
2015-08-28 20:06:39 -07:00 |
|
Mysticate
|
ebd3fbe6d5
|
Merge remote-tracking branch 'origin/master' into Myst_EVO
|
2015-08-28 20:19:27 -06:00 |
|
Mini-Chiss
|
abf1f23087
|
double gem
|
2015-08-28 19:16:49 -07:00 |
|
Mysticate
|
2d770a8dd1
|
More final tweaks.
|
2015-08-28 16:36:35 -06:00 |
|
Mysticate
|
513662e6e3
|
Fixed the block open flag.
|
2015-08-28 15:46:38 -06:00 |
|
Mysticate
|
f21ca35638
|
Final bug changes.
|
2015-08-28 15:44:41 -06:00 |
|
Jonathan Williams
|
e9b33668bc
|
Added donorsOnline to MinecraftServer snapshot
Refactored Rank class to use lowercase methods.
|
2015-08-28 13:22:04 -07:00 |
|
Mysticate
|
7b42f2155d
|
Tweaks. :D
|
2015-08-24 20:40:34 -04:00 |
|
Mini-Chiss
|
d6f17c609b
|
carl
|
2015-08-12 08:58:46 +02:00 |
|
Mini-Chiss
|
7cda53cb28
|
carl spinner in arcade/
tutorial fixes
|
2015-08-12 08:36:21 +02:00 |
|
Mini-Chiss
|
18843c2cc6
|
Merge branch 'Bonus'
|
2015-08-11 17:05:59 +02:00 |
|
Mini-Chiss
|
89dab7ec85
|
some little fixes
|
2015-08-11 16:33:32 +02:00 |
|
Mini-Chiss
|
cfcfbbed3b
|
removed double gem
|
2015-08-11 13:34:32 +02:00 |
|
Mini-Chiss
|
b348c62a3f
|
Merge branch 'EventGameUpdates'
|
2015-08-11 13:01:33 +02:00 |
|
Shaun Bennett
|
fe153bee11
|
Fix revert issues
|
2015-08-11 03:19:27 -05:00 |
|
Sarah
|
fef269b856
|
Fixing /e set.
|
2015-08-10 17:28:27 +02: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 |
|
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 |
|
Sarah
|
0d70fb6b96
|
removing deop of Admins and adding OP condition to setHost.
|
2015-08-09 16:55:10 +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 |
|
Morten
|
608e8bf693
|
For Sarah <3
|
2015-08-07 05:40:16 +02:00 |
|
Shaun Bennett
|
be18dc1bf5
|
Add experience rewards to reward manager
|
2015-08-06 21:41:56 -05:00 |
|
Sarah
|
83da6b7a9a
|
Improving the /disguise command even more. ;D
|
2015-08-05 13:32:05 +02:00 |
|
Mini-Chiss
|
5d7cc59909
|
fixed cases where negative stats were being uploaded
|
2015-08-05 08:56:52 +02:00 |
|
Sarah
|
e55557e1fd
|
Improving the /disguise command.
|
2015-08-05 07:57:52 +02:00 |
|
Mini-Chiss
|
88fe5b3ec6
|
Merge branch 'MPS-Maps'
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
|
2015-08-04 17:37:32 +02:00 |
|
Mini-Chiss
|
1fd5c51f03
|
DINGO ATE MY BABY
|
2015-08-04 17:33:23 +02:00 |
|
William Burns
|
644d6c9914
|
Whitelist fixes. Implemented MapSource.
|
2015-08-04 11:21:58 +01:00 |
|
Mini-Chiss
|
40e2b6216e
|
oops, was right before, reverting change.
|
2015-08-03 16:30:38 +02:00 |
|
Mini-Chiss
|
f350e4efe5
|
further fixed gem stuff!
|
2015-08-03 16:25:31 +02:00 |
|
Mini-Chiss
|
67fd0e2c1d
|
fixed MPS awards formatting
|
2015-08-03 16:24:43 +02:00 |
|
Mini-Chiss
|
ab670a03fb
|
fixed logic error that was displaying gems wrong
|
2015-08-03 16:23:50 +02:00 |
|
Mini-Chiss
|
e10d26dae1
|
reduced respawn time in OITQ
removed respawn msg for short respawn times
|
2015-08-03 16:18:59 +02:00 |
|