Mysticate
60c4e5812a
Fixed trackers
2015-09-24 23:02:19 -04:00
fooify
69ed764483
Added another maze.
2015-09-24 19:55:43 -07:00
libraryaddict
e8725b38ab
Colorize the messages for when a /game start fails
2015-09-25 14:06:35 +12:00
Mysticate
a9f20a573c
Merge branch 'monster-maze' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into monster-maze
2015-09-24 21:10:31 -04:00
Mysticate
9a70d4997a
Fix
2015-09-24 21:10:12 -04:00
Mysticate
d9b6d8f0e3
Changes
2015-09-24 21:01:18 -04:00
Mysticate
7445fda922
Made the thing a lot better. Yay! :D
2015-09-24 11:04:05 -04:00
fooify
4663aa3eaa
updated mazes
2015-09-24 07:29:48 -07:00
Mysticate
5de016c077
Merge branch 'monster-maze' of
...
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MonsterMaze.java
2015-09-23 23:46:21 -04:00
Mysticate
842da3d6fb
Tons of changes.
2015-09-23 23:44:10 -04:00
fooify
a301c87efc
workstuffchanges on monster maze
2015-09-23 19:23:21 -07:00
Sarah
0a42ab7aee
Adding spell system, spells, and more kits.
2015-09-23 22:04:45 +02:00
Mysticate
125b823a65
Fixed achievement arcade page size.
2015-09-23 15:43:14 -04:00
Mysticate
71408fabd2
One thing.
2015-09-23 15:24:34 -04:00
Mysticate
81e780d400
Merge branch 'monster-maze' of
...
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MMMazes.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/Maze.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MonsterMaze.java
2015-09-23 15:23:08 -04:00
Mysticate
84331901d4
Added achievements and final polish.
2015-09-23 15:18:44 -04:00
AlexTheCoder
d5ef15cd6d
- Trying to fix errors
2015-09-23 14:00:19 -04:00
AlexTheCoder
09e44d3372
- Fixed version stuff
2015-09-23 13:47:49 -04:00
AlexTheCoder
3ee6c5c7c8
- Fix Merge Error
2015-09-23 13:25:41 -04:00
AlexTheCoder
c709980db3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-09-23 13:08:25 -04:00
AlexTheCoder
512714219b
- Visual edits
2015-09-23 13:04:30 -04:00
fooify
0ad91a6b0b
more changes! :D
2015-09-23 07:10:48 -07:00
Morten
7838ad2bce
For Bisko to pull
2015-09-22 16:12:51 +02:00
Cheese
4519f2dda1
Merge branch 'EventGameUpdates'
2015-09-22 14:59:17 +10:00
fooify
1f84907309
more changes to monstermaze
2015-09-20 07:40:24 -07:00
AlexTheCoder
05f47be864
- Some fixes
2015-09-19 16:38:07 -04:00
Morten
a5398cb773
Added new challenges and fixed a lot of bugs.
2015-09-19 19:01:13 +02:00
AlexTheCoder
3a1acb9f37
- Code Cleanup
...
- Transitioning to banners fully
- Preparation to remove banner bugs
2015-09-19 00:41:23 -04:00
AlexTheCoder
52a5c63166
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-09-18 20:08:43 -04:00
AlexTheCoder
d4b8cb253c
- Edited messages as per owner request
2015-09-18 20:08:22 -04:00
libraryaddict
8015f5428d
Flags stuff
2015-09-19 08:36:23 +12:00
fooify
0581474a16
lots of work on Monster Maze
2015-09-18 08:25:11 -07:00
Cheese
aa30c866fd
flurrry
2015-09-18 10:22:16 +10:00
libraryaddict
5e8fc77164
Add pages to spectator and in-progress server menu
2015-09-17 04:34:45 +12:00
AlexTheCoder
e6ecd2d5e1
- Fix for stolen message
2015-09-15 18:38:02 -04:00
Sarah
362d99a819
Fixing up Gem signs, Effects etc.
2015-09-15 07:10:39 +02:00
AlexTheCoder
6c5c2f4c4e
- Added slowness to flag carriers and removed any active potion effects they had
2015-09-14 20:38:32 -04:00
AlexTheCoder
0035f3abb0
- Added requested flag location updating
...
- Added sudden death mode when the timer runs out and the game is tied, respawning is turned off and the first to capture a flag wins
2015-09-14 18:54:40 -04:00
AlexTheCoder
2018374b06
- Fixed a color bug
2015-09-14 18:53:10 -04:00
AlexTheCoder
abaf94618c
- Increase flag respawn time
...
- Fix flag timer being black
2015-09-14 18:42:08 -04:00
Cheese
ac269839c5
squid skill
2015-09-14 14:14:06 +10:00
Cheese
d9142ac33f
smash balance
2015-09-14 12:34:55 +10:00
fooify
2de7fff267
Merge remote-tracking branch 'origin/master' into monster-maze
2015-09-13 08:45:34 -07:00
fooify
aa8cb8943e
more work on monster maze
2015-09-13 08:42:26 -07:00
Sarah
7ca6f58108
Adding Gem signs.
2015-09-13 10:25:44 +02:00
Sarah
353c553589
Adding more Words, Removing some Minion types and changing Items in Hotbar.
2015-09-13 10:00:18 +02:00
Sarah
216c8783a9
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-09-13 03:51:06 +02:00
Sarah
a46cb2c274
last fix in the listAreaInfo method.
2015-09-13 00:35:22 +02:00
Sarah
53d5c2fd0e
adding area info command.
2015-09-13 00:30:55 +02:00
Sarah
112f94a842
forgot to add command to remove potion effects.
2015-09-13 00:00:47 +02:00
Sarah
fcec6253cd
fixing @p on signs, adding potioneffects and gadgets to areas.
2015-09-12 23:56:38 +02:00
Sarah
b6ffee73f5
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into EventGameUpdates
2015-09-12 21:17:45 +02:00
fooify
55ac104e2c
took forever to get it working, but the maze parsing works! :)
2015-09-12 09:50:06 -07:00
Cheese
119dc8ab52
changed name of method
2015-09-12 15:01:18 +10:00
Sarah
5c0ada3df6
Implementing RequiredRank file and command.
2015-09-12 06:39:40 +02:00
Sarah
b56813deef
Improving /e commands (/e kick, /e area, etc)
2015-09-12 04:33:10 +02:00
fooify
5824ec6df0
lots of changes to monster maze, check trello for list
2015-09-07 07:08:00 -07:00
Morten
6ea9a15e6d
Added a bunch of games
2015-09-07 11:46:08 +02:00
Sarah
4240026024
Adding Areas and a few more commands like /e kick and /e tempgadget to the event game.
2015-09-06 18:55:00 +02:00
Sarah
5712af8ddc
Adding Redstone function signs for events.
2015-09-05 20:38:51 +02:00
fooify
c648d7c186
stuff, things...things, stuff (Monster Maze)
2015-09-05 09:30:51 -07:00
fooify
9e3f87b71e
more edits to MM
...
- displaying more information
- permanent safezones around the map
- spawn now does not deteriorate, is permanent
2015-09-05 06:41:10 -07:00
Mysticate
271b86dabd
Fixed spectators slowing evolution times.
2015-09-04 11:45:42 -04:00
libraryaddict
21d9f5767e
CustomTagFix support changing and removing of names.
2015-09-04 19:23:33 +12:00
Cheese
03537e4650
fixed a spacing issue
2015-09-04 12:18:02 +10:00
Cheese
0ec3a8dc10
added radar for ctf and dom
2015-09-04 12:09:26 +10:00
Mysticate
0c58de3c19
Glitches. Fixed the things.
2015-09-01 02:35:06 -04:00
Mysticate
b4ce33a916
Fixed things.
...
• Added a cancelled check to No Ability
• Removed tokens on quit.
• Checked if players are alive before giving them places.
2015-09-01 01:59:36 -04:00
AlexTheCoder
bff9c99e2c
Added system to mount flags on carrier's head for easier identification and disabling of abilities as per Chiss' request
2015-08-31 21:48:25 -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
Sarah
58ae09ebd4
saving Project for pulling.
2015-08-31 11:32:18 +02:00
AlexTheCoder
129464a845
Added CTF to MPS menus
2015-08-31 04:42:36 -04:00
AlexTheCoder
cbf8b575c6
Changed data for certain types of spawning
2015-08-31 03:28:22 -04:00
AlexTheCoder
39a79eb818
Fixed a nullpointer
2015-08-31 03:05:43 -04:00
AlexTheCoder
474f1bd0b8
Made CTF follow Chiss' specifications and also added more advanced features
2015-08-31 03:04:18 -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
AlexTheCoder
149d37caad
Forgot to commit with actual game
2015-08-30 04:01:01 -04:00
AlexTheCoder
eca69a8ae2
Made new branch up to date and including previous branch's code
2015-08-30 03:58:58 -04:00
Jonathan Williams
47331658ac
Merge remote-tracking branch 'remotes/origin/Myst_EVO'
2015-08-30 00:14:53 -07:00
Mini-Chiss
d944d2e5c4
Merge branch 'Myst_EVO'
2015-08-29 23:54:28 -07:00
Mini-Chiss
64b9cd201c
snake crap
2015-08-29 16:02:14 -07:00
libraryaddict
6ae801314c
Fix spawning
2015-08-29 15:07:51 -07:00
libraryaddict
5030ae7d57
For Chiss, may the code never break.
2015-08-29 15:03:22 -07:00
libraryaddict
f0f9a4c674
Push it like a pushy pushy lady.
2015-08-29 13:46:09 -07:00
Mini-Chiss
b7b81ecaaa
snake
2015-08-29 13:38:40 -07:00
Mysticate
046fa4f8b6
Fixed possible NPE
2015-08-29 14:30:22 -06:00
Mysticate
736d88c82f
All achievements fixed. ^_^
2015-08-29 14:13:15 -06:00
Mini-Chiss
d2bc4b8cb4
SNAAAKE
2015-08-29 13:13:04 -07:00
libraryaddict
5d28509474
Snakes tail final location instead of rel movement
2015-08-29 12:38:19 -07:00
libraryaddict
e7f861a6c2
Push golem changes, snakes code and rename bossability thingy
2015-08-29 12:04:53 -07:00
Mysticate
97c7980bbc
Fixed evolving into walls.
2015-08-29 10:54:04 -06:00
Mysticate
55a7ea0439
Fixed kit bug.
2015-08-29 10:44:11 -06:00
Mini-Chiss
6a28845cb0
Merge branch 'Myst_EVO'
2015-08-29 00:14:15 -07:00
Mysticate
12d9888a1f
Fixed wins..
2015-08-29 00:58:53 -06: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
3f1c4d24b9
Merge branch 'Myst_EVO'
2015-08-28 21:00:00 -07:00
Mysticate
bb09720450
removed previous commit jesus
2015-08-28 21:56:35 -06:00
Mini-Chiss
d68f1fa547
Merge branch 'Myst_EVO'
2015-08-28 20:50:27 -07:00
Mysticate
6628f5a1ae
Added a checker for a no kit issue
2015-08-28 21:49:57 -06:00
Mini-Chiss
19b2ff5b58
fixed scoreboard
2015-08-28 20:48:32 -07:00
Mini-Chiss
11cc4a6cea
removed msg
2015-08-28 20:45:59 -07:00
Mini-Chiss
fda866a33f
Merge branch 'Myst_EVO'
2015-08-28 20:35:59 -07:00
Mysticate
4466c10441
FIXED
2015-08-28 21:35:31 -06:00
Mini-Chiss
4ac6b22e53
Merge branch 'Myst_EVO'
2015-08-28 20:31:56 -07:00
Mini-Chiss
88ca205474
fixes
2015-08-28 20:31:29 -07:00
Mysticate
815add4c59
FIXED THE THIGNS
2015-08-28 21:28:39 -06:00
Mini-Chiss
5777309d18
Merge branch 'Myst_EVO'
2015-08-28 20:07:22 -07:00
Mini-Chiss
8238a199d5
gem stuff
2015-08-28 20:06:39 -07:00
Mysticate
cc60371c1f
Fixed perk cancelling on death
2015-08-28 21:04:35 -06:00
Mini-Chiss
d879bc68ab
Merge branch 'Myst_EVO'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java
2015-08-28 19:59:48 -07:00
Mini-Chiss
b5b8bef39e
evo fixes
2015-08-28 19:58:51 -07:00
Mysticate
d6c8e51104
Things ^_^
2015-08-28 20:57:47 -06: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
56aa235e56
Fixed kit messages
2015-08-28 19:25:52 -06:00
Mini-Chiss
c8c569281b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-28 16:18:49 -07:00
Mini-Chiss
5562345c05
Merge branch 'SarahsAwesomeBugFixes'
2015-08-28 16:02:40 -07:00
Sarah
3be6483ed3
editing /game set for test servers.
2015-08-29 01:01:05 +02:00
Sarah
0f37829b54
changing Hotbar text to money.
2015-08-29 00:56:24 +02:00
Mysticate
2d770a8dd1
More final tweaks.
2015-08-28 16:36:35 -06:00
Sarah
ccc9645c47
adding hotbar text.
2015-08-29 00:24:44 +02: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
libraryaddict
1f5cd624a4
Fix up iron golem, add slam attack
2015-08-28 11:42:33 -07:00
Sarah
2a236684ac
Finalizing prototype of Type wars.
2015-08-28 14:47:49 +02:00
Mysticate
571d992dbe
Fixed a few bugs.
2015-08-27 20:47:55 -06:00
libraryaddict
379ee9271a
Merge pull request #43 in MIN/mineplex from clans/world-events to clans-beta
...
* commit '9d3f125c9eb1139e6d5cfbdbe63158161e6a488b':
Iron Wizard, fixed iron golem custom name
Push golem block shot as per request
2015-08-27 16:34:46 -05:00
libraryaddict
9d3f125c9e
Iron Wizard, fixed iron golem custom name
2015-08-27 14:18:10 -07:00
Mysticate
f2f6afb6ca
Fixes :D
2015-08-26 20:10:58 -06:00
Mysticate
a351a8f1ed
Minor improvements.
2015-08-26 13:47:01 -06:00
Mysticate
cfdb0dfa4f
Added kits + achievements. Hurrah!
2015-08-26 13:19:17 -06:00
Mysticate
988382375f
Started adding kits
2015-08-25 23:36:18 -06:00
Sarah
15aca5dca9
Making the mob spawning prototype. still have to figure out how to move them properly.
2015-08-26 00:59:28 +02:00
fooify
e9bc0d3a5f
capitalize h
2015-08-25 08:23:22 -07:00
fooify
64ca6ecce0
Merge remote-tracking branch 'origin/master' into foo
2015-08-25 08:20:37 -07:00
fooify
1952ee7824
fix some strings mentioning "admin" in MPS
2015-08-25 08:19:09 -07:00
Ty Sayers
69afefd66f
Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreMap.java
Additionally, fix bug where players could fish hook to combat-tag a player in spawn and then attack them. Fix issue where players were able to empty lava and water buckets. Fix bug where monsters wandered into and around spawn zones. Fix bugs where special abilities FireBlast, ExplosiveShot, and WolfsPounce were not affecting mobs (only players). Fix bug with soup left-click punch activation not fully integrated.
2015-08-24 20:55:29 -04:00
Mysticate
7b42f2155d
Tweaks. :D
2015-08-24 20:40:34 -04:00
fooify
549435224f
changes to monster maze!
2015-08-24 09:58:07 -07:00
libraryaddict
ba41118da7
Load boss battles properly
2015-08-25 01:58:57 +12:00
libraryaddict
8798244351
Bosses stuff
2015-08-24 08:34:29 +12:00
Mini-Chiss
d454d73ccb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-23 11:32:48 -07:00
Mini-Chiss
69ff514bf8
changed perms on write
2015-08-23 11:31:32 -07:00
Ty Sayers
a9f5197c64
Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Database/src/mineplex/database/Account.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
2015-08-22 15:18:51 -04:00
Morten
f9fecebeec
Minor update ;)
2015-08-22 11:01:37 +02:00
Mysticate
cbaaee60d9
Removed mob spectating method from evolving.
2015-08-21 13:00:08 -04:00
libraryaddict
bad339cf04
Tweak dead bodies more
2015-08-21 20:52:57 +12:00
libraryaddict
c41328d726
Dead bodies: Change to Item from disguised arrow, fix body positioning, move to Game.java to enable in all games
2015-08-21 20:40:09 +12:00
libraryaddict
39ede2064a
Bosses game progress
2015-08-21 16:12:26 +12:00
Mysticate
86ad6a09de
Used armor stands for evolving.
2015-08-20 13:04:22 -04:00
Mini-Chiss
f97da1bdba
Merge branch 'SarahsAwesomeBugFixes'
2015-08-19 16:33:37 +02:00
Sarah
6e926b431c
Fixing snowballs and eggs in Solo Skywars.
2015-08-19 16:00:36 +02:00
Mini-Chiss
3d7c81a3b4
fixed game tips
2015-08-19 08:15:22 +02:00
Mysticate
64990ed356
Fixed parse distance.
2015-08-18 21:37:52 -04:00
fooify
15eba5b491
added more y velocity
2015-08-18 12:22:34 -07:00
Mysticate
53395a7700
Made player immovable whilst evolving.
2015-08-18 13:07:46 -04:00
fooify
a47022d242
Merge remote-tracking branch 'origin/master' into monster-maze
2015-08-17 14:54:19 -07:00
Mysticate
75a4b3d568
Changes to make evolving easier
...
• Speed 1 on kill
• Evolve chargeup decreases 1.5 seconds per kill.
2015-08-17 10:36:28 -04:00
Mini-Chiss
7a7543886f
fixed a ton of commands NPEing on no args
2015-08-17 09:04:39 +02:00
Mysticate
993ed0a92d
Fixed a possible NPE
2015-08-16 22:38:59 -04:00
Mini-Chiss
8cc5ff042c
fixed block hunt gem exploits
2015-08-16 09:33:15 +02:00
Mini-Chiss
8584e0355a
final fix!
2015-08-15 12:32:03 +02:00
Mini-Chiss
ba6806935d
fixed better
2015-08-15 12:31:19 +02:00
Mini-Chiss
25f93bac2e
fixed logic on setgame
2015-08-15 12:27:11 +02:00
Sarah
27da9b64b6
Merge branch 'KitPreferences' of http://184.154.0.242:7990/scm/min/mineplex into SarahsAwesomeBugFixes
2015-08-15 07:40:40 +02:00
Sarah
96dc86a481
Fixing map rotation.
2015-08-15 07:34:04 +02:00
Mysticate
2659dd4e39
Fixed minor bugs. Head now follows mob altitude.
2015-08-14 23:17:56 -04:00
Mysticate
ac18dd3b79
Fixed iron golem select message. Removed slot change message.
2015-08-14 20:22:00 -04:00
libraryaddict
a1ea03f74b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events
...
Conflicts:
Plugins/.idea/misc.xml
Plugins/.idea/modules.xml
Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintballGun.java
Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
Plugins/Mineplex.Database/src/mineplex/database/Routines.java
Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java
Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
2015-08-14 19:44:56 +12:00
Mini-Chiss
80588a308b
balanaced brawler
2015-08-13 21:03:48 +02:00
Mini-Chiss
a1ba2cffac
fixed needler not doing posion
2015-08-13 20:56:02 +02:00
Mysticate
eaad787075
Removed the base kit and replaced it with Iron Golem.
2015-08-13 08:16:33 -04:00
Mini-Chiss
1487692609
completely disabled team armor in arcade. avoids typing it just as game starts.
2015-08-13 12:57:30 +02:00
Mini-Chiss
f3b58fe9b6
disabled team armor command in games D:
2015-08-13 12:51:57 +02:00
Jonathan Williams
8476578bc0
Merge pull request #28 in MIN/mineplex from Myst_LOBBERS to master
...
* commit 'f8a6a25b46b9336ae8a727e1f3478f3a7a394324':
Various Fixes.
2015-08-13 01:52:16 -05:00
Jonathan Williams
a308244966
Merge pull request #29 in MIN/mineplex from foo to master
...
* commit '07bdbdde46e2a9e7b49f4e8606c9068a0534c18d': (22 commits)
minor grammar issue
remove duplicate method
manually updating something
*crosses fingers* please work!
please work...
Freezes the time using doDayLightCycle instead of using a UpdateEvent.
Fixed double-half-slabs (line 68)
remove custom level to fix merge conflicts
squirrel!
fix getting snowballs from bedrock
add jnr_dev to updaterank
fix this agaaaaain
FOOIFY IS A NOOB OKAY
fix concurrentmodificationexception
fix turfforts bug
prevent STATIONARY_LAVA from breaking in creeper smash
fix creeper smash exploding lava and bedrock
fix spleef lava issue
ishh also wanted this :P (let me know if I should remove it)
ishh wanted it...k
...
2015-08-13 01:49:00 -05:00
Jonathan Williams
0ff7cee229
Merge pull request #32 in MIN/mineplex from Alex_MILKCOW to master
...
* commit 'cc24bb78d3968c0c364164fb43e19724007e3833':
Fixed Cows being able to fly if they had the Rabbit Farmer kit
Fixed new classes not appearing in repository
Milk The Cow: New Gameplay Feature - When a cow charges a farmer, any milk in their bucket will be lost
2015-08-13 01:45:56 -05:00
Mysticate
ed7dbddf4a
Redid how kits are done.
2015-08-13 00:12:28 -04:00
Mysticate
d7e28e9eb8
You can no longer have the option to Evolve if you kill while dead.
2015-08-12 13:28:31 -04:00
Mysticate
a7da10cb34
You no longer remain "charging" when you die.
2015-08-12 12:12:26 -04:00
Mysticate
ad94b63903
Blaze and Enderman now take water damage.
2015-08-12 10:46:12 -04:00
Mysticate
0c3c9702d9
Small fixes.
...
Added holograms to show kit abilities.
Fireworks are now client side only.
Decreased the # of emerald particles.
2015-08-12 09:44:55 -04:00
Mini-Chiss
d6f17c609b
carl
2015-08-12 08:58:46 +02:00
Mini-Chiss
c00f9a7aaa
Merge branch 'Bonus'
2015-08-12 08:39:31 +02:00
Sarah
be699558f1
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-12 08:38:18 +02:00
Sarah
af19754bcd
Implementing Carl to Arcade.
2015-08-12 08:37:54 +02:00
Mini-Chiss
7cda53cb28
carl spinner in arcade/
...
tutorial fixes
2015-08-12 08:36:21 +02:00
fooify
ddc663cc75
remove duplicate method
2015-08-11 09:52:04 -07:00
fooify
10f979772b
Merge remote-tracking branch 'origin/master' into foo
2015-08-11 09:51:13 -07:00
fooify
356060eedc
more amazing changes
2015-08-11 09:41:26 -07:00
fooify
c6ec60700c
monster maze is really working now! :D
2015-08-11 09:04:45 -07: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
2c30d20cb1
changing OP method, setHost permissions and /e command.
2015-08-11 09:26:01 +02:00
Sarah
d457e3a955
changing the setOP Event.
2015-08-11 08:36:39 +02:00
Mysticate
bd414cd231
Merge remote-tracking branch 'origin/master' into Myst_EVO
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
2015-08-10 19:47:53 -04:00
Mysticate
873a2f3c56
Changed slowness from 255 - 2
2015-08-10 19:45:40 -04:00
Mysticate
a618b19b73
Small changes
2015-08-10 14:32:35 -04:00
Sarah
fef269b856
Fixing /e set.
2015-08-10 17:28:27 +02:00
Mysticate
1804d668e1
A few small tweaks. Removed the "Frozen" effect.
2015-08-10 08:42:03 -04: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
Mysticate
463dfc7049
Minor Tweaks.
...
• Fixed wrong evo location
• Added a "Frozen" effect when evolving.
2015-08-10 00:21:48 -04:00
Mysticate
a19cd3559d
Renamed "Shift" to "Crouch"
2015-08-09 23:26:59 -04:00
Mysticate
158dcdc01e
Created a new way to Evolve.
...
• Getting a kill presents you the option "Hold Shift to Evolve"
• Holding shift for about 5 seconds evolves you as normal.
2015-08-09 23:25:26 -04:00
Mysticate
f8a6a25b46
Various Fixes.
...
• Merged w/ master
• Changed to William's method of Projectile limiting.
- Prevented TNT hitting Teammates
• Fixed gem count for Sniper
• Added gems for direct hits + TNT Thrown
• Removed assists counting for kills in 6 kill.
2015-08-09 15:01:27 -04:00
Mysticate
d9a8830e75
Few changes
2015-08-09 14:34:55 -04:00
Mini-Chiss
ee65c72e86
and wizards!
2015-08-09 18:46:02 +02: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
Mysticate
b9edb92c1e
Ready for full on testing.
2015-08-09 01:08:43 -04:00
Mysticate
5298fa341e
Removed the revolving thing.
2015-08-08 16:13:54 -04:00
fooify
db521668a9
more changes! it's getting pretty cool now x)
2015-08-07 14:20:15 -07: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
Mini-Chiss
b22706e649
hub update part 1
2015-08-07 21:45:38 +02:00
Mysticate
858e57bb0d
edited a few things
2015-08-07 14:39:29 -04:00
fooify
f70b1231ab
AI fixes and such for Monster Maze
2015-08-07 10:32:31 -07:00
Mysticate
a9350bfacd
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-07 11:58:53 -04:00
Sarah
181b778a9c
Fixing some bugs and disallow MPS while disguised.
2015-08-07 07:39:40 +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
Morten
1680b652db
Added Hat layer skin
...
Added Sneak animation
With love from Morten <3
2015-08-07 03:10:17 +02:00
Sarah
d8041ba582
Fixing Players can disguise as disguised Players.
2015-08-06 20:57:56 +02:00
fooify
0a9f7cc888
Merge remote-tracking branch 'origin/master' into monster-maze
2015-08-06 10:13:54 -07:00
fooify
9e92a3a68d
more changes (not really ready for testing yet though...)
2015-08-06 09:44:00 -07:00
Mini-Chiss
ebbc13c0a4
lowered headshot damage
2015-08-06 17:07:52 +02:00
Sarah
4a10f8d71a
fixing very last bugs. Ready to push!!!
2015-08-06 13:23:38 +02:00
Sarah
6947b54e66
16 char limit and Steve Skin.
2015-08-06 09:45:02 +02:00
Sarah
5809359449
Random Player disguises.
2015-08-06 09:19:19 +02:00
Sarah
208ce95c97
No youtuber Disguise.
2015-08-06 09:11:39 +02:00
Sarah
b52a9477fe
No Staff disguises!
2015-08-06 09:07:30 +02:00
Sarah
16a8164030
Fixing last bugs and disabling coin bombs while diguised.
2015-08-06 08:42:09 +02:00
fooify
b5d1202674
YET MORE WORK ON MM
2015-08-05 13:09:26 -07:00
fooify
551451c533
moar changes
2015-08-05 10:30:27 -07:00
Sarah
a15e8e1b95
Fixing more /disguise bugs.
2015-08-05 15:23:16 +02:00
Sarah
83da6b7a9a
Improving the /disguise command even more. ;D
2015-08-05 13:32:05 +02:00
AlexTheCoder
cc24bb78d3
Fixed Cows being able to fly if they had the Rabbit Farmer kit
2015-08-05 03:07:19 -04:00
Mini-Chiss
5d7cc59909
fixed cases where negative stats were being uploaded
2015-08-05 08:56:52 +02:00
Sarah
91de6a1852
last fix...
2015-08-05 08:40:09 +02:00
Sarah
511c61611a
fixing earlier commit.
2015-08-05 08:32: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
Sarah
ec3bc7cc38
Try fixing the map selection.
2015-08-04 17:04:49 +02:00
William Burns
644d6c9914
Whitelist fixes. Implemented MapSource.
2015-08-04 11:21:58 +01:00
Mini-Chiss
13d139d197
team kills/deaths only store for 3 games now
2015-08-04 08:46:00 +02:00
Mysticate
d88a37832b
Work on evolving
2015-08-03 18:22:31 -06:00
AlexTheCoder
a86fdc3c21
Fixed new classes not appearing in repository
2015-08-03 18:45:16 -04:00
AlexTheCoder
b53b98d6e3
Milk The Cow:
...
New Gameplay Feature - When a cow charges a farmer, any milk in their bucket will be lost
New Perk - Steady Hands:
- Lowers the amount of milk lost by a dead player to 3
- Removes losing milk in farmer's bucket when a cow charges into them
New Kit - Sturdy Farmhand:
- Iron skin damage reduction of 2.0
- Implements Steady Hands perk
- 2000 gems
2015-08-03 18:30:42 -04:00
Mini-Chiss
2d07cc571c
reduced invis in OITQ
2015-08-03 18:53:00 +02:00
Mini-Chiss
2f571aed25
fixed bugs from my vel fixes, WHOOPS. normalisation :(
2015-08-03 18:19:31 +02: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
817b8b03f6
Whitelist fixes etc.
2015-08-03 13:40:13 +01:00
William Burns
0c5cc25634
Stuff
2015-08-03 12:48:17 +01:00
William Burns
4ad19e4579
Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps
2015-08-03 10:52:00 +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
1d0bfbdf2d
fixed team sheep displaying in UHC lobby
2015-08-03 10:56:23 +02:00
Mini-Chiss
b26e01649b
removed requirement for ach kit
2015-08-03 10:13:46 +02:00
Mini-Chiss
eac8a3cd1c
fixed OITQ kit being unobtainable
2015-08-03 10:12:37 +02:00
Mini-Chiss
472409dc4b
fixed broadcast formatting
2015-08-03 10:06:15 +02:00
Mini-Chiss
2e1bccb3ad
DUN ALLOW overful
2015-08-03 09:02:28 +02:00
Mini-Chiss
0a84bd69d8
fixed some OITQ stuff
2015-08-02 23:17:23 +02:00
Mysticate
0a20a04903
Used packets to spectate the rotation bat.
2015-08-02 10:48:00 -06:00
Mini-Chiss
4cc810f1c0
Merge branch 'Myst_KITS'
2015-08-02 17:55:53 +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
ac4755a5a9
Fixed incorrect velocity
2015-08-02 11:24:34 +02:00
Mysticate
9c14e3d35a
Worked on evolution
2015-08-01 17:24:12 -06:00
fooify
519449e015
lots of stuff (:
2015-08-01 11:42:32 -07:00
Mysticate
62072077c1
Fixed evolution rotation
2015-08-01 00:47:44 -06:00
fooify
e4141a1b72
Merge remote-tracking branch 'origin/master' into snow-sprint
2015-07-31 07:32:17 -07: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
Sarah
b2c538b189
little tag fix.
2015-07-31 13:40:39 +02:00
Sarah
60a1768821
Fixing Team display bug on disbanding.
2015-07-31 13:05:28 +02:00
Mini-Chiss
b2a567673c
disabled sale msg
...
added double gem weekend
2015-07-31 09:53:52 +02:00
Mysticate
53a3a29cd2
Extreme revisions. Cheers!
2015-07-31 00:50:32 -06:00
fooify
e59f2751f3
more stuff changed to snow sprint
2015-07-30 17:31:26 -07:00
fooify
014cac31f0
more changes to snow sprint
2015-07-30 14:04:39 -07:00
fooify
6c39c08abf
some progress on snow sprint
2015-07-30 11:59:04 -07:00
Mini-Chiss
a3d768af6b
added res pack for HH
2015-07-30 15:07:40 +02:00
Mini-Chiss
31fd19aab5
added res pack for CC
2015-07-30 15:07:05 +02:00
Mini-Chiss
8a5088e181
fixed SGT deathmatch not working
2015-07-30 14:47:59 +02:00
Mini-Chiss
45d117a95a
added armor hotbar to smash
...
fixed scoreboard in snowfight
2015-07-30 14:45:28 +02:00
Mysticate
f02924987e
Did things
2015-07-30 04:30:19 -06:00
Mini-Chiss
8ef93c0b33
Merge branch 'SSM2PlayerTeams'
2015-07-30 08:42:50 +02:00
Sarah
30fa3b3309
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams
2015-07-30 03:07:41 +02:00
Sarah
37e432f0b2
Git fix.
2015-07-30 03:07:21 +02:00
Sarah
bf75594853
Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams
2015-07-30 02:33:51 +02:00
Sarah
de4d0a7dc3
Fixing needler, projectiles in SW and "Banannas...".
2015-07-30 02:33:06 +02:00
Mysticate
a5d73d791a
Thing
2015-07-29 16:14:38 -06:00
fooify
7c4786e7d2
Merge remote-tracking branch 'origin/master' into foo
2015-07-29 14:15:24 -07:00
fooify
5da23fa322
Merge branch 'foo' of http://Fooify@184.154.0.242:7990/scm/min/mineplex.git into foo
2015-07-29 14:13:07 -07:00
fooify
db5c5a9888
*crosses fingers* please work!
2015-07-29 14:12:52 -07:00
Mini-Chiss
97a144150b
fixed an NPE that was causing games not to end in MS
2015-07-29 21:51:18 +02:00
Mysticate
ab49407584
Things
2015-07-29 11:52:44 -06:00
Aaron Brock
d583598477
Fixed double-half-slabs (line 68)
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-29 10:49:20 -07:00
Mini-Chiss
be910cced9
gamemode color change
2015-07-29 17:00:36 +02:00
Mini-Chiss
0e55ce1879
removed old hint
2015-07-29 16:54:30 +02:00
Mini-Chiss
1004203b34
fixed up some merge issues
2015-07-29 16:48:49 +02:00
William Burns
13af2cec74
Pick highest voting button
2015-07-29 15:44:29 +01: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
71bedbe0fc
Merge branch 'WitherAssaultUpdate'
2015-07-29 16:37:29 +02:00
Mini-Chiss
c32e959f61
Merge branch 'SnowFightUpdate'
2015-07-29 16:36:33 +02:00
Morten
1a27dea32c
Why was these not added...
2015-07-29 16:35:57 +02:00
Mini-Chiss
d570cce1b0
Merge branch 'WitherAssaultUpdate'
2015-07-29 16:33:06 +02:00
Mini-Chiss
862cdae14f
team modes
2015-07-29 16:32:11 +02:00
Mini-Chiss
e47a343e2e
added mode for team games
2015-07-29 16:20:49 +02:00
Morten
f714bfbb0f
Adding testing achievement lol
2015-07-29 16:06:43 +02:00
Morten
b5d3ad0e0d
Adding perks
2015-07-29 16:05:43 +02:00
Sarah
9c5ca750cf
Improving /e mob command and implementing other commands.
2015-07-29 15:53:45 +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
Mini-Chiss
deba3f23fa
Merge branch 'MPS-Maps'
2015-07-29 15:27:11 +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
b2db2e988f
Merge branch 'WitherAssaultUpdate'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
2015-07-29 15:13:28 +02:00
Mini-Chiss
1c2bd988f9
fixed spawns for team gameds
2015-07-29 15:10:21 +02:00
William Burns
f6e64d25a2
Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps
2015-07-29 13:27:45 +01:00
William Burns
f82defb1db
Whitelist
2015-07-29 13:27:26 +01:00
Mini-Chiss
30f0b3cb60
fixed close spawn stuff
2015-07-29 14:25:15 +02: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
932fe197b4
Merge branch 'perm-changes'
...
Conflicts:
Plugins/.idea/encodings.xml
reverted it.
2015-07-29 14:06:21 +02:00
Mini-Chiss
ef89b96144
fixed game page bug
2015-07-29 14:02:56 +02:00
Mini-Chiss
b42be044ae
whtielisted MPS will be hidden from GUI
2015-07-29 13:20:20 +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
Jonathan Williams
10549601f8
Merge pull request #21 in MIN/mineplex from Myst_LOBBERS to master
...
* commit 'd0a45461d07904f70b5e42dee391f69843fb3978':
Fixed bug with direct hit
Final tweaks. this is as good as it's goign to get! ;d
Tweaks
Fixed waller achievement thing
Fixed waller kit bc I was stupid before ;c
Added an exception for a map to make it night.
Various improvements.
Added an achievement, removed team one, touched up another. Swag.
2015-07-29 00:15:41 -05:00
Mysticate
d0a45461d0
Fixed bug with direct hit
2015-07-28 21:25:29 -06:00
Mysticate
3e0eb03112
Final tweaks. this is as good as it's goign to get! ;d
2015-07-28 20:39:55 -06:00
Mysticate
99946ef1f3
Tweaks
2015-07-28 17:29:51 -06:00
Mysticate
2e58b75a1b
Fixed waller achievement thing
2015-07-28 08:51:21 -04:00
Mysticate
dd53d268e4
Fixed waller kit bc I was stupid before ;c
2015-07-28 08:46:37 -04:00
Mysticate
c5cf306097
Thing
2015-07-28 08:41:35 -04:00
Mysticate
0e00086b9e
Redid evolution!
2015-07-28 00:15:41 -04: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
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
Shaun Bennett
6c8c3946a3
Revert "Add IntelliJ IDE library files"
...
This reverts commit 71d696278d
.
2015-07-06 17:06:29 -05:00
Ben Sihota
71d696278d
Add IntelliJ IDE library files
2015-07-06 13:48:47 -07: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
4b634d1bc3
Fix slashes (this won't affect windows users, right?)
2015-06-26 10:14:37 -07: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
libraryaddict
bfb0c157a2
Update jooq libraries in common.xml and EnjinTranslator.xml and eclispe classpaths
2015-02-25 13:56:32 +13: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
Jonathan Williams
abaf9f4693
Refactored IRelation method names
...
Added support for negative amounts in Support server.
Clans in core testing state.
2014-12-03 13:06:50 -08:00
Chiss
a8deee5292
fixed a spelling error
2014-12-02 18:04:48 +11:00
Chiss
6319bffd42
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-02 09:50:47 +11:00
Chiss
185b182061
fixed teleports removing you from the game
2014-12-02 09:50:30 +11:00
Jonathan Williams
e7cf4eb51d
Removed use of Gem Boosters
...
Cleaned up some unused imports.
2014-12-01 02:27:39 -08:00
Jonathan Williams
9d39cb922c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-01 01:22:51 -08:00
Jonathan Williams
433483dcca
Fixed error in GameLootManager
2014-12-01 01:22:43 -08:00
Chiss
cee48f1978
made it so you can use fireworks without aiming against block in blockhunt
...
removed fire from magma blast
private blocks are no longer private if owner is dead
2014-12-01 19:33:36 +11:00
libraryaddict
9ddd0bd9cc
Player now sees theirselves disguised as the same block they are disguised as.
2014-11-30 16:39:27 +13:00
libraryaddict
e654b23a50
We don't need that debug output
2014-11-30 15:06:50 +13:00
libraryaddict
5157c2bf37
Disable hiders from seeing their own block
2014-11-30 15:06:18 +13:00
libraryaddict
54fe312251
Untested fix I'm 99% sure will fix hide and seek players being blinded
2014-11-30 13:47:07 +13:00
libraryaddict
f8869a84ba
Don't send the player himself the block change..
2014-11-30 13:22:01 +13:00
libraryaddict
751731a1ad
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-30 12:14:51 +13:00
libraryaddict
00d3e66ac4
Commit my current work on SnD kits
2014-11-30 12:12:02 +13:00
libraryaddict
8afb803d5d
Modify the bow kits a little
2014-11-30 10:26:12 +13:00
Jonathan Williams
f507db7664
Reworked spawn to save to database.
...
Work on Clans:
Fixed clan loading/updating/adding.
Refactored some code for Clans.
2014-11-29 03:16:37 -08:00
libraryaddict
e57bd8b473
Finish making the bow kit tree
2014-11-29 16:39:09 +13:00
libraryaddict
e3b0843b2c
Modify Barrage perk to support setting levels to indicate arrows
2014-11-29 16:38:54 +13:00
Chiss
b3beadf8b5
made recharge look nicer for 1.7
...
added missing files
2014-11-29 09:14:33 +11:00
Chiss
ca34ac4e02
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-29 09:09:23 +11:00
libraryaddict
b0e62bfedf
Cleanup imports and rename fields to your _ and non _
2014-11-29 10:51:34 +13:00
libraryaddict
24bc581f35
Add the kits I have
2014-11-29 10:36:34 +13:00
libraryaddict
e587fca8f1
Move KitBow to its own package
2014-11-29 07:53:33 +13:00
libraryaddict
5544bbb440
Add KitEvolve inventory
2014-11-29 07:22:18 +13:00
libraryaddict
e6fac6de39
Small typo in UpgradeKit stuff
2014-11-29 07:22:02 +13:00
Chiss
8f9f88987b
mods can no longer use /tp Here
...
only disqualifies on tp in live games.
2014-11-28 10:09:18 +11:00
Chiss
fdc67e021c
Staff using /tp commands will take them out of the game (Mod to Admin only)
...
Changed spec /tp command to /spec
2014-11-28 10:00:31 +11:00
libraryaddict
d5d9e2eb14
Don't bother with these checks in ItemLayout
2014-11-28 09:30:57 +13:00
libraryaddict
d731b6ee69
Registering of KitManager
2014-11-27 09:47:43 +13:00
libraryaddict
1bb4d902c6
Start on a kit manager
2014-11-27 06:44:46 +13:00
libraryaddict
9350aeb89a
Use holograms in game
2014-11-27 03:18:52 +13:00
libraryaddict
f5533dbce2
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SearchAndDestroy
2014-11-27 01:13:14 +13:00
libraryaddict
52411a188f
Fixed entityId not using UtilEnt
2014-11-27 01:08:43 +13:00
libraryaddict
b68c95c6a2
Finish up adding bombs and turn this into a working game. Add demo kit Bow
2014-11-27 01:08:42 +13:00
libraryaddict
3ae27ccc55
Store PacketHandler so that games can use it
2014-11-27 01:08:41 +13:00
libraryaddict
5bf185e588
Register Search and Destroy in GameFactory
2014-11-27 01:08:40 +13:00
libraryaddict
60fd6b01cc
Add Search and Destroy code
2014-11-27 01:08:40 +13:00
libraryaddict
aa0659828a
Register game SearchAndDestroy
2014-11-27 01:08:39 +13:00
libraryaddict
9928811a71
Merge pull request #2 from Better-Holograms to master
...
* commit 'ef59cb7a9db25b8688ee6e3254661d9cc65a5e89':
Remove the 'Made by Shaun'
Fix up mistakes in the previous modifications
You have your HologramManager presented in a light most fair. Should be worth noting I didn't test it thoroughly
Ignore wither skulls for CustomTagFix
Remove old holograms and add new holograms
2014-11-26 06:07:57 -06:00
libraryaddict
ef59cb7a9d
Merging changes from master to Better-Holograms
...
* master:
Antistack replacement
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2014-11-27 01:01:19 +13:00
Chiss
95e428eb4f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/inventory/data/InventoryRepository.java
2014-11-26 12:34:47 +11:00
Chiss
731b0d89dd
Merge
2014-11-26 12:33:39 +11:00
libraryaddict
03075fecae
You have your HologramManager presented in a light most fair.
...
Should be worth noting I didn't test it thoroughly
2014-11-26 10:28:37 +13:00
Jonathan Williams
484dfaaea9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-25 13:25:41 -08:00
Jonathan Williams
3b54789767
Optimized logins dealing with mysql with multiqueries.
...
Added lazy loading of Pool data and Loaded check before performing anything.
Refactored MiniClientPlugin and created MiniDbClientPlugin
Renamed RankBenefitManager9000 to BenefitManager
Removed /send ability for now.
2014-11-25 13:25:13 -08:00
Shaun Bennett
f1fbc21570
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-11-23 20:02:09 -06:00
Shaun Bennett
c7f2a8072e
Antistack replacement
2014-11-23 19:51:23 -06:00
Jonathan Williams
cb43bc04d3
Added /lobby
2014-11-23 03:35:16 -08:00
Chiss
0c5ec503be
reduced fireworks in dragons
2014-11-23 15:00:05 +11:00
Chiss
089fdf8a64
sparklers no longer attract once they're in water or below 0
2014-11-23 14:55:06 +11:00
Chiss
d4a127b8ad
reduced fps lag in runner
2014-11-23 14:47:28 +11:00
Chiss
f0c87e439a
fixed nametag color in paintball
2014-11-23 11:16:01 +11:00
Chiss
19d3bba461
fixed fence glitch in dom
2014-11-22 13:20:34 +11:00
Chiss
6dfcdce027
increased illusion cooldown
...
cleaned axethrow
2014-11-22 10:29:00 +11:00
Chiss
f1ba5947a4
Some more wither updates
2014-11-21 16:32:12 +11:00
Chiss
0d78433bd2
updated mapparser
...
buffed withers a little
2014-11-21 10:36:41 +11:00
Chiss
7a8759dfba
updated disguisemanager so it uses player arg
...
fixed invisibility bug on disguises for specific players
updated champs skills
made some hard achievements a bit easier
2014-11-21 09:42:05 +11:00
Chiss
972911fe05
set achievement skills
2014-11-20 18:01:46 +11:00
Jonathan Williams
d1a4080cbd
Added GUI support for achievement skills.
2014-11-19 22:47:10 -08:00
Chiss
450cc9ada2
Champions achievement update
...
Wither update
2014-11-20 17:21:22 +11:00
Chiss
4961b55986
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-18 16:43:53 +11:00
Chiss
f5022ecf16
Fixed dupe glitch (all games)
...
Some champions skill fixes
created GameSpectatorManager to handle spec stuffz
2014-11-18 16:43:39 +11:00
Shaun Bennett
e99a3f6544
Merge remote-tracking branch 'origin/master'
2014-11-17 18:19:06 -06:00
Shaun Bennett
f071d2e727
Fix for TNT explosion in Bridges
2014-11-17 18:09:58 -06:00
Chiss
cd890e6c6c
disabled spec menu in minestrike - fixes shop bug.
2014-11-16 14:40:50 +11:00
Chiss
4c3610c3ac
fixed DMT silence
2014-11-16 10:46:26 +11:00
Chiss
454deb03db
fixed SG crash bug
2014-11-16 09:31:03 +11:00
Chiss
057594205e
Only closing CREATIVE Inv for non-ops.
2014-11-15 22:40:56 +11:00
Chiss
ca58f11174
specs should be able to view stats now
2014-11-15 22:32:00 +11:00
Chiss
fb70b76d29
FINGERS CROSSED
2014-11-15 22:29:53 +11:00
Shaun Bennett
d16896e493
Merge remote-tracking branch 'origin/master'
2014-11-15 05:04:57 -06:00
Shaun Bennett
1ca23390cc
Fix my derp
2014-11-15 05:04:48 -06:00
Chiss
41b6296788
Wither no longer shoots in pregame lobby
2014-11-15 20:16:18 +11:00
Chiss
51bc53262d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-15 19:32:08 +11:00
Chiss
ca4eec20ed
Wither Assault update
2014-11-15 19:31:56 +11:00
Shaun Bennett
521b1e5f3b
Merge remote-tracking branch 'origin/master'
2014-11-13 21:54:15 -06:00
Chiss
8ab0116a27
initial push of Wither Assault
2014-11-14 14:14:31 +11:00
Shaun Bennett
223bc2d0c0
Remove some debug messages that we no longer need
2014-11-13 19:34:55 -06:00
Shaun Bennett
6038c72e86
Add cleaner page for when there is only 1 team
2014-11-13 19:33:39 -06:00
Shaun Bennett
ea8b8dca15
Disable spectator menu for castle siege and uhc until I work out a better way to show that many players
2014-11-13 19:18:28 -06:00
Shaun Bennett
af31f4cd42
Add Tab handling for MultiCommandBase and "game set" command
2014-11-13 18:22:00 -06:00
Shaun Bennett
48c09aa311
Making spectator gui look better
2014-11-13 18:05:28 -06:00
Shaun Bennett
eb4b451e12
Fixing some spectator gui bugs
2014-11-13 16:41:42 -06:00
Shaun Bennett
8b73b89a17
Merging spectator gui with main branch
2014-11-13 16:03:14 -06:00
Chiss
112f76a29a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-13 18:10:10 +11:00
Chiss
9eaacd20ab
fixed slime healing
...
fixed sheep quest brute not dropping sheep
updated punish page
2014-11-13 18:09:54 +11:00
CoderTim
09ca2234c4
Fixed survival games death match bug: https://trello.com/c/jNGSUUGI
2014-11-13 01:49:14 -05:00
CoderTim
7667aa25a8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-13 00:26:53 -05:00
Jonathan Williams
7cad40044a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
Plugins/Mineplex.Core/src/mineplex/core/report/ReportPlugin.java
2014-11-12 19:36:00 -08:00
Jonathan Williams
1372f74921
Refactored some names in MiniPlugin
...
Work on clans.
2014-11-12 19:21:12 -08:00
CoderTim
d363637015
Achievement bug fixes
2014-11-12 20:56:57 -05:00
Chiss
71a93bead5
Updated punish to be even less confuse.
2014-11-12 09:49:03 +11:00
Chiss
debf8ebcba
fixed chat not being unsilenced when someone picks word
2014-11-11 18:52:00 +11:00
Chiss
c37026e4df
SSM Dom changes
2014-11-11 18:36:32 +11:00
Chiss
a1eff92bbb
fixed achievement kit for sneaky not being accessible
2014-11-11 12:25:36 +11:00
Chiss
d2301337d2
fixed non-charged block toss not having any velocity.
2014-11-10 19:28:36 +11:00
Chiss
d362fb3b1c
fixed punish error
2014-11-10 19:15:56 +11:00
Chiss
0252db5a05
Punish simplification update
2014-11-10 18:40:39 +11:00
Chiss
d6ade5a15b
ensured that exp cannot be given multiple times for a game
2014-11-09 14:43:06 +11:00
Chiss
b65d2f491e
exp gives less for losing
2014-11-09 10:33:50 +11:00
Chiss
2a04ed6eda
losing games no longer gives exp
2014-11-09 10:30:26 +11:00
Chiss
ad933400b9
Sheep Quest update
...
lowered exp on loss
removed Participation exp
2014-11-09 10:06:04 +11:00
Chiss
7e26def6a1
centralised SneakyAssassins module cleanup
2014-11-08 18:40:23 +11:00
Chiss
5ce38c3030
removed final from npcManager
2014-11-08 18:37:18 +11:00
Chiss
c0ec9f92fc
nulled reference too, just to be safe :D
2014-11-08 18:36:05 +11:00
Chiss
2b0befdc13
fixed listener leak in SneakyAssassins
2014-11-08 18:35:34 +11:00
Chiss
fc2bba7eeb
reverted idlemanager stuff for dmt(had already made talking in chat count as action)
2014-11-08 11:08:13 +11:00
Chiss
8c74022996
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-08 11:04:06 +11:00
Chiss
601c1912f5
may have fixed sheep teams not working.
2014-11-08 11:03:53 +11:00
CoderTim
80226a20fa
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-07 18:55:20 -05:00
CoderTim
4c98d833e0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-07 18:33:46 -05:00
Chiss
e286bec777
added a little msg for people in UHC, informing that it will start soon
2014-11-08 10:30:32 +11:00
CoderTim
5b1a185a5f
Fixed Bad Hider achievement
2014-11-07 18:28:28 -05:00
CoderTim
ae35e82e22
Disabled AFK kick in Draw My Thing
2014-11-07 18:28:06 -05:00
Chiss
75c07588a5
UHC wont start for 2 minutes after creation
2014-11-08 10:22:23 +11:00
Chiss
c61ad8907a
set minimum MP level for staff
2014-11-08 09:15:27 +11:00
Chiss
5da0c53997
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-08 08:56:52 +11:00
Chiss
e773d44564
limited max exp so UHC doesnt give you a billion exp.
2014-11-08 08:56:30 +11:00
Jonathan Williams
4ac70281d4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-07 13:54:22 -08:00
Jonathan Williams
3309c0406b
Added ∞ for admin/owners as player level.
...
Fixed customer support issue where it wasn't totaling coins correctly.
Fixed Recharge memory leak.
2014-11-07 13:54:11 -08:00
Chiss
bd730b1e5a
Fixed OITQ not giving wins.
...
Added silence during word selection in DMT
2014-11-08 08:46:26 +11:00
Chiss
c64e4e3b5f
fixed winners/losers for death tag.
2014-11-07 23:35:43 +11:00
Chiss
908a8506a7
fixed broken OITQ kit
2014-11-07 23:21:30 +11:00
Chiss
519e63a1c1
re-unlocked kits for single game ultra chaps.
2014-11-07 23:10:33 +11:00
Chiss
c93862f299
updated player level
...
added /givestat command for owners (must use full string; Global.ExpEarned)
2014-11-07 22:10:41 +11:00
Chiss
9c80103d6e
completely disabled gamehost manager (double safe)
2014-11-07 21:32:44 +11:00
Jonathan Williams
2c098e531a
Added error catching for arcade configuration.
2014-11-07 02:14:34 -08:00
Chiss
fadaa59526
added mineplex level
...
removed ability to go into negative gems as villager morph
2014-11-07 19:20:15 +11:00
Chiss
6ded835ba4
MAC will no longer false positive on people standing blocks from block morph.
2014-11-07 14:14:43 +11:00
Chiss
a67842b504
returned hub to normal
...
removed flaming pumpkins from arcade
2014-11-07 12:54:38 +11:00
Chiss
b7ce12165e
game host stuff
2014-11-07 12:14:33 +11:00
Chiss
4c675cca9c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2014-11-07 11:54:14 +11:00
Chiss
91e0b42de8
Added start of MPS stuff
...
Some new gadgets
2014-11-07 11:52:58 +11:00
Jonathan Williams
f931bd26e6
Updated ServerConfiguration to support resourcepack and Arcade settings.
2014-11-06 00:25:49 -08:00
Jonathan Williams
6f2a6a6ebd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-05 14:45:54 -08:00
Jonathan Williams
1a09c14642
Reverted database connection pooling because it caused severe login delays.
2014-11-05 14:39:22 -08:00
Chiss
f3b9ad8adf
Chatting will reset Idle Timer in games (for DMT)
...
Minor kit changes
2014-11-05 14:46:49 +11:00
Chiss
b00fb0952a
Updated Sheep Quest to be 1.8 comptible.
...
Fixed fissure not working on slabs
Fixed a bug in recharge
Added ability for admins to give other people creative (they lose it when the admin quits)
2014-11-05 11:26:39 +11:00
Chiss
f6df7705b1
- Added 3 kits for DMT
...
- Added achievement kit for OITQ/Sneaky Assassins/DMT
- Fixed stats/achievements not working (Keen Eye, I See You, Incompetence, DMT Wins)
- Various improvements/fixes for Champions
- Nerfed trollability of Digger kit in DE
2014-11-04 19:17:06 +11:00
Chiss
ab62708883
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-03 16:34:20 +11:00
Chiss
20fe69b596
added skills to lore of custom builds
...
fixed skeleton not having enough arrows
2014-11-02 11:09:20 +11:00
CoderTim
f3770933b6
Merge branch 'feature/database-pool'
2014-11-01 01:59:07 -04:00
Chiss
da88d68513
UHC does not record team stats
2014-11-01 15:42:52 +11:00
Chiss
7f642673bc
fixed deathbomber achievement
2014-11-01 11:25:08 +11:00
Chiss
0095a03df7
returned bridges to normal
2014-11-01 11:11:35 +11:00
Chiss
de28906aa5
restored 10 min timer for bridges
2014-11-01 09:18:44 +11:00
Chiss
d0a8a86698
disabled tnt water damage before bridges drop
2014-11-01 09:18:25 +11:00
Chiss
58d6cf199b
fixed foodformassesstat kind of? doesnt update db still
2014-11-01 08:59:57 +11:00
Chiss
83d182db2e
Fixed Villager exploit! oops
...
Some balance stuff in champs
2014-11-01 08:38:36 +11:00
Chiss
bf6e788f36
1 more fix for sheepy
2014-10-31 16:47:20 +11:00
Chiss
c4264dcea1
fixed sheep skill trigger names
2014-10-31 15:58:11 +11:00
Chiss
aca18bb2e7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-31 10:36:06 +11:00
Chiss
aa45f031ac
3 new achievement Kits
...
SSM Balance patch
Champs balance
tons of bug fixes
2014-10-31 10:35:47 +11:00
CoderTim
5244f65d8f
All connections to db.mineplex.com/Account use database pool
2014-10-29 17:54:40 -04:00
CoderTim
08f0eb9252
Achievement bug fixes
2014-10-29 01:40:34 -04:00
CoderTim
cd5e4234b7
Fixed a couple more achievement bugs
...
Track damage mods in combat log
2014-10-27 19:00:34 -04:00
CoderTim
f0ba562265
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-27 18:11:29 -04:00
CoderTim
9f8b119fb7
Bug fixes
2014-10-27 18:09:23 -04:00
Chiss
66b446f1e6
Added some start-game invis to players.
2014-10-25 15:48:49 +11:00
Chiss
cfcfad610f
Improved recruit/prepare countdown timers
2014-10-25 13:56:23 +11:00
Chiss
bd2e7faf3e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-25 13:40:53 +11:00
Chiss
4002528c51
Updated GUI text.
...
- recharges/etc now use bottom text
- uses appropriate bottom/top for 1.7 or 1.8
- fixed 1.7 dragon bar so it works as it did pre-1.8
- dragon bar in 1.8 will now send dragon+wither, for more reliability
- renamed utils to be more clear
2014-10-25 13:40:34 +11:00
Shaun Bennett
6138da5f93
Merge remote-tracking branch 'origin/master'
2014-10-24 19:43:06 -05:00
Shaun Bennett
5cf3e6c3a1
Fix for arcade custom tags
2014-10-24 19:36:22 -05:00
Chiss
7dbba0a1f9
Added teleport for map parser
...
Fixed new method in UtilFirework always being BALL_LARGE
Updated lazer
2014-10-25 11:17:32 +11:00
Chiss
92d9fc4ca0
Deleted deprecated firework module and converted to Util
2014-10-25 11:03:45 +11:00
Chiss
01f311a3d6
Added missing requirements for SG Achievement Kit
...
fixed a parkour exploit
2014-10-25 10:38:47 +11:00
Chiss
95937db83a
changed firework color
2014-10-24 19:10:10 +11:00
Chiss
25fc3c0645
Achievement Kits (3 games)
...
Halloween Pumpkins
Youtube command (allows kits)
2014-10-24 19:05:57 +11:00
Chiss
d4512e464a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-23 14:05:54 +11:00
Chiss
c2bb53c887
Halloween pumpkins
...
Minestrike balance
bug fixes
2014-10-23 14:05:35 +11:00
CoderTim
0472870e78
Fixed bug that prevented the Necromancer purchase menu from displaying
2014-10-21 20:06:13 -04:00
Shaun Bennett
a47be7a2f6
Merge remote-tracking branch 'origin/master'
2014-10-19 00:08:13 -05:00
Shaun Bennett
1394e33056
Fix for Arcade Kit NPC Names in 1.8
2014-10-18 21:15:53 -05:00
Jonathan Williams
8630a1ba4c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-17 23:39:21 -05:00
Jonathan Williams
e3cd6f0e69
Fixed Mem leak in CustomTagFix
...
Changed to ServerGameMenu
Fix for overfilling HH servers
Added staff ability to join all servers.
2014-10-17 23:29:24 -05:00
Chiss
68009d3013
A little more time to handle wave 5
2014-10-18 13:51:25 +11:00
Chiss
02ea14bcd1
Damaging Boss restores all hunger
2014-10-18 10:50:17 +11:00
Chiss
651791ad83
HH FOod update
2014-10-18 10:40:08 +11:00
Chiss
af0daf4a3d
HH Hunger Update
2014-10-18 10:29:00 +11:00
Chiss
727e137cc4
Final HH Update
2014-10-17 12:12:22 +11:00
Chiss
5db2c072a0
Halloween update
2014-10-16 16:27:09 +11:00
Chiss
eb5af41323
Added halloween reward pet
...
minor bug fixes
2014-10-15 15:44:26 +11:00
Chiss
15b6a80613
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-14 13:02:17 +11:00
Chiss
bf1f28318b
fix for UHC not ending
2014-10-14 13:02:04 +11:00
Chiss
ed9dd6e894
Minor patches
2014-10-14 12:42:53 +11:00
CoderTim
127e12b7c7
Added missing dependency in intellij
2014-10-13 20:49:35 -04:00
CoderTim
8f90c96019
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-13 20:45:55 -04:00
CoderTim
2016ea09cb
Added achievements to games and Achievement enum
2014-10-13 20:38:58 -04:00
Chiss
e41b10ccb8
minor UHC fix
2014-10-13 14:09:58 +11:00
Chiss
9b1c4783ce
lowered UHC win to 8k
2014-10-13 09:57:38 +11:00
Chiss
6e6e0e2ae0
added flags to disable gem multipliers per-game. UHC was giving too much :O
2014-10-13 09:44:30 +11:00
Chiss
a8d1cef933
Minestrike, ensure bomb does not get overridden.
2014-10-12 18:31:05 +11:00
Chiss
623cdb0f2c
Allowed players to rejoin if disconnect within first 10 minutes of UHC.
2014-10-12 18:27:49 +11:00
Chiss
603c0cb66e
Staggered UHC game teleports to help reduce lag.
2014-10-12 18:26:18 +11:00
Chiss
28285ab999
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-12 14:19:52 +11:00
Chiss
9cc28d1ad8
MAC Update
2014-10-12 14:19:35 +11:00
Jonathan Williams
3e92b02bab
Fixed max slot bug with ultra/hero
2014-10-11 05:56:47 -07:00
Chiss
1d3b792ed8
UHC head apple fixes
2014-10-11 23:09:56 +11:00
Chiss
9c8ed5360d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-11 21:01:52 +11:00
Chiss
8e071f59d6
missing file
2014-10-11 20:59:36 +11:00
Jonathan Williams
797dd002ad
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-11 02:43:56 -07:00
Chiss
a2df64787f
remove players from closed game, on update
2014-10-11 20:30:40 +11:00
Chiss
961163c135
delaying return to hub
2014-10-11 20:26:08 +11:00
Chiss
a7ceb24b15
Hub UHC time log
2014-10-11 20:10:48 +11:00
Chiss
dc0709f17e
HH Update
...
Added UHC to skytext for hub
2014-10-11 19:43:28 +11:00
Jonathan Williams
19afebe53d
Added in mysql hooks for coins/gems/ranks for database conversion preperation.
...
Added in failover database calls in CoreClient/DonationManager
2014-10-11 01:32:22 -07:00
Chiss
e2c72a3ae2
HH update
2014-10-11 14:28:00 +11:00
CoderTim
3422f48325
New acheivements
2014-10-10 21:49:03 -04:00
Chiss
b61979a31f
UHC anti-xray; veins can now contain multiple ores. prevents veins occluded by other veins being removed.
2014-10-10 19:05:04 +11:00
Chiss
7d1a62e810
UHC anti-xray visibility update
2014-10-10 18:58:12 +11:00
Chiss
0acaf2e426
removed anti-xray on coal
2014-10-10 18:56:21 +11:00
Chiss
d0d2622ecc
added UHC on-the-fly anti-xray
2014-10-10 18:54:38 +11:00
Chiss
a739712dca
fixed game autostart flag bug.
...
added UHC gem rewards
2014-10-10 15:26:04 +11:00
Chiss
e3747b5183
Minestrike fixes
...
Hub UHC announcer
2014-10-10 13:07:59 +11:00
Chiss
232dd231d0
UHC joinability/MOTD
...
Minestrike spec shop bug fix
2014-10-10 10:49:39 +11:00
Chiss
ffc2ff5058
Modifided output of friends list
...
- buttons to left side for alignment
- sorted by sent>offline>pending>online
- improved 'no friends' message
2014-10-09 12:15:45 +11:00
Chiss
8701f9ddcc
Added TabTitle
...
Converted MineStrike to use scoreboard name hiding
2014-10-09 10:35:54 +11:00
Chiss
7a345dce95
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-05 13:40:15 +11:00
Chiss
d3f87dff46
MineStrike update
2014-10-05 13:37:27 +11:00
Jonathan Williams
9033843a31
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-03 01:50:35 -07:00
Jonathan Williams
c641eab3c7
Fixed up friends.
2014-10-03 01:50:23 -07:00
Chiss
cda9234ad3
Fixed TimeInGame stat not recording sometimes
2014-10-03 11:17:36 +10:00
Chiss
17e34e2060
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-03 10:49:42 +10:00
Chiss
31ceaad7fe
MineStrike audio update
2014-10-03 10:49:26 +10:00
CoderTim
ce306e88ed
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-30 02:45:28 -04:00
CoderTim
70fd8835ac
Added GamesPlayed and TimeInGame stats
2014-09-30 02:45:20 -04:00
Shaun Bennett
c7d34e70ef
Merge remote-tracking branch 'origin/master'
2014-09-29 17:42:13 -05:00
Shaun Bennett
7892c442d0
Add show mac reports user pref for mod+
2014-09-29 11:14:20 -05:00
Chiss
79e808814a
Minestrike cleans up incendiary at the end of rounds
2014-09-25 20:52:13 +10:00
Chiss
969c7c0fde
Music gadget fixes
...
Tournament point tally
Removed snow from frosty HorseMount
Added Tournament hub invite messages
2014-09-24 15:46:55 +10:00
Chiss
5774de552d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-22 17:53:39 +10:00
Chiss
a58335d906
Added GameStatManager.java
2014-09-22 17:46:36 +10:00
CoderTim
77e21c0d99
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-22 02:53:55 -04:00
CoderTim
1949de4fd7
Database implementation of NpcManager partially complete
2014-09-21 15:45:15 -04:00
Chiss
7ca4b6830b
added in GameStatManager
2014-09-21 09:28:12 +10:00
Chiss
9fce0b1926
Added small cooldown to be able to click hub clock after your gamestate changes. (prevents accidental clicking)
...
Moved stat stuff to gamemanager.
2014-09-21 09:26:34 +10:00
Chiss
767a0247a6
More change to end game title :)
2014-09-20 16:36:30 +10:00
Chiss
6e60c301cf
fixed Title for end game
2014-09-20 16:33:24 +10:00
Chiss
d9677ddda2
Disabled saving game player log for non-tournament
2014-09-20 16:28:45 +10:00
Chiss
a830c72d22
Jukebox will be removed.
2014-09-20 15:29:59 +10:00
Chiss
0d090d7bdc
fixed issue with MASSSSSSSSSIVE PLANET SIZED gui scale
...
added lore to coins in GUI, to help new players and sell more ranks
slightly lowered hitbox for headshots in minestrike
2014-09-20 09:10:55 +10:00
Chiss
9bbac7578e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
2014-09-20 08:29:06 +10:00
Jonathan Williams
96498af626
Fixed parkour bug with gadget blocks.
...
Removed a ton of debug messages with inventory close.
2014-09-19 09:06:42 -10:00
Chiss
21c131273e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-19 18:01:52 +10:00
Chiss
91037384f9
Loot tweaks
...
Music fixes
some bug fixes
2014-09-19 18:01:38 +10:00
CoderTim
edce1c9f90
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-19 02:46:12 -04:00
CoderTim
8cb836d5b3
Fixed some achievement bugs
2014-09-19 02:46:04 -04:00
Shaun Bennett
5d643c00d5
treasssssurreeeeees
2014-09-18 21:03:46 -05:00
Shaun Bennett
88a8e3a896
Hackyish way to log rewards given out in a database
2014-09-18 14:35:59 -05:00
Chiss
ed59e03795
Loot update
2014-09-18 17:05:56 +10:00
CoderTim
8b14c85572
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-18 01:57:04 -04:00
CoderTim
f8ee20c433
Record server name in basic game stats
2014-09-18 01:56:46 -04:00
Chiss
fed3d31374
MineStrike fixes
2014-09-18 15:44:48 +10:00
Chiss
09a3cc16b0
Reward stuffs
2014-09-18 14:36:22 +10:00
Chiss
bb8e481c7f
More Reward stuff
2014-09-18 14:25:39 +10:00
Chiss
8780d5e4ee
MS fixes
2014-09-17 11:18:59 +10:00
Chiss
e6797582f9
Minor fixes
2014-09-17 08:59:09 +10:00
CoderTim
6eed36f0ee
Accidentally committed with line of code commented out
2014-09-15 23:46:44 -04:00
CoderTim
d3b541dc27
Updated Arcade .classpath
2014-09-15 23:43:13 -04:00
CoderTim
c5ff9da552
Record basic game stats (game type, timestamp, duration, winners, losers)
2014-09-15 23:31:53 -04:00
Jonathan Williams
c7e0ebefd1
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-13 20:52:13 -10:00
Jonathan Williams
a395cae764
Fixes for Custom tag
...
Fix for Bridge time
Fix for tournament auto whitelist.
Added UI stuf for tourney
Added build files for arcade.
2014-09-13 20:50:27 -10:00
Chiss
26a51f4ef2
Re-allowed opening of chests (for GUIs) during games.
2014-09-14 15:28:43 +10:00
Chiss
f3df86a5a9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-14 14:10:51 +10:00
Chiss
7e3b9b4b3a
some 1.8 title stuff
2014-09-14 14:10:40 +10:00
Jonathan Williams
a196e43fde
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
2014-09-12 19:46:19 -10:00
Chiss
e36f843feb
Fixed bug in MineStrike
2014-09-13 12:29:35 +10:00
Jonathan Williams
14c4152248
Fixed CustomTagFix.
...
Updated ServerData ServerGroup and SErverMonitor for new flags in Arcade.
2014-09-12 10:03:33 -10:00
Chiss
5de59b6e0e
Hub UHC countdown basics
...
UHC MOTD timer stuff
2014-09-12 18:06:51 +10:00
Chiss
b5152bd621
removed some redundant repeated color stuff
2014-09-12 11:59:32 +10:00
Chiss
0dff0412d1
Fixed game flag for not allowing inventory opens
...
Removed some redundant flags in game
Lots of MineStrike updates
Fixed NPE in WinWithoutLosingTeammateStatTracker
2014-09-12 11:47:39 +10:00
Chiss
092e9ba479
Modified UHC borders for release
2014-09-11 17:44:57 +10:00
CoderTim
235cf8cae7
Fixed win stats on solo games
2014-09-09 02:18:20 -04:00
CoderTim
b341089cfe
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-08 16:28:50 -04:00
CoderTim
90d88ebd0b
Fixed "The Longest Shot" achievement bug
2014-09-08 16:27:09 -04:00
Chiss
347e2b1bf5
Changed FIRE items to Blaze Powder
2014-09-08 10:14:55 +10:00
Chiss
f138a4108b
Deregister stat trackers from listener
2014-09-06 22:01:05 +10:00
Jonathan Williams
558231457c
Fixed disguises leaving extra tags
...
Fixed memory problem in Arcade.
2014-09-06 03:39:20 -07:00
Chiss
644d3da050
JOOQ for Eclipse
2014-09-06 11:31:55 +10:00
Chiss
892b67beb2
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-05 21:43:33 +10:00
Jonathan Williams
d01529a344
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2014-09-05 04:38:23 -07:00
Jonathan Williams
1c6790b611
Fixed for DisguiseManager
...
Rewrote packet handling
Fixed up CustomTagFix
Removed swapping kits in Block Hunt
Removed Stacked entities for 1.8 players.
2014-09-05 04:36:01 -07:00
Chiss
4064c5238c
bridges volcano fix
...
minestrike npe fix
2014-09-05 21:35:26 +10:00
CoderTim
3830ab8e0f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-05 06:06:13 -04:00
CoderTim
91a2266a04
Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking
2014-09-05 04:00:51 -04:00
Chiss
4e94bcfd98
Block Hunt winners fix (team/solo)
2014-09-05 17:29:23 +10:00
Chiss
abc95853f7
sulhpur bomb fix
2014-09-05 15:47:35 +10:00
Chiss
8c1e0c3e9e
Fletcher data fix
...
Minestrike stuff
2014-09-05 15:45:14 +10:00
Chiss
b691b1bad0
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-05 12:51:59 +10:00
Chiss
f6ce9abed8
Minestrike
...
- added mixed slow/instant mode
- added accurate hitboxes for slow bullets
- added many new weapons
- removed speed from knife
- adjusted gun balance
2014-09-05 12:28:29 +10:00
Jonathan Williams
b28fc8ee6b
Added custom name tag fix for mobs for 1.8 players
...
Worked on boss bar display.
Bug with <=50% hp.
2014-09-04 11:33:51 -07:00
CoderTim
74e012a811
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-03 16:54:41 -04:00
CoderTim
39b46bc8f5
Fixed some NPEs
2014-09-03 16:53:29 -04:00
Shaun Bennett
e7f79aa5bf
Update IntelliJ files for latest changes
2014-09-03 11:42:50 -05:00
Jonathan Williams
92191dc19a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R4/PlayerConnection.java
2014-09-03 03:47:15 -07:00
Jonathan Williams
a4871b5509
Updated to latest spigot with 1.8 support.
...
Tweaked disguise manager for 1.8 support.
Work on CUstomer support server + admin stuff.
2014-09-03 03:46:24 -07:00
Chiss
21225d7b65
Minor Fixes
2014-09-03 15:09:14 +10:00
Chiss
50140ef92d
Minestrike update
2014-09-03 14:49:38 +10:00
Chiss
246f2e91d9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-03 12:38:57 +10:00
Chiss
58f98881f2
Minestrike Update
2014-09-03 12:38:44 +10:00
Chiss
1dec79c0fa
Minestrike update
2014-09-03 12:28:45 +10:00
Shaun Bennett
2d5c676e1b
Merge remote-tracking branch 'origin/master'
2014-09-02 18:57:35 -05:00
Chiss
d5766d62ae
nerf p90
2014-09-02 16:49:45 +10:00
Chiss
449281501f
MineStrike Update
2014-09-02 16:49:15 +10:00
Chiss
5d6834633f
MineStrike update
2014-09-02 11:16:17 +10:00
Shaun Bennett
df882012e5
When items are dropped in The Bridges, only the player that broke the block can pickup the item for 8 seconds. (Only applies to specific item types)
2014-09-01 15:38:07 -05:00
Chiss
05623b7522
Initial MineStrike push
...
fixed frames being breakable in games
2014-09-01 21:37:39 +10:00
Jonathan Williams
8198bb31c8
Added sneaking to player disguise.
...
Did work on DDoSProtectionSwitcher
Work on AccountAdministrator to fix rank issues.
2014-09-01 00:56:32 -07:00
Chiss
2b333859d1
PUUSH
2014-08-30 19:24:04 +10:00
Chiss
3767911718
updated game desc output
2014-08-30 19:07:43 +10:00
Chiss
7696349187
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-30 16:34:10 +10:00
Chiss
2c30cc3ef4
Implemented new servers flags
...
Removed OP from Admisn in HUB, gave them /gm command instead
2014-08-30 16:33:56 +10:00
CoderTim
b7baa1b2f4
Count disconnecting from the server as a loss
2014-08-30 02:30:07 -04:00
CoderTim
34f04ad4e3
Fixed Champions Assassination and Longshot achievements
2014-08-29 21:09:51 -04:00
Chiss
41daba98c4
Background work for Minestrike
...
Admins no longer have OP in hubs. They have /gm command to gamemode.
2014-08-29 18:21:08 +10:00
Chiss
1f6b9374eb
disable le minestrike
2014-08-29 11:55:06 +10:00
Chiss
c3bb0ddbcb
Chest example gadget for shauny
2014-08-29 11:00:16 +10:00
CoderTim
cc57ddf4bc
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-28 06:54:36 -04:00
CoderTim
bdef9acecd
Fixed DragonEscape win stat tracker
2014-08-28 00:53:54 -04:00
Chiss
ec4cb91a1c
Poll changes
...
Achievement output double space fix
2014-08-28 11:50:09 +10:00
Jonathan Williams
526ca42add
Fixed Gem booster problem.
...
FIxed stat problem.
2014-08-27 12:48:24 -07:00
Chiss
9439daa852
Fixed bug where spectators could trigger anti-cheat in bridges
2014-08-27 15:16:20 +10:00
Chiss
d9ef5f50be
disabled minestrike
2014-08-27 14:23:31 +10:00
Chiss
596bcbfae6
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-27 14:23:01 +10:00
Chiss
da5f953212
Fixed BlockMorph leaving blocks behind when player was teleported.
2014-08-27 14:22:35 +10:00
CoderTim
5ef2772abd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-26 20:27:51 -04:00
CoderTim
7d6572ff4d
Fixed SheepGame Selfish achievement
2014-08-26 20:27:39 -04:00
Chiss
f25f7d3aa2
Fixed 1v3 achievement not giving achievement if players quit (required 4 at END)
2014-08-27 09:52:33 +10:00
Chiss
5540835052
removed micro debug
...
fixed a bug in achievement output
2014-08-27 09:09:06 +10:00
Chiss
f9ce0d353c
Achievements now need 75%+ players at START of game
2014-08-27 08:57:11 +10:00
CoderTim
d9e1f35985
Fixed BadHiderStatTracker and limited stat recording to when games are at least 75% full
2014-08-26 16:30:55 -04:00
Chiss
17649ce36c
Fixed bug where desc for past-completed achievements was still showing
2014-08-26 21:51:59 +10:00
Chiss
ab29a5fa29
Fixed text output in Achi GUI for completed
2014-08-26 18:06:01 +10:00
Chiss
3eae26ef80
Updated Achievement Output
2014-08-26 18:03:29 +10:00
Chiss
d62b59776f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-26 17:54:50 +10:00
Chiss
116fe496a8
Changed post game achievement output
...
Added Reward to Achi GUI
2014-08-26 17:53:54 +10:00
Chiss
7e7906865f
Fixed some stats being added after send-off
2014-08-26 17:45:35 +10:00
Jonathan Williams
526b5c333a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-26 00:34:00 -07:00
Jonathan Williams
137b8692e4
Added Gem booster use.
2014-08-26 00:33:48 -07:00
Chiss
0546c9e175
Fixed so only Supply drop chests trigger achievement
2014-08-26 17:33:23 +10:00
Chiss
1b15a57fc8
Added Gem Rewards for Achievements
2014-08-26 17:10:20 +10:00
Chiss
dd61077850
Added missing Achievements
2014-08-26 14:46:10 +10:00
Chiss
1b3e32ca26
Added Arcade Achievements
2014-08-26 14:42:17 +10:00
Chiss
28d523d696
Added Achievements
2014-08-26 13:42:42 +10:00
Chiss
86930de23e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/AssistsStatTracker.java
2014-08-26 08:19:50 +10:00
Chiss
07ee44508e
Missing Gadgets
2014-08-26 08:17:41 +10:00
CoderTim
933d32d8f8
Fixed team death/kills stats
2014-08-25 18:06:50 -04:00
CoderTim
9acc7d8496
Added team kill and death achievement trackers
2014-08-25 17:43:49 -04:00
CoderTim
4ce537a3a7
Fixed some NPEs and achievement bugs
2014-08-25 16:27:02 -04:00
Chiss
13eb3da0fa
Achievment gui changes
2014-08-25 09:26:01 +10:00
Chiss
7669998ad3
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-25 08:38:29 +10:00
Shaun Bennett
ff441f2262
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2014-08-24 16:14:29 -05:00
Shaun Bennett
2cb87b23e6
Stat Gui, Start of Treasure Gui (disabled)
2014-08-24 16:08:19 -05:00
Chiss
23f6d0ae1a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-24 16:46:00 +10:00
Chiss
3f5cff3e21
Killing cheaters for a few things in bridges
2014-08-24 16:45:47 +10:00
CoderTim
c89461628b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-23 16:00:26 -04:00
CoderTim
fb90336d4e
Finished stats/achievements
2014-08-23 16:00:15 -04:00
Chiss
642f8b46b9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-23 18:01:35 +10:00
Chiss
7348a26951
fixed damage dealt npe
2014-08-23 18:00:23 +10:00
Chiss
af9bf0727a
Fixed damage taken stat NPE
...
Added tournament team auto-rejoin
2014-08-23 17:55:28 +10:00
Jonathan Williams
70beb58bd6
Enabled debugging in Hub/Arcade
2014-08-23 01:49:48 -05:00
Chiss
3ec43f90e8
GameAchievementManager now utilises TaskManager to record whether or not people have previously completed Achievements
2014-08-23 15:04:43 +10:00
CoderTim
4afafe2d51
Some stats fixes
2014-08-22 21:54:08 -04:00
CoderTim
b2b208bdba
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-22 17:30:08 -04:00
CoderTim
02bb53578a
Registered stat listeners with each game
2014-08-22 17:20:02 -04:00
Chiss
231ef2bbe1
Cosmetic Update
2014-08-23 04:30:41 +10:00
Chiss
0022586e3e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-22 17:08:29 +10:00
Chiss
97c087a28d
Allowed commands to specify specific ranks
...
allowed youtube/build to start/set games
2014-08-22 17:05:14 +10:00
CoderTim
591b5c026c
Almost all achievements done
2014-08-21 18:55:40 -04:00
Jonathan Williams
5e47a12531
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-21 15:56:02 -05:00
CoderTim
94f2aade08
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-21 15:01:22 -04:00
Jonathan Williams
1398543490
Fixed bug with Projectile
...
Changed tp out of game to 1 per tick.
2014-08-21 02:07:54 -05:00
Chiss
ac088e85b2
Added some game flags
...
Dragon escape changes
2014-08-21 13:35:31 +10:00
CoderTim
f266f4e016
More achievements
2014-08-20 19:20:11 -04:00
Chiss
60869d114e
Dragon Escape changes
2014-08-20 15:45:10 +10:00
Shaun Bennett
a7bb84be0b
Revert chris' revert
2014-08-19 21:24:49 -05:00
Shaun Bennett
f60a818e6a
Update craftbukkit to remove the extra _INVALID mappings
2014-08-19 21:22:04 -05:00
CoderTim
18ca7d5656
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-19 21:16:44 -04:00
CoderTim
599277b88e
More work on achievements
2014-08-19 21:16:28 -04:00
Chiss
94e5eb03da
Fixed errors for new getPlayers method.
2014-08-20 10:43:56 +10:00
Chiss
7535f39d18
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-20 10:39:58 +10:00
Chiss
afea0ba87f
Parser Merge
2014-08-20 10:39:41 +10:00
CoderTim
09c01d90ad
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-19 19:07:37 -04:00
Shaun Bennett
e1a57a673e
Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors
2014-08-19 16:58:55 -05:00
CoderTim
05686cb584
Work on achievements
2014-08-18 16:41:16 -04:00
Chiss
d8123795aa
changed the way disguises show rank.
2014-08-16 16:33:18 +10:00
Chiss
508ef65fcf
Added missing file
2014-08-16 14:17:15 +10:00
CoderTim
19222c6815
Updated IntelliJ environment to be compatible with latest changes
2014-08-15 15:51:29 -04:00
Chiss
29db90837d
Spleef Update
...
Map parser block stuff
2014-08-15 15:28:50 +10:00
Chiss
85522cddca
Debug (will clean once fixed)
...
Game stats
2014-08-15 09:49:00 +10:00
Chiss
74435bac12
fixed bug where players kept inventory open, to be able to enable morphs ingame.
2014-08-14 17:31:14 +10:00
Chiss
5f80d9c57a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2014-08-14 11:24:51 +10:00
Chiss
b6ba142c5a
Mineplex in scoreboard is fancier.
2014-08-14 11:23:48 +10:00
Shaun Bennett
b9534bd245
Merge remote-tracking branch 'origin/master'
2014-08-13 20:07:01 -05:00
Shaun Bennett
cfe45139b6
Adjust lobby text for the removal of premium kits
2014-08-13 19:56:47 -05:00
Shaun Bennett
83f04273fa
Sort kits properly when a game uses NullKit
2014-08-13 19:45:38 -05:00
Chiss
b21ae8ef72
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-14 10:32:52 +10:00
Chiss
7a3bba45a7
Mergey!
2014-08-14 10:32:41 +10:00
Jonathan Williams
6039168601
Updated code base to build #1604 spigot
2014-08-13 18:57:37 -05:00
Chiss
95394c51cc
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-12 11:24:12 +10:00
Chiss
2d67d4ce36
Achievement fix + active
2014-08-12 11:23:53 +10:00
Shaun Bennett
d63137ead2
Merge remote-tracking branch 'origin/master'
2014-08-11 12:44:28 -05:00
Shaun Bennett
7e93ed657f
Display boss bar properly while a dragon mount is spawned in arcade
2014-08-11 12:26:56 -05:00
Chiss
02270a9d25
TNT effect only triggers off self tnt.
2014-08-11 15:33:45 +10:00
Chiss
7191d48bd0
fixed paintball pre-game bug
2014-08-11 14:25:11 +10:00
Chiss
e4871c4988
Disabling cosmetics 5s before game starts, was having some carryover due to lag.
2014-08-11 11:55:00 +10:00
Chiss
d81b32bd3a
Sneaky Assassins balance+polish
2014-08-10 21:05:41 +10:00
Chiss
06bcf5079b
Disabled Gem hunter (bugged?)
...
Disabled chicken morph letting people fly
2014-08-10 18:36:18 +10:00
Chiss
25b525837f
Fixed TNT blowing up lobby when it changed to prepare.
2014-08-10 11:07:05 +10:00
Chiss
9057246ab8
Arcade Inventory fixes
2014-08-10 10:50:31 +10:00
Chiss
3533ce1b7e
Particles dont play in stealth games.
2014-08-10 01:04:53 +10:00
Chiss
616a0ecf11
Staff get all kits unlocked.
2014-08-10 00:32:50 +10:00
Chiss
38fd85335f
Fixes disguises being disabled.
2014-08-10 00:21:45 +10:00
Chiss
62cc422f42
FINAL FIX
2014-08-10 00:13:04 +10:00
Chiss
c95cf79aa6
fxied more
2014-08-10 00:10:08 +10:00
Chiss
a43a5b2c0e
bacon brawl fix
...
signel game ultra shows in hub scoreboard
2014-08-10 00:09:39 +10:00
Chiss
3d1ddecffb
Smash Kit fix
...
Gem Booster (dragons) fix
2014-08-09 23:25:13 +10:00
Chiss
cac7f85410
Single game ultra kit unlock
2014-08-09 23:10:40 +10:00
Chiss
23f93e55cf
fixed dragons destroying pregame lobby
2014-08-09 22:59:54 +10:00
Chiss
ff6ea3c798
Added Cosmetics to Arcade
...
Set prices on cosmetics
2014-08-09 19:55:05 +10:00
Jonathan Williams
8fe4e39207
Split up Cosmetic shop and Inventory
...
Added Ammo purchase for item gadgets.
2014-08-09 03:57:56 -05:00
Chiss
91a79f0345
Pig Morph
...
Morphs have tags/
2014-08-09 14:57:01 +10:00
Chiss
fb19e93992
Gem text
2014-08-09 13:46:41 +10:00
Chiss
c93a49add2
More gem boosty!
2014-08-09 13:42:29 +10:00
Chiss
2e95548b6e
Gem Boosters!
2014-08-09 13:39:57 +10:00
Chiss
3a220b6f1c
Micro Update
...
SGTeams inv click fix.
2014-08-09 13:11:32 +10:00
Jonathan Williams
6bd9273edf
Refactored getting item count for ClientInventory
...
Fixed up Arcade gem boosters so they are hooked into inventory.
Cleaned up unused code.
2014-08-08 22:10:02 -05:00
Chiss
313f675ae4
Hub Parkour update
...
Smash kit prices
2014-08-09 12:16:37 +10:00
Chiss
b36b1cb007
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-08 17:05:23 +10:00
Chiss
fa3695be4e
Gem Booster In Lobby
...
Achievement Stuff
2014-08-08 17:05:11 +10:00
Shaun Bennett
9395711dcb
Merge remote-tracking branch 'origin/master'
2014-08-08 01:51:50 -05:00
Shaun Bennett
b7ecf5eb04
GET MINEPLEX ULTRA FOR AMAZING FUN TIMES
2014-08-08 01:51:11 -05:00
Chiss
1a33dbb5ee
Achievement Module
...
Gem Booster/Achivement
2014-08-08 13:46:35 +10:00
Shaun Bennett
2fd7621a81
Display proper team in Arcade Lobby (Fixes bug where a player connecting will break scoreboards)
2014-08-07 18:44:27 -05:00
Jonathan Williams
c01fbd279d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/GadgetManager.java
2014-08-07 00:48:32 -07:00
Jonathan Williams
6d86f403ac
Added coins Currency to web api
...
Added coins purchase for all cosmetic items
Added Stats manager
Added Inventory Manager
Redesigned gadgets/morph/particle/pets/mounts page and inventory.
2014-08-07 00:33:24 -07:00
CoderTim
8a74b08b0d
Fixed silly mistake I made
2014-08-06 23:59:52 -04:00
CoderTim
f7f9d3e703
Sneaky assassin power-up maximum is 5 and hanging entities cannot be damaged
2014-08-06 21:35:11 -04:00
Chiss
c647e6b48d
Missing morphs
...
Bacon brawl knockback increase over time
Parse color error fix
2014-08-07 09:47:11 +10:00
Chiss
a737aa8624
Game desc
2014-08-06 19:16:17 +10:00
Chiss
c4768a8a9c
Smokebomb doesnt end instantly :o
2014-08-06 19:13:25 +10:00
Chiss
f68586cca4
Micro Battle
2014-08-06 19:00:18 +10:00
Chiss
248111749f
Sneaky Changes
2014-08-06 17:14:07 +10:00
CoderTim
bea6eabb95
Sneaky Assassins: Revealed players have wither effect. Fireworks are yellow. Additional announce messages
2014-08-06 01:41:50 -04:00
CoderTim
16353c4bc9
Changes to Sneaky Assassin power-ups, including addition of compass power-up.
2014-08-06 01:23:06 -04:00
Chiss
9e047847c2
scoreboard fix
2014-08-06 12:42:07 +10:00
Chiss
4108a02f50
Sneaky scoreboard order
2014-08-06 12:37:41 +10:00
Chiss
a0010668c6
Sneaky Assassins changes
2014-08-06 12:23:02 +10:00
Chiss
f09506e436
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/SneakyAssassins.java
2014-08-06 11:09:16 +10:00
Chiss
c8dfb2f02e
Parser Fixes
...
Sneaky Stuff
2014-08-06 11:07:49 +10:00
CoderTim
3ee0b271b6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-05 01:23:37 -04:00
CoderTim
0240d50029
Sneaky Assassins Changes:
...
- when you get a kill, give an armor upgrade and 1 smoke bomb
- Revealer range increased to 12 blocks
- NPC dies once every 2 seconds
- Lose 1 hunger every second. Gain 8 when damaging player or NPC
- Reveal all players every 60 seconds, for 2 seconds
- Added cloaking back to smoke bomb
- Power-up is always green and type alternates per player. Power-ups always include smoke bomb and mushroom soup.
- NPC speed slightly decreased
- Corrected sword power-up progression
2014-08-05 01:23:24 -04:00
Shaun Bennett
e8d14e9fbf
Remove created by comment
2014-08-04 00:33:34 -05:00
Shaun Bennett
1c5b3919e1
Merge remote-tracking branch 'origin/master'
2014-08-04 00:31:56 -05:00
Shaun Bennett
0edb0d74a7
Fix bugs with kit sorting + cost of kits
2014-08-04 00:31:46 -05:00
CoderTim
e7d3cf9e02
Sneaky Assassins previous commit bug fix
2014-08-04 01:06:11 -04:00
CoderTim
012382ec48
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-04 01:02:27 -04:00
CoderTim
8a727e1365
Smarter Sneaky Assassins AI
2014-08-04 01:02:05 -04:00
Shaun Bennett
e4662ab563
Update my SneakyAssassinKit change to work with Tim's changes
2014-08-03 23:41:54 -05:00
Shaun Bennett
34dfe8dacd
Merge remote-tracking branch 'origin/master'
2014-08-03 23:32:37 -05:00
Shaun Bennett
fe32cf5444
Remove KitAvailability.Blue
2014-08-03 23:31:55 -05:00
CoderTim
39e23c16f0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-04 00:00:12 -04:00
CoderTim
482f48f994
Prevent players in Sneaky Assassins from breaking paintings and item frames
2014-08-04 00:00:04 -04:00
CoderTim
ec48a59301
Added option DISGUISE_TYPE:<ENTITY_TYPE> in WorldConfig.dat for Sneaky Assassins to configure which entity players are disguised as.
2014-08-03 23:59:10 -04:00
Shaun Bennett
35b16e026c
Blue kits cost gems instead of being premium kits
2014-08-03 22:44:01 -05:00
Chiss
07fe476fd3
fix for stuff that jon broke
2014-08-01 17:45:22 +10:00
Chiss
b6fe33e6fb
Ultra/hero gems removed
2014-08-01 17:03:07 +10:00
Chiss
0f9e72d623
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-01 14:06:13 +10:00
Chiss
599a6eb1f7
Changed kit availability to be based on free/premium.
2014-08-01 14:05:53 +10:00
CoderTim
c36242cc47
Added stained glass around power-up beacon base in sneaky assassins to identify power-up more easily.
...
Added workaround to make revealer fireworks explode consistently
Power-ups use UtilPlayer.message and have a sound effect is player when a power-up is aqcuired
Power-up bug fixes
2014-07-31 23:35:50 -04:00
CoderTim
6ac00cde99
Move Sneaky Assassins NPCs during Prepare and Live
2014-07-31 23:32:26 -04:00
CoderTim
22748eb225
Updated KitRevealer description
2014-07-31 23:31:42 -04:00
CoderTim
77b6f0250e
Play zombie_unfect sound when PerkRevealer explodes
...
PerkSmokeBomb also applies effects to NPCs
PerkSmokeBomb now uses HUGE_EXPLOSION effect
Set Sneaky Assassins PrepareFreeze flag to false
2014-07-30 23:56:40 -04:00
Chiss
308c2e1b91
Kit availability
2014-07-31 13:00:05 +10:00
Chiss
a4d579789c
Sneaky Assassins changes :)
2014-07-31 12:58:33 +10:00
Jonathan Williams
4d397438be
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-29 21:11:15 -07:00
CoderTim
0382afecd8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-29 20:24:04 -04:00
CoderTim
fa91bf0a00
Disable dropping hunger in Sneaky Assassins
2014-07-29 20:22:46 -04:00
Jonathan Williams
46cc2576dd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-26 10:41:04 -07:00
Jonathan Williams
4e1a05e9bd
Fixed whitelist issue with tournament mode.
2014-07-26 10:40:49 -07:00
Chiss
78b3d3b35c
restored original bridge timer :)
2014-07-26 21:05:12 +10:00
Chiss
3f4e4b6607
fixed -1 not working
2014-07-26 21:03:50 +10:00
Chiss
802415be8f
-1 team kills for suicide (only after bridge drop)
2014-07-26 20:57:40 +10:00
Chiss
f090ed9313
end game fixes
2014-07-26 20:53:48 +10:00
Chiss
4f46ccc8aa
Winner is decided on bridge tourney timeout
2014-07-26 20:29:01 +10:00
Chiss
fa73ab5335
Bridges Tourney stuff
2014-07-26 17:40:17 +10:00
Chiss
21314afabe
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-26 17:03:30 +10:00
Chiss
107388baa3
Added game flag to allow clicking in inventory during games
2014-07-26 17:03:03 +10:00
Jonathan Williams
a455042c07
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-25 23:38:38 -07:00
Jonathan Williams
12b42cad29
Made tournament changes:
...
Staff can't see team chat
Bridge tournament time is 90 min
Kits are not all free
Removed twitch charity text/motd
If team not picked, you go to spec.
2014-07-25 23:38:21 -07:00
CoderTim
fe46355130
Added missing description to Sneak Assassin revealer items
2014-07-24 21:25:59 -04:00
CoderTim
fe356add41
Restore original blocks when Sneaky Assassin power-up beacon is removed
2014-07-23 15:45:30 -04:00
CoderTim
a6a274069c
Prevent power-up message spam when player is fully powered-up
2014-07-21 17:26:45 -04:00
CoderTim
4460f2e651
Prevent fully powered-up Sneaky Assassin players from using additional power-ups
2014-07-21 16:29:15 -04:00
CoderTim
efa74f509a
Fixed bug where revealer doesn't always work
...
Prevent players from trading with sneaky assassin npcs
Display message when user powers up
2014-07-18 02:48:06 -04:00
CoderTim
64feaf63ed
Implemented Sneaky Assassin Revealer kit
2014-07-15 00:36:38 -04:00
CoderTim
c547801b7b
Added Sneaky Assassin NPC movement
2014-07-11 22:55:48 -04:00
CoderTim
b15534e1b2
Some work on Sneak Assassins NPCs
...
Added /game start <seconds> to start a game faster
Optimized GameTeam.GetSpawn() by avoiding unnecessary square root calculations
2014-07-11 00:56:25 -04:00
Mini-Chiss
bd6b9b8888
so many fix
2014-07-08 17:35:27 -07:00
Mini-Chiss
c5e05523d3
sneakyfix
2014-07-08 17:34:47 -07:00
Mini-Chiss
dd0040086d
Parser Permissions
...
Sneaky Assasssin thingy.
2014-07-08 17:33:22 -07:00
Mini-Chiss
1455b4001f
Parser Update
2014-07-08 15:13:30 -07:00
Jonathan Williams
963c71f128
Fixed internet status stuff for bungees.
...
Fixed new portal arg req.
2014-07-08 12:44:17 -07:00
Mini-Chiss
cf25bdc44f
Bridges fix being able to break mid chests before gamestart
...
Map parser Updates
2014-07-07 19:04:44 -07:00
Mini-Chiss
ef86fe6948
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-07 16:24:43 -07:00
Mini-Chiss
62f6ea815d
Champs Balance Update
...
Map Parser Update
2014-07-07 16:23:55 -07:00
CoderTim
38e4240a61
Fully implemented Sneaky Assassins Power-Ups
2014-07-07 19:10:29 -04:00
CoderTim
fe1bf95342
Fixed code style and updated IntelliJ code style settings
2014-07-07 14:45:02 -04:00
Mini-Chiss
df8562e69a
Tourney mode for UHC
2014-07-04 23:11:13 -07:00
Mini-Chiss
c65712c260
UHC fixes
...
Sneaky Assassin listener leak fix
Some map parser stuffs.
2014-07-04 23:04:46 -07:00
CoderTim
6365ec5351
Started on Sneaky Assassins kits and power-ups
2014-07-04 11:14:34 -04:00
CoderTim
2fb2aadf66
Merge remote-tracking branch 'origin/master'
2014-07-04 11:12:52 -04:00
CoderTim
46c979e088
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-04 11:12:33 -04:00
Mini-Chiss
d19b34b0e4
Removed debug
2014-07-02 17:14:52 -07:00
Mini-Chiss
22ceba9841
Fixed Scoreboards!
2014-07-02 17:12:52 -07:00
Jonathan Williams
d0fafce585
Reverted change to helper only joining full, now ultras can.
...
Added check so BETA servers cannot be joined by less than Helper.
Fixed message in AccountAdministrator for rankUpdate
2014-07-02 16:59:31 -07:00
Jonathan Williams
8eaad57516
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-02 16:05:37 -07:00
Jonathan Williams
f1393ffb33
Fixed rankUpdate changing existing higher ranked players.
...
Fixed join limits in arcade and hub.
2014-07-02 16:05:26 -07:00
Mini-Chiss
bea6902198
Spectators can use /tp
2014-07-02 13:09:47 -07:00
Mini-Chiss
82dd94de9b
Scoreboard fix
...
Unbreakable boats in hub
2014-07-02 12:50:04 -07:00
Mini-Chiss
05e116ea0d
Scoreboard flicker fixed!
2014-07-02 12:38:41 -07:00
Mini-Chiss
558f79fe34
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-02 10:58:34 -07:00
Mini-Chiss
17c36026f6
fixed bug where player who comes first was not being added to ranks. (get nothing)
2014-07-02 10:57:30 -07:00
Peter Miller
6c67ff9106
Resolving issues from Portal.java conflict resolution
2014-07-02 04:09:41 -04:00
Jonathan Williams
9514f6391e
Fixed bug in Arcade with client manager.
2014-07-01 21:42:00 -07:00
CoderTim
44a57a485f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 21:39:03 -04:00
Jonathan Williams
081260757d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 18:31:26 -07:00
Mini-Chiss
31772196a9
More scoreboard stuff (TDM)
...
New Tug game
2014-07-01 18:30:04 -07:00
Jonathan Williams
b627e8fdf5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 10:25:12 -07:00
Jonathan Williams
9fd3f14248
Added RankUpdate command.
...
Fixed Lobby joinable issue with server monitor.
Changed server monitor to be fully dynamic for us.
2014-07-01 10:23:22 -07:00
CoderTim
7ea818c0c8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 02:20:45 -04:00
Mini-Chiss
8c461b3e1b
Cooldown on Spec Compass
...
Hub Forcefield Update
Scoreboard MINEPLEX refactor
2014-06-30 16:12:42 -07:00
CoderTim
ccb17d5ac3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-27 19:33:34 -04:00
Mini-Chiss
f10b081473
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-06-26 18:38:28 -07:00
Mini-Chiss
3d12196b17
Merge
...
UHC Public
Small refactor for player ranks in games.
Trimed scoreboard teams to 16 chars.
2014-06-26 18:38:11 -07:00
Jonathan Williams
f6ad5c5549
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-25 12:07:49 -07:00
Jonathan Williams
4f3ffde892
Added timing/debugging code.
2014-06-25 12:06:24 -07:00
Mini-Chiss
46849745c4
Champions TDM Update
2014-06-23 16:20:50 -07:00
Jonathan Williams
f2c82cbf95
Refactored TimeUtil and added totalling option.
2014-06-20 20:42:36 -07:00
Jonathan Williams
6cac04d399
Optimized create scoreboards.
2014-06-19 00:48:04 -07:00
Jonathan Williams
231ffd7234
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-15 17:21:47 -07:00
Jonathan Williams
93fbe70e9c
Added more loggingggggg.
2014-06-15 17:21:40 -07:00
Chiss
c386023a6f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-06-16 10:18:30 +10:00
Chiss
fd17c1b254
More staggered teleports on game end
...
Logging teleports.
2014-06-16 10:18:10 +10:00
Jonathan Williams
6515dd13a0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-15 16:25:40 -07:00
Jonathan Williams
0f7885d911
Added safety checks in ClientManager
...
Added logging and teampreference swap fix in arcade.
2014-06-15 16:25:32 -07:00
Chiss
a756bb88a2
NPE log
2014-06-16 09:25:14 +10:00
Chiss
9a79d0ede7
Fixed CME
...
Gadget cost fix
MapParser fix
2014-06-15 15:10:19 +10:00
Chiss
d5c96f95c0
Fixed bug that gave items while respawning.
2014-06-15 12:01:58 +10:00
Jonathan Williams
be8fea8ca9
Changed Chat API key.
...
Fixed PreferenceManager not saving asynchronously.
2014-06-12 08:02:47 -07:00
Chiss
661a869116
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2014-06-10 13:02:17 +10:00
Chiss
7fc2fbe564
Scoreboard Refactor
2014-06-10 12:51:47 +10:00
Chiss
6cba6b9b9e
merge
2014-06-10 10:27:25 +10:00
Jonathan Williams
3ae119d88a
Fixed hub package unlock bug.
...
Fixed Champions build page open bug.
MOved some code around because i'm a boss.
2014-06-08 11:27:14 -05:00
Chiss
967ff44d0a
gamecreation fix
2014-06-05 10:15:22 +10:00
Chiss
644f946f69
error debug
2014-06-04 17:56:21 +10:00
Chiss
4c72651f86
game creation
2014-06-04 17:55:13 +10:00
Chiss
1d549e38ff
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-05-30 15:02:22 +10:00
Chiss
d4465fd8f2
merge
2014-05-30 15:01:08 +10:00
CoderTim
1b5b2d21b2
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-28 17:51:38 -04:00
Jonathan Williams
48975d02c7
Adding some missing files for website.
2014-05-28 11:20:13 -07:00
CoderTim
94e31e36f8
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-27 21:42:01 -04:00
CoderTim
e101c027ce
Created Sneaky Assassins and started work on the kits
2014-05-27 21:38:22 -04:00
Jonathan Williams
449fa13cc3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
...
Conflicts:
.gitignore
2014-05-27 02:23:22 -07:00
Jonathan Williams
0634ee5543
Removed unused global stuff in Mineplexer.
...
Did some edits in GroupManager...need to pick that up.
Changed TimeUtil to pop last entry when stopping.
Fixed WorldUtil's dimension thing for UHC.
Fixed Exception with AntihackRepository and no static lock object on _connection
Work on Elo manager.
Work on Queue.
Added checking for player to server transfer records.
Added option for rejoin time in TeamGame (UHC...yay)
2014-05-27 02:10:29 -07:00
CoderTim
49de140f41
Configured eclipse to use UTF-8
2014-05-25 21:04:14 -04:00
CoderTim
c45e7d2a80
Converted file encoding from ISO-8859-1 to UTF-8
2014-05-25 19:42:39 -04:00
CoderTim
3859a42f1d
Removed broken and obsolete shifter code
...
Set up more intellij stuff
2014-05-25 19:11:58 -04:00
CoderTim
aa6b5324eb
Set up IntelliJ IDEA
2014-05-20 00:39:50 -04:00
Jonathan Williams
6d19c80af2
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-13 22:15:55 -05:00
Jonathan Williams
6af5d9205b
Added TimeUtil.java
...
Removed double gems.
Removed extra world uninitialize.
Changed AccountAdministrator to use UUID.
2014-05-13 22:13:48 -05:00
Chiss
002260dce8
better date
2014-05-14 12:57:43 +10:00
Jonathan Williams
12041b0d72
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-13 21:54:58 -05:00
Chiss
8ea344cacd
fixed a NPE
2014-05-14 12:38:06 +10:00
Jonathan Williams
40ba1a64f8
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-13 14:46:15 -05:00
Chiss
fbb0031dc1
fixed bug in dom where endCheck was being called multiple times
...
logging for world stuff
2014-05-13 11:18:17 +10:00
Jonathan Williams
b1514fef5a
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-09 21:18:48 -07:00
Jonathan Williams
0ec08d5208
Fixed chunk load outside borders (disabled for testing right now)
2014-05-09 21:18:38 -07:00
Chiss
208a78b070
respawning players are tp'd if leave area.
2014-05-10 14:01:02 +10:00
Chiss
d9225c003e
CS Update
2014-05-10 09:55:27 +10:00
Jonathan Williams
eae2d41fad
Fixed party out of bounds exception.
...
Fixed tnt in wrong place in dom shop.
2014-05-08 20:01:21 -07:00
Jonathan Williams
b72bcadbf4
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-06 22:38:50 -07:00
Jonathan Williams
ebf40afe75
Fix dom bow shoot in lobby bug.
...
Work on preventing illegal builds.
2014-05-06 22:38:27 -07:00
Peter Miller
e0dd0116a2
Beginning changes for stats from PlayerName to PlayerUUID
2014-05-06 17:06:19 -04:00
Jonathan Williams
5f2b2c251d
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-06 09:06:49 -07:00
Jonathan Williams
8110506ac4
Fixed duplicate login issue with CoreClientManager
...
Added EloRanking and EloStart for elo games in Game.java
Refactored Elo code in Arcade to be based off of above values in Game
Changed Lobby scoreboard in Arcade to just Players at top current/max.
2014-05-06 09:06:39 -07:00
Chiss
f79b3b147c
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-05-06 15:59:20 +10:00
Chiss
223da7bf4d
ResetAll for class skills
2014-05-06 15:55:14 +10:00
Jonathan Williams
2f397e7d2a
Work on elo manager.
...
implemented coreclient cleanup.
2014-05-04 22:40:44 -07:00
Jonathan Williams
f079333d3b
Optimized ChunkBlockChange.
...
Still no dead chunks!
Fixed LobbyManager advertising to an empty lobby.
2014-05-04 18:29:19 -07:00
Jonathan Williams
97e083c1e7
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-04 12:52:14 -07:00
Jonathan Williams
f623026dfc
Fixed projectile order issue..check for dead before collision.
...
Fixed dead chunks in Aracde.
2014-05-04 12:52:04 -07:00
Chiss
6e8bdfa769
disabled hub clock for tournament
2014-05-03 17:26:21 +10:00
Chiss
0ce3b3fb2d
Disabled AFK kick during Tournament
2014-05-03 17:23:10 +10:00
Jonathan Williams
fe7ed5c96a
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-02 23:19:05 -07:00
Chiss
b432c094d9
Misisng ifles
2014-05-03 16:16:52 +10:00
Jonathan Williams
0101531291
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2014-05-02 23:15:08 -07:00
Jonathan Williams
484ba97b23
Updated file delete mechanism so there is no reflection.
...
Removed list block on deleting players from coreclient quit.
2014-05-02 23:12:39 -07:00
Chiss
4304327bf9
Disallowed /spec during games.
2014-05-03 13:06:15 +10:00
Chiss
395a5d2c08
MAC disabled with Tournament Mode
...
Bridges TM game desc fix
2014-05-03 11:47:15 +10:00
Chiss
e818662161
Added /spec toggle, to allow players to not partake in games.
...
Added TeamArmorAddon for games to use, to mark team colors easier.
Minor other changes.
2014-05-03 11:23:10 +10:00
Chiss
1d4d98b910
Twitch Prep
...
MAC changes
2014-05-02 14:35:41 +10:00
Chiss
8240101d60
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
2014-05-01 09:33:59 +10:00
Chiss
423a355057
Helpers+ wont be kicked yb MAC
2014-05-01 09:31:47 +10:00
Jonathan Williams
f4a92ec07a
Implemented Logger
...
Logger now catches all uncaught exceptions and logs them to DB.
Put in some preventative checks in Hub/Party as they threw a lot of the same errors.
Added autoreconnect to AntiHack as it was spamming errors in DB
2014-04-30 10:57:19 -07:00
Jonathan Williams
7637d94ae0
Added mysql logger.
...
Hooked it up in a few places.
Fixed Asynch crap with AntiHack.
2014-04-30 00:31:22 -07:00
Jonathan Williams
e958a922fe
Fixed Hub chat so it goes through filter.
...
Added back in server name so it tracks correctly.
Fixed PlayerCount in Mineplexer AGAIN.
2014-04-29 12:53:22 -07:00
Jonathan Williams
3ec1653532
Added in chat filtering command and finished up filtration.
2014-04-29 11:54:20 -07:00
Jonathan Williams
66aa7223cc
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-27 21:59:35 -07:00
Jonathan Williams
47417dea6b
Implemented initial SafeChat.
2014-04-27 21:59:18 -07:00
Chiss
dc6a3da0fa
Added more DMT words
2014-04-28 14:08:40 +10:00
Chiss
77809b409d
MAC Update
2014-04-28 12:28:48 +10:00
Chiss
40ef432211
Cannot use skills/items in HubManager
...
Dom CP score rate lowered
Dom items dont use energy
2014-04-28 09:41:00 +10:00
Chiss
82afefd11a
Quick fix for respawning players not being able to get stuff from creative inventory
2014-04-27 01:09:25 +10:00
Chiss
95d6ec7f50
Barrage fix
2014-04-26 17:25:35 +10:00
Chiss
b86b014058
Fixed a whole bunch of bugs
2014-04-26 11:59:11 +10:00
Jonathan Williams
ac1c081bc8
Fixed scoreboard issues.
2014-04-25 17:52:04 -07:00
Jonathan Williams
a37ace7576
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-25 00:44:27 -07:00
Jonathan Williams
9136fa0b15
Upgraded to latest spigot.
...
Fixed npcs being so loud.
Npcs are now ghosted automatically.
Added UUID on login.
2014-04-25 00:44:14 -07:00
Chiss
9495630bf2
CP rate increase
2014-04-25 11:10:37 +10:00
Jonathan Williams
7fef4adbee
Fixed resupply resetting skills.
2014-04-22 22:19:03 -07:00
Chiss
7ea601e94b
Cant open bridge chests until bridges are down.
2014-04-23 10:38:59 +10:00
Chiss
0325892e2a
Champs water fixes
...
First push for Twitch games
2014-04-23 10:21:01 +10:00
Jonathan Williams
e62dfb0dd2
Fix skill/item packs not deducting gems.
...
Fix players not getting spectating flag when dying.
2014-04-22 16:50:44 -07:00
Chiss
bddc36271d
fixed gems for capture
2014-04-21 17:16:35 +10:00
Chiss
0f31052d00
cannot shoot arrow in water.
...
less gems for capping
2014-04-21 17:14:23 +10:00
Chiss
a150249f4f
game will not announce winner multiple times
2014-04-21 17:01:50 +10:00
Chiss
adf8821a26
more CP changes
2014-04-21 12:55:24 +10:00
Chiss
b1e082b73a
fixed riposte bug
...
tweaked capture effects
2014-04-21 11:56:14 +10:00
Chiss
0eaa3110f5
Risposte nerf
2014-04-21 11:18:14 +10:00
Chiss
b8e573e8f8
redid capture display. much less annoying.
2014-04-21 11:15:49 +10:00
Chiss
07098b0b82
fixed no damage on weapons
...
items not usable until game is live
fixed proxies not triggering
some skill balance/fixes
players with null kit are now given default knight
2014-04-21 10:48:04 +10:00
Chiss
ddc8e435e8
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java
2014-04-21 08:49:13 +10:00
Chiss
3281eb2ed7
Merge
2014-04-21 08:47:07 +10:00
Jonathan Williams
1f225f05ff
Custom build fixes.
2014-04-20 00:27:32 -07:00
Jonathan Williams
dc625726c4
Item Custom Build Fixes.
2014-04-19 22:54:52 -07:00
Jonathan Williams
458f5741d7
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-19 20:54:04 -07:00
Jonathan Williams
e5e9cc7284
Custom Items in custom Builds for dom.
2014-04-19 20:53:55 -07:00
Chiss
845d45bd4d
fixed some skill bugs
...
players quitting during recruit will no longer remain on a team, caused unbalance
GiveClock flag added to game, to stop giving clock.
2014-04-20 13:50:15 +10:00
Chiss
de2b42e190
fixed tnt bug
2014-04-19 15:18:13 +10:00
Chiss
b720a6433c
Explosions crack carved stone brick
2014-04-19 15:10:30 +10:00
Chiss
1bf1f04d53
Champs Stuff
2014-04-19 14:50:14 +10:00
Chiss
424f915388
Champs Merge
2014-04-18 13:24:30 +10:00
Chiss
5ac48a02fb
Stripped indicator func out of Condition
...
Class Combat skills arent usable before game starts
Silence re-enabled for class combat skills
2014-04-15 17:53:24 +10:00
Chiss
e5ea7483db
Merge
2014-04-14 09:27:31 +10:00
Chiss
5df8d34426
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java
2014-04-13 18:01:55 +10:00
Chiss
9874dae60f
Merge
2014-04-13 18:00:53 +10:00
Jonathan Williams
5efaf9bd36
Fixed inf loop.
2014-04-13 00:59:55 -07:00
Chiss
85aa748218
Champs Bug Fixes
2014-04-13 17:20:49 +10:00
Chiss
f25a6c26c9
Champs Update
2014-04-13 11:06:10 +10:00
Chiss
154479d1b7
Fixed TDM health
2014-04-13 09:29:22 +10:00
Chiss
f73d4d3e23
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-13 09:29:12 +10:00
Chiss
2e4bc587b1
Champs Update
2014-04-13 09:26:31 +10:00
Jonathan Williams
98430be09e
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-12 01:45:01 -07:00
Jonathan Williams
8f42d91d8a
Fixed ban kick bug.
...
Fixed Hub right click mount crash bug.
Fix for custom builds not saving.
Fixed Bridges not starting/hanging.
Updated to 1.7.8 spigot support.
Removed logging on HS.
2014-04-12 01:28:33 -07:00
Chiss
ecc40bda47
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-12 18:25:59 +10:00
Chiss
ba1c6ae35f
Champs Balance
2014-04-12 18:22:53 +10:00
Jonathan Williams
eb1d1c1ed2
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-11 03:10:02 -07:00
Jonathan Williams
c8af89dded
Fixed BH and GRavity.
2014-04-11 03:09:21 -07:00
Chiss
80df2c2944
Bux fixes for 1.7
...
Champions TDM
SSM Domination
2014-04-11 15:33:31 +10:00
Chiss
71b2931936
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-11 10:34:51 +10:00
Chiss
2adf0395a1
Merge
2014-04-11 10:33:56 +10:00
Jonathan Williams
0375384fb5
Converted to Spigot's latest 1.7.5
2014-04-10 17:15:44 -07:00
Chiss
b64acf524c
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-09 19:07:22 +10:00
Chiss
b868db0f22
Fixed so you can now charge bow skills in air.
2014-04-09 19:07:12 +10:00
Jonathan Williams
e4ca9084cc
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-09 02:03:41 -07:00
Jonathan Williams
ec29c66d1c
Added arrows sticking in you.
...
Removed bouncing arrows.
2014-04-09 02:03:19 -07:00
Chiss
146202a52c
Champs Balance + Red Arrow Fix
2014-04-09 18:50:38 +10:00
Chiss
0ecd38c656
Champs Balance
2014-04-09 16:48:01 +10:00
Jonathan Williams
bedabd84cc
Added silence to kits (UtilEnt.silence)
...
Cleaned up a ton of unused code....
2014-04-08 23:31:32 -07:00
Chiss
2eaaa85e04
Fixed /game stop trapping players in dead world.
2014-04-08 12:08:59 +10:00
Chiss
bb3f2c6281
CHAMPS
2014-04-08 10:53:41 +10:00
Chiss
85c57f2942
IButton now has Left/Right
...
Added right-click skill removal.
2014-04-06 12:45:52 +10:00
Jonathan Williams
88131836d7
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-05 16:01:07 -04:00
Chiss
8214e3b8f4
Lots of little bug fixes
2014-04-05 16:52:23 +11:00
Jonathan Williams
05d916de3c
Fixed custombuild selection not applying armor
2014-04-04 15:57:56 -04:00
Chiss
13b8f1e7ea
Champs Update
2014-04-04 13:26:00 +11:00
Chiss
26fe974b00
More CHamps
2014-04-03 15:48:58 +11:00
Chiss
80c153095b
Cooldown bar
2014-04-02 22:03:56 +11:00
Chiss
2f0167ea09
Champs Update
2014-04-02 21:22:21 +11:00
Chiss
2aaf749414
Champions Update
2014-04-02 15:19:58 +11:00
Jonathan Williams
d227a6bd06
Changed full server message
2014-03-29 18:45:44 -04:00
Chiss
fce249d7d8
fixed some desc stuff
...
castle seige removed OP kit
2014-03-28 18:50:38 +11:00
Chiss
4386ce0b96
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/ISkill.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java
2014-03-28 14:55:13 +11:00
Jonathan Williams
aae40d3899
Changed up Skills and SkillsPage for Dom 2 changeover.
...
Fixed CustomBuild stuff.
2014-03-27 22:17:31 -04:00
Chiss
e4a86e0600
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-22 10:45:01 +11:00
Chiss
fe09c3fc49
More CS Update
2014-03-22 10:44:31 +11:00
Jonathan Williams
8bf78fe14d
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-21 15:30:06 -07:00
Jonathan Williams
33d342b049
updated 1.7 stuff.
2014-03-21 10:57:31 -07:00
Chiss
ab2a72ba16
CS Update
2014-03-21 11:59:56 +11:00
Jonathan Williams
f24f81b7c3
Finished conversion.
2014-03-19 04:09:40 -07:00
Jonathan Williams
7042159f46
Updated to 1.7 and changed namespaces to 1.7
2014-03-19 02:24:26 -07:00
Chiss
a7888b0c02
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-19 17:51:48 +11:00
Chiss
7714ff4a09
CS Update
2014-03-19 17:51:37 +11:00
Jonathan Williams
9715f5454a
Removed double gems.
...
Removed unused code for ssm time
2014-03-18 12:55:04 -07:00
Chiss
6830033d8a
PLEASE JUST WORK :(
2014-03-16 10:52:34 +11:00
Chiss
d6e3f076cd
PLEASE JUST WORK MR TORTOISE
2014-03-16 10:42:30 +11:00
Chiss
3277a0a2f8
Making sure puushed
2014-03-16 10:35:58 +11:00
Chiss
d695ec72ca
Added SSM Team Game
2014-03-16 10:28:46 +11:00
Jonathan Williams
3603d3ef8b
Removed afk kick from arcade.
2014-03-14 21:49:01 -07:00
Jonathan Williams
0094c0ebeb
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-14 02:20:01 -07:00
Jonathan Williams
246f28a464
Enabled DoubleGem weekend.
...
Added 3 new maps
updated news
2014-03-14 02:19:52 -07:00
Chiss
aa206d9c91
Gravity fixes
2014-03-14 20:17:06 +11:00
Chiss
24efe3d0d8
SQ kit restrictions
2014-03-14 13:24:38 +11:00
Jonathan Williams
de1365b5cf
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-13 17:56:16 -07:00
Jonathan Williams
efee9fdcbf
Fixed Hub class shop.
...
Added chat logging.
Added message with file updater.
2014-03-13 17:56:05 -07:00
Chiss
f4cd2fcbb9
Staggered game teleports/start
2014-03-13 18:18:22 +11:00
Chiss
82644002c5
A little bit o dem ol bug fixles. yknow what im sayin?
2014-03-13 16:32:48 +11:00
Jonathan Williams
c4b7cd19c8
Added default builds for kits in Champions/Dominate
...
Added default build selection in lobby when only hitting kit and not selecting a build.
2014-03-11 03:29:11 -07:00
Chiss
105b210afa
mob spawnin'
2014-03-10 13:42:05 +11:00
Chiss
464fdb1e5e
Renamed Champions to Dominate
2014-03-10 13:35:36 +11:00
Chiss
8593eb326e
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-10 13:32:52 +11:00
Chiss
1bc5fef625
Kit npc location change
2014-03-10 13:32:39 +11:00
Jonathan Williams
a565da45e4
Added classes to champions.
...
Added ability to open direct classes page.
2014-03-09 19:32:27 -07:00
Jonathan Williams
f51a6747fd
Moved files into Mineplex.core
...
Removed references to Core project.
2014-03-09 00:50:13 -08:00
Jonathan Williams
2cc50d5725
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-03-06 02:15:46 -08:00
Jonathan Williams
d05c2f906c
Fix for ServerNpc page beta join.
...
Work on Dom 2.0
Added sheep quest map.
2014-03-06 02:15:16 -08:00
Chisstop
60bc3f15bb
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-03-05 14:35:01 -08:00
Chisstop
c9a938d2c5
Sheep Quest Fixes
2014-03-05 14:34:51 -08:00
Jonathan Williams
a09a2aaa30
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-03-05 00:40:51 -08:00
Jonathan Williams
f0b347f97f
Changed beta testing to Ultra and up.
...
Did some work on DOM 2.0
2014-03-05 00:34:20 -08:00
Chisstop
af2cf4e7a9
this is the one change i needed to push
2014-03-04 23:27:37 -08:00
Chisstop
2b56b970fa
Sheep Game?
2014-03-04 22:39:48 -08:00
Jonathan Williams
d99a3c9253
Optimized mysql queries with server status' address/updated fields.
...
Removed double gems.
Added BETA check for Hero only beta games.
2014-03-03 12:47:57 -08:00
Jonathan Williams
b3f10b9d62
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-03-01 01:59:25 -08:00
Jonathan Williams
750fff32c7
Added Skeletal horse.
2014-03-01 01:58:58 -08:00
Chiss
b54e4dfbc4
hunger
2014-03-01 11:29:01 +11:00
Chiss
18880a00f4
fletcher doesnt give to specs
2014-03-01 11:09:15 +11:00
Chiss
dfa4ea0edc
fix
2014-03-01 11:06:01 +11:00
Chiss
bfaa138526
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2014-03-01 10:35:20 +11:00
Chiss
7cf6391ddd
Sheep Quest
...
Double Gem Weekend
2014-03-01 10:35:06 +11:00
Jonathan Williams
c2044f7e8a
Added horse disguise.
...
Added Hub redirect on full.
Fixed Repo for ServerMonitor.
Fixed Bridge QuitOut/AutoBalance issue.
Removed unnecessary region folder create in dominate.
2014-02-28 01:18:32 -08:00
Jonathan Williams
f2570caad5
Swapped default connections to new dns names.
...
Fixed bug with LobbyBalancer and retrieving no lobbies.
2014-02-21 13:32:14 -08:00
Jonathan Williams
525df6c2b0
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-02-07 09:46:54 -08:00
Jonathan Williams
516e5f7f99
Moved Rejoin ability into TeamGame.
...
Added autobalance flag for game.
Punish only does exact name lookup.
2014-02-07 08:50:13 -08:00
Chiss
b776c1bf60
spacehelemettts
2014-01-22 08:28:06 +11:00
Chiss
d868c9b73d
fixed gold blocks being destroyed.
2014-01-22 08:02:01 +11:00
Chiss
567b7c4a7b
minor fixes
2014-01-21 23:14:23 +11:00
Chiss
9118e79d9a
Minor fixes
2014-01-21 22:57:49 +11:00
Chiss
e124dde006
Finished Gravity
...
INcluded map
2014-01-21 22:48:18 +11:00
Chiss
bdb7f3cc28
UHC season 5
2014-01-21 11:56:35 +11:00
Chiss
76b2baf626
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2014-01-21 11:28:37 +11:00
Chiss
7bbfdd1a42
Gravity Update
2014-01-21 11:28:12 +11:00
Jonathan Williams
dea96a9e65
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-01-18 09:08:12 -06:00
Jonathan Williams
177f4a878b
Removed bad eventhandler line
...
Refactored StatsManager
Removed Pvp Table add for StatsManager
Added commented out hooks for HG stats
2014-01-18 09:02:56 -06:00
Chiss
75669e2333
Hub News Changes
...
AntiHack Autokick for Severe Hackers
2014-01-18 20:33:38 +11:00
Chiss
1333f2ee9f
SSM Horse Disabled
2014-01-18 12:56:00 +11:00
Chiss
1031846198
SSM Update
...
Gravity game start
2014-01-18 12:34:24 +11:00
Jonathan Williams
6904f9cf3d
Minor verbage "Starting in 1 Second."
...
Fixed NPE in client cleanup.
2014-01-03 05:50:05 -05:00
Jonathan Williams
faea1072a1
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-01-03 01:37:49 -05:00
Jonathan Williams
93c0575fe2
Fixed naming in some hub modules.
...
Fixed StatusManager ip and DynamicServer comparison.
Tweaked Bungee Lobby selection so it doesn't select a Lobby with < 10 slots left
Added client cleanup in CoreClientManager
Added Paintball cleanup
Added AntiHack ignore list cleanup.
Added clearDisguises call in DisguiseManager
Added ServerMonitor tracking based on Private Address.
2014-01-03 01:37:39 -05:00
Chiss
fa2e24d686
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
2013-12-25 09:08:03 +11:00
Chiss
375d689cc6
fixed visual bug with hero gems
2013-12-25 09:06:22 +11:00
Jonathan Williams
3fefc8fa73
Fixed Hero message in Arcade.
2013-12-24 04:13:52 -05:00
Chiss
74e49a3ff1
Hero Rank stuff
...
New SSM Kit
2013-12-24 19:14:40 +11:00
Chiss
200504ec8b
made snowman boss a little tougher.
2013-12-22 00:10:15 +11:00
Chiss
b895c66005
snake even more easy
2013-12-22 00:02:38 +11:00
Chiss
2f063e9f8e
wave 3 snowman invul fix
2013-12-21 23:54:10 +11:00
Chiss
d6c37055da
cleaner leak fix.
2013-12-21 23:06:27 +11:00
Chiss
1c3d90a70f
leak fixes
2013-12-21 23:00:51 +11:00
Chiss
58e049acf9
snake bit is easier :)
2013-12-21 22:34:04 +11:00
Chiss
a6eb7ea665
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-21 20:07:04 +11:00
Chiss
0585116e78
Hub Gadgets
...
Hub Dragon (Hero Only)
XMAS block efficiency
2013-12-21 20:05:42 +11:00
Jonathan Williams
7574a5972b
Prevented sounds from silenced vegetables.
2013-12-21 03:22:58 -05:00
Jonathan Williams
5fffcf89b6
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-12-21 02:44:20 -05:00
Jonathan Williams
70c14268e1
Fixed Leash issue.
...
Added invis for utilent.ghost
2013-12-21 02:44:12 -05:00
Chiss
f50ae06dff
NPE fix
2013-12-21 16:52:59 +11:00
Chiss
50c2b10b50
25% easier boss
2013-12-21 15:10:17 +11:00
Chiss
c52a7d2fe1
Christmas update
...
Hub Update
2013-12-21 15:06:01 +11:00
Chiss
bc9c309aa1
Xmas Game
2013-12-21 10:17:22 +11:00
Chiss
ac723c14bd
Push so i can pull :O
...
just some xmas stuff
2013-12-21 08:42:49 +11:00
Chiss
f4edcedce3
push so i can pull :\?
2013-12-18 21:17:28 +11:00
Jonathan Williams
e054b06cc2
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-12-13 21:01:08 -08:00
Jonathan Williams
6b92b6c4a8
Added stats manager.
...
Added lots of missing files.
2013-12-13 21:00:56 -08:00
Chiss
1eebed737e
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
2013-12-13 18:05:08 +11:00
Chiss
5f2e457362
Minor HG Stuffs ;o
2013-12-13 16:21:39 +11:00
Jonathan Williams
d6544202f0
Added ghost ability for mobs.
2013-12-12 02:19:58 -08:00
Chiss
2fb4bc4fbc
UHC stuff
2013-12-07 23:04:10 +11:00
Chiss
db7b4f3a40
more draw words
2013-12-04 15:25:18 +11:00
Chiss
00bccdc1f7
More draw words
...
UHC complete! probably not :'(
2013-12-04 13:31:23 +11:00
Chiss
a29cc4664f
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
2013-12-04 12:48:12 +11:00
Chiss
28c928b4c3
Xmas + UHC changes
2013-12-04 12:45:17 +11:00
Jonathan Williams
8984309c56
Cleaned up portal cancellation.
2013-12-03 17:41:58 -08:00
Jonathan Williams
022c343a98
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
2013-12-03 13:58:28 -08:00
Jonathan Williams
09a77e98cc
Prevent Enderdragon from creating portal.
2013-12-03 13:57:43 -08:00
Chiss
36a98d5e41
UHC changes
2013-12-03 21:31:02 +11:00
Chiss
f972418fd1
UHC!
2013-12-03 17:13:29 +11:00
Chiss
d10871abd9
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-12-03 16:27:12 +11:00
Chiss
43196dd7af
UHC Update
2013-12-03 16:26:47 +11:00
Jonathan Williams
ce4eb43145
UHC end transfer.
2013-12-02 21:20:28 -08:00
Chiss
c8fc792fdd
UHC prep for s4
...
Draw updates
2013-11-30 20:40:09 +11:00
Chiss
8807854b57
Added Draw
2013-11-29 23:38:38 +11:00
Chiss
f927f2c1be
wolf tackle fix
...
HG furnace no use
2013-11-27 12:48:16 +11:00
Chiss
0d811272cc
final HG fix :D
2013-11-27 11:52:20 +11:00
Chiss
6f06ac2018
HG lag fixes
...
item frames cannot be broken
creep damage messages
2013-11-26 23:54:02 +11:00
Jonathan Williams
25782813f4
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-26 02:35:05 -08:00
Jonathan Williams
9a7a815a21
Added multiblock packets only for sg.
...
RE-tweaked loot.
Fixed blocks pawns in lobby.
2013-11-26 02:34:54 -08:00
Chiss
e57722ed0b
HG snowball fix
2013-11-26 12:02:03 +11:00
Chiss
48e392fdf0
HG;
...
-compass
-deathmatch
-various fixes
2013-11-25 20:59:46 +11:00
Chiss
e469c5705b
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-25 10:23:28 +11:00
Chiss
b941359840
HG
2013-11-25 10:23:10 +11:00
Jonathan Williams
2ebf13aba6
Added commented out chunk change stuff.
2013-11-24 15:22:29 -08:00
Jonathan Williams
e2646a982f
Added MultiBlock packet.
...
Tweaked performance for chunks that are < 64 changes for HungerGames.
2013-11-24 04:54:41 -08:00
Jonathan Williams
0a1f4ecfd5
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-24 03:04:07 -08:00
Chiss
276898dced
HG
2013-11-24 21:58:55 +11:00
Jonathan Williams
8d19f3ecac
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-24 02:44:59 -08:00
Jonathan Williams
dbd7820279
Loot tweak.
2013-11-24 02:44:52 -08:00
Chiss
4c7e42760b
debugz
2013-11-24 21:44:43 +11:00
Chiss
83bec39aef
game not end
2013-11-24 21:36:35 +11:00
Chiss
c9e1c0a0f4
HG lag fix
2013-11-24 21:29:49 +11:00
Chiss
2a41979277
HG Lag Fixes!
2013-11-23 23:58:51 +11:00
Chiss
0d7444f35a
TNT Damage off
2013-11-23 19:38:58 +11:00
Chiss
e6080c9192
drop fixes
2013-11-23 18:39:26 +11:00
Chiss
d5ae42910f
OOPDOOTS
2013-11-23 18:19:26 +11:00
Chiss
11bd4804f4
skeleton/wolf removal on death
2013-11-23 11:03:52 +11:00
Chiss
8752a7a6ac
HG Ice Speed + TNT Delay
2013-11-23 10:21:06 +11:00
Chiss
3a3ac9f8ce
redblockstore
2013-11-23 10:04:37 +11:00
Chiss
189b22ab4c
Pushed fixes
2013-11-23 09:55:48 +11:00
Chiss
42cab3a39c
HG STUFF
2013-11-23 09:28:27 +11:00
Chiss
a5a80378f7
Loot fixes
2013-11-23 09:15:13 +11:00
Chiss
3d13fb0dc9
HG Fixes
2013-11-22 23:12:39 +11:00
Chiss
0a683416ff
SG Update
2013-11-22 18:40:38 +11:00
Chiss
18c70901ca
gem kit fix
2013-11-17 21:04:27 +11:00
Chiss
fff13a14bf
Gem lowered on firework/meow
2013-11-17 12:31:13 +11:00
Chiss
0aae7d24ed
BH Gem Fixes
2013-11-17 12:30:14 +11:00
Chiss
630281c663
SSM Hunger Fix
2013-11-17 09:53:53 +11:00
Jonathan Williams
3f93e6daf1
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/CreatureForm.java
2013-11-16 01:56:22 -08:00
Jonathan Williams
75c2a5fd6e
Added sound disguises
...
Removed purchasable batgun.
2013-11-16 01:55:10 -08:00
Chiss
9c6ebcea52
shocking nerf
2013-11-16 18:25:19 +11:00
Chiss
37ed58cea9
axe boost nerf
2013-11-16 17:57:21 +11:00
Chiss
690811dd05
cased SG debug properly
2013-11-16 17:54:30 +11:00
Chiss
b8e1c22967
BH updates
2013-11-16 17:53:42 +11:00
Chiss
ea8d28abc1
Formula
2013-11-16 17:10:54 +11:00
Chiss
ef54732531
DISGUISE THEM CATS
2013-11-16 16:43:03 +11:00
Chiss
2e6758e23c
BH Updates
2013-11-16 13:15:16 +11:00
Chiss
29ce493f64
Hide and SEEEEEEK (block honts)
2013-11-15 18:52:46 +11:00
Chiss
99c97d1ecd
Block Hunt changes
2013-11-14 16:28:29 +11:00
Chiss
6ebda931fd
Fixed bug where backtracking players could be in the scoreboard twice.
2013-11-11 07:27:41 +11:00
Chiss
3c5b1fe74f
H&S Updates
...
some punish fixes
hub toggles no longer pulse on pressure plate
2013-11-09 09:48:40 +11:00
Chiss
dc062c7bb6
H&S Push
2013-11-07 19:49:21 +11:00
Chiss
6b577af7b4
Punish Update
...
H&S Additions
2013-11-07 15:25:46 +11:00
Chiss
9f11352f10
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-11-07 10:19:30 +11:00
Chiss
03731de7f8
Rank changes
...
MAC no longer kicks lag/fly
some H&S stuff :O
2013-11-07 10:18:36 +11:00
Jonathan Williams
ff6488b371
safe file separators
2013-11-05 16:10:14 -08:00
Jonathan Williams
43d5b6441b
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-11-05 10:19:17 -08:00
Chiss
bcb86fc911
PB gem for healing remove
2013-11-04 09:46:09 +11:00
Chiss
e14bc76639
arcade map directory up up right left down up right update!
...
some paintball fixes
H&S start
2013-11-04 08:59:29 +11:00
Jonathan Williams
6999d7979f
Added paintball to LobbyMenu
...
Fixed Lobby count in lobby menu
Fixed ultra/green kits in Paintball
2013-11-02 12:26:28 -07:00
Chiss
0cbefc1280
Paintball update!
2013-11-02 15:42:37 +11:00
Chiss
24723cd5e5
paintball update
2013-11-02 10:09:07 +11:00
Chiss
c72f1337e8
fixed memory leak in antihack
2013-11-01 10:40:33 +11:00
Chiss
08497e474d
mobs no longer move as soon as they spawn. GET IN LINE BOYS!
2013-11-01 08:34:32 +11:00
Chiss
7dcd58ec2d
HH debug prints
2013-11-01 08:27:45 +11:00
Chiss
d41338b76a
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/Champions.java
2013-10-31 17:38:44 +11:00
Chiss
ae4bf75485
Champs update
2013-10-31 17:36:41 +11:00
Jonathan Williams
7b8608de95
Rah Rah, Custom Class Combat in Arcade!
2013-10-30 23:35:24 -07:00
Chiss
52ac670f3f
More dom changes
2013-10-31 12:43:54 +11:00
Chiss
386e2e3067
Added Champs
...
MAC update
2013-10-31 09:45:11 +11:00
Chiss
33c7d594a0
robin hood regen nerf
2013-10-29 10:43:04 +11:00
Chiss
ad487e48bd
THIS IS HALLOWEEN THIS IS HALLOWEEN
2013-10-29 10:41:53 +11:00
Chiss
91ec162c88
slightly easier
2013-10-28 22:30:51 +11:00
Chiss
3142bd517d
Fixed regen aura... wasnt working at all
2013-10-28 21:35:16 +11:00
Chiss
f0f7a4156f
saving heads to file
2013-10-28 17:53:25 +11:00
Chiss
09a8cbe558
re-enabled waves
2013-10-28 14:08:55 +11:00
Chiss
1d4f902298
HH CPU fixes
2013-10-28 13:54:10 +11:00
Chiss
4974fc17aa
Halloween balance (slightly easier)
...
Giant hitbox improved
2013-10-27 15:24:28 +11:00
Chiss
7948fa6f71
cpu fix ;o
2013-10-27 06:21:43 +11:00
Chiss
c9a295d56e
Halloween event changes final
2013-10-27 05:32:21 +11:00
Chiss
935599030b
moved witch (so its not default kit)
2013-10-27 02:44:14 +11:00
Chiss
9a025eb540
Potion rename
2013-10-27 02:37:11 +11:00
Chiss
f838452b5c
uncommented waves
2013-10-27 01:46:46 +11:00
Chiss
b4e2145ad7
giant speed decrease
...
ghast teleports back if it flies too far away.
2013-10-27 01:43:41 +11:00
Chiss
cd2c9dcdda
more tips
2013-10-27 01:20:10 +11:00
Chiss
c672e68713
some help during boss fight.
2013-10-27 00:14:38 +11:00
Chiss
7eb1cc6519
Halloween game additions
2013-10-27 00:06:44 +11:00
Chiss
723b57cd46
Added paintball gun Gadget
...
Added bat blaster Gadget
Halloween Game near-completed
Added SSM Witch
2013-10-26 19:01:26 +11:00
Chiss
a52bd69558
Witch SSM
2013-10-26 11:34:05 +11:00
Chiss
e8ddfc266e
fsd6gty72 tjn6g wgh
2013-10-25 22:20:46 +11:00
Chiss
61b7a86b67
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-25 21:25:36 +11:00
Chiss
b74b8e3915
Halloween event changes
2013-10-25 21:25:23 +11:00
Jonathan Williams
e5f99331dd
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-25 05:16:15 -05:00
Chiss
5563d94111
Halloween event update
...
hub News
hub mounts
hub gadgets
2013-10-25 19:20:14 +11:00
Jonathan Williams
21128eb153
Prepping filterChat and CoreClientManager for mysql
...
Removed get all clients at server start.
2013-10-23 16:36:13 -05:00
Chiss
1977572ced
Added Halloween Minigame
...
Updated gadgets and other minor things.
2013-10-22 15:46:31 +11:00
Jonathan Williams
90fbc397ff
Converted gem rewards to boolean return from website.
...
Implemented gem transactions and source.
2013-10-18 00:46:06 -07:00
Jonathan Williams
f88c202e07
Added AntiHack to Arcade/Hub
...
Added AntiHack Offense uploading.
Fixed memory leaks in PreparedStatments
Added Ultra tag in hub chat.
2013-10-17 00:37:57 -07:00
Chiss
2a836f3464
Added anti-hack
2013-10-16 12:23:23 +11:00
Chiss
40e49dd3d4
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-16 08:11:04 +11:00
Chiss
ec80d8a568
added AntiHack
...
added dragonrider coolness
2013-10-16 08:10:45 +11:00
Jonathan Williams
1cdb89f4bf
Derp, missing arcade.
2013-10-13 21:51:38 -07:00
Chiss
9ffc793f61
added Dragon Rider
...
anti-stack changes (dont anti-stack mined blocks)
2013-10-14 10:29:20 +11:00
Chiss
36b825d36d
Snake update (woo)
2013-10-13 10:33:16 +11:00
Chiss
d784a0b017
snake speed ramp up decrease
2013-10-13 09:38:03 +11:00
Chiss
e12477c4b6
snake max speed decrease
2013-10-13 08:46:02 +11:00
Chiss
1fd894934a
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-13 08:43:06 +11:00
Chiss
377f4b0680
Gem fix, now correctly displays scaled gems.
...
UHC public changes
Snake fixes.
2013-10-13 08:42:49 +11:00
Jonathan Williams
c5385ee7dc
Fixed ultra join in arcade manager.
2013-10-12 02:53:22 -07:00
Chiss
c8386bbc40
blue kit for snake
2013-10-12 18:22:20 +11:00
Chiss
a315064a3f
snake fix
...
parkour radius increase
2013-10-12 18:21:19 +11:00
Chiss
0564bd740a
SSM wolf balance
2013-10-12 17:17:24 +11:00
Chiss
4eecca3063
Wolf fixes
2013-10-12 17:13:28 +11:00
Chiss
8766767d96
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-12 16:59:38 +11:00
Chiss
27fb3b4262
Snake changes
...
SSM Wolf fixes
2013-10-12 16:59:23 +11:00
Jonathan Williams
f2c295c391
Fixed global ultra joining full games.
2013-10-11 22:03:17 -07:00
Chiss
0b2dcc2617
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-12 09:34:59 +11:00
Chiss
8376316994
Added Paintball
...
Added SSM Kit: Wolf
UPDATES.
2013-10-12 09:34:46 +11:00
Jonathan Williams
fc18d0fbb1
Added null check logging to arcade custom kit name.
...
Removed wolf kit in SSM for release
Cleaned up PlayerAccountController
Fixed connection leak for mysql connections.
Added server shutdown if server is empty for dominate.
2013-10-10 09:01:48 -07:00
Chiss
ed804e3336
Dragon escape update
2013-10-09 21:50:39 +11:00
Chiss
1fc446ae13
Lobby text now displays map
2013-10-08 17:56:57 +11:00
Chiss
b64803e499
Smash Wolf
2013-10-08 17:44:04 +11:00
Chiss
e7de90c267
Bridge changes to allow for 12 team map
...
Bridge timer fix
Smash wolf remove
World parser allows more than 4 teams.
2013-10-05 22:14:57 +10:00
Chiss
ab45c717dd
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-10-05 07:49:21 +10:00
Chiss
3ba848567c
paintball added
...
hg additions
minor changes to other games
2013-10-05 07:49:05 +10:00
Jonathan Williams
57b0d06786
Added DisguiseWolf
...
Added lobby menu (disabled autogive for testing)
Removed unused commands.
2013-10-02 22:23:01 -07:00
Chiss
34521eef8f
minor game fixes
...
portal method in StackerManager.java
2013-09-27 17:08:32 +10:00
Chiss
2a3d7426d5
Some scoreboard fixes
2013-09-26 12:38:32 +10:00
Chiss
f0e6a7294e
squid hitbox larger
2013-09-24 09:18:36 +10:00
Chiss
0390d4f63b
desc update suqid
2013-09-24 08:56:51 +10:00
Chiss
064dd97d00
HitBox support for disguises
...
Squid hitbox added
Changed squid swimming!
2013-09-24 08:56:09 +10:00
Chiss
ea5cc7161a
pigssss
2013-09-24 08:19:07 +10:00
Chiss
d8d4b69dda
baby pig to pig
2013-09-24 08:15:48 +10:00
Chiss
82f5fcb963
Pig Fix!
2013-09-24 08:12:51 +10:00
Chiss
d4775a91a1
hitbox reduction
2013-09-23 17:45:14 +10:00
Chiss
0f9f28dcc2
fixed weapon names in pigs, + baby pig on platform
2013-09-23 17:36:53 +10:00
Chiss
5ba494c381
Made player names more visible in squid
2013-09-23 16:05:05 +10:00
Chiss
ce89108aea
Fixed disguises in bacon brawl
2013-09-23 16:00:35 +10:00
Chiss
eae38dfa22
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
...
Conflicts:
Plugins/Libraries/craftbukkit.jar
2013-09-23 15:50:30 +10:00
Chiss
bf4dc35b5f
Added pig Game
...
added squid game
added recharged skill event
2013-09-23 15:48:35 +10:00
Jonathan Williams
e098d93155
Added baby disguise ability.
...
Added Stacker recharge.
Fixed issue with ServerGameMenu Champions button.
SuperSmash decreased hunger gain on attack.
Code cleanup.
2013-09-22 20:53:24 -07:00
Jonathan Williams
cc63fdccfc
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-21 15:02:14 -07:00
Jonathan Williams
558d9b4cc6
Added shop link to kits.
...
REmoved client cache.
Added random messages.
Fixed problem with Confirmation Page.
2013-09-21 15:01:40 -07:00
Chiss
b3a78112be
Fixed gem display bug
2013-09-21 13:53:12 +10:00
Chiss
eb6bbceecd
Slowed hunger degen a little, increased regen to damage dealt.
2013-09-21 13:40:04 +10:00
Chiss
9064272a38
Prepared SSM for 200 player Game (added hunger)
2013-09-21 13:34:14 +10:00
Chiss
9da18ea43f
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-21 08:34:24 +10:00
Chiss
a92c74a28a
HG Updates
...
Other minor fixes
2013-09-21 08:34:07 +10:00
Jonathan Williams
85cc6e5b2b
Updated to 1.6.4
2013-09-20 01:50:56 -07:00
Chiss
91ce36d6e4
Hub refactor
...
Hub parkour module
2013-09-18 19:46:45 +10:00
Jonathan Williams
ae00d3df18
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-17 15:52:16 -07:00
Jonathan Williams
f31a734a0d
Fixed server pages to show 5 servers.
...
Added in creeper explode block list for UHC.java
Added task assignment/reward message only on return confirm call.
Hide players in hub when they have an inventory open.
Added gem command into donation manager.
Revamped bungee player count method.
Revamped server status method.
2013-09-17 15:50:23 -07:00
Chiss
c6a9d4675f
MTC changes
...
Barbarians changes
OITQ enchanter desc improvement
renamed Turf Forts
Added 2.5x gems for bridges
2013-09-17 10:37:45 +10:00
Chiss
c6b3a8a56c
Added Minigames to hub TextCreator.java
...
Milk the cow changes!
2013-09-16 12:23:57 +10:00
Chiss
118d52e106
Slime Buff
2013-09-16 12:03:04 +10:00
Chiss
7bd13b416e
Some turf forts fixes/changes
...
Fixed SSM lobby
2013-09-16 11:52:27 +10:00
Chiss
616ba6312c
fixed bug with bomber not giving tnt
2013-09-15 15:27:50 +10:00
Chiss
6f03c57c22
Farmers lose 5 milk when dying.
2013-09-15 14:21:10 +10:00
Chiss
6b5373c20c
Fixed Turf Forts arrow bug
2013-09-15 13:57:13 +10:00
Chiss
7894f95aab
Milk Cow now has 3 cows
...
dragon escape backtrack fix
2013-09-15 13:43:56 +10:00
Chiss
d51599de28
HG start
...
Added /hub and /leave to return to hub
2013-09-15 11:12:11 +10:00
Chiss
cc39abfd7f
UHC fixes
...
IdleManager NPE fix
2013-09-14 20:03:24 +10:00
Chiss
44b82f90b1
Shredder buff
2013-09-14 19:05:07 +10:00
Chiss
5ad627decb
SSM Creeper shield nerf by 50% duration
2013-09-14 16:13:24 +10:00
Chiss
743c8e9978
SSM Blaze slight buff
...
Dragons: Removed knockback (based on feedback)
Dragons: added 3 mroe dragons :D
2013-09-14 16:09:30 +10:00
Chiss
72718ff7b4
nerfed farmer in milk teh cow
...
fixed some UHC bugs
made party tutorial return you to spawn
2013-09-14 15:20:28 +10:00
Chiss
34c333dac9
added announcement logging
...
fixed creeper explosion disable for uhc
fixed player logout thing for UHC?
2013-09-14 12:27:40 +10:00
Chiss
e49b92d280
UHC fixes
...
Game inventory disable doesnt disable punish anymore
2013-09-14 11:33:33 +10:00
Chiss
3ae6ba709d
smash kit display update
2013-09-14 09:34:05 +10:00
Chiss
35c10f22a1
Fixed gems in a few games
...
Milk Cow; cannot pickup water, cannot drink milk after end
2013-09-14 08:13:21 +10:00
Chiss
20090406a6
missing kit
2013-09-13 12:25:45 +10:00
Chiss
b1744e86d8
many UHC bug fixes
...
dragon escape bug fixes
barbarians bug fixes
death tag fixes
2013-09-13 12:24:33 +10:00
Chiss
60dd6c84d0
Updated World Parser / Data to account for Y of corner blocks.
...
Use same height to have no height limits.
2013-09-12 09:01:37 +10:00
Chiss
2a65086b70
Added Milk the Cow
...
Maps now set Min/Max Y
2013-09-12 08:57:51 +10:00
Chiss
ea81e558ea
Added;
...
- Death Tag
- Dragon Escape
- Barbarians
Spleef; added hunger
Dragons; added knockback
Turf Forts; buffed shredder + fixed infil on respawn
Added knockack to 1 damage attacks.
Removed 'hit sound' from hitting mobs (just plays animal sound)
2013-09-11 12:22:55 +10:00
Chiss
c46a550282
restructured games in arcade
2013-09-10 07:56:55 +10:00
Jonathan Williams
6b7b6c9fdf
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2013-09-09 01:30:28 -07:00
Jonathan Williams
d4b3c5d461
Fixed memory leaks.
...
Added in party joining for servers in Hub
Modified server status's in server UI.
2013-09-09 01:28:35 -07:00
Chiss
9fe33bab84
Added UHC
...
Added pig disguise
Added func to Game base to support UHC
Moved map to Core
2013-09-09 18:06:44 +10:00
Chiss
8b2cc7993f
Added UHC
...
Disabled Join Maps
2013-09-08 19:31:58 +10:00
Chiss
8dec407f16
SSM: wither image dies when you die
...
Turf Forts: you retain infil slow if you go onto enemy spawn
Hub Maps
2013-09-08 10:16:39 +10:00
Chiss
f612826787
SSM: dont give passive item descs in game.
2013-09-07 19:30:06 +10:00
Chiss
ff0e39067a
Added Mount Manager
2013-09-07 16:01:10 +10:00
Jonathan Williams
7a9a3fea4f
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-06 17:43:59 -07:00
Jonathan Williams
2266cc4556
Added stop override and player redirect to Hub
...
Added prevention of items going into inventory for ServerNpcPage
Fixed issue with ClientClass and Competitive ULTRA
Fixed issue with CustomBuildPage and Competitive ULTRA
Added ULTRA joining full servers for Arcade.
Added ULTRA packs displaying in Arcade chat/tab.
Removed IChat from TeamGameEngine and Dominate.
2013-09-06 17:43:45 -07:00
Chiss
213b1efb0c
Added Dragon Escape
...
fixed kit availability for runner
SSM: wither skel projectile continues after releasing block
SSM: nerfed blizzard
SSM: reduced gem price of a few kits
2013-09-06 15:58:58 +10:00
Chiss
768f57ae5e
SSM: Added Wither Skeleton and Creeper kits
...
Compass: no longer teleports if not holding compass (on click)
SSM: various balance changes.
2013-09-05 13:55:42 +10:00
Chiss
f29b844798
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
resolved
2013-09-05 07:50:13 +10:00
Chiss
87fa103711
WHITE SPACE CHANGES!
2013-09-05 07:44:53 +10:00
Jonathan Williams
34dd5a1af3
Added broadcast command.
...
Added Chat to hub.
Disabled /me
Fixed Pets not returning when pushed off into the void.
Prevented eggs from spawning in hub.
2013-09-04 11:35:59 -07:00
Jonathan Williams
55b6bd6e95
Fixed memory leaks in SSM kits.
2013-09-04 10:46:33 -07:00
Jonathan Williams
552675b1bf
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-04 10:36:13 -07:00
Chiss
010336983a
SSM: fixed fissure not working
...
Hub: fixed invisibility for tutorial players (others could still see them and throw em)
2013-09-04 18:03:01 +10:00
Jonathan Williams
2a2c48087f
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-03 23:31:44 -07:00
Jonathan Williams
d5ef0208a1
Added lag meter to hub and arcade.
2013-09-03 23:31:29 -07:00
Chiss
93e59c1c43
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
...
Conflicts:
Plugins/Libraries/craftbukkit.jar
2013-09-04 16:13:12 +10:00
Chiss
ca6131d1d5
SSM Minor patches
2013-09-04 16:11:50 +10:00
Chiss
48c4ca0e24
SSM minor changes
2013-09-04 15:40:02 +10:00
Jonathan Williams
37897037a3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-03 20:46:48 -07:00
Jonathan Williams
63b4776893
Garrrr, fixed craftbukkit building.
2013-09-03 20:43:32 -07:00
Chiss
e3eae200ae
arcade: fixed kit material NPE
...
SSM: added knight
SSM: added placeholder for wither skel
2013-09-04 11:55:19 +10:00
Chiss
23ac045a41
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-04 08:14:20 +10:00
Chiss
6b57a87285
SSM Kit Item Lore
2013-09-04 08:13:59 +10:00
Jonathan Williams
346bdb030e
Cleaned warning.
...
Fixed punish command on web side.
2013-09-03 14:10:14 -07:00
Jonathan Williams
c2ec238af5
Fixed kit purchase in SuperSmashMobs
2013-09-03 12:13:15 -07:00
Chiss
564c1720bd
SSM Balances
2013-09-03 19:18:56 +10:00
Chiss
83567fce50
SSM slime nerf
...
disguise 0 velocity packet fix
2013-09-03 10:47:15 +10:00
Jonathan Williams
66131ad0b0
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-02 04:20:18 -07:00
Jonathan Williams
8840f04977
Fixed FileUpdater.
...
Added FileUpdater to DOM and Arcade.
2013-09-02 04:19:56 -07:00
Chiss
ad26c519ba
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-02 18:45:31 +10:00
Chiss
45d28569e0
Added idle fix
...
fixed hub Dragon.java
ate the rabbit stew.
2013-09-02 18:45:12 +10:00
Jonathan Williams
af7a41ae71
Implemented ServerRestart event on FileUpdate check.
...
Implemented cancels in arcade/dom/mk
Implemented Restart updates in server manager page.
Implemented lobby removal is restarting.
2013-09-02 01:09:28 -07:00
Jonathan Williams
43c3f8cc87
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-01 23:28:22 -07:00
Jonathan Williams
63d2563f92
Added Disguise hurt sounds.
...
Enabled disguised hurt sounds in DamageManager
2013-09-01 23:28:07 -07:00
Chiss
441e6d80b7
lobby kit disguises :D
...
slime NPE fix
2013-09-02 16:01:14 +10:00
Chiss
ee20174d80
lobby adv messagfe
2013-09-02 15:47:08 +10:00
Chiss
d5fd95c53b
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-02 15:07:27 +10:00
Chiss
98b285d819
turf forts self kill fix.
2013-09-02 15:07:07 +10:00
Jonathan Williams
a49f67b33c
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-01 22:06:35 -07:00
Jonathan Williams
f0b0c72ddb
Fixed arcade packethandler problem.
...
Fixed skill page issue for class combat.
2013-09-01 22:06:20 -07:00
Chiss
c483d869a5
Added SSM Spider and Squid Kit
...
prepared DamageManager.java for disguise sounds
minor SSM balance changes
fixed compass targetting self.
2013-09-02 14:40:06 +10:00
Chiss
789a26471d
smash stats Perk
2013-09-02 09:51:53 +10:00
Jonathan Williams
3041cacb26
Renamed disguise methods to lowercase.
2013-09-01 16:38:32 -07:00
Chiss
668a6e4854
changed utilplayer health method to double
...
spleef eventhandelr removal
turf forts kit green/blue
added kit stats for smash
nerfed flap in smash
2013-09-02 09:35:04 +10:00
Chiss
9149cc565e
Hub turns off flight (people were staying in flying somehow)
...
Spleef block damage fix
Smash kit balances
2013-09-02 08:16:35 +10:00
Chiss
07dcfeb266
Compass in smash
...
can break windows in OITQ
block toss cannot dig tunnels, or take from walls.
chicken missile fixes
remove fire ticks from players on respawn
2013-09-01 12:18:48 +10:00
Chiss
72bec77237
Queueing now works with less players than teams.
...
Added DragonName text-input for hub
Fixed smash bug, where spectators were causing lightning effect
2013-09-01 08:34:53 +10:00
Chiss
dab3f33cbf
Hub text changes
...
Hub animal spawns
Hub spawn invisibility
Smash kit balances
2013-08-31 18:19:23 +10:00
Chiss
6ee2e427b5
Changed TeamEntity from Creature to LivingEntity
2013-08-31 13:58:40 +10:00
Chiss
fb592640a1
Fixed various merge errors.
...
(Updates)
2013-08-31 13:47:48 +10:00
Chiss
81f8503180
Merge commit '13110356aabbcc69d83ce29d8f9e5bec27812009'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/deathtag/kits/KitArcher.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitCoward.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitMarksman.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitPyrotechnic.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitDefenceArcher.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitHorseKnight.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitBrawler.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitElementalist.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitLeaper.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitInfiltrator.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitMarksman.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitShredder.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanElementalist.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanKnight.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanMarksman.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanPeasant.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorArcher.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorKnight.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorRogue.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitUndeadAlpha.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2013-08-31 13:41:58 +10:00
Chiss
e17368a9ac
>.< Updates
2013-08-31 13:15:16 +10:00
Jonathan Williams
13110356aa
Added Enjin Translator poll ability.
...
Fixed up kits for arcade.
Fixed disguise for enderman to not teleport on fire ticks.
2013-08-30 16:37:21 -07:00
Chiss
7dbfe9d0dc
Moremissing stuff.
2013-08-29 16:20:36 +10:00
Chiss
aad017690e
FIREFLY
2013-08-29 16:17:52 +10:00
Chiss
a198d0d3cb
Added events...
2013-08-29 16:16:22 +10:00
Chiss
8559e77a24
"UPDATES!"loooooooool
2013-08-29 16:13:05 +10:00
Jonathan Williams
a1d622c790
Tweaked disguise movement to cut out jitters.
2013-08-28 15:00:39 -07:00
Jonathan Williams
1b7b549647
Removed class files from source control.
2013-08-27 16:21:57 -07:00
Jonathan Williams
3fb52c5c71
Initial Commit
2013-08-27 08:14:08 -07:00