Cheese
cb9e8f8e0b
pumpkin smasher achievement
2015-10-11 14:48:02 +11:00
Mysticate
435e74225a
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
2015-10-10 23:35:33 -04:00
Cheese
8b75664627
queued holiday transactions
2015-10-11 12:54:35 +11:00
Cheese
6860fa608a
titan placeholder perks
...
art
fixed pumpkin gem count
2015-10-11 11:26:09 +11:00
Mysticate
5e7ddb968e
Changes and bug fixes.
2015-10-10 15:54:18 -04:00
Cheese
da6b1316d3
removed pumpkins from MPS
2015-10-10 22:47:19 +11:00
Shaun Bennett
a242c6b592
Halloween Update finishes
2015-10-10 03:23:37 -04:00
Cheese
7bc3b4970b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java
2015-10-10 17:34:17 +11:00
Mysticate
7851cb451a
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
2015-10-09 22:34:05 -04:00
Shaun Bennett
aa9fd1abf3
Titan giveaway work
2015-10-09 22:14:10 -04:00
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
Thanos paravantis
c2518bc6c4
Some additional bug fixes were applied on the previous commit.
...
Water damage by TNT on game lobbies is now patched.
2015-10-04 16:32:34 +03:00
Mysticate
a7ab0cd723
ADDED MORE KITS I'M DONE HOORAY LOVE ME @CHISS
2015-10-02 22:43:29 -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
AlexTheCoder
129464a845
Added CTF to MPS menus
2015-08-31 04:42:36 -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
AlexTheCoder
6fefcbd953
Kit Changes/Fixes:
...
- Fixed Kit Mobs not opening guis in Champions games
- Fixed Abilities not working in CTF
- Added new event when a player attempts to choose a kit
- Cancelled changing kit while holding a flag
2015-08-30 17:13:08 -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
William Burns
0c5cc25634
Stuff
2015-08-03 12:48:17 +01:00
Mini-Chiss
bb2e15c4fd
made it so games can set another game as its 'kit source' so games can share kit unlocks
2015-08-03 11:38:16 +02:00
Mini-Chiss
472409dc4b
fixed broadcast formatting
2015-08-03 10:06:15 +02:00
Mini-Chiss
afc41c8831
converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity
2015-08-02 11:50:26 +02:00
Mini-Chiss
ae8d351145
Merge branch 'SSM2PlayerTeams'
2015-07-31 14:09:55 +02:00
Sarah
fba10e4cbd
fixing the long term "Kit" bug ;D
2015-07-31 14:08:08 +02:00
Mini-Chiss
b2a567673c
disabled sale msg
...
added double gem weekend
2015-07-31 09:53:52 +02:00
Mini-Chiss
be910cced9
gamemode color change
2015-07-29 17:00:36 +02:00
Mini-Chiss
1004203b34
fixed up some merge issues
2015-07-29 16:48:49 +02:00
Mini-Chiss
52844d7b80
Merge branch 'EventGameUpdates'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
2015-07-29 16:41:35 +02:00
Mini-Chiss
ab2c865ab3
better colors
2015-07-29 15:48:12 +02:00
Mini-Chiss
51cef64554
improved text
2015-07-29 15:29:12 +02:00
William Burns
2b3fec754f
Colour change cause colour!
2015-07-29 14:25:38 +01:00
William Burns
3bc66f16b6
Woo a push
2015-07-29 14:22:49 +01:00
Mini-Chiss
c9c3db70f3
Merge branch 'SSM2PlayerTeams'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-07-29 14:08:17 +02:00
Mini-Chiss
e0ab853e57
Merge branch 'MPS-Maps'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
2015-07-29 13:03:05 +02:00
William Burns
8385c8a7c7
Whitelist fix
2015-07-27 22:18:41 +01:00
William Burns
76e5d3d562
Finish update
2015-07-27 18:18:37 +01:00
Mini-Chiss
1247f33b1e
end game stats will display, even if no gems awarded.
2015-07-26 11:43:24 +02:00
William Burns
cf61b50d98
More changes.
2015-07-25 17:35:43 +01:00
William Burns
91d0a37d77
Animation change etc.
2015-07-25 12:48:39 +01:00
Mini-Chiss
9fa8c6ac45
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
2015-07-25 10:48:06 +02:00
Jonathan Williams
d3fede790a
Merge pull request #17 in MIN/mineplex from MinorTweaks to master
...
* commit '335eb5eacdcf9d837af48445d9fa9a59b4ef986a':
Fixed report link
http://pastebin.com/BRhT7pZP
Reverted things
Reverted Trainee to Helper due to popular demand.
LOTS of tweaks :D
Cleaned up somethings (lib's request)
I'm a dumbass
Fixed a few achievements
Changed mineplex.com/supporthub > mineplex.com/reports
2015-07-25 03:37:28 -05:00
Mini-Chiss
59d14624c0
Merge branch 'Myst_LOBBERS'
2015-07-25 10:26:47 +02:00
William Burns
c1e5c2a9dc
MPS changed requested by <insert meow here>.
2015-07-24 21:15:19 +01:00
William Burns
956d685549
Added MPS Game Voting.
2015-07-24 20:24:21 +01:00
William Burns
dcb6e0ec59
Added rejected games and whitelist to MPS.
2015-07-24 16:03:53 +01:00
Sarah
c3742ec794
Fixing the too long String bug.
2015-07-24 15:00:49 +02:00
Sarah
609199a6b8
Improving Team names in Team games.
2015-07-24 13:14:41 +02:00
William Burns
5deb699b02
Added rejected games and whitelist to MPS.
2015-07-23 18:24:41 +01:00
Mini-Chiss
71148ef387
gave twitch same perms as youtubers
2015-07-23 16:29:42 +02:00
Sarah
de1ed4ca59
Improving the Event System with ShinyRukii's requests.
2015-07-23 12:06:40 +02:00
Mysticate
e4ecc9e858
http://pastebin.com/BRhT7pZP
2015-07-22 23:31:07 -04:00
Mysticate
6addf00037
LOTS of tweaks :D
2015-07-20 14:27:10 -04:00
Mysticate
8b2b4c2826
Added to MPS
2015-07-19 15:51:34 -04:00
Cheese
6ed3f93df7
fixed some scoreboard stuff
2015-07-17 16:17:01 +10:00
