JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,456 Commits 1 Branch 0 Tags 481 MiB
d3884bd090
Commit Graph

6232 Commits

Author SHA1 Message Date
Cheese
288c20fc74 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 19:13:05 +11:00
Cheese
9e35399d1d rarities tweaked + shards 2015-12-14 19:09:55 +11:00
Shaun Bennett
db9db558a0 Update GUI slots 2015-12-14 02:56:07 -05:00
Shaun Bennett
4afca01ad0 Treasures! 2015-12-14 02:49:51 -05:00
Cheese
c508b5ea96 chest visuals 2015-12-14 18:13:19 +11:00
Shaun Bennett
063c87c4fe Merge remote-tracking branch 'origin/master' 2015-12-14 00:29:11 -05:00
Shaun Bennett
cdbcae7e3e Cosmetic Menu Update 2015-12-14 00:28:28 -05:00
Cheese
048a9a81b8 gadget ammo should no logner be purchasable 2015-12-14 16:20:39 +11:00
Virizion
93c13d138d Remove some debug stuff I forgot to remove. 2015-12-14 00:10:45 -05:00
Virizion
09643d3e61 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-14 00:08:32 -05:00
Cheese
7f9e5c4ec9 more coal 2015-12-14 16:06:49 +11:00
Cheese
f6f04fe256 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 16:04:05 +11:00
Cheese
55fffdad59 fixed some colors 2015-12-14 16:03:51 +11:00
Virizion
b3b41e453b Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-14 00:01:41 -05:00
Virizion
d8f44434ff Fixed a bunch of bugs. Still need to fix clicking compass ending game. 2015-12-14 00:00:40 -05:00
Shaun Bennett
e8b0e5dd8e Fix IntellIJ Files 2015-12-13 23:51:47 -05:00
Shaun Bennett
8e31c79c58 Merge remote-tracking branch 'origin/master' 2015-12-13 23:46:46 -05:00
Cheese
bccade55bc reduced coal fumes size 2015-12-14 15:43:45 +11:00
Shaun Bennett
5be91de006 Merge master 2015-12-13 23:40:18 -05:00
Cheese
f26c31b7ec xmas a little harder 2015-12-14 15:33:09 +11:00
Shaun Bennett
fe3431ba04 Cosmetic Menu Update 2015-12-13 23:31:21 -05:00
Cheese
1073981778 Merge branch 'master' into update-xmaschaos 2015-12-14 15:30:15 +11:00
Cheese
94169a5b8a it made me push it :( 2015-12-14 15:29:34 +11:00
Cheese
c34ac3ec52 xmas 2015-12-14 15:21:43 +11:00
Jonathan Williams
dcf3c1ea88 Deleted and added new Cache since renaming was jacked up. 2015-12-13 23:14:17 -05:00
Mysticate
42244ae798 Snowman AI fix 2015-12-13 22:43:11 -05:00
Mysticate
a04eaddc42 Fixed bump 2015-12-13 22:25:18 -05:00
libraryaddict
f90484c37f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-12-14 15:43:03 +13:00
libraryaddict
b5bdf7ced4 Remove custom name on players on join and arcade spectator 2015-12-14 15:42:32 +13:00
Virizion
54911bb213 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-13 19:54:57 -05:00
Virizion
12eba41975 Fixed corner stairs. 2015-12-13 19:52:32 -05:00
Mysticate
0dd7db27cd FIXED FORAMTTING 2015-12-13 19:49:41 -05:00
Mysticate
a827f95eb4 Fixed scoreboard. VIVA LA FIESTA 2015-12-13 19:24:24 -05:00
Mysticate
0e9e8c155f Quick fix that I don't think i caused. 2015-12-13 19:11:06 -05:00
Mysticate
0c383f8bf4 Remove bad message 2015-12-13 18:58:03 -05:00
Mysticate
90145bf8e7 Merge branch 'master' of 
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
update-xmaschaos

Conflicts:
	Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
 2015-12-13 18:57:35 -05:00
Mysticate
35ab40727b XMAS UPDATE OMG :O 2015-12-13 18:55:21 -05:00
xGamingDudex
64fb2b11d8 Added fake skin data 
+Moved hats to use fake non-changing skin data
+Added Rudolph hat
+Added Grinch hat
+Added suport for fake skins on DisguisePlayer
+Tweaked PartyPopper
 2015-12-13 23:09:25 +01:00
William Burns
d91e4ab4f7 Another door bug, and a title fix. 2015-12-13 20:27:37 +00:00
Shaun Bennett
677e95a7fd Update IntellIJ grouping 2015-12-13 14:05:28 -05:00
Sarah
63f5794c79 Only fix Giant facings is prepare Phase 2015-12-13 14:31:21 +01:00
William Burns
e31124e212 Health looks nicer. 2015-12-13 13:29:46 +00:00
William Burns
4fad564e15 Bug fixes. Title shortened. 2015-12-13 12:50:06 +00:00
Cheese
b095fa9efe Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-13 21:15:32 +11:00
Cheese
011a194dc6 fixed exploit 2015-12-13 21:14:57 +11:00
Virizion
8bcc36adb1 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-13 01:39:42 -05:00
Virizion
ec86cad7ee Changed descriptions. 2015-12-13 01:38:38 -05:00
libraryaddict
e7213fdb7e Remove project specific settings 2015-12-13 16:41:37 +13:00
libraryaddict
9058428484 Change ItemBuilder to have ItemFlag, change hub icons to not display weapon damage 2015-12-13 16:40:46 +13:00
Sarah
a92361f2fe some more descriptions for Tutorials 2015-12-12 20:03:35 +01:00
AlexTheCoder
cf05cf5d7b - All finished 
- Added method for disabling explosion manager miniplugin
 2015-12-12 05:12:17 -05:00
AlexTheCoder
1535e167cd - Inventory enum fix 2015-12-12 02:36:01 -05:00
AlexTheCoder
49186680f0 - Game ID conflict resolution 2015-12-12 00:31:13 -05:00
AlexTheCoder
31be60bdb4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2015-12-12 00:25:24 -05:00
Virizion
2a45018fcd array thing 2015-12-11 23:41:46 -05:00
Virizion
7a82cf04f0 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-11 23:02:16 -05:00
Shaun Bennett
402530d671 Merge pull request #94 in MIN/mineplex from william-gladiators to master 
* commit '0d4bd91b573ca251d15471b6454452bd4ebca195':
  lag detection thing
  Scoreboard change and breaking blocks.
  Couple of fixes
 2015-12-11 18:57:52 -06:00
Shaun Bennett
c470ad880d Merge pull request #77 in MIN/mineplex from foo to master 
* commit 'd7497ec09881047d7461630fac2c3b51bf37a06c': (23 commits)
  Fixed Micro Battle icon not appearing in stats menu
  Gravity's icon changed to ENDER_PORTAL_FRAME
  world's smallest bugfix - admin->co-host
  Fixed advertisement being able to be bypassed by spec and instant join
  fixed naming pets non-alphanumeric characters
  changed reference to premium ranks
  removed important debug thing
  fixed ssm enderman always facing south on teleport
  fixed bacon blast exloding blocks
  fixed shield smash and fissure affecting spectators
  fixed slab issue with Assassin's Flash
  Re-fixed Barbarian bug
  Fixed SG Barbarian bug
  SSM bug fix: magma cube flame dash doesn't make player invisible
  fixed several smash bugs and one global issue
  Slightly bumped Monster Maze jump time value
  fixed bridge bug "Death Bomber counts suicides as well"
  typo fix in legendary aura description
  Update achievement kit reference text
  Fixed tnt bug (SG)
  ...
 2015-12-11 18:57:18 -06:00
William Burns
0d4bd91b57 lag detection thing 2015-12-11 22:47:07 +00:00
Sarah
09e5aed6e7 Adding some descriptions. 2015-12-11 22:06:23 +01:00
xGamingDudex
6d1e4b6cab Merge remote-tracking branch 'origin/master' into project-cosmetics 2015-12-11 18:09:09 +01:00
xGamingDudex
9af6fd6904 Merge branch 'project-cosmetics' of 
http://JustSomeDude@184.154.0.242:7990/scm/min/mineplex.git into
project-cosmetics

Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPartyPopper.java
	Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountBabyReindeer.java
 2015-12-11 18:06:35 +01:00
William Burns
6456d7bd66 Scoreboard change and breaking blocks. 2015-12-11 16:55:15 +00:00
William Burns
1dcbf5f7fd Couple of fixes 2015-12-11 16:34:04 +00:00
xGamingDudex
ba087d119a Small tweaks 2015-12-11 17:31:05 +01:00
Cheese
2ffd1d4595 BOB ROSS 2015-12-11 23:11:33 +11:00
Cheese
d5612a8f27 added a hint to how many more coal you need to your next prize. 2015-12-11 23:09:06 +11:00
Cheese
39f5f70a5f fixing up coal things 2015-12-11 22:43:34 +11:00
Shaun Bennett
ac6d3c2c8f merge with master 2015-12-11 06:27:23 -05:00
Cheese
7c432461c9 changed coal item rewards to 3 tier :) 2015-12-11 22:25:14 +11:00
Cheese
e01a5369fd set bonuses 
item gadget gui update
 2015-12-11 21:53:39 +11:00
