JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,496 Commits 1 Branch 0 Tags 481 MiB
55f0453897
Commit Graph

5295 Commits

Author SHA1 Message Date
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
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
NewGarbo
be727e6e26 fixed deployed tasks not being deregistered as Listeners after being adding to Cull 2015-11-29 19:46:08 +00: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
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
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
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
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
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
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
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
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
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