William Burns
76e5d3d562
Finish update
2015-07-27 18:18:37 +01:00
Sarah
aaf4991737
Fixing Banana team.
2015-07-27 18:31:01 +02:00
Sarah
572ae1e99b
Updating Team names.
2015-07-27 18:22:24 +02:00
Ben Sihota
0b53bca385
Needed permission changes for Jr Developers (Pending approval)
2015-07-26 18:58:35 -07:00
Mini-Chiss
1247f33b1e
end game stats will display, even if no gems awarded.
2015-07-26 11:43:24 +02:00
Mysticate
0586e5fb77
Added an exception for a map to make it night.
2015-07-26 00:27:09 -04:00
Mysticate
4ceb156e69
Various improvements.
2015-07-25 23:44:55 -04:00
Mysticate
0fd59e9fdb
Added an achievement, removed team one, touched up another. Swag.
2015-07-25 21:50:37 -04:00
William Burns
cf61b50d98
More changes.
2015-07-25 17:35:43 +01:00
Mini-Chiss
dffde68982
fixed bug
...
removed debug
2015-07-25 17:11:02 +02:00
Mini-Chiss
7c7b166b4d
reduced particles a little
2015-07-25 16:05:12 +02:00
Mini-Chiss
aebd3eeb4f
Merge branch 'Myst_LOBBERS' of ssh://184.154.0.242:7999/min/mineplex into Myst_LOBBERS
2015-07-25 15:56:23 +02:00
Mysticate
9feac87a15
Fixed not being able to buy Armorer. Lowered view distance on particles.
2015-07-25 09:51:23 -04:00
William Burns
91d0a37d77
Animation change etc.
2015-07-25 12:48:39 +01:00
Mini-Chiss
d64d713a87
Merge branch 'Myst_LOBBERS'
2015-07-25 10:50:55 +02: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
Mysticate
ae5c74680c
SMALL CHANGE OMG DON'T MERGE WITH MASTER YET PELASE
2015-07-25 04:30:56 -04:00
Mini-Chiss
59d14624c0
Merge branch 'Myst_LOBBERS'
2015-07-25 10:26:47 +02:00
Mysticate
d295cead09
Final stuff
2015-07-25 04:18:18 -04:00
Mysticate
a002da4c0f
Redid how lobbers works
2015-07-25 03:21:56 -04:00
Mysticate
5d87d9e1e4
.
2015-07-25 02:01:55 -04: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
13fa6bca8b
Make it go back to game choose page.
2015-07-24 16:24:17 +01:00
William Burns
dcb6e0ec59
Added rejected games and whitelist to MPS.
2015-07-24 16:03:53 +01:00
Sarah
a50455acf5
Fising last character bug.
2015-07-24 15:44:36 +02: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
Mysticate
7205065a56
Merge branch 'master' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into Myst_KITS
2015-07-23 17:47:33 -04:00
Mysticate
9a3c4f3a00
Added Ninja Kit to OITQ. New Achievement kit.
2015-07-23 17:46:10 -04:00
Mysticate
365968f41d
Added a bomb token thing
2015-07-23 16:26:43 -04:00
Mysticate
06d4de16cf
Changed particle methods
2015-07-23 13:34:11 -04: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
e638674444
Fixed fuse on detonator
2015-07-22 20:17:19 -04:00
Mysticate
b9762bddc4
Fixes
2015-07-22 16:50:57 -04:00
libraryaddict
eff71c3e17
Champions: Add Morten G's changes to fix BlockToss
2015-07-22 08:10:57 +12:00
Mysticate
b4df9f47c5
Added a mortar kit ;o (Please don't fire me b2)
2015-07-21 11:01:45 -04:00
Mysticate
d38fc1a603
Reverted things
2015-07-20 16:40:37 -04:00
Morten
b239f0af28
Fixed some bugs with the Editor kit
2015-07-20 20:40:43 +02:00
Mysticate
6addf00037
LOTS of tweaks :D
2015-07-20 14:27:10 -04:00
Mysticate
63df369700
Cleaned up somethings (lib's request)
2015-07-20 10:18:50 -04:00
Mysticate
bb769aa0f4
I'm a dumbass
2015-07-20 10:02:50 -04:00
Mysticate
87cc40fc0c
Fixed a few achievements
2015-07-19 22:38:03 -04:00
Mysticate
8b2b4c2826
Added to MPS
2015-07-19 15:51:34 -04:00
Morten
c5f7c4fe0e
Finalized after QA testing. Pretty much ready to go
2015-07-19 19:50:53 +02:00
Morten
2cad6223a7
Ubs.. Forgot to actually upload the new kits.. :D
2015-07-18 15:15:53 +02:00
Morten
b986cf968e
Added new kits, Changed Compass feature, Fixed a lot of bugs
2015-07-18 15:10:03 +02:00
Mysticate
2dc2b8792c
Fixes, updates
2015-07-17 17:01:24 -04:00
Sarah
8b26ffaecd
Improving Team names in SG, SSM and Skywars and disabled friendly fire.
2015-07-17 14:05:27 +02:00
Cheese
5e05530b1d
spawn near allies!
2015-07-17 21:28:46 +10: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
5389193cab
Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams
2015-07-17 06:31:10 +02:00
Sarah
02a71bff68
another git fix
2015-07-17 06:30:53 +02:00
Sarah
aaae11d426
Git Fix.
2015-07-17 06:29:32 +02:00
Cheese
cfb4911c25
added ability for teams will fill before moving onto next team
2015-07-17 12:54:53 +10:00
Cheese
63f6adf295
fixed spawn picking
2015-07-17 12:50:34 +10:00
Cheese
3335a7c288
changed skywars teams. forced at 16 teams.
2015-07-17 12:07:09 +10:00
Cheese
558b71f866
fixed thigny
2015-07-17 11:48:14 +10:00
Shaun Bennett
2b2e5e5c97
Spelling fixes + Observer mode
2015-07-16 15:51:21 -05:00
Morten
d46ac59e10
Added project start
2015-07-16 01:34:57 +02:00
Sarah
9eee425792
revert mistake from last commit.
2015-07-14 23:46:56 +02:00
Sarah
e6aec58ece
Updating Map source.
2015-07-14 23:14:56 +02:00
Mysticate
1e1cf6403d
Added achievements
2015-07-14 13:31:41 -04:00
Sarah
3a2011ee6a
Improving Map System: GameTypes can have more mapSources now.
2015-07-14 13:22:59 +02:00
Sarah
2b10aa2cf9
Improving spawn selection in SkywarsTeams.
2015-07-14 08:19:33 +02:00
Cheese
251e6206af
Merge branch 'SSM2PlayerTeams' of ssh://184.154.0.242:7999/min/Mineplex into SSM2PlayerTeams
2015-07-14 14:02:50 +10:00
Cheese
0315f61038
changed team spawn selection
2015-07-14 14:02:35 +10:00
Sarah
304a51de04
Improving TeamSurvivalGames Scoreboard.
2015-07-14 05:44:58 +02:00
Sarah
e72d612379
Implementing the mapSource parameter in GameType and setting up SkywarsTeams and SurvivalGamesTeams.
2015-07-14 05:25:08 +02:00
Shaun Bennett
5c5e7dd4a9
Merge master into clans
2015-07-13 20:42:10 -05:00
Mysticate
df60659786
Core edits
2015-07-13 12:14:25 -04:00
Mysticate
616c444c16
Added some things and stuff
2015-07-12 18:15:33 -04:00
Mysticate
0a09ae29f3
Merge remote-tracking branch 'origin/master' into BombLobbers
2015-07-12 18:14:25 -04:00
Sarah
bd3641cdac
Updating TeamSmash with team Generation Methods.
2015-07-12 02:51:18 +02:00
Sarah
be194c5493
Adding Peace Phase Announcement.
2015-07-12 01:00:50 +02:00
Sarah
625f7d3168
Some last small changes.
2015-07-12 00:45:47 +02:00
Sarah
55a1c311bf
Kit improvements and balancing.
2015-07-12 00:21:13 +02:00
Sarah
251accb40a
Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams
2015-07-11 18:49:38 +02:00
Sarah
d41fcb1b7b
Improving the SSM Team Game.
2015-07-11 18:44:33 +02:00
Mysticate
d0180910e9
Added two new kits.
2015-07-11 10:25:04 -04:00
Sarah
64915a0b7d
Implementing Meteoroids for Game end and changing Kit description.
2015-07-11 04:28:37 +02:00
Mysticate
0353b8571d
Merge branch 'BombLobbers' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into BombLobbers
2015-07-10 16:41:29 -04:00
Mysticate
f812fd0530
Please push please
2015-07-10 16:31:37 -04:00
Sarah
5429e3eb76
snowfight kits
2015-07-10 13:17:07 +02:00
Sarah
152523fc3d
snowfight update
2015-07-10 13:13:38 +02:00
Mysticate
9e07be51c7
Bug fixes
2015-07-09 12:03:56 -04:00
Mysticate
1b3d7f1c20
Fixed and added things
2015-07-08 23:57:48 -04:00
Cheese
49daf597b5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-09 12:47:57 +10:00
Cheese
7d073fdc0d
fixed skywars icon
...
changed LOSSES to GAMESPLAYED for consistency
2015-07-09 12:47:40 +10:00
Shaun Bennett
a9e68ff777
Completed Energy
2015-07-08 21:39:31 -05:00
William Burns
3ba7ba259c
Added map selection to MPS.
2015-07-08 15:24:16 +01:00
William Burns
e819a4dab3
Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps
2015-07-08 09:56:39 +01:00
William Burns
6008e58c12
Added map selection to MPS.
2015-07-08 09:49:41 +01:00
libraryaddict
7e3fdef2e8
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-07-08 18:43:56 +12:00
libraryaddict
1f250bf951
MineWare: Add current progress
2015-07-08 18:43:37 +12:00
Ben Sihota
ca880371a6
Merge remote-tracking branch 'origin/master'
2015-07-07 21:19:43 -07:00
Cheese
480a29b874
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-08 13:55:16 +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
Ben Sihota
ffbee4a9aa
Add more details to /game
...
Fix NPE with /game set
2015-07-07 18:20:27 -07:00
libraryaddict
9eff5b7245
Perks: Forgot to include this in last commit, no harm done.
2015-07-08 07:51:33 +12:00
fooify
8149d61343
Merge remote-tracking branch 'origin/master' into foo
2015-07-07 07:59:46 -07: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
libraryaddict
3d0dda382b
Stacker: Fixed an infinite loop
2015-07-06 07:07:19 +12:00
Cheese
1e26ebe0bd
disabled ice forming
2015-07-02 10:09:39 +10:00
fooify
70d351adae
fix getting snowballs from bedrock
2015-07-01 16:58:16 -07:00
Cheese
0100ca1b8c
fixed a derp bug
2015-07-02 09:41:33 +10:00
fooify
d1e4306684
fix this agaaaaain
2015-07-01 16:38:10 -07:00
fooify
04c863c0eb
FOOIFY IS A NOOB OKAY
2015-07-01 16:10:41 -07:00
fooify
4495468c7f
fix concurrentmodificationexception
2015-07-01 15:50:07 -07:00
fooify
8574c0bdeb
fix turfforts bug
2015-07-01 09:58:45 -07:00
fooify
b7476cec5e
prevent STATIONARY_LAVA from breaking in creeper smash
2015-07-01 08:25:17 -07:00
fooify
6dc7384c82
fix creeper smash exploding lava and bedrock
2015-07-01 08:16:14 -07:00
fooify
6d42be4d13
fix spleef lava issue
2015-07-01 07:17:41 -07:00
Cheese
dd9fc8e7c6
bridge speed increase
2015-07-01 15:14:46 +10:00
Cheese
0650b73374
more bridge tweaks
2015-07-01 14:16:56 +10:00
Shaun Bennett
9ccc85a79e
Improved block restore for Events
2015-06-30 22:30:49 -05:00
Cheese
190e58c37e
bridges update
2015-07-01 12:58:54 +10:00
fooify
a72eee9cf3
Merge remote-tracking branch 'origin/master' into foo
2015-06-30 09:20:43 -07:00
fooify
d2cc8d5077
fix grammar bug
2015-06-30 09:19:21 -07:00
fooify
11fb02a594
add stained glass to list of blocks that can be broken in quiver
2015-06-30 09:03:43 -07: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
fooify
4ff456b722
Merge remote-tracking branch 'origin/master' into foo
2015-06-29 11:29:22 -07:00
Cheese
48f5fa118a
fixed a few sky bugs
2015-06-29 14:26:00 +10:00
Cheese
b0f8369bcd
lowered block falling speed.
...
fixed a bug where some chests didnt fall
2015-06-29 10:09:36 +10:00
Cheese
ead402d026
skywars art
2015-06-28 14:31:25 +10:00
Shaun Bennett
d07c319581
Saving some work
2015-06-27 22:22:02 -05:00
Cheese
08e4ef199e
added twitch to dguisecmd
2015-06-28 12:53:18 +10:00
Cheese
faca14dd23
fixed disguise permission
2015-06-28 12:50:27 +10:00
Cheese
840ebabf2a
added delay on mad scientist eggSpawn
...
fixed Exp bug
2015-06-27 20:39:05 +10:00
Cheese
1f34bc40a3
increased time you can hold TNT for in CS
2015-06-27 14:08:16 +10:00
Cheese
4c164ce2a6
enabled double gems
2015-06-27 12:44:43 +10:00
Cheese
d0368a19d8
Players who quit early do not get full game worth of EXP.
2015-06-27 12:38:04 +10:00
Cheese
754026f403
chicken teleport fix
...
scientist minion name fix
2015-06-27 12:18:12 +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
fooify
333c54cff9
Merge branch 'master' into foo
2015-06-26 10:07:13 -07:00
Cheese
9a0ac821a2
fixed stat bug
2015-06-26 19:44:13 +10:00
Cheese
750769d03a
fixed gem thing
2015-06-26 19:12:34 +10:00
Cheese
62a7fd6a99
you now get levels for kills/assists
...
fixed scoreboard bug
2015-06-26 19:12:11 +10:00
Cheese
b0019242e7
skywars scoreboard fix
2015-06-26 19:02:34 +10:00
Jonathan Williams
8c427bee24
Fix _gameDisplay bug.
...
Fix Skywars quickmenu link.
2015-06-26 03:57:39 -05:00
Jonathan Williams
8f2c0cf9d8
Fix file names.
2015-06-26 03:15:16 -05:00
Cheese
1aa0832bb9
SkyWars to Skywars
2015-06-26 17:55:49 +10:00
Cheese
9bf58a2d98
disabled pistons
2015-06-26 17:47:04 +10:00
Cheese
1564a8bc51
disabled hoppers
2015-06-26 17:46:05 +10:00
Shaun Bennett
2657ef336a
Merge remote-tracking branch 'origin/master'
2015-06-26 02:33:00 -05:00
Shaun Bennett
60901cc17e
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
2015-06-26 02:32:51 -05:00
Cheese
c31d3609bb
soup no longer spawns in stacks
2015-06-26 17:32:46 +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
Cheese
a5aa2bc0e9
text changes
2015-06-26 17:28:23 +10:00
Cheese
c514cacd5d
more skywars fixes
2015-06-26 17:05:29 +10:00
Cheese
027efe02fc
skywars!
2015-06-26 16:38:44 +10:00
Cheese
257c088948
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-26 16:08:17 +10:00
Cheese
b744320ecc
pearl trail fix
2015-06-26 16:08:04 +10:00
Cheese
16af8453e3
pearl fix
2015-06-26 16:04:07 +10:00
Cheese
338797f4a6
skywars update
2015-06-26 15:57:47 +10:00
Cheese
aef8a00017
update!
2015-06-26 15:25:43 +10:00
Cheese
8f3d0ad84b
fixed some bugs :O
2015-06-26 14:38:39 +10:00
Cheese
0874178973
skywars update!
2015-06-26 14:14:22 +10:00
Cheese
2d1d65b239
skywars fixes
2015-06-26 13:15:03 +10:00
fooify
7f7edddf42
Fix TNT bug in SG - tested, works fine! :)
2015-06-25 19:36:31 -07:00
Cheese
5710831777
fixed webs dropping webs
2015-06-26 12:34:26 +10:00
Cheese
7d4e36651f
less random chests
2015-06-26 12:26:57 +10:00
Cheese
fdbaa4e9c7
dont allow overfill
2015-06-26 12:18:25 +10:00
Cheese
f1da68a82a
fixed chickens not spawning
2015-06-26 12:14:35 +10:00
Cheese
00da27a3d6
added middle chests
...
added chicken spawns
added zombie/chicken loot
2015-06-26 12:06:40 +10:00
Cheese
beb78270e5
skywars loot changes
2015-06-26 11:54:35 +10:00
Cheese
bb569a26e2
skywars update
2015-06-26 11:22:33 +10:00
Cheese
b48820a753
ore gen fixed!
2015-06-26 10:50:38 +10:00
Cheese
d9a8d2b6ab
ore changes
2015-06-26 10:36:45 +10:00
Jeremiah Bishop
0342a5ac61
Fixed Achievements
...
Reordered Kits
Added new Kit
etc, etc, etc...
2015-06-25 19:03:25 -04:00
Cheese
2179795677
Merge branch 'SkyWars' of ssh://184.154.0.242:7999/min/Mineplex into SkyWars
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SkyWars.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
2015-06-25 20:48:34 +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
Jonathan Williams
5bdb90b459
Changed disguise perm to YOUTUBE
2015-06-25 04:57:56 -05:00
Jeremiah Bishop
ed667fedee
Added more achievements
2015-06-24 22:59:28 -04:00
Jeremiah Bishop
cd10a2ad79
Fixed both kits
...
Added game achievements.
2015-06-24 20:08:31 -04:00
Jeremiah Bishop
5b4a3249ca
Added chest loot and such.
2015-06-22 21:42:45 -04:00
Jeremiah Bishop
03c45116ef
Various fixes, and added the new data to Zoologist kit
2015-06-21 23:38:25 -04:00
Jeremiah Bishop
a05c2d085d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars
2015-06-21 16:17:51 -04:00
Jeremiah Bishop
e12ff7ef7d
Fixed?
2015-06-20 22:20:30 -04:00
Jeremiah Bishop
3cf1297d89
Added SkyWars ;)
2015-06-20 22:08:15 -04:00
Jonathan Williams
91b5beaff2
Fixed new Chat constructor requirement.
2015-06-20 03:43:38 -05: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
Aaron Brock
1f0accd2a1
Fixed a little boolean derp that stopped people from breaking blocks.
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-20 01:09:21 -04:00
Cheese
478a3c8591
some champs fixes/balance
...
duplicate message improvement
2015-06-20 15:00:16 +10: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
Aaron Brock
61494f93ba
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into bench
2015-06-19 18:13:48 -04:00
Cheese
8a224950b3
Added sale notifications
...
Added 3s chat delay
2015-06-19 13:27:59 +10:00
Aaron Brock
76e4dc6056
Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist.
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-18 19:50:06 -04:00
Jeremiah Bishop
dd9e6a6866
Started adding SkyWars game mechanics
2015-06-18 14:54:26 -04:00
Cheese
9a3a014dd5
removed debug!
2015-06-18 12:04:49 +10:00
Aaron Brock
41e77b1ade
Fixed double-half-slabs (line 68)
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-17 20:49:35 -04:00
Shaun Bennett
dbdb2b3fc5
Scoreboards and WorldEvent work
2015-06-17 17:40:16 -05:00
Cheese
6886484d79
Fixed Micro Battles lag (stupid lava)
...
cmds for jnr devs
smaller head hitbox in MS
added MB to parser plugin
2015-06-17 13:02:12 +10:00
Cheese
3014521e79
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-17 10:43:01 +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
Shaun Bennett
8245b6c466
Schematic generation over time, fixes to gold manager drops
2015-06-14 17:30:02 -05:00
Cheese
a141cec104
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-11 08:57:04 +10:00
Cheese
390ffcab6d
bridges support for lillypads map
2015-06-11 08:56:32 +10:00
Shaun Bennett
a20f41be09
Merge remote-tracking branch 'origin/master'
2015-06-09 13:21:26 -05:00
Shaun Bennett
3f9010fb7a
Fix GameScore comparator
2015-06-09 13:21:15 -05:00
libraryaddict
2971761a5e
Game stop command: Move unregister of game listener after the gamestate has been changed
2015-06-09 22:19:03 +12:00
libraryaddict
1f08c989b5
Minestrike: Enforce resource pack
2015-06-09 03:31:24 +12:00
libraryaddict
8cf10afb1b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-06-06 18:31:08 +12:00
libraryaddict
fd3232f45d
Mineware: Rename old MineWare and move packages
2015-06-06 18:30:47 +12:00
libraryaddict
ef9c69f356
UtilShapes: Fix a method, add a space in OldMineWare in GameType
2015-06-06 18:08:37 +12:00
libraryaddict
5f2810ae37
SurvivalGames: Fix anyone able to start game
2015-06-06 18:07:55 +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
a961e5f0d5
Wizards: Don't gain wands from stats page
2015-06-02 18:49:50 +12:00
libraryaddict
4d8a54e7ba
Wizards: Add spellbook on /spec
2015-06-02 18:49:27 +12:00
libraryaddict
bcdb851e21
Teleport: Don't disqualify staff if they are not alive
2015-06-02 18:48:45 +12:00
libraryaddict
35c005feb8
Game: add isInsideMap(Player) and have border call that on Game.java in order to have games able to define specific borders for players
2015-05-30 10:30:30 +12:00
libraryaddict
092447170e
Game Border: Fix typo that offsets border by one block
2015-05-30 10:24:15 +12:00
libraryaddict
ae41f232b0
GameType: Change to reflection for creating game instances
2015-05-30 10:23:46 +12:00
Shaun Bennett
a900a2a70a
[Arcade] Another attempt at fixing spectator gui.... :^)
2015-05-26 19:50:01 -05:00
Shaun Bennett
25ba20e411
[Arcade] Fixes for DMT and DT not counting loses properly
2015-05-26 19:28:42 -05:00
libraryaddict
e15e42afae
UHC: Expanded from 32 blocks to 36
2015-05-27 02:40:27 +12:00
libraryaddict
b8cd2aaece
UHC: Expand anti-build protection from 16 blocks to 32
2015-05-26 11:04:27 +12:00
libraryaddict
c53d52ee42
UHC: Disable gadgets
2015-05-24 20:17:39 +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
63e28e25c9
HoleInTheWall: Push the failed game
2015-05-24 20:10:56 +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
Jonathan Williams
f0c7f2fe76
Merge branch 'MSSQL_Conversion'
...
Conflicts:
Website/LOCWebsite.suo
2015-05-17 23:11:50 -07:00
Shaun Bennett
c107f4d0d9
[Arcade] Working on private servers
2015-05-17 16:31:09 -05:00
Shaun Bennett
5cd191f582
Merge remote-tracking branch 'origin/master'
2015-05-17 16:29:01 -05:00
Shaun Bennett
1e9abaf002
[Arcade] Add more games to private servers
2015-05-15 23:38:43 -05:00
libraryaddict
f899194e3b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-15 12:23:27 +12:00
libraryaddict
091f98fa9d
DrawMyThing: Remove all found words from the checked string when looking for multiple guesses
2015-05-15 12:23:05 +12:00
Shaun Bennett
6b7c52cb87
[Arcade] Add additional hub clock check
2015-05-14 15:17:45 -05:00
Mini-Chiss
d390d83dd1
removed some meh words
2015-05-13 22:35:26 -05:00
Mini-Chiss
f49c2ca546
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-13 22:27:41 -05:00
Mini-Chiss
e68a2775e8
ex p chnage
2015-05-13 22:27:33 -05:00
libraryaddict
67f1e4ad1f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-14 14:29:43 +12:00
libraryaddict
0fc1d680af
UHC: Add 20 seconds of invincibility on game start
2015-05-14 14:29:30 +12:00
Mini-Chiss
44cb6d8a62
increased exp more
2015-05-13 17:08:56 -05:00
libraryaddict
4bc38e3396
Arcade: Removed ocean, river and swampland from biome generation for UHC
2015-05-14 09:55:22 +12:00
libraryaddict
c46bdfd2dc
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-14 09:18:51 +12:00
libraryaddict
1b27e84e54
DrawMyThing: Fixed a check being in the wrong brackets
2015-05-14 09:18:35 +12:00
Mini-Chiss
bd58c06017
fixed being able to team with self in UHC
...
fixed eventgame admin toggle
2015-05-13 13:32:20 -05:00
Mini-Chiss
c34cac42ee
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-13 13:20:14 -05:00
Mini-Chiss
c26174ffa2
fixed team name
2015-05-13 13:20:05 -05:00
libraryaddict
938386bf77
Wizards: Removed chainmail loot, added gold armor instead
2015-05-13 19:14:40 +12:00
libraryaddict
20aeccb3be
Wizards: Lowered ice shards max level to 3, removed damage from web shot
2015-05-13 14:04:19 +12:00
libraryaddict
744c867990
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-13 13:19:09 +12:00
libraryaddict
d2e37df4ca
DrawMyThing: Prevented all multiple guesses, not just when it contains an accurate word
2015-05-13 13:18:54 +12:00
libraryaddict
a75aab7f98
DrawMyThing: Added more words, fixed the multiple guesses prevention never firing.
2015-05-13 13:15:53 +12:00
libraryaddict
03c384e7e6
Wizards: Remove boat from loot, fix napalm typo
2015-05-13 10:04:05 +12:00
Mini-Chiss
e1dd3a318e
UHC!!!!!
2015-05-12 15:52:19 -05:00
Shaun Bennett
32338cfce4
[MB] More words for update
2015-05-12 17:25:37 -05:00
Shaun Bennett
bdfffa3a4c
Merge remote-tracking branch 'origin/master'
2015-05-12 17:14:57 -05:00
Shaun Bennett
26db4fa269
[MB] Add more build themes
2015-05-12 16:15:44 -05:00
Mini-Chiss
2928c73767
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-12 14:46:30 -05:00
Mini-Chiss
e13e735246
UHC updates!
2015-05-12 14:46:21 -05:00
Shaun Bennett
c7a9ae8cd5
[Arcade] Attempt at fixing spectator gui bugs
2015-05-12 06:23:32 -05:00
Shaun Bennett
06a0f3d0d5
Merge remote-tracking branch 'origin/master'
2015-05-12 00:37:40 -05:00
Shaun Bennett
270ef37a7c
[MB] More words and more ground types
2015-05-12 00:37:13 -05:00
Mini-Chiss
ed90e97c68
removed border attack stuff
2015-05-11 21:00:38 -05:00
Shaun Bennett
9d959ee7a3
Fix/Enable Look at me Button
2015-05-11 20:46:37 -05:00
Mini-Chiss
643ed2c047
Fixed most enchants not working
...
added commands to event
minor update to snowfight to make it more fun
2015-05-11 19:55:26 -05:00
libraryaddict
214a750f6e
UHC: Add borders from SG
2015-05-12 11:01:04 +12:00
libraryaddict
a558995e12
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-12 09:52:21 +12:00
Shaun Bennett
d57bab7430
Merge remote-tracking branch 'origin/master'
2015-05-11 15:17:50 -05:00
Shaun Bennett
e799ea0909
[MB] Look at me Button (Disabled - not working properly), Villager profession button, Small bug fixes
2015-05-11 15:17:35 -05:00
Mini-Chiss
e3f2c02836
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-11 14:11:00 -05:00
Mini-Chiss
5e73441b9a
UHC world loading
2015-05-11 14:10:51 -05:00
Mini-Chiss
123af16bd2
UHC map gen
2015-05-11 13:25:05 -05:00
Shaun Bennett
c0dc531252
[MB] Allow Item Frames and Paintings
2015-05-11 12:38:21 -05:00
Mini-Chiss
5ec60d234a
UHC changes
2015-05-11 12:27:43 -05:00
Mini-Chiss
9b0736816b
UHC changes
...
abstracted out some common attribs
2015-05-11 12:21:32 -05:00
Jonathan Williams
b1a46d0f0d
Converted TaskManager
2015-05-11 01:21:27 -07:00
Shaun Bennett
46c07665e1
Merge remote-tracking branch 'origin/master'
2015-05-11 00:44:34 -05:00
Shaun Bennett
2e7428e79a
Temporary fletcher fix
2015-05-11 00:42:55 -05:00
libraryaddict
5ee3f48754
Wizards: Nerf rumble max level from level 5 to level 3
2015-05-11 14:08:40 +12:00
Mini-Chiss
3e64115f05
vote colors
2015-05-09 17:45:08 -05:00
Mini-Chiss
41599de06f
build vote update
2015-05-09 17:34:07 -05:00
Mini-Chiss
6e2b437e55
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-09 12:28:16 -05:00
Mini-Chiss
822718095d
cannot PM from spawn
...
first push of cards game
2015-05-09 12:23:07 -05:00
libraryaddict
7faee918af
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-09 14:13:03 +12:00
libraryaddict
0751876622
Wizards: Do a null check and event is cancelled check on damage
2015-05-09 14:12:46 +12:00
Shaun Bennett
ef86f8bb6f
merge
2015-05-08 12:22:58 -05:00
libraryaddict
689ca94c57
Wizards: Nerf rainbow beam damage, rebalance gust spell, raise armor effectiveness
2015-05-08 18:57:33 +12:00
libraryaddict
3e02806b75
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-07 02:57:20 +12:00
libraryaddict
47acf7fb85
DrawMyThing: Ignore guesses containing more than two answers.
2015-05-07 02:54:55 +12:00
Shaun Bennett
ae03743c63
Build sort of bug fix for teleported into block
2015-05-04 19:27:16 -05:00
Mini-Chiss
7505bbc1a2
gravity fix
2015-05-04 15:34:57 -05:00
Mini-Chiss
b959bcaa90
fixed 1.8 req
2015-05-04 00:56:12 -05:00
Mini-Chiss
50cd692c62
fixed wither morph damaging blocks in grav lobby
2015-05-04 00:34:03 -05:00
Mini-Chiss
fa1ac52f78
grav balance
2015-05-03 20:21:00 -05:00
Mini-Chiss
838c369b7c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-03 20:12:13 -05:00
Mini-Chiss
95c9be47b6
missing kit
2015-05-03 20:12:06 -05:00
Shaun Bennett
cb2666c4a5
Merge remote-tracking branch 'origin/master'
2015-05-03 20:06:19 -05:00
Shaun Bennett
af1f735a43
Add lightning packets, various gui improvements
2015-05-03 20:06:10 -05:00
Mini-Chiss
58671fa229
more words
2015-05-03 19:36:50 -05:00
Mini-Chiss
6978a176b1
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-03 19:10:55 -05:00
Mini-Chiss
7f0e175ba1
build update
2015-05-03 19:10:49 -05:00
Shaun Bennett
044d1098f4
Merge remote-tracking branch 'origin/master'
2015-05-03 19:10:22 -05:00
Shaun Bennett
a435ed5bae
More build changes
2015-05-03 19:10:13 -05:00
Mini-Chiss
1576085d87
more words
2015-05-03 18:33:31 -05:00
Mini-Chiss
73132d96b9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-03 18:33:03 -05:00
Mini-Chiss
f36d7774cc
Gravity update
2015-05-03 18:32:57 -05:00
Shaun Bennett
de1f432be4
Build bug fixes
2015-05-03 18:31:56 -05:00
Shaun Bennett
74474c6227
Use itemstackfactory for formatted name
2015-05-03 18:26:20 -05:00
Shaun Bennett
f98ac0874c
Merge remote-tracking branch 'origin/master'
2015-05-03 18:22:14 -05:00
Shaun Bennett
83ff3c96aa
Close inventory when game starts
2015-05-03 18:21:59 -05:00
Shaun Bennett
fbfb5e637e
Mob Gui + Ground Change Gui + UtilSkull for special mob skulls
2015-05-03 18:18:16 -05:00
Mini-Chiss
a42c71ebb8
more 1.8 stuff
2015-05-03 16:54:02 -05:00
Mini-Chiss
bd8bd2dfd6
Abstracted kicking non-1.8 players
...
Abstracted resource pack msg
2015-05-03 16:51:13 -05:00
Mini-Chiss
40d56c3500
Converted all code to updated UtilParticle methods
...
/suicide
2015-05-03 16:37:00 -05:00
Mini-Chiss
97a86fde90
builds!
2015-05-03 15:39:15 -05:00
Mini-Chiss
a07132df49
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-03 15:39:04 -05:00
Shaun Bennett
73719e0df3
Fix world particles issues
2015-05-03 15:30:58 -05:00
Mini-Chiss
40c838b030
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-03 14:50:56 -05:00
Mini-Chiss
8224450b44
Build Update
2015-05-03 14:50:50 -05:00
Shaun Bennett
74dbf7e827
Merge remote-tracking branch 'origin/master'
2015-05-03 14:41:18 -05:00
Shaun Bennett
ff6da92fb7
Some Build world, support for far rendered particles
2015-05-03 14:41:09 -05:00
libraryaddict
b58bef1bd8
ResourcePack: Lengthen timeout from 10 seconds to 20 seconds
2015-05-04 04:13:23 +12:00
libraryaddict
9986bd6ee5
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-04 04:10:05 +12:00
libraryaddict
3fcec13e68
Wizards: Melee with wands should say it was wands that did it
2015-05-04 04:09:49 +12:00
Shaun Bennett
11b36e6b44
[Build] Show message to players to open inventory until they click something in their inventory
2015-05-02 22:50:27 -05:00
Mini-Chiss
9c08e57602
fixed NPE
2015-05-02 22:45:14 -05:00
Mini-Chiss
122dbad45c
added time setting and framework for lightning strikes
2015-05-02 22:26:03 -05:00
Mini-Chiss
6ad09f0ade
Master Builder update
2015-05-02 22:05:12 -05:00
Mini-Chiss
5b04d43400
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-02 17:45:39 -05:00
libraryaddict
08140f8863
ResourcePack: Resource pack refused now links to a forum guide
2015-05-03 08:10:25 +12:00
libraryaddict
8cb9493125
Wizards: Rainbow Road no longer lasts more than 20 seconds, cooldown never decreases
2015-05-02 16:39:20 +12:00
libraryaddict
9c268786aa
Wizards: Nerfed lightning strike damage
2015-05-02 16:22:59 +12:00
libraryaddict
efed6e129b
Wizards: Removed fishing rod from loot, fixed overtime locations not permitted to touch the highest block.
2015-05-02 16:11:57 +12:00
libraryaddict
3e9b64db66
Wizards Implode: Don't cast spell if no blocks are effected
2015-05-02 15:26:23 +12:00
libraryaddict
cd1a5793fa
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-02 15:24:16 +12:00
Jonathan Williams
707772d58b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-05-01 22:07:33 -05:00
Jonathan Williams
2902e6075f
Fix for n positive bug.
2015-05-01 22:05:03 -05:00
libraryaddict
05c9174491
Wizards: Prevent using keyboard shortcuts to drop hotbar locked items
2015-05-02 14:59:15 +12:00
Mini-Chiss
ab6937a525
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-01 18:05:55 -05:00
Shaun Bennett
e04b61a91d
Give build item when game starts
2015-05-01 18:03:56 -05:00
Shaun Bennett
244ffece8a
Fixes for build game + fix clans compile
2015-05-01 18:02:06 -05:00
Shaun Bennett
910cdff935
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
2015-05-01 17:54:00 -05:00
Shaun Bennett
37f1f7eabb
Master Builders changes for chiss
2015-05-01 17:46:42 -05:00
libraryaddict
b136be0d47
ResourcePack: Removed code that demanded a enum and changed to boolean
2015-05-02 03:03:53 +12:00
libraryaddict
e8cbb2fc29
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-01 21:26:56 +12:00
libraryaddict
93a25d5a67
ResourcePack: Fixed links and declined message
2015-05-01 21:26:42 +12:00
Jonathan Williams
fb634c190e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-05-01 02:29:54 -05:00
Jonathan Williams
e800d74976
Disabled Double Gems.
2015-05-01 02:29:20 -05:00
libraryaddict
c240a1752f
GameType: Update resource pack to use https not http
2015-05-01 19:28:42 +12:00
libraryaddict
f85d27db1a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-01 19:25:11 +12:00
libraryaddict
cc65830f9b
ResourcePack: Ignore ServerGroup's resource pack and set MineStrike to use new ResourcePack code
2015-05-01 19:24:20 +12:00
Mini-Chiss
1b8ab13160
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-01 00:51:52 -05:00
Mini-Chiss
ba5802cc14
wizards kit availability
2015-05-01 00:47:51 -05:00
Jonathan Williams
fa4466b6a9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-05-01 00:13:39 -05:00
libraryaddict
88bd99e11f
Wizards: Update UtilTextBottom text for the custom method
2015-05-01 16:57:11 +12:00
Jonathan Williams
af86586d74
Added 'Sloth' to draw my thing list.
2015-04-30 23:57:11 -05:00
Jonathan Williams
d161d62773
Added chat filtering to private messages.
2015-04-30 23:56:08 -05:00
Mini-Chiss
21800d83c6
Build fixes
2015-04-30 23:16:30 -05:00
libraryaddict
319cde5c46
Wizards: Update resource pack url
2015-05-01 16:14:59 +12:00
libraryaddict
fbafeca150
Wizards: Remove block burn flag true
2015-05-01 15:44:11 +12:00
libraryaddict
82cd4208bd
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
2015-05-01 14:22:53 +12:00
libraryaddict
c660e0e3c7
Wizards: Re-sorted spells
2015-05-01 14:19:13 +12:00
libraryaddict
7bd133f704
Wizards: Temporary resource pack
2015-05-01 13:04:05 +12:00
Mini-Chiss
ed1c7e2336
Master Builders initial push (dont worry jon it doesnt effect anything for the update!)
2015-04-30 18:20:35 -05:00
libraryaddict
23ea7bbce4
Spectators: Set fire ticks to 0 on damage
2015-04-30 20:55:30 +12:00
libraryaddict
33bbe96964
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards
2015-04-30 01:33:43 +12:00
libraryaddict
497550549b
ResourcePackCode: Fixed the return to hub sender displaying the wrong message. Bad downloads are now sent back to hub.
2015-04-30 01:33:21 +12:00
libraryaddict
c2b7001fcc
Wizards: Current progress
2015-04-30 01:32:22 +12:00
Mini-Chiss
45b801ba81
hitbox changes
2015-04-27 19:21:33 -05:00
libraryaddict
1c1ab9bbe3
Throwing TNT: Fixed tnt not being movable from other inventories
2015-04-23 08:30:23 +12:00
libraryaddict
2aaa93e58f
ResourcePack: Add constructors to GameType for resource pack urls, sorted the enum's by name
2015-04-22 05:38:32 +12:00
libraryaddict
b29893ff60
Merge branch 'ResourcePack' into Wizards
2015-04-22 03:46:25 +12:00
libraryaddict
9f8fe3bf78
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into ResourcePack
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-04-22 03:45:59 +12:00
libraryaddict
aeff6bf4b9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards
2015-04-22 00:25:56 +12:00
libraryaddict
0196a5c359
Wizards: Latest changes by Chiss
2015-04-21 13:54:19 +12:00
libraryaddict
cd47da179a
Wizards: Added new food Cheese, removed other foods and raised spawn chance of remaining
2015-04-18 06:12:34 +12:00
libraryaddict
9db8aff37a
Wizards: Changed spell icons for resource pack
2015-04-18 06:10:23 +12:00
libraryaddict
25dfeacb09
Wizards: Spell levels are now viewable on items in chest as item amount
2015-04-16 16:20:01 +12:00
libraryaddict
8803941bd8
Wizards: More changes as per demand.
2015-04-16 05:51:08 +12:00
libraryaddict
073c7d16c2
Wizards Napalm: Make glazed blocks more common, raise damage
2015-04-13 15:06:52 +12:00
libraryaddict
e0b0975195
Bridge: Prevent hoppers being crafted to prevent abuse
2015-04-13 14:38:32 +12:00
libraryaddict
03fb8c203e
Wizards: Balancing
2015-04-12 23:20:15 +12:00
libraryaddict
81aeff86bf
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards
2015-04-12 20:15:28 +12:00
Cheese
1378dcb815
Properly fixed MS spec bug
2015-04-11 11:45:27 +10:00
Cheese
9b2c4662c3
fixed minestrike bug where newly joined specs could buy/drop items
...
removed easter baskets
2015-04-11 11:25:25 +10:00
libraryaddict
afa372dca7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/SpellButton.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellLightningStrike.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellSpeedBoost.java
2015-04-11 12:20:29 +12:00
libraryaddict
fc7c6e5831
Wizards changes
2015-04-11 12:11:50 +12:00
Cheese
3d95a5cfa4
bloock toss fix
2015-04-10 14:09:21 +10:00
Cheese
e0a58ba165
champions exploit fix update
2015-04-06 19:57:33 +10:00
Cheese
cdb86d3ebb
champions exploit fixes and balance
2015-04-06 17:17:36 +10:00
Cheese
6c3fc3009b
fixed sheep quest bug where players were unable to pick up sheep rapidly
...
fixed bug where falling blocks were instantly hitting players
2015-04-06 13:03:59 +10:00
Cheese
93abca0c01
can no logner break levers and other usables in SG
2015-04-04 16:12:33 +11:00
Cheese
c79432c8b9
Fixed projectile hitboxes and specific values
2015-04-04 10:54:03 +11:00
Cheese
23df6daab0
Added Easter Morph
...
Added Eggs Baskets in games
Added double gem for 1.8
2015-04-03 20:31:23 +11:00
libraryaddict
23abf92722
IcePathData: Compare Material instead of integers
2015-04-03 19:37:27 +13:00
libraryaddict
6faf5011a8
Wizards: Add spells: Gust, RainbowPath, SpectralArrow, IcePrison. Remove spells: ExplosiveRune, HealingRune, LaunchRune, Launch, TeleportRune. Explosions now launch blocks. Other changes done such as modified spells.
2015-04-03 19:33:49 +13:00
Cheese
d4e8c0c9a6
Added Respawn middle screen text
...
Added Champs capture point mid screen text
Fixed hitbox mults for projectiles
Fixed inconsistent arrow damage
Lots of Champions balance
2015-04-03 15:28:10 +11:00
Cheese
f682bb8f9c
fixed kit items not spawning
...
horse pet doesnt spawn when dead
2015-04-03 12:10:02 +11:00
libraryaddict
bb821996b1
Wizard modifications
2015-04-03 09:22:31 +13:00
Cheese
43c58bd31c
removed april fools from arcade :(
2015-04-01 20:22:13 +11:00
Cheese
3355d2b457
disabled aprilfools cow for team games
2015-04-01 19:15:11 +11:00
Cheese
5737df8d6a
final fixes for bacon brawl
2015-04-01 18:07:45 +11:00
Cheese
da9e7892f0
fixed aprilfools bugs
...
mamapig debug :(
2015-04-01 18:01:09 +11:00
Cheese
24ba42cb16
fixed armor stands blocking attacks in bacon brawl
2015-04-01 17:49:49 +11:00
Cheese
8bd883cb26
fixed damage transfer for mama pigglez kit
2015-04-01 17:43:46 +11:00
Cheese
59fce1cd88
adding some mmoooo text
...
changed pig kit for baconbrawl
2015-04-01 17:15:56 +11:00
Cheese
ed35d2a992
April Fools update
2015-04-01 16:56:13 +11:00
libraryaddict
b84756ef7a
Revert wizard commits
2015-03-27 22:13:50 +13:00
libraryaddict
a772d4cbf2
BlockHunt: Use new setInvisible method in DisguiseChicken
2015-03-27 22:05:16 +13:00
libraryaddict
a27e6fba5c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
2015-03-27 06:00:14 +13:00
Cheese
821c7f0cb6
Replaced bebe piggles kit with a new kit
2015-03-26 17:43:22 +11:00
Jonathan Williams
f4061854cd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-25 15:11:17 -07:00
Jonathan Williams
6472194d44
Optimized queries to retrieve and update player information by removing inner join calls on the account.
...
Added account id retrieval on login.
Added account id caching in redis.
2015-03-25 15:10:59 -07:00
libraryaddict
db5e6ad745
Wizards: Summoned wolves are one-hittable, and one per spell level
2015-03-25 19:25:32 +13:00
libraryaddict
be5086e2a5
Wizards: Give warning before lightning spell hits
2015-03-25 19:22:08 +13:00
libraryaddict
be542b9ce4
Rebalance wizard spell SpeedBoost
2015-03-25 19:21:38 +13:00
libraryaddict
853e6420dd
Add instant-casting to wizards
2015-03-25 19:21:20 +13:00
Cheese
4a25265c7c
Added utility methods to check for players within a sight pyramid
2015-03-25 17:13:22 +11:00
libraryaddict
4988b90d0e
Prevent TNT from being moved in inventories in PerkBomberHG
2015-03-25 16:56:37 +13:00
libraryaddict
63c55a1449
SurvivalGames: Prevent wood dropping, add mushroom soup to base loot and change bowl to soup. Add throwing tnt to loot.
2015-03-25 16:56:05 +13:00
libraryaddict
ad967a092a
Remove TNT from SG placeable and breakable
2015-03-25 16:19:56 +13:00
Cheese
9142227dd4
updates to SG border
...
balanced cleave for SG and Champs
2015-03-25 14:16:09 +11:00
Cheese
5fded981d9
Timings for Visibility
2015-03-23 16:38:17 +11:00
Cheese
46dfb532fb
Bridges scoreboard fix
...
SG balance
DONT QUIT msg improvement
2015-03-23 11:50:09 +11:00
Cheese
3f2b7444a3
made SG scoreboard display individual player names once there's less then 8
2015-03-22 10:06:11 +11:00
libraryaddict
f99edecba0
Change deathmatch color to red
2015-03-22 00:05:24 +13:00
Cheese
2bbf035d4c
SG borders now have audio and attack nearby players.
2015-03-21 12:22:47 +11:00
libraryaddict
ee7ae77311
Use VisibilityManager instead of hidePlayer showPlayer in SG Deathmatch
2015-03-21 01:38:20 +13:00
Cheese
0a766cd7bb
increased food and weapons
2015-03-20 22:23:25 +11:00
Cheese
376824edfc
slowly tnt explosion by 0.5s
2015-03-20 20:46:11 +11:00
Cheese
446951d8af
balance changes for SG
2015-03-20 20:43:42 +11:00
Cheese
57502c226f
changed slasher to barb
2015-03-20 19:39:23 +11:00
Cheese
392a648f8e
fixed cleave hurting self
2015-03-20 18:43:44 +11:00
Cheese
810517b142
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-20 18:22:10 +11:00
Cheese
cdd9400ec2
added slasher kit to SG
2015-03-20 18:21:56 +11:00
libraryaddict
f2ffc57ae2
Fix error, allow snowball and egg to do damage
2015-03-20 20:15:10 +13:00
libraryaddict
baaebd3662
Chiss wants a shorter Assassin Description
2015-03-20 19:43:27 +13:00
libraryaddict
11dcc4af8b
Fix description of Assassin Kit
2015-03-20 19:41:56 +13:00
libraryaddict
83b18129f2
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
2015-03-20 19:33:27 +13:00
libraryaddict
7bf9c13fd8
Kit Assassin in SG has nametag visiblity set to 8 blocks, normal set to 24
2015-03-20 19:30:08 +13:00
Cheese
6c78bc6f8f
added 10s delay on getting bow in block hunt
2015-03-20 16:51:24 +11:00
Cheese
746fa9e11b
stealer kit for SG
2015-03-20 16:20:55 +11:00
libraryaddict
6c257c1e7d
Store killed players in a hashmap in SG
2015-03-20 18:17:34 +13:00
libraryaddict
19cc6dc12b
Minor bug-fix in the hopes it fixes a major bug for SG
2015-03-20 17:51:03 +13:00
libraryaddict
6e30834565
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-03-20 17:35:42 +13:00
libraryaddict
03bcb120fc
Change border damage from Void to Border Damage
2015-03-20 17:35:27 +13:00
libraryaddict
3e7346618b
Change border creep speed, boats only placeable on water
2015-03-20 17:34:44 +13:00
Cheese
e4475eb7b1
allowed mapleads to stop games
...
removed nametag (long range) on wolf pet, and lowered damage from 4 to 3
2015-03-20 12:37:18 +11:00
libraryaddict
7b41649d94
Removed debug logging in SurvivalGames
2015-03-18 22:10:03 +13:00
Cheese
ee237c9f5b
re-enabled SG in gamefactory
2015-03-17 22:20:40 +11:00
libraryaddict
1f0e204eb3
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SurvivalGames
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/subclasses/HealingRune.java
2015-03-18 00:04:41 +13:00
libraryaddict
261b18fcf0
Add GameType options
2015-03-17 23:59:59 +13:00
libraryaddict
52f0941fb9
Add resourcepack options
2015-03-17 23:59:24 +13:00
libraryaddict
733134f709
Update SurvivalGames
2015-03-17 23:53:43 +13:00
libraryaddict
f12d0bf9ef
Allow disabling of game start sounds, and changing of the game PrepareTime.
2015-03-17 23:52:58 +13:00
libraryaddict
340441edbe
SG kit fletcher no longer can pickup fletched arrows
2015-03-17 18:30:48 +13:00
libraryaddict
06ebbbbc73
Remove SG wolf pet on quit
2015-03-17 18:30:17 +13:00
libraryaddict
41469b198a
Change wizards spells to use conditions for potion effects
2015-03-17 18:07:43 +13:00
Cheese
3eba559b01
fixed merge error
2015-03-17 15:02:41 +11:00
Cheese
73c66fa93f
Merge branch 'SpecRemoveCreative'
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
2015-03-17 14:57:17 +11:00
Cheese
e3eb62887d
fixed an eventgame bug
2015-03-17 14:50:56 +11:00
Cheese
28c683a37a
fixed display for effects
2015-03-16 15:16:17 +11:00
Cheese
c941c383e7
fixed hosts not being able to use creative inventroy
2015-03-16 15:01:35 +11:00
Cheese
efa2b649bd
updated eventserver not expiring
2015-03-16 14:19:43 +11:00
Cheese
a700b61613
added WE permissions to event servers.
2015-03-16 14:10:58 +11:00
Cheese
420c4e7229
More work on Event game
2015-03-16 13:39:33 +11:00
libraryaddict
bead4a7626
No longer need to constantly set the durability of items in the sheep game
2015-03-15 13:13:06 +13:00
libraryaddict
ba04c5e834
Fixed GameScoreboard demanding strings are shortened to 15 chars when the max is 16
2015-03-15 12:35:39 +13:00
libraryaddict
e9fe1fb423
Formatted SpellType, fixed lightning spell description
2015-03-15 12:34:45 +13:00
Cheese
98960b6ce7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-13 15:40:41 +11:00
Cheese
6762e4b537
Merge branch 'SpecRemoveCreative' of ssh://184.154.0.242:7999/min/Mineplex into SpecRemoveCreative
2015-03-13 11:34:57 +11:00
Cheese
c5d48a82a3
Fixed invisibility bug
2015-03-13 11:34:45 +11:00
Shaun Bennett
b18ea22df4
Fix spectator gui bug
2015-03-12 15:50:46 -04:00
Cheese
3ceb0ff678
Converted spec away from CREATIVE
2015-03-12 15:31:40 +11:00
Shaun Bennett
f660620e4b
Revert "Pre-Frost changes"
...
This reverts commit dbeea5bf69
.
2015-03-11 22:18:29 -04:00
Cheese
bf901b2280
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-12 12:15:48 +11:00
Cheese
8e77d1fc21
more event server updates
2015-03-12 12:14:49 +11:00
libraryaddict
9cf0e4d1e8
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-03-11 13:17:16 +13:00
libraryaddict
f47447134e
Cleanup hologram class, remove witherskull option for 1.8 and fix duplicate nametags and non-invisibility on armorstands
2015-03-11 13:16:00 +13:00
Tim Ziankoski
759db08679
Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex"
...
This reverts commit 2e06a272b4
, reversing
changes made to e443b41e15
.
2015-03-09 17:24:01 -04:00
Tim Ziankoski
2e06a272b4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-09 16:43:00 -04:00
Cheese
e443b41e15
removed unfinished code
2015-03-09 22:16:08 +11:00
Cheese
3a0e597276
more event server stuff
2015-03-09 22:15:24 +11:00
libraryaddict
dbeea5bf69
Pre-Frost changes
2015-03-09 05:17:04 +13:00
Tim Ziankoski
ac4b495301
Created internationalization helper class and began i18n process
2015-03-07 20:50:47 -05:00
Cheese
e0ba667613
old chests drop a little more frequently
2015-03-07 11:53:18 +11:00
Cheese
f2a71b2ea9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-07 11:13:30 +11:00
Cheese
683f86bd89
event server fixes and parser gamtypes
2015-03-07 11:13:17 +11:00
Jonathan Williams
2d7f65588c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-06 01:36:38 -08:00
Jonathan Williams
09ecb994f6
Pooled Friend/Ignore/Preferences/Poll/Elo repositories.
...
Removed ArcadeRepository as its unused.
Removed target server check for RedisCommand because it breaks other commands.
2015-03-06 01:36:25 -08:00
Cheese
0336df55aa
Event update
2015-03-06 19:43:17 +11:00
Cheese
e62d9774a9
Initial Event Game push
2015-03-06 19:11:26 +11:00
Jonathan Williams
5e78b43860
Added StaffOnly code to ServerConfiguration
2015-03-02 12:33:04 -08:00
libraryaddict
1fbadfa4f4
Don't compare player world to a plugin fetched world, instead compare the name.
2015-03-01 18:18:53 +13:00
Shaun Bennett
90ebbd9962
More refactors
2015-02-27 22:53:55 -05:00
Shaun Bennett
efce714375
DEVP-66 Refactor commonly used classes to Java conventions
...
Refactoring + testing jira
2015-02-26 00:07:07 -05:00
Shaun Bennett
cf7e2eed69
Merge with MPS Update
2015-02-24 21:11:16 -05:00
Shaun Bennett
ad5481ef9c
Revert "Remove arcade repository stuff"
...
This reverts commit a5f7050e40
.
2015-02-24 21:04:19 -05:00
Shaun Bennett
be591c7d09
Disallow start/stop/kick/setgame while a game is in progress for Donor ranks
2015-02-24 17:22:47 -05:00
Shaun Bennett
857052992d
Increase max player cap to 100 for SnrMod+/Youtube
2015-02-24 14:47:10 -05:00
Shaun Bennett
570374fbb4
Add Wither Assault and Wizards gametypes to legend+ private servers
2015-02-24 14:45:31 -05:00
Shaun Bennett
48dd5639d2
Kick banned players from games
2015-02-24 14:38:12 -05:00
CoderTim
0bf6866ad7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-23 20:56:34 -05:00
libraryaddict
fc5771b33c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-24 13:04:06 +13:00
libraryaddict
56e03221ad
Improve party system
2015-02-24 13:03:51 +13:00
Jonathan Williams
87558eb01a
Merge pull request #10 in MIN/mineplex from leaderboards_dev to master
...
* commit 'e1f7e2dbcc91bb79d393b09ea5b250fe895cfe11':
Remove old lines of debug code.
Add in hooks to update statistical events log for leaderboards. Modify leaderboard PHP script for new updated leaderboard table formats.
2015-02-21 01:55:59 -06:00
libraryaddict
53bb67ec4f
Magic missile nerfed to no cooldown decrease, nerfed rumble dmg, nerfed lance multihits
2015-02-21 20:41:07 +13:00
Ty Sayers
def101cc8d
Add in hooks to update statistical events log for leaderboards.
...
Modify leaderboard PHP script for new updated leaderboard table formats.
2015-02-19 18:53:46 -05:00
CoderTim
44f453c56e
Updated jOOQ and database tables
2015-02-18 18:51:36 -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
Mini-Chiss
cdbf6c450e
fixed mis-named gameloot chests
2015-02-15 17:35:58 +13:00
Shaun Bennett
a5f7050e40
Remove arcade repository stuff
2015-02-13 07:33:50 -05:00
libraryaddict
9bdf248643
Add cross-server message and adminmessage commands. Fixed casing on messagecommands package.
2015-02-12 04:08:06 +13:00
Shaun Bennett
e21e27f07f
Merge remote-tracking branch 'origin/master'
2015-02-10 13:33:59 -05:00
Shaun Bennett
6b3f2114f2
Holy debug code!
2015-02-10 13:27:29 -05:00
Mini-Chiss
884df48695
disguise command (not yet working fully)
2015-02-10 19:08:54 +13:00
libraryaddict
29f3241098
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-10 02:32:13 +13:00
libraryaddict
ce7db289a7
Add commands /ignore and /unignore. Fixed mutes not working with private messaging
2015-02-10 02:31:33 +13:00
Shaun Bennett
ed8638ae9f
Tablist thingy for 1.8, sort of helps the situation a bit but doesnt perfectly solve it
2015-02-06 23:39:22 -05:00
Chiss
417122b7a7
reduced rate that smash crystal spawns
2015-02-06 14:47:34 +11:00
Chiss
09b78fccd7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-06 14:16:26 +11:00
Chiss
14fc6f2145
Chest Update
2015-02-06 14:16:10 +11:00
libraryaddict
f549402712
Modify wizards to use | for bossbar displays
2015-02-05 23:42:26 +13:00
libraryaddict
6f8d39b630
Fixed spiders climbing liquids
2015-02-05 22:34:06 +13:00
Shaun Bennett
939c6189a7
Merge energy and war with master
2015-02-03 14:16:07 -05:00
Shaun Bennett
6cefeb1b74
More work on War
2015-02-03 14:02:45 -05:00
libraryaddict
9118aef60f
Even if death is not the end, refuse players re-entry if they were in the lobby when they quit.
2015-02-01 16:03:29 +13:00
libraryaddict
f9cbab6fd8
SuperSmash no longer restores hunger unless you damage a player, not a entity
2015-02-01 09:47:00 +13:00
libraryaddict
6f369cbcdb
Sort players in spectator menu by name
2015-02-01 08:25:38 +13:00
Chiss
f03c9d5bab
Fixed damage rate on barrage
2015-01-30 20:48:46 +11:00
Chiss
115f9b58ab
Spider nest :)
2015-01-30 17:02:28 +11:00
Chiss
5b112caa4a
Bone Storm buff
2015-01-30 16:10:03 +11:00
Chiss
c066cb5185
Fixed Bugs
2015-01-30 16:08:22 +11:00
Chiss
3fdf914d63
Smash Wolf Update!
2015-01-30 15:18:50 +11:00
Chiss
76b76cd38c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 14:42:51 +11:00
Chiss
c8afa151d9
SSM Zombie + Spider Update
2015-01-30 14:42:39 +11:00
libraryaddict
505dcc1e8e
Add friends gui, deprecate the old chatbased friends display
2015-01-30 13:46:07 +13:00
Chiss
e18107a82f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 11:08:37 +11:00
Chiss
6a269cc03b
More SSM Changes
2015-01-30 11:08:23 +11:00
libraryaddict
ebc74e5565
Fireball still too fast
2015-01-29 15:01:00 +13:00
Chiss
7f4bcd1210
Smash Update
...
new scoreboard (not implemented yet)
reward changes
2015-01-29 11:54:59 +11:00
libraryaddict
2dfdde4457
Kit mage will now start with two spells
2015-01-28 03:01:44 +13:00
libraryaddict
1da873ab8f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-27 21:09:31 +13:00
libraryaddict
94f79990e4
Kit changes to wizards
2015-01-27 21:09:15 +13:00
Chiss
f80e640d34
Map Parser voxel update
...
Disabled spec GUI in bridges
other minor changes
2015-01-26 11:23:08 +11:00
Chiss
10ab390bd7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-26 11:20:12 +11:00
Chiss
40ef3317dd
committing necessary files to merge
2015-01-26 11:20:02 +11:00
libraryaddict
76e6b7530f
Meteors now explode everything on contact. Added spellbook for spectators and pregame. Mana cost now obvious when cooling down. Lowered some random item amounts
2015-01-26 09:09:46 +13:00
libraryaddict
b4b8b307b0
Rename Wizard Battles to Wizards
2015-01-25 18:50:45 +13:00
libraryaddict
c19f10aff9
Reduce kit mystic mana regen to 10%
2015-01-25 18:33:22 +13:00
libraryaddict
8262eb9f48
Rebalance explosive rune, fix rank bug and books no longer drop
2015-01-25 18:27:21 +13:00
libraryaddict
7682907478
Wizards modifications - Its amazing how things slip past you
2015-01-25 06:18:07 +13:00
libraryaddict
3525243f9d
Numerous fixes to Wizards
2015-01-24 23:14:23 +13:00
libraryaddict
3ff0592d2d
Mild fix on fireball, fix heal given less cooldown and lower heal spell heals
2015-01-24 13:51:18 +13:00
libraryaddict
31c1be9dd8
Nerf the spell heal
2015-01-23 23:25:03 +13:00
libraryaddict
99c9bfbf33
Left clicking a chest is harmless
2015-01-23 23:18:29 +13:00
libraryaddict
da81d131a7
Don't open wizard spell menu if they right clicked a chest
2015-01-23 23:17:45 +13:00
libraryaddict
b00deb683e
Red overtime
2015-01-23 22:28:07 +13:00
libraryaddict
def2018c8b
Remove center blocks of stone wall wizard spell
2015-01-23 22:15:27 +13:00
libraryaddict
92ef0af39d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
2015-01-23 22:01:51 +13:00
libraryaddict
c5b444ae6e
Wizards push
2015-01-23 21:52:03 +13:00
Jonathan Williams
08078c1622
Removed Logger
2015-01-22 23:18:38 -08:00
libraryaddict
0b8babb36d
Spectator menu shouldn't be opened when standing on pressure plates should it..
2015-01-23 02:31:38 +13:00
libraryaddict
74d7c7df2b
More wizard modifications
2015-01-23 02:30:44 +13:00
libraryaddict
29dc598c00
Update the fireball times to 20min
2015-01-22 01:00:57 +13:00
libraryaddict
eb7e68885b
Hunger now takes longer to decrease
2015-01-21 19:00:26 +13:00
libraryaddict
dd2418232c
Wizards progress
2015-01-21 19:00:07 +13:00
libraryaddict
e11e2090ad
Fix up spells somewhat
2015-01-18 21:23:50 +13:00
libraryaddict
9b574de541
Current wizards
2015-01-18 21:23:49 +13:00
libraryaddict
1ea19ee2e7
Add spell HealingRune, deny weapon crafting, use scoreboard for a simply display
2015-01-18 21:23:49 +13:00
libraryaddict
ea452d8fa5
Wizards progress
2015-01-18 21:23:48 +13:00
libraryaddict
72e61a02df
Changes to wizards
2015-01-18 21:23:48 +13:00
libraryaddict
611d184024
Cleanup code, add custom explosion, add lance and traprune spell
2015-01-18 21:23:47 +13:00
libraryaddict
d6d01241cb
Progress on wizards
2015-01-18 21:23:44 +13:00
libraryaddict
d232bab051
Wizards Game Progress. Now workable
2015-01-18 21:23:43 +13:00
libraryaddict
0648276720
Current progress on wizards
2015-01-18 21:23:03 +13:00
libraryaddict
5a5946c0d0
Current progress on wizards - Working on scoreboards in a new branch
2015-01-18 21:23:02 +13:00
libraryaddict
a3e0a6b4fd
Wizards Commit
2015-01-18 21:23:02 +13: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
b32259d7f1
Fixed length checking with team prefix in GameScoreboard
2015-01-12 12:58:40 -08:00
libraryaddict
b2fde6c6ca
Do a for(15) loop instead of while true. Don't update scoreboard if its unchanging
2015-01-12 12:22:01 +13:00
libraryaddict
1006d66e0a
Format Scoreboard, fix displaying more than 15 lines
2015-01-12 12:09:45 +13: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
libraryaddict
fa59ed52b9
Fixed arrow count not updating on shoot cancel
...
Spectators are now permitted to walk on enemy turf
2015-01-11 09:49:46 +13:00
libraryaddict
6343a00b53
Instead of removing the shot arrow, cancel the event instead. Fixes kit Shredder being usable during buildtime
2015-01-10 09:08:35 +13:00
libraryaddict
9863b701d8
Fixed typos in descriptions of SSM kits Wolf and WitherSkele
2015-01-10 08:54:00 +13:00
Chiss
9daee9733f
Fixed UHC height limit
...
fixed UHC rejoin health bug
2015-01-08 13:08:15 +11:00
Chiss
8ce097d837
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-04 13:21:35 +11:00
Chiss
5f36c8e424
minor scoreboard changes
...
legend loot bonus
2014-12-30 08:50:37 +11:00
Jonathan Williams
97f57b655b
Prevent horses from spawning in Clans
...
Added Building supplies shop and pvp shop to clans.
2014-12-29 06:44:00 -05:00
Jonathan Williams
81e423fa4f
Fixed Server transfer stuff. Portal send works!
2014-12-24 14:35:34 -05:00
Shaun Bennett
043f67f78c
Fix for max players not displaying properly (MPS)
2014-12-23 17:48:38 -06:00
Chiss
35bcf28c83
champions builds will now load in MPS, even if the current game isnt champs.
2014-12-23 23:44:59 +11:00
Chiss
78977788a1
fixed bug
2014-12-23 23:18:29 +11:00
Chiss
f4c5922b05
added messages for when server is expired
2014-12-23 23:17:21 +11:00
Chiss
78d94320a8
fixed reciptient of message
2014-12-23 22:55:07 +11:00
Jonathan Williams
07cca7a1d4
Fixed NPE in GameHostManager
...
Fixed CD for creating server.
2014-12-23 06:46:05 -05:00
Shaun Bennett
21d255fcd1
Merge remote-tracking branch 'origin/master'
2014-12-23 04:15:55 -06:00
Shaun Bennett
c41b5b0cfb
private server gui, i think?
2014-12-23 04:15:33 -06:00
Chiss
6d2bd84b5b
disabled always joinable motd for minestrike
2014-12-23 20:39:49 +11:00
Jonathan Williams
9a767af018
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 03:44:05 -05:00
Jonathan Williams
f00854ee4c
Removed bad code thats bad from the bad birdy.
...
Hooked in PersonalServer item click and command.
Re-enabled redis transport commands.
Added transfer command sending on personal server start.
Updated Enjin to handle more versatile inventory purchases.
2014-12-23 03:43:56 -05:00
Chiss
521b61c624
disabled free evolutions
2014-12-23 19:42:13 +11:00
Chiss
a15256da88
update
2014-12-23 19:04:10 +11:00
Jonathan Williams
103ff0e6b0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 02:57:24 -05:00
Chiss
07d82b8206
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-23 18:39:22 +11:00
Chiss
39745913ac
re-enabled roggue
2014-12-23 18:39:05 +11:00
Shaun Bennett
eb0f23318f
Fix my fix for scoreboard - mine broke when new players joined
2014-12-23 00:06:30 -06:00
Shaun Bennett
4b4ebd0e36
Change admin item to sparkling melon
2014-12-23 00:06:04 -06:00
Shaun Bennett
8f9794a5f7
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2014-12-22 23:56:18 -06:00
Shaun Bennett
706b3e25ef
Fix broken player count when changing max players
2014-12-22 23:54:51 -06:00
Chiss
64d37d1886
minor snd changes
2014-12-23 16:50:31 +11:00
Jonathan Williams
4cac65a81f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 00:50:20 -05:00
Jonathan Williams
0e85b7e6cc
Added HostName to server groups.
...
Added handling of private server groups in server monitor.
Optimized server group/server status load.
Added ability to add/remove server group.
2014-12-23 00:49:52 -05:00
Shaun Bennett
1957db25d9
Add player head button
2014-12-22 23:20:20 -06:00
Chiss
e8953b0c96
fixed merge errors
2014-12-23 15:14:03 +11:00
Chiss
f961fd0233
Merge remote-tracking branch 'remotes/origin/searchanddestroy'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-12-23 15:09:58 +11:00
Chiss
19a7e6d666
time update
2014-12-23 13:01:44 +11:00
Shaun Bennett
8ed7f34ab6
Sorted game pages
2014-12-22 19:20:08 -06:00
Chiss
4797b251b1
YAY Champions enable/disable works.
2014-12-23 11:39:03 +11:00
Chiss
71cf8e8fd2
undid champs stuff :(
2014-12-23 11:22:41 +11:00
Chiss
ec9401506c
Game servers can now run champions/normal on the fly.
2014-12-23 11:18:48 +11:00
Chiss
a197724de8
fixed le bugs.
2014-12-23 10:48:15 +11:00
Shaun Bennett
1396c3395a
Add kill button, rename ban to remove, add some messages for actions, add remove admin
2014-12-22 17:37:02 -06:00
Chiss
fa0a9ac859
fixed exploit on skylands
2014-12-22 21:08:44 +11:00
Chiss
ec8e1f0546
more MPS stuff
...
fixed bridges exploit
2014-12-22 16:31:13 +11:00
Chiss
2472ca95ec
MPS updates
2014-12-22 13:19:45 +11:00
Chiss
98b614848d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into HEAD
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
2014-12-22 10:54:31 +11:00
Chiss
0e7dec919d
minor updates
2014-12-22 10:51:19 +11:00
Chiss
9321abdaf5
Merge branch 'searchanddestroy' of ssh://184.154.0.242:7999/min/mineplex into searchanddestroy
2014-12-19 13:59:31 +11:00
Chiss
184c6cb4ba
added func to change attackreason for combatmanager
2014-12-19 13:59:18 +11:00
libraryaddict
93314711e7
Modified snd
2014-12-18 17:56:21 +13:00
Chiss
437c1aeabe
MPS rank todo
2014-12-18 13:06:57 +11:00
Chiss
60f567a3fb
fixed some errors ;o
2014-12-18 12:47:00 +11:00
Chiss
679f7909b0
Merge branch 'feature/private-servers' of ssh://184.154.0.242:7999/min/mineplex into feature/private-servers
2014-12-18 12:45:56 +11:00
Chiss
56d14b7bc0
Particle stuff
2014-12-18 12:45:45 +11:00
Shaun Bennett
604243dfa3
UI improvements - icon changes, whitelist toggle, notify messages
2014-12-17 19:42:11 -06:00
Shaun Bennett
2677d2e557
Fancy icons for 1.8!
2014-12-17 19:15:31 -06:00
Shaun Bennett
a63c48e338
Refactoring private server menu
2014-12-17 18:45:15 -06:00
Shaun Bennett
d19431a47f
Rename Clicked to onClick
2014-12-17 18:40:44 -06:00
Shaun Bennett
6e42894d5c
Refactor button again
2014-12-17 18:33:24 -06:00
Chiss
12973aba7d
Merge branch 'master' into feature/private-servers
2014-12-17 16:47:19 +11:00
libraryaddict
0e7adab3eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-17 18:32:50 +13:00
libraryaddict
17ac36d9ae
Add wither pet, pets are no longer stackable. Enderdragon no longer has his health changed in the hub
2014-12-17 18:31:51 +13:00
Shaun Bennett
6eb3efa0b6
More changes
2014-12-16 20:37:14 -06:00
Shaun Bennett
62a621270e
More work on private server gui. Still need to do a bunch of refactoring
2014-12-16 13:43:01 -06:00
Shaun Bennett
83218c9a73
Pushing unfinished code for laptop
2014-12-16 11:42:06 -06:00
libraryaddict
5b1f4f16fb
Modify giveGems for new give gems
2014-12-16 21:58:17 +13:00
Chiss
a433ad764d
Wither Morph
...
Legend Particle
2014-12-16 16:18:09 +11:00
Jonathan Williams
c43ee95c55
Added 1.8 hooks for disguise setName and getName
...
Refactored method names in some disguise classes.
2014-12-15 21:46:14 -05:00
libraryaddict
7e6b6bd1b2
Add evolve effect
2014-12-16 15:23:31 +13:00
libraryaddict
6d3a1116b9
Changes to SnD
2014-12-16 15:14:10 +13:00
libraryaddict
913f827ced
Changes to SnD
2014-12-16 15:14:09 +13:00
libraryaddict
da6b4b6a79
Current work for SnD
2014-12-16 15:14:09 +13:00
libraryaddict
0026127647
More work done on SnD
2014-12-16 15:14:08 +13:00
libraryaddict
f5d9d8dcf0
Modify scoreboard to use teams to support duplicate lines and up to 32 in length
2014-12-16 15:14:08 +13:00
libraryaddict
715862b365
Commit current changes
2014-12-16 15:14:07 +13:00
libraryaddict
6d7a71d043
Modifications for SnD test
2014-12-16 15:14:07 +13:00
Chiss
2e7d101850
added material/data for gametypes
2014-12-16 12:26:37 +11:00
Chiss
ee363f55a6
re-enabled gems for CC
2014-12-15 15:50:25 +11:00
Chiss
d7eb01e8f0
fixed CC Bug :D
2014-12-15 15:49:52 +11:00
Chiss
d1be64d7e7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
2014-12-15 14:56:09 +11:00
Chiss
95081a8ab7
Gems cannot be given multiple times for certain things (prevents bugs giving mass gems)
2014-12-15 14:33:38 +11:00
Jonathan Williams
230c6ede13
Disabled gem reward in ChristmasChaos
2014-12-14 22:14:41 -05:00
Chiss
19dfafe9ed
disabled gems
2014-12-15 13:58:36 +11:00
Chiss
909c0d9be7
christmas no longer rewards gems
2014-12-15 13:56:48 +11:00
Chiss
d0f8a6a063
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-15 12:26:25 +11:00
Chiss
9136165d4f
fixed christmas elf name
...
pet names now have limited range
2014-12-15 12:24:40 +11:00
Jonathan Williams
5b67e2182a
Added disguise to Pet Manager for eventual wither disguised pet.
2014-12-14 02:30:39 -05:00
Chiss
78a34b1517
hopefully fixed a bug where pumpking king despawned.
...
removed 11 disc from loot
2014-12-13 11:55:12 +11:00
Chiss
3f24325c3c
removed +50% player limit for CC
2014-12-12 21:23:01 +11:00
Chiss
4fd6ed80c4
final xmas Updates
...
xmas hub
2014-12-12 19:44:04 +11:00
libraryaddict
9a16616e6c
Add fix for wither bossbar and add a checkpoint hologram for snake bit in xmas
2014-12-12 12:40:23 +13:00
Chiss
adafc95d3f
boss weaker
2014-12-12 10:26:32 +11:00
Chiss
2be4d7d6d2
XMAS UPDATE
2014-12-12 10:03:25 +11:00
Chiss
3af8a90d3b
near final xmas push :D
2014-12-11 15:23:01 +11:00
libraryaddict
3a8ab0afb0
Uncomment SleighHorse
2014-12-11 15:24:10 +13:00
Chiss
6b1fa91565
Xmas Updates
2014-12-11 12:42:06 +11:00
Chiss
86b9d8342f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Sleigh.java
2014-12-11 11:27:47 +11:00
libraryaddict
ee8d699bd1
Minor text cleanup in the sleighhorse code because you guys seem to like that
2014-12-11 07:25:40 +13:00
libraryaddict
2a13255af3
Turn christmas chaos game horses into reindeer
2014-12-11 07:23:47 +13:00
Chiss
068a0901f9
xmas updatre
2014-12-11 00:16:15 +11:00
Chiss
358d5fde44
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-10 22:38:19 +11:00
Chiss
450d3eb923
merge
2014-12-10 22:38:08 +11:00
Jonathan Williams
c4fee8e681
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/.classpath
2014-12-10 03:34:53 -08:00
Jonathan Williams
ea034812b9
Fixed path finder crap in UtilEnt
...
Cleaned up unused code in OutfitRaveSuit
Fixed eclipse bug for NotificationManager
Removed christmas/Sleigh columns.
2014-12-10 03:32:35 -08:00
Chiss
db8e0484ab
missing files + new pet
2014-12-10 18:23:22 +11:00
Chiss
0aba82eee6
fixed some eclipse java6 stuff with mail
...
Christmas game update
2014-12-10 15:38:57 +11:00
Chiss
bee81ff455
lowered coin rewards
2014-12-09 20:23:56 +11:00
Chiss
828fabb80a
Initial Christmas Chaos update
2014-12-09 20:04:59 +11:00
Chiss
50358c0c30
removed EULA breach in bridges private blocks
2014-12-08 18:23:47 +11:00
Chiss
ef8e5104f1
SnD Kits
...
minor bug fixes
2014-12-08 17:28:18 +11:00
Chiss
64c8edc292
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-08 17:25:03 +11:00
libraryaddict
048aa40590
Remove comments and add comments
2014-12-06 03:25:53 +13:00
libraryaddict
307d280534
Read merge message
2014-12-06 02:22:52 +13:00
Chiss
4430efd7be
minor updates
2014-12-05 16:25:34 +11:00
Chiss
38639fb58f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Taunt.java
2014-12-04 13:34:08 +11:00
Chiss
6cc4ec034b
Champs Updates
...
UHC Y Limit in middle
2014-12-04 13:33:31 +11:00