Cheese
40c2fdc3fc fixed suits 2015-12-11 21:11:35 +11:00
Cheese
d7f39bdfd8 costume sets 2015-12-11 20:59:55 +11:00
Cheese
7fc08f34a7 fixed typo 2015-12-11 20:34:01 +11:00
Cheese
f717a5f8cc more set stuff 2015-12-11 20:30:41 +11:00
Cheese
0cda29e135 improved cosmetic set implementation 2015-12-11 20:08:36 +11:00
Cheese
a6f664006f set display in gui 2015-12-11 20:01:54 +11:00
Cheese
d8a5edf9e9 fixed up gui items 2015-12-11 19:24:19 +11:00
Cheese
61a8d2825e gadget gui overhaul 2015-12-11 19:20:13 +11:00
William Burns
523c1875ef fix 2015-12-11 06:58:11 +00:00
Jonathan Williams
95a81ef368 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
 2015-12-11 01:26:20 -05:00
Cheese
66011cde8c fixed player count 2015-12-11 17:25:23 +11:00
Jonathan Williams
222173ab17 Improved and implemented GameProfile caching. 2015-12-11 01:24:59 -05:00
Jonathan Williams
b5c157c123 Changed PlayerCache to Cache 2015-12-11 01:24:16 -05:00
Cheese
98e91d29f6 more cosmetic stuff :) 2015-12-11 17:21:54 +11:00
Cheese
7f8c9c02bc and the mounts 2015-12-11 16:38:44 +11:00
Cheese
fe7ce40783 finished cosmetic names 2015-12-11 16:31:15 +11:00
Cheese
05a80b23a1 converting gadget text. (kill me now) 2015-12-11 16:07:02 +11:00
Cheese
88f44a293b candy! 2015-12-11 15:31:35 +11:00
AlexTheCoder
42065fc5dc - Fixed duplicate code 2015-12-10 23:22:08 -05:00
Cheese
3447de9a92 Merge branch 'master' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusRepository.java
 2015-12-11 15:20:50 +11:00
Cheese
a5b28422cd cosmetics 2015-12-11 15:19:20 +11:00
libraryaddict
9a4006df27 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-12-11 17:18:07 +13:00
AlexTheCoder
33f73aebe5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2015-12-10 23:17:59 -05:00
libraryaddict
c5f0624bf7 Add build file 2015-12-11 17:17:52 +13:00
Shaun Bennett
4588091c5b Merge remote-tracking branch 'origin/master' 2015-12-10 23:15:42 -05:00
Shaun Bennett
21c8a66917 Fix imports 2015-12-10 23:15:35 -05:00
libraryaddict
3cd187ff04 Move LineFormat.java 2015-12-11 16:57:21 +13:00
Shaun Bennett
bc46518a05 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 2015-12-10 22:54:53 -05:00
Shaun Bennett
1ab13d2ef5 Treasure Shards! 2015-12-10 22:52:15 -05:00
AlexTheCoder
6878e4489d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2015-12-10 22:49:19 -05:00
AlexTheCoder
fe933913e8 - Fixed maps 
- Spawners
 2015-12-10 22:48:57 -05:00
libraryaddict
4cfa7c436b Add missing file 2015-12-11 16:48:40 +13:00
Virizion
14b5a9453a Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-10 22:18:00 -05:00
Virizion
68360c6705 shortened if 2015-12-10 22:17:10 -05:00
William Burns
a760dba783 i lied. 2015-12-11 02:59:16 +00:00
William Burns
7a597d90b7 final push goodnight 2015-12-11 02:48:06 +00:00
William Burns
1607345f04 title + debug 2015-12-11 02:41:44 +00:00
Shaun Bennett
557f3e97a5 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 2015-12-10 21:32:35 -05:00
Shaun Bennett
5a1892e1ed Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics 2015-12-10 21:32:14 -05:00
Shaun Bennett
d6aed5dff7 More work 2015-12-10 21:32:10 -05:00
William Burns
563a0f0ec7 remove tutorial and no flicker 2015-12-11 02:30:44 +00:00
libraryaddict
a0b7870acc Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-12-11 15:21:18 +13:00
libraryaddict
1661c056c1 Added line stuff 2015-12-11 15:21:05 +13:00
Cheese
31cea3342e some gadget stuff 2015-12-11 13:17:38 +11:00
Shaun Bennett
ffd4658740 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 2015-12-10 21:06:50 -05:00
Shaun Bennett
2694787590 Reverting 2015-12-10 20:59:57 -05:00
Shaun Bennett
cf73d27a84 Merge remote-tracking branch 'origin/master' 2015-12-10 20:53:42 -05:00
Shaun Bennett
4d05bd5c50 Player count for chiss 2015-12-10 20:53:38 -05:00
Shaun Bennett
16f39c1e71 Pushing changes to go help william 2015-12-10 20:51:34 -05:00
William Burns
f8d7aeb5ea before revert 2015-12-11 01:32:32 +00:00
William Burns
dda5ac6728 work 2015-12-11 01:20:36 +00:00
Sarah
4abad9e1c4 fixing chat and test commands. 2015-12-11 02:00:26 +01:00
Sarah
ffb75a7832 Adding CustomEnding 2015-12-11 01:44:19 +01:00
William Burns
626a812844 Many changes 2015-12-11 00:40:54 +00:00
Shaun Bennett
4d8b8bd58b Fix errors, update cosmetic menu 2015-12-10 19:27:32 -05:00
Shaun Bennett
a9e6224eca Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-12-10 19:21:33 -05:00
Shaun Bennett
5d96ceb41e Let owner+ disguise as staff - easy way to check a player's rank 2015-12-10 19:20:11 -05:00
Shaun Bennett
7b4f5d5b75 Christmas chest in gui 2015-12-10 19:19:20 -05:00
Shaun Bennett
72a8aaf556 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-12-10 19:18:49 -05:00
xGamingDudex
44a244caf4 Merge branch 'project-cosmetics' of http://JustSomeDude@184.154.0.242:7990/scm/min/mineplex.git into project-cosmetics 2015-12-11 01:10:54 +01:00
xGamingDudex
5b0909012d Renamed GadgetActivateEvent to GadgetEnable event 
Some files didn't make it to prev commit
 2015-12-11 01:07:47 +01:00
xGamingDudex
a6a4c8be36 Cosmetic Update 
+ Added GadgetDisable Event
+ Renamed GadgetActivateEvent to GadgetEnable event
+ Added hat framework, and some example hats
+ Added sets and Frost Lord set
+ Fixed some imports
+ Added new way of checking ownership of gadgets
+ Added some utility methods to GadgetManager
+ Added support for alternative package name of gadgets
+ Fixed coal
+ New Blood Helix particle
 2015-12-11 01:05:32 +01:00
Shaun Bennett
d16d9a36e9 Use Account ID from client manager instead of PlayerCache 2015-12-10 17:25:39 -05:00
Shaun Bennett
ab16bf89e5 Merge remote-tracking branch 'origin/master' 2015-12-10 17:04:25 -05:00
Shaun Bennett
851b613d2e Now playing fix 2015-12-10 17:04:15 -05:00
William Burns
4cf33eef05 Tutorial changes! 2015-12-10 21:32:14 +00:00
William Burns
624e8bbe89 Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators 2015-12-10 20:56:03 +00:00
William Burns
0bd276c16a Merge branch 'pregametutorial' of ssh://184.154.0.242:25565/min/mineplex into pregametutorial 2015-12-10 20:53:01 +00:00
William Burns
8d7b03e3f6 Added the ability to have title AND subtitle per TutorialText. 2015-12-10 20:52:41 +00:00
William Burns
2951088005 Tutorial changes/additions. 2015-12-10 20:48:13 +00:00
Virizion
c73bd54aec Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-10 15:38:17 -05:00
William Burns
3586642414 Added back the tutorial. 2015-12-10 19:32:25 +00:00
William Burns
af7c058f22 Lots of bug fixes / additions since the testing 12/9/15. 2015-12-10 19:06:07 +00:00
Sarah
0f8028f6e6 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
 2015-12-10 12:24:11 +01:00
