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
Sarah
b7ad0035bc
Implementing UHC team system to ssm, sg and skywars.
2015-07-17 07:06:49 +02:00
Sarah
02a71bff68
another git fix
2015-07-17 06:30:53 +02:00
Sarah
3a2011ee6a
Improving Map System: GameTypes can have more mapSources now.
2015-07-14 13:22:59 +02:00
Cheese
7d073fdc0d
fixed skywars icon
...
changed LOSSES to GAMESPLAYED for consistency
2015-07-09 12:47:40 +10:00
Cheese
e36b0440a4
Merge branch 'bench'
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
Plugins/Mineplex.StaffServer/.classpath
2015-07-08 13:55:01 +10:00
libraryaddict
bff3897fab
Perks and kits: Change priority for unregistering to high, add new method to Perk firing when perk listener is registered.
2015-07-07 12:30:20 +12:00
Cheese
de36e3d8e4
added WATER_DAMAGE support for maps
...
modified some bridges code
2015-07-01 00:18:06 +10:00
Cheese
e3d060376b
disabled double gem
2015-06-30 13:10:08 +10:00
Cheese
4c164ce2a6
enabled double gems
2015-06-27 12:44:43 +10:00
Cheese
4183d6f21d
some balance
2015-06-27 11:40:40 +10:00
Cheese
4e06a1aae3
fixed a few skywars bugs
...
improved warning for bridges
2015-06-27 11:24:01 +10:00
Shaun Bennett
7c698f65cf
Quick Menu, and Stats adjustments for SkyWars. Updated Private server page to show game icon instead of player heads
2015-06-26 02:31:35 -05:00
Jeremiah Bishop
0342a5ac61
Fixed Achievements
...
Reordered Kits
Added new Kit
etc, etc, etc...
2015-06-25 19:03:25 -04:00
Aaron Brock
8ea23f96fc
Froze time using doDayNightCycle instead of setting the time on UpdateEvent.
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-20 01:36:05 -04:00
Cheese
2c43dc76c9
DMT no longer effected by 3s chat delay
...
Minestrike no longer has 'terrorists'
Jr.Dev rank up!
2015-06-20 11:12:24 +10:00
libraryaddict
b0c026e67c
Mineware: Commit what I have, fix DisguiseVillager not extending agable and adding new option to disable auto respawn
2015-06-16 14:01:52 +12:00
libraryaddict
8cf10afb1b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-06-06 18:31:08 +12:00
Cheese
f9b49caeed
More gems for bridges/sg kills
...
Changed Al'Jaha MS name to Bombers
Added Reporting functionality to Builders
Nerfed Iron Hook
Allowed longer AFk during games
2015-06-05 12:21:20 +10:00
libraryaddict
bcdb851e21
Teleport: Don't disqualify staff if they are not alive
2015-06-02 18:48:45 +12:00
libraryaddict
ae41f232b0
GameType: Change to reflection for creating game instances
2015-05-30 10:23:46 +12:00
libraryaddict
21aa97b3b9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-24 20:13:43 +12:00
libraryaddict
0d0d5eea64
Game: Change GameFlagManager to use Game.isInsideMap(), change isInsideMap to treat MaxX,Y,Z with a +1
2015-05-24 20:10:16 +12:00
Jonathan Williams
303cfd02fa
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-05-17 23:12:27 -07:00
