d598f83ec0
More progress
2015-12-08 18:17:43 +00:00
504a49278c
SSM kit description change, grammar mistake
2015-12-08 16:35:49 +00:00
2bf1012fa4
SSM Pig bomb bug fix
2015-12-08 16:34:07 +00:00
f8f95c64e5
Fixing arena moving
2015-12-08 15:10:29 +00:00
a1915e324c
Some java 8 code
2015-12-08 08:42:45 -05:00
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
2b12016e14
Progress
2015-12-08 13:12:30 +00:00
addb2c8c0e
Fix java 8 compiler issue
2015-12-08 08:02:40 -05:00
cdc602a435
Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-08 10:55:57 +00:00
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
b22c64ca6a
Fix excludes
2015-12-08 05:51:21 -05:00
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
a84f580719
Update IntelliJ to Java 8
2015-12-08 05:45:26 -05:00
99cf7ea22c
Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-08 10:44:43 +00:00
e6d995008e
Arenas
2015-12-08 10:44:24 +00:00
fe1f763374
changed order blocks will be added to the list
2015-12-08 15:26:32 +11:00
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
719297ebb1
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-08 10:31:25 +11:00
4ba2e8c96c
fixed old staff being stuck invis.
...
partially changed scoreboard to show playercount
2015-12-08 10:31:11 +11:00
42a0354c9e
Now Playing, Preference to disable ads
2015-12-07 18:28:05 -05:00
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
55f0453897
Start of re-write
2015-12-07 23:20:03 +00:00
0619fb857f
fixing invisibility.
2015-12-07 23:44:02 +01:00
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
eed6966a5b
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-12-07 13:21:17 -05:00
c3ace42a68
Winter MOTD, Stat fixes (maybe?!)
2015-12-07 13:21:11 -05:00
3f7eef35d5
Forcefield range.
2015-12-07 18:59:06 +01:00
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
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
7984c0ac31
Add !
2015-12-07 06:12:49 -05:00
a39b11ce67
slowed meteors
2015-12-07 21:56:00 +11:00
1fe6b5489a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 21:53:49 +11:00
d318a5cf87
interacto!
2015-12-07 21:53:34 +11:00
c6c012031f
Less ugly formatting
2015-12-07 04:44:19 -05:00
4354133de9
Add Minecraft timings to /lag
2015-12-07 04:40:34 -05:00
6e67f34db1
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 20:39:46 +11:00
e1efcabfbf
chat sale msgs
2015-12-07 20:39:31 +11:00
3cdf8c4b08
Merge remote-tracking branch 'origin/master'
2015-12-07 04:23:33 -05:00
2afbe23a7c
Load songs from update folder
2015-12-07 04:23:26 -05:00
7b11baf24b
Christmas sale bossbars
2015-12-07 20:20:49 +11:00
8c4615203c
sale message
2015-12-07 20:07:20 +11:00
ed3bea8e85
DONE!
2015-12-07 18:36:05 +11:00
5c632a1e3a
sharper target
2015-12-07 18:20:12 +11:00
1a0d90a495
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 18:06:43 +11:00
fea637db80
fixed some freeze
2015-12-07 18:06:26 +11:00
ecde1dd314
Merge remote-tracking branch 'origin/master'
2015-12-07 02:06:09 -05:00
44a5bcb793
remove titan chest message, update pumkin message, holiday MB/DMT words
2015-12-07 02:06:00 -05:00
d75d7a2c8f
snowfight finish
2015-12-07 17:56:35 +11:00
1e441ac017
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 17:37:04 +11:00
1ada06af91
rewrote lots!
2015-12-07 17:36:45 +11:00
7b5db2d4fb
Hub Music, HubMusic Preference
2015-12-07 00:58:44 -05:00
5486d8acf6
more prep
2015-12-07 13:42:59 +11:00
97fe633e4c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 13:25:48 +11:00
54ec0e39bb
more polisshhhh on snowfight
...
enabled xmas chests
2015-12-07 13:25:32 +11:00
488895ea53
Note block player
2015-12-06 21:12:10 -05:00
cbafb2ba91
fixes
2015-12-07 13:04:45 +11:00
0c397d6a81
simplified kits and intro
2015-12-07 13:02:26 +11:00
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
b2a595b01b
snwo fight changes
2015-12-07 12:02:53 +11:00
09f7a03444
Quick changes to improve things.
2015-12-06 20:00:22 -05:00
072856be7d
teleportations.
2015-12-06 23:19:53 +01:00
b5967a1205
Uncommented bouncy balls
2015-12-06 17:14:51 -05:00
e74b83f8f2
Merge remote-tracking branch 'origin/master' into update-paintball
2015-12-06 17:12:29 -05:00
5e57caa94d
Final tweaks to random armorstand
2015-12-06 17:09:33 -05:00
6f16eeead7
missin files
2015-12-07 08:48:55 +11:00
10d26ca32b
timer fixes.
2015-12-06 22:41:04 +01:00
64f8ee7280
fixing some timings.
2015-12-06 21:48:21 +01:00
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
a9c7f088f3
made use ability teleport player back to where they should be
2015-12-06 19:10:18 +00:00
3260550368
adding proper forcefield for minions and giants.
2015-12-06 19:38:23 +01:00
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
11b2748a5a
Quick thing before merge
2015-12-06 11:45:10 -05:00
fa6418769b
YT name change
2015-12-06 21:26:02 +11:00
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
35c362b8bf
small youtuber perms
2015-12-06 18:08:36 +11:00
b7b5235f59
Fix error
2015-12-06 00:57:43 -05:00
d095e14b4c
Merge branch 'monster-league'
2015-12-06 16:33:21 +11:00
9880e9a3c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-06 16:32:59 +11:00
040e94f1fb
bouncy
2015-12-06 16:32:45 +11:00
618105b4c8
Add minimum rank to Announcement Command
2015-12-06 00:15:49 -05:00
8d831d5228
Fix END_PORTAL bug causing gui's to break
2015-12-06 00:06:31 -05:00
9c7eea86b4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-06 14:56:18 +11:00
32a6d572ee
Disable gadgets in arcade for player count > 40
2015-12-05 22:56:15 -05:00
5aabd00972
set hub to christmas
...
removed snowball pickup
disabled arrows sticking into players from ALL projectiles
2015-12-06 14:55:28 +11:00
11e1e53a36
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-12-05 21:36:19 -05:00
d5a9a92913
Forgot to push these changes last update!
2015-12-05 21:36:07 -05:00
b98944b0a0
Handle attach entity
2015-12-06 14:38:00 +13:00
114ae33d89
fixing spawns and monster slowdown.
2015-12-06 00:00:50 +01:00
d5606f55ea
Modified CustomTagFix to support player name titles
2015-12-06 10:18:35 +13:00
90c6d0a83f
spelling fixes, disabling Particles, fixing mob limit.
2015-12-05 22:17:45 +01:00
4c4b997453
fixing giant facing.
2015-12-05 19:00:44 +01:00
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
a3d6af884d
spawns after tutorial and Giants facing each other.
2015-12-05 00:57:27 +01:00
d7497ec098
Fixed Micro Battle icon not appearing in stats menu
2015-12-04 15:56:48 -08:00
49c735e43c
removed duplicate code
2015-12-05 10:34:06 +11:00
4a53667539
gadget restructure
...
converted frost lord and titan particles into 4 subcategories.
2015-12-05 10:22:00 +11:00
35534afd4a
overall runtime.
2015-12-04 19:54:02 +01:00
1bb40b21d3
Tutorial/Phase Time.
2015-12-04 19:49:28 +01:00
5d59b1a015
fixed tnt blowing up in claims when offline
2015-12-04 18:32:46 +00:00
bca65116ab
fixed task not getting cleanup up after /skiptutorial
2015-12-04 18:23:23 +00:00
f57f4ed0aa
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-12-04 12:10:10 -05:00
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
bb382a969c
Fix heavy attribute, disable claim visualizer
2015-12-04 08:02:38 -05:00
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
2435ebba13
Disable subtasks for now
2015-12-04 05:16:14 -05:00
5c575b41fc
Clans alpha 0.17
2015-12-04 05:15:28 -05:00
e01d30b920
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-04 13:19:07 +11:00
ef2511434d
tuber arnk
2015-12-04 13:18:23 +11:00
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
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
b1bd2ff5ac
Gravity's icon changed to ENDER_PORTAL_FRAME
2015-12-03 16:50:27 -08:00
91aaf5f2fb
world's smallest bugfix - admin->co-host
2015-12-03 16:45:30 -08:00
348f2d8e4c
Merge remote-tracking branch 'origin/master' into foo
2015-12-03 16:31:16 -08:00
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
39daf969fd
clan claim visualizer
2015-12-03 22:29:36 +00:00
19254fc4a0
Prepare Timer flag.
2015-12-03 18:06:27 +01:00
584a02ae3e
fixed infinite claims
2015-12-03 10:30:06 +00:00
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
27f335779a
adding tutorial sounds and flag for it.
2015-12-02 19:39:44 +01:00
e9fd661311
disabled koth
2015-12-02 18:25:53 +00:00
8fea5afdce
fixed message on tick (might be cause of laggg)
2015-12-02 06:56:58 +00:00
92c1abf221
a few last touches
2015-12-02 06:04:53 +00:00
8db5ffe5c7
forcejoin command for ADMIN+ and fixed auto tree replanting.
2015-12-02 05:54:00 +00:00
3a4e453ac3
made it so that you can only use /reset in safe zones
2015-12-02 05:18:04 +00:00
d6ca52e4a4
modifications
2015-12-02 05:11:09 +00:00
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
b04f139883
Fixed advertisement being able to be bypassed by spec and instant join
2015-12-01 19:26:52 -08:00
338e0f1892
fixed naming pets non-alphanumeric characters
2015-12-01 16:23:07 -08:00
b8e2086928
changes to tutorial
2015-12-02 00:19:48 +00:00
ba27d94158
fixed skiptutorial message not displaying
2015-12-01 23:23:11 +00:00
cffb6bd62f
bunch o' changes
2015-12-01 23:01:41 +00:00
a7d6026c07
made skip tutorial messages be seen whilst in tutorial
2015-12-01 22:33:47 +00:00
69cb395f5a
made entire clan know about disband
2015-12-01 22:30:05 +00:00
35ae89ab1f
fixed players from being able to eat their carrot in the making money task
2015-12-01 19:37:53 +00:00
ea099d7a82
fixed some annoying bugs and fixed certain messages not showing in tutorial
2015-12-01 18:41:33 +00:00
b0e16f6612
Zombie smash Color.
2015-12-01 17:05:55 +01:00
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
fbf9c8eb0c
made certain messages visible in tutorial that are actually required to be seen
2015-12-01 13:37:34 +00:00
f536bf23e5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-12-01 12:06:25 +00:00
d32e6fdb96
Got rid of deployed tasks. using different system now. (untested)
2015-12-01 11:28:14 +00:00
633697dc7a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-30 23:49:32 -06:00
03a1f19df9
Fixed memory leaks in Disguise and Recall.
...
Removed debug messages in ItemMapManager
2015-11-30 23:49:16 -06:00
51023a7630
cosmetic cooldown fix
2015-12-01 15:38:54 +11:00
48ae23ebff
changed reference to premium ranks
2015-11-30 19:58:41 -08:00
06ef964000
removed important debug thing
2015-11-30 19:33:03 -08:00
ed96c8e3b3
fixed ssm enderman always facing south on teleport
2015-11-30 19:27:34 -08:00
208eaf3a01
cosmetics recharge slowdown
2015-12-01 11:38:52 +11:00
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
1a1fa684e4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-01 10:44:39 +11:00
7217cd0f33
remove conditions upon death
2015-12-01 10:44:13 +11:00
9d380a0b31
Merge remote-tracking branch 'remotes/origin/master' into virizion_utils
2015-11-30 17:47:08 -05:00
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
18504e48f7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-30 21:00:42 +00:00
1a851679c4
made it so players cannot see chat whilst in tutorial
2015-11-30 20:40:30 +00:00
482ec8a120
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-30 14:26:37 -06:00
513810caaa
Fixed memory leak in MarkedForDeath
2015-11-30 14:26:25 -06:00
6eb44ed87b
whoops.. this isn't php hehe
2015-11-30 19:11:18 +00:00
813e7ee789
made it so that no messages are shown when in tutorial
2015-11-30 19:08:16 +00:00
e2cfcef55b
RunTasksSync Flag.
2015-11-30 16:58:41 +01:00
0862cfce72
fixed doors getting placed in spawn and shops
2015-11-30 07:26:02 +00:00
261d6dd030
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-30 07:08:34 +00:00
f528531b82
removed some testing stuff
2015-11-30 07:06:36 +00:00
34c4bade06
Merge remote-tracking branch 'origin/master'
2015-11-29 19:30:51 -05:00
02bc7ffab6
map changes
2015-11-30 11:17:23 +11:00
981eead816
Merge remote-tracking branch 'origin/master'
2015-11-29 19:05:56 -05:00
0f79b5814f
more color f ixes
2015-11-30 10:52:44 +11:00
25bb913c4f
Merge remote-tracking branch 'origin/master'
2015-11-29 18:41:35 -05:00
2ac21b1434
better colors
2015-11-30 10:40:57 +11:00
4a9d53de50
Merge remote-tracking branch 'origin/master'
2015-11-29 18:33:43 -05:00
18b603ec2f
map color changes
2015-11-30 10:33:08 +11:00
f7f7d5fdef
Merge remote-tracking branch 'origin/master'
2015-11-29 18:26:40 -05:00
e27808a011
map!
2015-11-30 10:26:07 +11:00
125d9988c2
Merge remote-tracking branch 'origin/master'
2015-11-29 18:21:02 -05:00
cd6ecc1e67
pt!
2015-11-30 10:20:27 +11:00
06706da4cf
Merge remote-tracking branch 'origin/master'
2015-11-29 18:16:13 -05:00
a886088f48
more changes
2015-11-30 10:15:50 +11:00
2b22639d8a
Merge remote-tracking branch 'origin/master'
2015-11-29 18:03:46 -05:00
af77a2ddeb
fix
2015-11-30 10:03:27 +11:00
1c71efbff7
Merge remote-tracking branch 'origin/master'
2015-11-29 17:59:39 -05:00
58d7e8562b
update clans version for next release
2015-11-29 17:58:29 -05:00
af61b62a47
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-30 09:58:06 +11:00
7e3cab9c87
map test
2015-11-30 09:57:47 +11:00
8026ad891d
fixed king of the hill
2015-11-29 21:09:18 +00:00
dc68375ec8
TimeBetweenPhase Flag.
2015-11-29 21:48:39 +01:00
be727e6e26
fixed deployed tasks not being deregistered as Listeners after being adding to Cull
2015-11-29 19:46:08 +00:00
6120c8246b
Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes
2015-11-29 19:11:24 +01:00
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
2c2370f8a0
Added method to edit NoAI field on entities.
2015-11-29 19:08:26 +01:00
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
327bf8d09b
We only need to add the "Go Back" page once...
2015-11-29 18:32:24 +01:00
61df87b446
Merge remote-tracking branch 'origin/master' into foo
2015-11-29 06:37:30 -08:00
7bdf5451d4
Upped map scan performance.
2015-11-29 02:49:12 -06:00
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
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
782026556e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-29 02:24:32 -06:00
e9da258333
Lowered scan rate significantly for ItemMapManager.
2015-11-29 02:24:17 -06:00
f82396d485
Clans changes/fixes
2015-11-29 02:41:53 -05:00
0d5fa70632
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-28 23:05:32 -06:00
5acf6b19a4
Fixed bed checking interval.
...
Added timing logging to map rendering.
2015-11-28 23:05:22 -06:00
7c947ad97b
Merge master
2015-11-28 23:55:00 -05:00
c6ff01b92d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-28 22:33:03 -06:00
118af20f44
Updated EnjinTranslator.
2015-11-28 22:32:50 -06:00
b88a842f1c
stuff
2015-11-29 03:22:52 +00:00
c870d99e0e
teleport stuff
2015-11-29 02:55:45 +00:00
a9afe1f068
added self clan create/delete messages
2015-11-29 02:54:40 +00:00
84303234fd
fixed task 2
2015-11-29 02:48:03 +00:00
392ab601c2
tutorial tasks reset
2015-11-29 02:43:12 +00:00
d7658f3838
fixed stuck manager taking 0 seconds
2015-11-29 02:39:09 +00:00
dc5aec33b4
tutorial ending message
2015-11-29 02:37:20 +00:00
8dca384d35
force join command
2015-11-29 02:31:14 +00:00
9ff9724fc8
tutorial revamp 2.0
2015-11-29 02:10:39 +00:00
5cefe27257
cosmetic fixes
2015-11-29 11:40:19 +11:00
e1be0b1dbd
dupe fix
2015-11-28 23:34:41 +00:00
66fd85af1f
Adding Phase Event.
2015-11-28 23:32:09 +01:00
aa68701ebd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-28 20:16:49 +00:00
ace4548b1e
don't cull an entity if a player is nearby
2015-11-28 20:14:48 +00:00
afbccba36f
added force join command for ADMIN+
2015-11-28 19:56:47 +00:00
75ef42d8c9
fixed the clan claim box check
2015-11-28 19:37:03 +00:00
8cdae7ce1a
Merge remote-tracking branch 'origin/master' into foo
2015-11-28 09:33:47 -08:00
0dff0ffe1d
fixed bacon blast exloding blocks
...
fixed sg compass pointing to teammates
2015-11-28 09:32:54 -08:00
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
51227ae4f3
fixed leak
2015-11-29 01:25:15 +11:00
f5384a1382
staff mode
2015-11-28 09:31:18 +00:00
d8ae035f84
creative scoreboard team. and fixed npe in tutorials
2015-11-28 09:20:42 +00:00
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
a0ae500876
tutorial revamp [clans]
2015-11-28 09:03:58 +00:00
b6f6d4458e
Fixed StaffServer.
2015-11-28 01:43:00 -06:00
700cf51206
titan stuff almost done
2015-11-28 16:35:11 +11:00
963caae719
Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes'
2015-11-28 16:00:28 +11:00
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
0871663498
titan stuff
...
I HATE YOU SNAKE.
2015-11-28 15:57:07 +11:00
bcbc5244c6
Add Clans.core to hub build (IntelliJ)
2015-11-27 23:14:54 -05:00
1a87d85174
Merge remote-tracking branch 'remotes/origin/master' into clans-beta
2015-11-27 23:13:43 -05:00
24f8a98545
Added titan particle trail.
2015-11-28 02:22:41 +01:00
ad54d28b0d
fixing teleportation issues.
2015-11-27 22:29:29 +01:00
260002c9cf
final changes
2015-11-27 21:02:20 +00:00
9e84029e04
fixes
2015-11-27 20:50:00 +00:00
b36642b22b
remove trust command
2015-11-27 20:27:33 +00:00
d5502500b6
fixes & changes
2015-11-27 20:24:07 +00:00
fd0c5cf273
Adding some more flags.
2015-11-27 20:47:57 +01:00
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
fe085c1571
loaaads of stuff
2015-11-27 19:42:15 +00:00
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
5f8f643d95
What snake mount code I did
2015-11-28 05:26:43 +13:00
f06ceab277
Adjustments
2015-11-27 09:33:31 -05:00
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
4d23b2a39f
fixed (I BELIEVE) chests not opening in own territory
2015-11-27 14:24:02 +00:00
def46c715e
fixer
2015-11-28 00:52:54 +11:00
627fbc7df2
add info into chat if a player is in creative
2015-11-27 13:50:18 +00:00
b45eb53dff
remove old items
2015-11-28 00:43:01 +11:00
ad0c161f16
set players time to day during tutorial
2015-11-27 13:28:37 +00:00
3be2986cea
sethome command now places bed even if theres grass
2015-11-27 13:26:12 +00:00
691105b2cb
force place bed on first claim
2015-11-27 13:23:37 +00:00
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
ab3d2ba098
updated tutorials.
...
added worldmanager to cull entities.
2015-11-28 00:23:18 +11:00
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
f0669cb610
fixed undead camp item naming being italic
2015-11-27 13:15:26 +00:00
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
53da9c97d0
item frame cancel!
2015-11-27 22:27:20 +11:00
b996dc20ca
Enable tutorial, fix stuck command
2015-11-27 06:26:32 -05:00
a5ebf9b059
Fixes for release
2015-11-27 05:53:57 -05:00
ec0e2d2d64
fixed colors
2015-11-27 21:09:25 +11:00
3e37a63aa8
fixed chome teleport height
2015-11-27 20:59:23 +11:00
dda0e827e1
FGIXEXFSD
2015-11-27 20:46:33 +11:00
9ce4440679
extra cmds
2015-11-27 20:36:00 +11:00
6428d28275
travel hub bed fix
2015-11-27 20:31:19 +11:00
797dcf8d8e
fxied song again T_T
2015-11-27 20:01:48 +11:00
936e61de57
gui changes :)
2015-11-27 19:42:04 +11:00
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
5d40a57df8
sound fix
2015-11-27 19:29:17 +11:00
0b0710458f
Hub updates/try to fix chiss stuff
2015-11-27 03:22:17 -05:00
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
f55b6761a8
disabled titan gadgets!
2015-11-27 19:14:35 +11:00
e25df8739d
EAST 2 WEST
2015-11-27 18:46:15 +11:00
4085c998cd
MUSIC 4 LIFE
2015-11-27 18:44:33 +11:00
408c2cf72a
im an idiot
2015-11-27 01:40:28 -05:00
bdbb75e196
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-27 01:35:16 -05:00
34368722a9
Fix gold manager again
2015-11-27 01:35:10 -05:00
7efcf5426d
no hunger depletion in safe zones
2015-11-27 06:34:29 +00:00
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
42d39a40e9
WIND
2015-11-27 06:25:58 +00:00
94090c9434
adjust gold drops
2015-11-27 01:24:03 -05:00
e211fe182d
Adjust gem conversion rate
2015-11-27 01:06:53 -05:00
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
a9669ade31
Immolate fix hopefully
2015-11-27 06:05:22 +00:00
0aeca96746
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-27 01:05:16 -05:00
32c17cad7e
Shop price changes
2015-11-27 01:04:51 -05:00
77be81c216
pet changes
2015-11-27 16:50:22 +11:00
2b047cdde8
more titan stuff
2015-11-27 16:46:48 +11:00
9082ace3f3
wind blade fall damage
2015-11-27 05:46:37 +00:00
20a9ed5a6e
staff not being able to join fix
2015-11-27 05:13:47 +00:00
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
b22c766c94
more clans modificatons
2015-11-27 05:04:24 +00:00
05e7183b65
titan stuff update
2015-11-27 15:55:00 +11:00
a46bed53fa
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 23:42:22 -05:00
31f083387d
Use Castle icon on travel page
2015-11-26 23:42:16 -05:00
174825776b
meow clams
2015-11-27 04:39:04 +00:00
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
6119500b68
changes
2015-11-27 04:23:02 +00:00
faaa1fcf0b
Use castle clan icon for /c <clan>
2015-11-26 23:15:14 -05:00
William Burns
Teddy
Shaun Bennett
Cheese
xGamingDudex
Shaun Bennett
Sarah
Mysticate
NewGarbo
libraryaddict
Keir
fooify
Virizion
Jonathan Williams