libraryaddict
1ee1e7a04b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-12-10 20:02:39 +13:00
libraryaddict
eaf3937004 Fix the damage while walking on falling block 2015-12-10 20:02:12 +13:00
Virizion
0e9d401717 Restore block when break is cancelled because it can be in the air phase and not get restored. 2015-12-09 22:32:39 -05:00
Virizion
9b53e15b4f More stuff. 2015-12-09 21:38:00 -05:00
Virizion
662d3b464f Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-09 21:15:39 -05:00
Virizion
0ff87cf134 Stuff. 2015-12-09 21:14:45 -05:00
Cheese
fabf3dab59 updated blocksearch 2015-12-10 13:12:01 +11:00
Sarah
c94c84f203 Some fixes 2015-12-10 02:59:22 +01:00
Sarah
76b29756ff Fixing some stats and disabling Chat spam messages. 2015-12-10 02:02:36 +01:00
Virizion
be6f9ac6dc Capitalize enum names. 2015-12-09 19:17:12 -05:00
William Burns
87a834c01b FIX 2015-12-10 00:03:57 +00:00
William Burns
90896073d4 debug 2015-12-10 00:03:17 +00:00
William Burns
cea2716851 fight man 2015-12-09 23:59:20 +00:00
William Burns
05bd55f720 iter 2015-12-09 23:53:04 +00:00
William Burns
b8a2304edd work 2015-12-09 23:39:00 +00:00
William Burns
3ad0a3db6e fix 2015-12-09 23:14:08 +00:00
William Burns
17c989d941 Less per-player arena stuff 2015-12-09 22:39:04 +00:00
William Burns
513db5dd8d doing byes 2015-12-09 21:33:31 +00:00
William Burns
852be97bae Work 2015-12-09 20:16:16 +00:00
Sarah
a5c46545df fixing timer being shown. 2015-12-09 14:44:22 +01:00
NewGarbo
667f076202 fixed unsafe timer 2015-12-09 10:46:05 +00:00
Virizion
507761d5b0 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-08 21:24:21 -05:00
William Burns
c021fbf9ed Bounce baby bounce. 2015-12-08 23:27:38 +00:00
William Burns
d709071feb Much fix, many wow. 2015-12-08 23:20:42 +00:00
Shaun Bennett
2e49611035 LinkedHashMaps, Buttons 2015-12-08 17:45:27 -05:00
Shaun Bennett
7f75749194 Merge remote-tracking branch 'origin/master' 2015-12-08 16:55:14 -05:00
Cheese
26c5c419f8 fixed a bug where old displayName would be used after name was updated. 2015-12-09 08:38:05 +11:00
Sarah
484dce18e1 Changing some Achievement things, to allow double values and dividing, Adding WPM, fixing some bugs. 2015-12-08 22:34:42 +01:00
Cheese
fba88ec231 mount stuff is fixed 2015-12-09 08:19:55 +11:00
Virizion
8051486fcb Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-08 16:14:41 -05:00
William Burns
a83ede3caa Handling slow movers 2015-12-08 21:14:19 +00:00
William Burns
7bdbd5a6af Woo almost done! 2015-12-08 21:10:27 +00:00
Cheese
2decc049c5 fixed my muddling of perks 2015-12-09 07:47:07 +11:00
Cheese
09d8367b4b fixed method 2015-12-09 07:32:36 +11:00
Christopher Jozsa
0b8e0409b6 Merge pull request #92 in MIN/mineplex from update-SSM to master 
* commit '504a49278cb7e140029e4c2ceb85f3defe524a33':
  SSM kit description change, grammar mistake
  SSM Pig bomb bug fix
 2015-12-08 14:29:32 -06:00
Shaun Bennett
ca71f1f64f Merge remote-tracking branch 'origin/master' 2015-12-08 14:32:17 -05:00
William Burns
d598f83ec0 More progress 2015-12-08 18:17:43 +00:00
Teddy
504a49278c SSM kit description change, grammar mistake 2015-12-08 16:35:49 +00:00
Teddy
2bf1012fa4 SSM Pig bomb bug fix 2015-12-08 16:34:07 +00:00
William Burns
f8f95c64e5 Fixing arena moving 2015-12-08 15:10:29 +00:00
Shaun Bennett
a1915e324c Some java 8 code 2015-12-08 08:42:45 -05:00
William Burns
4e2a422f27 Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java
 2015-12-08 13:13:18 +00:00
William Burns
2b12016e14 Progress 2015-12-08 13:12:30 +00:00
Shaun Bennett
addb2c8c0e Fix java 8 compiler issue 2015-12-08 08:02:40 -05:00
William Burns
cdc602a435 Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators 2015-12-08 10:55:57 +00:00
Shaun Bennett
89e8a7a2b5 Merge pull request #91 in MIN/mineplex from clans-beta to master 
* commit 'b22c64ca6a5419e6b23abea1681cc750d15b6d37':
  Fix excludes
 2015-12-08 04:51:58 -06:00
Shaun Bennett
b22c64ca6a Fix excludes 2015-12-08 05:51:21 -05:00
Shaun Bennett
ffbf76a125 Merge pull request #90 in MIN/mineplex from clans-beta to master 
* commit 'a84f580719d1b221bbcaa49cd19d4251defa3b11':
  Update IntelliJ to Java 8
 2015-12-08 04:46:47 -06:00
Shaun Bennett
a84f580719 Update IntelliJ to Java 8 2015-12-08 05:45:26 -05:00
William Burns
99cf7ea22c Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators 2015-12-08 10:44:43 +00:00
William Burns
e6d995008e Arenas 2015-12-08 10:44:24 +00:00
Virizion
48a5776fb7 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-07 23:30:30 -05:00
Virizion
d22a905206 Lot more stuff! :D 2015-12-07 23:29:33 -05:00
Cheese
fe1f763374 changed order blocks will be added to the list 2015-12-08 15:26:32 +11:00
xGamingDudex
b1536547d3 Cosmetic Update 2 
+ Item Coal
+ Freeze Cannon
+ Party Popper / Party Bomb
+ Snowball
+ Coal Fumes Particle
+ Snowman sneak trail/glide
+ Teaked stuff
 2015-12-08 00:50:08 +01:00
Virizion
f837fd14db Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-07 18:45:42 -05:00
Cheese
719297ebb1 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-08 10:31:25 +11:00
Cheese
4ba2e8c96c fixed old staff being stuck invis. 
partially changed scoreboard to show playercount
 2015-12-08 10:31:11 +11:00
Shaun Bennett
42a0354c9e Now Playing, Preference to disable ads 2015-12-07 18:28:05 -05:00
William Burns
43192317ad Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators 2015-12-07 23:20:21 +00:00
William Burns
55f0453897 Start of re-write 2015-12-07 23:20:03 +00:00
Virizion
ec4a21a282 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-07 18:19:16 -05:00
Sarah
0619fb857f fixing invisibility. 2015-12-07 23:44:02 +01:00
Shaun Bennett
8ff034fb5d Merge pull request #89 in MIN/mineplex from clans-beta to master 
* commit 'eed6966a5b39d1fc9544055a5b5801758a62a56a':
  Winter MOTD, Stat fixes (maybe?!)
  made use ability teleport player back to where they should be
  Forgot to push these changes last update!
  fixed tnt blowing up in claims when offline
  fixed task not getting cleanup up after /skiptutorial
  fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping
  Fix heavy attribute, disable claim visualizer
  Disable subtasks for now
  Clans alpha 0.17
  clan claim visualizer
  fixed infinite claims
 2015-12-07 12:22:10 -06:00
Shaun Bennett
eed6966a5b Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-12-07 13:21:17 -05:00
Shaun Bennett
c3ace42a68 Winter MOTD, Stat fixes (maybe?!) 2015-12-07 13:21:11 -05:00
Sarah
3f7eef35d5 Forcefield range. 2015-12-07 18:59:06 +01:00
Sarah
dfb1837e81 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
 2015-12-07 18:54:19 +01:00
Shaun Bennett
ffbb057d23 Merge pull request #88 in MIN/mineplex from iKeirNez_Bugfix to master 
* commit '9bd7869e2260e23a0ff981b7084ff9b4a3768b43':
  Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved.
 2015-12-07 11:25:17 -06:00
Shaun Bennett
7984c0ac31 Add ! 2015-12-07 06:12:49 -05:00
Cheese
a39b11ce67 slowed meteors 2015-12-07 21:56:00 +11:00
Cheese
1fe6b5489a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-07 21:53:49 +11:00
Cheese
d318a5cf87 interacto! 2015-12-07 21:53:34 +11:00
Shaun Bennett
c6c012031f Less ugly formatting 2015-12-07 04:44:19 -05:00
Shaun Bennett
4354133de9 Add Minecraft timings to /lag 2015-12-07 04:40:34 -05:00
Cheese
6e67f34db1 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-07 20:39:46 +11:00
Cheese
e1efcabfbf chat sale msgs 2015-12-07 20:39:31 +11:00
Shaun Bennett
3cdf8c4b08 Merge remote-tracking branch 'origin/master' 2015-12-07 04:23:33 -05:00
Shaun Bennett
2afbe23a7c Load songs from update folder 2015-12-07 04:23:26 -05:00
Cheese
7b11baf24b Christmas sale bossbars 2015-12-07 20:20:49 +11:00
Cheese
8c4615203c sale message 2015-12-07 20:07:20 +11:00
Cheese
ed3bea8e85 DONE! 2015-12-07 18:36:05 +11:00
Cheese
5c632a1e3a sharper target 2015-12-07 18:20:12 +11:00
Cheese
1a0d90a495 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-07 18:06:43 +11:00
Cheese
fea637db80 fixed some freeze 2015-12-07 18:06:26 +11:00
Shaun Bennett
ecde1dd314 Merge remote-tracking branch 'origin/master' 2015-12-07 02:06:09 -05:00
Shaun Bennett
44a5bcb793 remove titan chest message, update pumkin message, holiday MB/DMT words 2015-12-07 02:06:00 -05:00
Cheese
d75d7a2c8f snowfight finish 2015-12-07 17:56:35 +11:00
Cheese
1e441ac017 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-07 17:37:04 +11:00
Cheese
1ada06af91 rewrote lots! 2015-12-07 17:36:45 +11:00
Shaun Bennett
7b5db2d4fb Hub Music, HubMusic Preference 2015-12-07 00:58:44 -05:00
Virizion
6904f7c9a9 Tons more stuff on the checklist. 2015-12-06 22:54:45 -05:00
Cheese
5486d8acf6 more prep 2015-12-07 13:42:59 +11:00
Cheese
97fe633e4c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-07 13:25:48 +11:00
Cheese
54ec0e39bb more polisshhhh on snowfight 
enabled xmas chests
 2015-12-07 13:25:32 +11:00
Shaun Bennett
488895ea53 Note block player 2015-12-06 21:12:10 -05:00
Cheese
cbafb2ba91 fixes 2015-12-07 13:04:45 +11:00
Cheese
0c397d6a81 simplified kits and intro 2015-12-07 13:02:26 +11:00
xGamingDudex
c36182b8d4 Cosmetic Update 
New:
+ New GUI System
+ Candy Cane Particle
+ Candy Cane Double Jump
+ Candy Cane Death Effect
+ Candy Cane Arrow Trail
+ Snowman Morph
+ Baby Reindeer Mount
+ Pet Coal Apparition

Fixed/Updated:
* Added getTick to UpdateEvent and UtilTime
* Added more methods to UtilParticle
* Gadget manager isMoving now counts flying as moving
* Updated some cosmetics
 2015-12-07 02:53:14 +01:00
Cheese
b2a595b01b snwo fight changes 2015-12-07 12:02:53 +11:00
Mysticate
09f7a03444 Quick changes to improve things. 2015-12-06 20:00:22 -05:00
AlexTheCoder
118bde5484 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2015-12-06 19:57:27 -05:00
Sarah
072856be7d teleportations. 2015-12-06 23:19:53 +01:00
Mysticate
b5967a1205 Uncommented bouncy balls 2015-12-06 17:14:51 -05:00
Mysticate
e74b83f8f2 Merge remote-tracking branch 'origin/master' into update-paintball 2015-12-06 17:12:29 -05:00
Mysticate
5e57caa94d Final tweaks to random armorstand 2015-12-06 17:09:33 -05:00
Cheese
6f16eeead7 missin files 2015-12-07 08:48:55 +11:00
Sarah
10d26ca32b timer fixes. 2015-12-06 22:41:04 +01:00
Virizion
ca7e5d0d6d remove later 2015-12-06 16:37:00 -05:00
Sarah
64f8ee7280 fixing some timings. 2015-12-06 21:48:21 +01:00
NewGarbo
425463d339 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-12-06 19:11:13 +00:00
NewGarbo
a9c7f088f3 made use ability teleport player back to where they should be 2015-12-06 19:10:18 +00:00
Sarah
3260550368 adding proper forcefield for minions and giants. 2015-12-06 19:38:23 +01:00
Mysticate
88dcdaa445 Merge remote-tracking branch 'origin/master' into update-paintball 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
 2015-12-06 12:00:06 -05:00
Mysticate
11b2748a5a Quick thing before merge 2015-12-06 11:45:10 -05:00
Cheese
fa6418769b YT name change 2015-12-06 21:26:02 +11:00
AlexTheCoder
4278f3fa99 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2015-12-06 03:51:08 -05:00
AlexTheCoder
430de10008 - Everything except maps [probably should've committed sooner] 2015-12-06 03:47:07 -05:00
Cheese
ccb6456110 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
 2015-12-06 18:09:24 +11:00
Cheese
35c362b8bf small youtuber perms 2015-12-06 18:08:36 +11:00
Shaun Bennett
b7b5235f59 Fix error 2015-12-06 00:57:43 -05:00
Cheese
d095e14b4c Merge branch 'monster-league' 2015-12-06 16:33:21 +11:00
Cheese
9880e9a3c7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-06 16:32:59 +11:00
Cheese
040e94f1fb bouncy 2015-12-06 16:32:45 +11:00
Shaun Bennett
618105b4c8 Add minimum rank to Announcement Command 2015-12-06 00:15:49 -05:00
Shaun Bennett
8d831d5228 Fix END_PORTAL bug causing gui's to break 2015-12-06 00:06:31 -05:00
Cheese
9c7eea86b4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-06 14:56:18 +11:00
Shaun Bennett
32a6d572ee Disable gadgets in arcade for player count > 40 2015-12-05 22:56:15 -05:00
Cheese
5aabd00972 set hub to christmas 
removed snowball pickup
disabled arrows sticking into players from ALL projectiles
 2015-12-06 14:55:28 +11:00
Shaun Bennett
11e1e53a36 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-12-05 21:36:19 -05:00
Shaun Bennett
d5a9a92913 Forgot to push these changes last update! 2015-12-05 21:36:07 -05:00
libraryaddict
b98944b0a0 Handle attach entity 2015-12-06 14:38:00 +13:00
Virizion
9144ab7b3f Fixed some demolition stuff. 2015-12-05 20:30:21 -05:00
Virizion
5b49c4adc3 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-05 19:58:55 -05:00
Virizion
d3ce0d6434 Some more stuff on the checklist. 2015-12-05 19:57:48 -05:00
Sarah
114ae33d89 fixing spawns and monster slowdown. 2015-12-06 00:00:50 +01:00
libraryaddict
d5606f55ea Modified CustomTagFix to support player name titles 2015-12-06 10:18:35 +13:00
Sarah
90c6d0a83f spelling fixes, disabling Particles, fixing mob limit. 2015-12-05 22:17:45 +01:00
Sarah
4c4b997453 fixing giant facing. 2015-12-05 19:00:44 +01:00
Virizion
62c49fa8e6 some more stuff on the checklist 2015-12-04 23:04:52 -05:00
Keir
9bd7869e22 Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved. 2015-12-05 01:08:21 +00:00
Sarah
a3d6af884d spawns after tutorial and Giants facing each other. 2015-12-05 00:57:27 +01:00
fooify
d7497ec098 Fixed Micro Battle icon not appearing in stats menu 2015-12-04 15:56:48 -08:00
Cheese
49c735e43c removed duplicate code 2015-12-05 10:34:06 +11:00
Cheese
4a53667539 gadget restructure 
converted frost lord and titan particles into 4 subcategories.
 2015-12-05 10:22:00 +11:00
Sarah
35534afd4a overall runtime. 2015-12-04 19:54:02 +01:00
Sarah
1bb40b21d3 Tutorial/Phase Time. 2015-12-04 19:49:28 +01:00
NewGarbo
5d59b1a015 fixed tnt blowing up in claims when offline 2015-12-04 18:32:46 +00:00
NewGarbo
bca65116ab fixed task not getting cleanup up after /skiptutorial 2015-12-04 18:23:23 +00:00
Shaun Bennett
f57f4ed0aa Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-12-04 12:10:10 -05:00
NewGarbo
e158704534 fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping 2015-12-04 15:58:51 +00:00
Shaun Bennett
bb382a969c Fix heavy attribute, disable claim visualizer 2015-12-04 08:02:38 -05:00
NewGarbo
3b125dc8a5 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java
 2015-12-04 11:12:19 +00:00
Shaun Bennett
2435ebba13 Disable subtasks for now 2015-12-04 05:16:14 -05:00
Shaun Bennett
5c575b41fc Clans alpha 0.17 2015-12-04 05:15:28 -05:00
Virizion
efbabb1519 Players now look at the middle of the middle block instead of the corner. 2015-12-03 21:27:10 -05:00
Cheese
e01d30b920 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-04 13:19:07 +11:00
Cheese
ef2511434d tuber arnk 2015-12-04 13:18:23 +11:00
Virizion
465f8c28f6 Set FixSpawnFacing to false so that out looking at the middle feature would work. 2015-12-03 21:13:33 -05:00
Virizion
bb708911d6 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-03 21:10:31 -05:00
Christopher Jozsa
fc68ce9b78 Merge pull request #87 in MIN/mineplex from virizion_utils to master 
* commit '9951701ded301c47bcc203c12001ef866204b78c':
  Added a FixSpawnFacing flag to Game which controls whether or not GameTeam will modify the yaw of a spawn when returning it.
 2015-12-03 19:05:15 -06:00
Virizion
9951701ded Added a FixSpawnFacing flag to Game which controls whether or not GameTeam will modify the yaw of a spawn when returning it. 2015-12-03 19:51:11 -05:00
fooify
b1bd2ff5ac Gravity's icon changed to ENDER_PORTAL_FRAME 2015-12-03 16:50:27 -08:00
fooify
91aaf5f2fb world's smallest bugfix - admin->co-host 2015-12-03 16:45:30 -08:00
Virizion
c3a564faa7 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-03 19:31:24 -05:00
fooify
348f2d8e4c Merge remote-tracking branch 'origin/master' into foo 2015-12-03 16:31:16 -08:00
Christopher Jozsa
8717f962e6 Merge pull request #83 in MIN/mineplex from mrsomeone12_SmallFixes to master 
* commit 'c98b427fdebb0d8abcce3a17731c0f9b35eece01':
  Added missing MountData and SingleEntityMountData files.
  Mount bug fix.
  Added method to edit NoAI field on entities.
  Implemented new mount data system replacing instead of entities as data.
  We only need to add the "Go Back" page once...
  TitanMount fixes
 2015-12-03 17:15:21 -06:00
NewGarbo
39daf969fd clan claim visualizer 2015-12-03 22:29:36 +00:00
Sarah
19254fc4a0 Prepare Timer flag. 2015-12-03 18:06:27 +01:00
NewGarbo
584a02ae3e fixed infinite claims 2015-12-03 10:30:06 +00:00
Virizion
ee51766e1f Removed teleports. Made the spawns face the middle but it doesn't work yet because of GameTeam changing the direction again. 2015-12-02 22:12:53 -05:00
Virizion
f0c28e6234 Updated references to the util method. 2015-12-02 20:20:14 -05:00
Virizion
cab5c2a76d Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-02 20:12:41 -05:00
Christopher Jozsa
fc0cae8e0f Merge pull request #85 in MIN/mineplex from virizion_utils to master 
* commit 'bf92af647abceb78596f9fd1922d3522e61ff053':
  Fixed the skull bug where it gave you the wrong skull type. Now gets the meta of the block as well. Also can return multiple items if the block is made up of multiple items (flower pots, ender portal frames).
 2015-12-02 18:53:30 -06:00
Sarah
27f335779a adding tutorial sounds and flag for it. 2015-12-02 19:39:44 +01:00
NewGarbo
e9fd661311 disabled koth 2015-12-02 18:25:53 +00:00
NewGarbo
8fea5afdce fixed message on tick (might be cause of laggg) 2015-12-02 06:56:58 +00:00
NewGarbo
92c1abf221 a few last touches 2015-12-02 06:04:53 +00:00
NewGarbo
8db5ffe5c7 forcejoin command for ADMIN+ and fixed auto tree replanting. 2015-12-02 05:54:00 +00:00
NewGarbo
3a4e453ac3 made it so that you can only use /reset in safe zones 2015-12-02 05:18:04 +00:00
NewGarbo
d6ca52e4a4 modifications 2015-12-02 05:11:09 +00:00
Virizion
bf92af647a Fixed the skull bug where it gave you the wrong skull type. Now gets the meta of the block as well. Also can return multiple items if the block is made up of multiple items (flower pots, ender portal frames). 2015-12-02 00:00:32 -05:00
fooify
b04f139883 Fixed advertisement being able to be bypassed by spec and instant join 2015-12-01 19:26:52 -08:00
Virizion
1810defd2d Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-01 20:39:54 -05:00
fooify
338e0f1892 fixed naming pets non-alphanumeric characters 2015-12-01 16:23:07 -08:00
NewGarbo
b8e2086928 changes to tutorial 2015-12-02 00:19:48 +00:00
NewGarbo
ba27d94158 fixed skiptutorial message not displaying 2015-12-01 23:23:11 +00:00
NewGarbo
cffb6bd62f bunch o' changes 2015-12-01 23:01:41 +00:00
NewGarbo
a7d6026c07 made skip tutorial messages be seen whilst in tutorial 2015-12-01 22:33:47 +00:00
NewGarbo
69cb395f5a made entire clan know about disband 2015-12-01 22:30:05 +00:00
NewGarbo
35ae89ab1f fixed players from being able to eat their carrot in the making money task 2015-12-01 19:37:53 +00:00
NewGarbo
ea099d7a82 fixed some annoying bugs and fixed certain messages not showing in tutorial 2015-12-01 18:41:33 +00:00
Sarah
b0e16f6612 Zombie smash Color. 2015-12-01 17:05:55 +01:00
Sarah
d335e58652 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialPhase.java
 2015-12-01 17:01:44 +01:00
NewGarbo
fbf9c8eb0c made certain messages visible in tutorial that are actually required to be seen 2015-12-01 13:37:34 +00:00
NewGarbo
f536bf23e5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-12-01 12:06:25 +00:00
NewGarbo
d32e6fdb96 Got rid of deployed tasks. using different system now. (untested) 2015-12-01 11:28:14 +00:00
Jonathan Williams
633697dc7a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-30 23:49:32 -06:00
Jonathan Williams
03a1f19df9 Fixed memory leaks in Disguise and Recall. 
Removed debug messages in ItemMapManager
 2015-11-30 23:49:16 -06:00
Cheese
51023a7630 cosmetic cooldown fix 2015-12-01 15:38:54 +11:00
fooify
48ae23ebff changed reference to premium ranks 2015-11-30 19:58:41 -08:00
fooify
06ef964000 removed important debug thing 2015-11-30 19:33:03 -08:00
fooify
ed96c8e3b3 fixed ssm enderman always facing south on teleport 2015-11-30 19:27:34 -08:00
Virizion
1ad534366e Switch item dropping to the new util method. 2015-11-30 22:09:15 -05:00
Cheese
208eaf3a01 cosmetics recharge slowdown 2015-12-01 11:38:52 +11:00
Virizion
d24135771f Fixed formatting by adding bodies to all for loops. 2015-11-30 19:10:59 -05:00
Virizion
ae8a10d55d Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-11-30 18:50:21 -05:00
xGamingDudex
c98b427fde Added missing MountData and SingleEntityMountData files. 
For some reason, git decided that it was a good idea to remove these two
files from the index...
 2015-12-01 00:46:20 +01:00
Cheese
1a1fa684e4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-01 10:44:39 +11:00
Cheese
7217cd0f33 remove conditions upon death 2015-12-01 10:44:13 +11:00
Virizion
9d380a0b31 Merge remote-tracking branch 'remotes/origin/master' into virizion_utils 2015-11-30 17:47:08 -05:00
Virizion
666b9963e4 Added an utility method in UtilBlock to get an ItemStack from a block and also handles correcting Material types and Data Values. 2015-11-30 17:42:48 -05:00
NewGarbo
18504e48f7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-30 21:00:42 +00:00
NewGarbo
1a851679c4 made it so players cannot see chat whilst in tutorial 2015-11-30 20:40:30 +00:00
Jonathan Williams
482ec8a120 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-30 14:26:37 -06:00
Jonathan Williams
513810caaa Fixed memory leak in MarkedForDeath 2015-11-30 14:26:25 -06:00
NewGarbo
6eb44ed87b whoops.. this isn't php hehe 2015-11-30 19:11:18 +00:00
NewGarbo
813e7ee789 made it so that no messages are shown when in tutorial 2015-11-30 19:08:16 +00:00
Sarah
e2cfcef55b RunTasksSync Flag. 2015-11-30 16:58:41 +01:00
NewGarbo
0862cfce72 fixed doors getting placed in spawn and shops 2015-11-30 07:26:02 +00:00
NewGarbo
261d6dd030 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-30 07:08:34 +00:00
NewGarbo
f528531b82 removed some testing stuff 2015-11-30 07:06:36 +00:00
Shaun Bennett
34c4bade06 Merge remote-tracking branch 'origin/master' 2015-11-29 19:30:51 -05:00
Cheese
02bc7ffab6 map changes 2015-11-30 11:17:23 +11:00
Shaun Bennett
981eead816 Merge remote-tracking branch 'origin/master' 2015-11-29 19:05:56 -05:00
Cheese
0f79b5814f more color f ixes 2015-11-30 10:52:44 +11:00
Shaun Bennett
25bb913c4f Merge remote-tracking branch 'origin/master' 2015-11-29 18:41:35 -05:00
Cheese
2ac21b1434 better colors 2015-11-30 10:40:57 +11:00
Shaun Bennett
4a9d53de50 Merge remote-tracking branch 'origin/master' 2015-11-29 18:33:43 -05:00
Cheese
18b603ec2f map color changes 2015-11-30 10:33:08 +11:00
Shaun Bennett
f7f7d5fdef Merge remote-tracking branch 'origin/master' 2015-11-29 18:26:40 -05:00
Cheese
e27808a011 map! 2015-11-30 10:26:07 +11:00
Shaun Bennett
125d9988c2 Merge remote-tracking branch 'origin/master' 2015-11-29 18:21:02 -05:00
Cheese
cd6ecc1e67 pt! 2015-11-30 10:20:27 +11:00
Shaun Bennett
06706da4cf Merge remote-tracking branch 'origin/master' 2015-11-29 18:16:13 -05:00
Cheese
a886088f48 more changes 2015-11-30 10:15:50 +11:00
Shaun Bennett
2b22639d8a Merge remote-tracking branch 'origin/master' 2015-11-29 18:03:46 -05:00
Cheese
af77a2ddeb fix 2015-11-30 10:03:27 +11:00
Shaun Bennett
1c71efbff7 Merge remote-tracking branch 'origin/master' 2015-11-29 17:59:39 -05:00
Shaun Bennett
58d7e8562b update clans version for next release 2015-11-29 17:58:29 -05:00
Cheese
af61b62a47 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-30 09:58:06 +11:00
Cheese
7e3cab9c87 map test 2015-11-30 09:57:47 +11:00
NewGarbo
8026ad891d fixed king of the hill 2015-11-29 21:09:18 +00:00
Sarah
dc68375ec8 TimeBetweenPhase Flag. 2015-11-29 21:48:39 +01:00
NewGarbo
be727e6e26 fixed deployed tasks not being deregistered as Listeners after being adding to Cull 2015-11-29 19:46:08 +00:00
Virizion
e7960d65e0 Moved classes into separate packages so it is more organized. 2015-11-29 14:36:51 -05:00
Virizion
840b784239 Removed some redundant calls and replaced them with a call to one method. 2015-11-29 13:42:30 -05:00
xGamingDudex
6120c8246b Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes 2015-11-29 19:11:24 +01:00
xGamingDudex
d1d58919f4 Mount bug fix. 
Mount was put in map before removed, resulting in new mount being half
disabled.
 2015-11-29 19:09:55 +01:00
Virizion
c6f1d29496 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-11-29 13:09:31 -05:00
xGamingDudex
2c2370f8a0 Added method to edit NoAI field on entities. 2015-11-29 19:08:26 +01:00
xGamingDudex
509835ea64 Implemented new mount data system replacing instead of entities as data. 
+ Removed some unnecessary code
+ Made StackManager use new mount system

This system also fixes a bug allowing players "hijack" some of the
mounts as it was not properly persistent.
 2015-11-29 19:08:00 +01:00
xGamingDudex
327bf8d09b We only need to add the "Go Back" page once... 2015-11-29 18:32:24 +01:00
fooify
61df87b446 Merge remote-tracking branch 'origin/master' into foo 2015-11-29 06:37:30 -08:00
Jonathan Williams
7bdf5451d4 Upped map scan performance. 2015-11-29 02:49:12 -06:00
Jonathan Williams
1d1a1d96f8 Fixed onAbilityUsed bug with _player (presumably because it was added to cull and _player was set to null right before SkillTriggerEvent happened.) 2015-11-29 02:39:37 -06:00
Jonathan Williams
5b04a3223d Fixed bug with Posion effect NPE (Something in champs is adding a null source). 
Fixed bug with Tutorial cleanup.
 2015-11-29 02:29:47 -06:00
Jonathan Williams
782026556e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-29 02:24:32 -06:00
Jonathan Williams
e9da258333 Lowered scan rate significantly for ItemMapManager. 2015-11-29 02:24:17 -06:00
Shaun Bennett
f82396d485 Clans changes/fixes 2015-11-29 02:41:53 -05:00
Virizion
e09e5851a6 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-11-29 01:17:17 -05:00
Jonathan Williams
0d5fa70632 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-28 23:05:32 -06:00
Jonathan Williams
5acf6b19a4 Fixed bed checking interval. 
Added timing logging to map rendering.
 2015-11-28 23:05:22 -06:00
Shaun Bennett
7c947ad97b Merge master 2015-11-28 23:55:00 -05:00
Jonathan Williams
c6ff01b92d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-28 22:33:03 -06:00
Jonathan Williams
118af20f44 Updated EnjinTranslator. 2015-11-28 22:32:50 -06:00
NewGarbo
b88a842f1c stuff 2015-11-29 03:22:52 +00:00
NewGarbo
c870d99e0e teleport stuff 2015-11-29 02:55:45 +00:00
NewGarbo
a9afe1f068 added self clan create/delete messages 2015-11-29 02:54:40 +00:00
NewGarbo
84303234fd fixed task 2 2015-11-29 02:48:03 +00:00
NewGarbo
392ab601c2 tutorial tasks reset 2015-11-29 02:43:12 +00:00
NewGarbo
d7658f3838 fixed stuck manager taking 0 seconds 2015-11-29 02:39:09 +00:00
NewGarbo
dc5aec33b4 tutorial ending message 2015-11-29 02:37:20 +00:00
NewGarbo
8dca384d35 force join command 2015-11-29 02:31:14 +00:00
NewGarbo
9ff9724fc8 tutorial revamp 2.0 2015-11-29 02:10:39 +00:00
Cheese
5cefe27257 cosmetic fixes 2015-11-29 11:40:19 +11:00
NewGarbo
e1be0b1dbd dupe fix 2015-11-28 23:34:41 +00:00
Sarah
66fd85af1f Adding Phase Event. 2015-11-28 23:32:09 +01:00
Virizion
278082caed Finished the checklist. I might recode eliminations since I kind of don't like it right now. 2015-11-28 15:18:06 -05:00
NewGarbo
aa68701ebd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-28 20:16:49 +00:00
NewGarbo
ace4548b1e don't cull an entity if a player is nearby 2015-11-28 20:14:48 +00:00
NewGarbo
afbccba36f added force join command for ADMIN+ 2015-11-28 19:56:47 +00:00
NewGarbo
75ef42d8c9 fixed the clan claim box check 2015-11-28 19:37:03 +00:00
fooify
8cdae7ce1a Merge remote-tracking branch 'origin/master' into foo 2015-11-28 09:33:47 -08:00
fooify
0dff0ffe1d fixed bacon blast exloding blocks 
fixed sg compass pointing to teammates
 2015-11-28 09:32:54 -08:00
xGamingDudex
dc0da3987b TitanMount fixes 
Added so that the magma cube is looking in the direction of which the
player is flying.
Removed players ability to unequipt the armorstand that take out the
netherrack block from their head slot.
 2015-11-28 17:22:17 +01:00
Cheese
51227ae4f3 fixed leak 2015-11-29 01:25:15 +11:00
NewGarbo
f5384a1382 staff mode 2015-11-28 09:31:18 +00:00
NewGarbo
d8ae035f84 creative scoreboard team. and fixed npe in tutorials 2015-11-28 09:20:42 +00:00
NewGarbo
0dceca5cfc Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-28 09:04:15 +00:00
NewGarbo
a0ae500876 tutorial revamp [clans] 2015-11-28 09:03:58 +00:00
Jonathan Williams
b6f6d4458e Fixed StaffServer. 2015-11-28 01:43:00 -06:00
Cheese
700cf51206 titan stuff almost done 2015-11-28 16:35:11 +11:00
Cheese
963caae719 Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes' 2015-11-28 16:00:28 +11:00
Cheese
8af545af80 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitanData.java
 2015-11-28 15:59:26 +11:00
Cheese
0871663498 titan stuff 
I HATE YOU SNAKE.
 2015-11-28 15:57:07 +11:00
Shaun Bennett
bcbc5244c6 Add Clans.core to hub build (IntelliJ) 2015-11-27 23:14:54 -05:00
Shaun Bennett
1a87d85174 Merge remote-tracking branch 'remotes/origin/master' into clans-beta 2015-11-27 23:13:43 -05:00
xGamingDudex
24f8a98545 Added titan particle trail. 2015-11-28 02:22:41 +01:00
Sarah
ad54d28b0d fixing teleportation issues. 2015-11-27 22:29:29 +01:00
NewGarbo
260002c9cf final changes 2015-11-27 21:02:20 +00:00
NewGarbo
9e84029e04 fixes 2015-11-27 20:50:00 +00:00
NewGarbo
b36642b22b remove trust command 2015-11-27 20:27:33 +00:00
NewGarbo
d5502500b6 fixes & changes 2015-11-27 20:24:07 +00:00
Sarah
fd0c5cf273 Adding some more flags. 2015-11-27 20:47:57 +01:00
NewGarbo
6ac871f04c Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-27 19:43:48 +00:00
NewGarbo
fe085c1571 loaaads of stuff 2015-11-27 19:42:15 +00:00
Sarah
e81aa72c7e Merge branch 'rankdescriptions' of http://184.154.0.242:7990/scm/min/mineplex 2015-11-27 20:33:18 +01:00
libraryaddict
636dcdf9f7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitan.java
 2015-11-28 05:28:04 +13:00
libraryaddict
5f8f643d95 What snake mount code I did 2015-11-28 05:26:43 +13:00
Shaun Bennett
f06ceab277 Adjustments 2015-11-27 09:33:31 -05:00
NewGarbo
0c463cf7cd Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-27 14:24:25 +00:00
NewGarbo
4d23b2a39f fixed (I BELIEVE) chests not opening in own territory 2015-11-27 14:24:02 +00:00
Cheese
def46c715e fixer 2015-11-28 00:52:54 +11:00
NewGarbo
627fbc7df2 add info into chat if a player is in creative 2015-11-27 13:50:18 +00:00
Cheese
b45eb53dff remove old items 2015-11-28 00:43:01 +11:00
NewGarbo
ad0c161f16 set players time to day during tutorial 2015-11-27 13:28:37 +00:00
NewGarbo
3be2986cea sethome command now places bed even if theres grass 2015-11-27 13:26:12 +00:00
NewGarbo
691105b2cb force place bed on first claim 2015-11-27 13:23:37 +00:00
Cheese
fdb493d95d Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-28 00:23:32 +11:00
Cheese
ab3d2ba098 updated tutorials. 
added worldmanager to cull entities.
 2015-11-28 00:23:18 +11:00
NewGarbo
4423baca96 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-27 13:15:46 +00:00
NewGarbo
f0669cb610 fixed undead camp item naming being italic 2015-11-27 13:15:26 +00:00
Cheese
67b9755f0d Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-27 22:27:33 +11:00
Cheese
53da9c97d0 item frame cancel! 2015-11-27 22:27:20 +11:00
Shaun Bennett
b996dc20ca Enable tutorial, fix stuck command 2015-11-27 06:26:32 -05:00
Shaun Bennett
a5ebf9b059 Fixes for release 2015-11-27 05:53:57 -05:00
Cheese
ec0e2d2d64 fixed colors 2015-11-27 21:09:25 +11:00
Cheese
3e37a63aa8 fixed chome teleport height 2015-11-27 20:59:23 +11:00
Cheese
dda0e827e1 FGIXEXFSD 2015-11-27 20:46:33 +11:00
Cheese
9ce4440679 extra cmds 2015-11-27 20:36:00 +11:00
Cheese
6428d28275 travel hub bed fix 2015-11-27 20:31:19 +11:00
Cheese
797dcf8d8e fxied song again T_T 2015-11-27 20:01:48 +11:00
Cheese
936e61de57 gui changes :) 2015-11-27 19:42:04 +11:00
Cheese
c501a42094 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-27 19:29:33 +11:00
Cheese
5d40a57df8 sound fix 2015-11-27 19:29:17 +11:00
Shaun Bennett
0b0710458f Hub updates/try to fix chiss stuff 2015-11-27 03:22:17 -05:00
Cheese
4e2f48b37e Merge branch 'master' into clans-beta 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
 2015-11-27 19:16:30 +11:00
Cheese
f55b6761a8 disabled titan gadgets! 2015-11-27 19:14:35 +11:00
Cheese
e25df8739d EAST 2 WEST 2015-11-27 18:46:15 +11:00
Cheese
4085c998cd MUSIC 4 LIFE 2015-11-27 18:44:33 +11:00
Shaun Bennett
408c2cf72a im an idiot 2015-11-27 01:40:28 -05:00
Shaun Bennett
bdbb75e196 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-27 01:35:16 -05:00
Shaun Bennett
34368722a9 Fix gold manager again 2015-11-27 01:35:10 -05:00
NewGarbo
7efcf5426d no hunger depletion in safe zones 2015-11-27 06:34:29 +00:00
NewGarbo
c96b0c529a Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-27 06:26:23 +00:00
NewGarbo
42d39a40e9 WIND 2015-11-27 06:25:58 +00:00
Shaun Bennett
94090c9434 adjust gold drops 2015-11-27 01:24:03 -05:00
Shaun Bennett
e211fe182d Adjust gem conversion rate 2015-11-27 01:06:53 -05:00
NewGarbo
c33eea28a2 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-27 06:05:39 +00:00
NewGarbo
a9669ade31 Immolate fix hopefully 2015-11-27 06:05:22 +00:00
Shaun Bennett
0aeca96746 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-27 01:05:16 -05:00
Shaun Bennett
32c17cad7e Shop price changes 2015-11-27 01:04:51 -05:00
Cheese
77be81c216 pet changes 2015-11-27 16:50:22 +11:00
Cheese
2b047cdde8 more titan stuff 2015-11-27 16:46:48 +11:00
NewGarbo
9082ace3f3 wind blade fall damage 2015-11-27 05:46:37 +00:00
NewGarbo
20a9ed5a6e staff not being able to join fix 2015-11-27 05:13:47 +00:00
NewGarbo
f81d1d390a Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-27 05:04:46 +00:00
NewGarbo
b22c766c94 more clans modificatons 2015-11-27 05:04:24 +00:00
Cheese
05e7183b65 titan stuff update 2015-11-27 15:55:00 +11:00
Shaun Bennett
a46bed53fa Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-26 23:42:22 -05:00
Shaun Bennett
31f083387d Use Castle icon on travel page 2015-11-26 23:42:16 -05:00
NewGarbo
174825776b meow clams 2015-11-27 04:39:04 +00:00
NewGarbo
9dcc048953 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-27 04:23:14 +00:00
NewGarbo
6119500b68 changes 2015-11-27 04:23:02 +00:00
Shaun Bennett
faaa1fcf0b Use castle clan icon for /c <clan> 2015-11-26 23:15:14 -05:00
Virizion
73c2f16d8b Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-11-26 23:11:12 -05:00
Virizion
3d74c9ca05 Fixed some bugs and finished some items on the checklist, too many to put down here. 2015-11-26 23:10:19 -05:00
NewGarbo
5744178286 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-27 04:06:02 +00:00
NewGarbo
dbda29e3f3 magnetic maul fixes 2015-11-27 04:05:47 +00:00
NewGarbo
73f4450fa3 clans fixes 2015-11-27 04:04:29 +00:00
Shaun Bennett
ef511f1704 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-26 22:38:03 -05:00
Shaun Bennett
6da10950da Update clan icons, fix client class 2015-11-26 22:37:54 -05:00
NewGarbo
0274bf2847 loads of changes. 2015-11-27 03:28:19 +00:00
libraryaddict
3c98243201 Some more guardian stuff 2015-11-27 15:56:56 +13:00
libraryaddict
0a4416381b Fix guardian 2015-11-27 15:55:02 +13:00
Cheese
98d988584d titan cosmetics 2015-11-27 13:35:25 +11:00
NewGarbo
e849484670 bunch of changes and fixes and bugs and stuff and things 2015-11-26 23:59:47 +00:00
NewGarbo
055702b36e changes and fixes and woo 2015-11-26 23:08:33 +00:00
NewGarbo
56d4b34969 fixed formatting on death notices. 
Made world event middle texts longer lasting.
Fixed logout NPC timer
 2015-11-26 21:57:26 +00:00
NewGarbo
5393d1d18c Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-26 21:16:21 +00:00
Shaun Bennett
6e416b1059 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
 2015-11-26 16:12:54 -05:00
Shaun Bennett
27e214a643 Region fix 2015-11-26 16:12:29 -05:00
NewGarbo
dd33d9587d made power recharge a tad faster with Wind Blade 2015-11-26 21:12:09 +00:00
NewGarbo
0aaee24600 fixed gear UI display stuff incorrectly 2015-11-26 21:06:33 +00:00
NewGarbo
bb3ea0115d fixed classes not loading 2015-11-26 20:41:42 +00:00
NewGarbo
67a28a94fb bunch of fixes 2015-11-26 20:32:01 +00:00
Sarah
9e1d522876 Increase Render distance on particles, Don't spawn mob until "protect him from evil minions" title appears and changing some timings. 2015-11-26 16:47:31 +01:00
Sarah
33383af18a Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-26 16:37:57 +01:00
Sarah
c74732af39 One more fix. 2015-11-26 16:37:18 +01:00
Sarah
cb67e42f96 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-26 16:27:24 +01:00
Sarah
21f859f579 fixing 2 seconds delay. 2015-11-26 16:26:49 +01:00
Sarah
efc05803ac Minion spawn. 2015-11-26 16:25:44 +01:00
Sarah
40259a26f1 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-26 16:12:51 +01:00
Sarah
a653f053a5 Adding 2 Seconds delay. 2015-11-26 16:12:13 +01:00
Sarah
9f3c3589b2 Particle render distance. 2015-11-26 16:09:29 +01:00
Sarah
3128a6005b Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-26 16:06:53 +01:00
Sarah
eddbde5ebd Changing length formula. 2015-11-26 16:06:15 +01:00
NewGarbo
2bce722539 some code polishing. fixed some mispositioning with Spawn holograms. 2015-11-26 13:29:40 +00:00
NewGarbo
e5fa59b8da Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-26 13:17:28 +00:00
NewGarbo
009ddaaee1 stop players in tutorial from receiving/sending chat. 2015-11-26 13:16:50 +00:00
NewGarbo
bbfd319bcd Spawn holograms 2015-11-26 13:14:10 +00:00
NewGarbo
1ce2a362c6 disallow item frames being rotated in Spawn 2015-11-26 12:34:12 +00:00
NewGarbo
be19c17fee fixed gem -> gold conversion rate 2015-11-26 12:33:29 +00:00
NewGarbo
9aaad0b4a1 fixed formatting in /spawn command 2015-11-26 12:31:55 +00:00
Shaun Bennett
bdc08676d9 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
 2015-11-26 03:34:33 -05:00
Shaun Bennett
d4f3786b1c Fixes 2015-11-26 03:31:03 -05:00
NewGarbo
94a0f3244d corrected typo in WindBlade.java 2015-11-26 07:53:37 +00:00
NewGarbo
af0df835b8 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
 2015-11-26 07:52:35 +00:00
NewGarbo
97e903f403 updated regions 2015-11-26 07:51:10 +00:00
Shaun Bennett
75ff5bb3da Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-26 02:46:56 -05:00
NewGarbo
56d5c10481 oops util ent new method didn't commit in last commit 2015-11-26 07:29:59 +00:00
NewGarbo
c0cfdf9785 fixed windblade not recharging whilst jumping 2015-11-26 07:29:39 +00:00
NewGarbo
e80c1097b5 corrected regions 2015-11-26 07:08:30 +00:00
NewGarbo
0d43ffc7b2 fixessss 2015-11-26 06:54:49 +00:00
Shaun Bennett
6de7b8a73e Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-26 01:46:43 -05:00
NewGarbo
972a2d151a simplified combat log npc title 2015-11-26 06:21:01 +00:00
NewGarbo
f92849f796 that doesn't do what i thought it did 2015-11-26 05:32:59 +00:00
NewGarbo
1e4b6b4d0f fixed formatting error in clan tip 2015-11-26 05:30:13 +00:00
NewGarbo
7da8b8e3bf fix players hurting each other in safe zones 2015-11-26 05:29:35 +00:00
NewGarbo
48ebfc219d removed travel npcs from shops 2015-11-26 05:24:33 +00:00
Shaun Bennett
389956240b Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-26 00:20:41 -05:00
NewGarbo
76d009e0de Unstuck (Spawn) command 2015-11-26 05:18:18 +00:00
Virizion
fdb4ae6e58 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-11-25 23:48:35 -05:00
NewGarbo
33cdd5400d fixed some coloring issues 2015-11-26 04:32:41 +00:00
Cheese
193c5fe487 fixed static 2015-11-26 15:26:57 +11:00
Shaun Bennett
8f14c8beae Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
 2015-11-25 23:26:29 -05:00
Shaun Bennett
7a663b4f7b Fix legendaries 2015-11-25 23:24:07 -05:00
NewGarbo
8bd1f4b3c8 reduced hyper axe damage. OP as heck 2015-11-26 04:21:30 +00:00
NewGarbo
abcee009dd stuff 2015-11-26 04:07:33 +00:00
Virizion
de82806fc0 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-11-25 22:53:06 -05:00
Cheese
059a9a32cd fixed method 2015-11-26 14:51:45 +11:00
Cheese
83a7b398bc Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-26 14:47:24 +11:00
Cheese
1a5dbc073d recursive block find method 2015-11-26 14:47:01 +11:00
Virizion
6a6807d6f0 - Added time left progress bar 
- Added subtitle to countdown 5, 4, 3, 2, 1, TIME'S UP when a build is about to end
- Added an elder guardian who floats and shoots lasers at the losers builds and blows the blocks up with an explosion
- Added a subtitle to show who was eliminated
- Prevented players from entering other build areas
 2015-11-25 22:45:23 -05:00
NewGarbo
670afc17ef clans chat is being weird 2015-11-26 03:26:15 +00:00
NewGarbo
5230b25dfd fixed suicide command (?) 2015-11-26 03:24:48 +00:00
NewGarbo
4f275d79fa fixed staff tags only displaying if player is in clan 2015-11-26 03:19:40 +00:00
NewGarbo
5fb58b1dad added suicide command 2015-11-26 03:17:05 +00:00
NewGarbo
8a64a2f4ce fixed world events spawning floating on grass and other boundless blocks 2015-11-26 03:06:27 +00:00
NewGarbo
b43cf0b28a got rid of enchanted effect on rare items 2015-11-26 03:00:59 +00:00
libraryaddict
55ff04ca93 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-11-26 15:49:54 +13:00
libraryaddict
3e8a53562e Add new hologram interaction thingy so holograms can catch interactions that they would normally block 2015-11-26 15:49:28 +13:00
NewGarbo
7e23f896ca changes 2015-11-26 02:49:01 +00:00
Cheese
55f5f95869 added no ammo display 2015-11-26 13:05:27 +11:00
Cheese
65a1441e1f -Fixed smoke being removed when bomb was planted in it 
-Fixed being unable to defuse bomb in smoke
-Fixed older smokes removing newer intersecting smokes
-Grenades will still detonate after being burned
-Bizon now gives $600 per kill
-Added replacement smoke on gun fire
-Added shell ejecting particles on gun fire
-Removed gun bobbing when firing
-Changed ammo display location
 2015-11-26 12:56:26 +11:00
NewGarbo
a19ade0739 rain rain go away 2015-11-26 00:53:01 +00:00
NewGarbo
11deec75dd fixed illusion 2015-11-26 00:44:13 +00:00
Shaun Bennett
c150ea6175 Potatoes and Tornadoes 2015-11-25 19:08:13 -05:00
Sarah
32ee1c285a merging pregametutorial into type wars. 2015-11-26 00:29:28 +01:00
Sarah
063299ab3a Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-26 00:23:02 +01:00
Sarah
809faf3098 changing teleport mechanic. 2015-11-26 00:14:15 +01:00
Shaun Bennett
cc75bafb4c Bugs and thugs 2015-11-25 16:45:04 -05:00
Shaun Bennett
1306137cb2 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-25 14:51:00 -05:00
Shaun Bennett
ff5d828dd7 Merge with master, lots of clans fixes/work 2015-11-25 14:50:49 -05:00