ac6d3c2c8f
merge with master
2015-12-11 06:27:23 -05:00
7c432461c9
changed coal item rewards to 3 tier :)
2015-12-11 22:25:14 +11:00
e01a5369fd
set bonuses
...
item gadget gui update
2015-12-11 21:53:39 +11:00
40c2fdc3fc
fixed suits
2015-12-11 21:11:35 +11:00
d7f39bdfd8
costume sets
2015-12-11 20:59:55 +11:00
7fc08f34a7
fixed typo
2015-12-11 20:34:01 +11:00
f717a5f8cc
more set stuff
2015-12-11 20:30:41 +11:00
0cda29e135
improved cosmetic set implementation
2015-12-11 20:08:36 +11:00
a6f664006f
set display in gui
2015-12-11 20:01:54 +11:00
d8a5edf9e9
fixed up gui items
2015-12-11 19:24:19 +11:00
61a8d2825e
gadget gui overhaul
2015-12-11 19:20:13 +11:00
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
222173ab17
Improved and implemented GameProfile caching.
2015-12-11 01:24:59 -05:00
b5c157c123
Changed PlayerCache to Cache
2015-12-11 01:24:16 -05:00
98e91d29f6
more cosmetic stuff :)
2015-12-11 17:21:54 +11:00
7f8c9c02bc
and the mounts
2015-12-11 16:38:44 +11:00
fe7ce40783
finished cosmetic names
2015-12-11 16:31:15 +11:00
05a80b23a1
converting gadget text. (kill me now)
2015-12-11 16:07:02 +11:00
88f44a293b
candy!
2015-12-11 15:31:35 +11:00
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
a5b28422cd
cosmetics
2015-12-11 15:19:20 +11:00
4588091c5b
Merge remote-tracking branch 'origin/master'
2015-12-10 23:15:42 -05:00
21c8a66917
Fix imports
2015-12-10 23:15:35 -05:00
1ab13d2ef5
Treasure Shards!
2015-12-10 22:52:15 -05:00
14b5a9453a
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-10 22:18:00 -05:00
a760dba783
i lied.
2015-12-11 02:59:16 +00:00
7a597d90b7
final push goodnight
2015-12-11 02:48:06 +00:00
5a1892e1ed
Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics
2015-12-10 21:32:14 -05:00
d6aed5dff7
More work
2015-12-10 21:32:10 -05:00
31cea3342e
some gadget stuff
2015-12-11 13:17:38 +11:00
ffd4658740
Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics
2015-12-10 21:06:50 -05:00
2694787590
Reverting
2015-12-10 20:59:57 -05:00
cf73d27a84
Merge remote-tracking branch 'origin/master'
2015-12-10 20:53:42 -05:00
4d05bd5c50
Player count for chiss
2015-12-10 20:53:38 -05:00
16f39c1e71
Pushing changes to go help william
2015-12-10 20:51:34 -05:00
626a812844
Many changes
2015-12-11 00:40:54 +00:00
4d8b8bd58b
Fix errors, update cosmetic menu
2015-12-10 19:27:32 -05:00
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
7b4f5d5b75
Christmas chest in gui
2015-12-10 19:19:20 -05:00
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
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
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
d16d9a36e9
Use Account ID from client manager instead of PlayerCache
2015-12-10 17:25:39 -05:00
851b613d2e
Now playing fix
2015-12-10 17:04:15 -05:00
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
c94c84f203
Some fixes
2015-12-10 02:59:22 +01:00
76b29756ff
Fixing some stats and disabling Chat spam messages.
2015-12-10 02:02:36 +01:00
507761d5b0
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-08 21:24:21 -05:00
d709071feb
Much fix, many wow.
2015-12-08 23:20:42 +00:00
7f75749194
Merge remote-tracking branch 'origin/master'
2015-12-08 16:55:14 -05:00
484dce18e1
Changing some Achievement things, to allow double values and dividing, Adding WPM, fixing some bugs.
2015-12-08 22:34:42 +01:00
fba88ec231
mount stuff is fixed
2015-12-09 08:19:55 +11:00
8051486fcb
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-08 16:14:41 -05:00
ca71f1f64f
Merge remote-tracking branch 'origin/master'
2015-12-08 14:32:17 -05: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
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
42a0354c9e
Now Playing, Preference to disable ads
2015-12-07 18:28:05 -05:00
55f0453897
Start of re-write
2015-12-07 23:20:03 +00:00
ec4a21a282
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-07 18:19:16 -05: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
c3ace42a68
Winter MOTD, Stat fixes (maybe?!)
2015-12-07 13:21:11 -05: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
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
e1efcabfbf
chat sale msgs
2015-12-07 20:39:31 +11:00
44a5bcb793
remove titan chest message, update pumkin message, holiday MB/DMT words
2015-12-07 02:06:00 -05:00
7b5db2d4fb
Hub Music, HubMusic Preference
2015-12-07 00:58:44 -05:00
488895ea53
Note block player
2015-12-06 21:12:10 -05: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
09f7a03444
Quick changes to improve things.
2015-12-06 20:00:22 -05: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
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
32a6d572ee
Disable gadgets in arcade for player count > 40
2015-12-05 22:56:15 -05:00
b98944b0a0
Handle attach entity
2015-12-06 14:38:00 +13:00
5b49c4adc3
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-05 19:58:55 -05:00
d5606f55ea
Modified CustomTagFix to support player name titles
2015-12-06 10:18:35 +13: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
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
5c575b41fc
Clans alpha 0.17
2015-12-04 05:15:28 -05:00
b1bd2ff5ac
Gravity's icon changed to ENDER_PORTAL_FRAME
2015-12-03 16:50:27 -08:00
c3a564faa7
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-03 19:31:24 -05: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
cab5c2a76d
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-02 20:12:41 -05:00
d6ca52e4a4
modifications
2015-12-02 05:11:09 +00:00
1810defd2d
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-01 20:39:54 -05:00
338e0f1892
fixed naming pets non-alphanumeric characters
2015-12-01 16:23:07 -08: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
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
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
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
e09e5851a6
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-11-29 01:17:17 -05:00
7c947ad97b
Merge master
2015-11-28 23:55:00 -05: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
aa68701ebd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-28 20:16:49 +00:00
8cdae7ce1a
Merge remote-tracking branch 'origin/master' into foo
2015-11-28 09:33:47 -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
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
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
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
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
a5ebf9b059
Fixes for release
2015-11-27 05:53:57 -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
77be81c216
pet changes
2015-11-27 16:50:22 +11:00
2b047cdde8
more titan stuff
2015-11-27 16:46:48 +11:00
05e7183b65
titan stuff update
2015-11-27 15:55:00 +11:00
73c2f16d8b
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-11-26 23:11:12 -05:00
0274bf2847
loads of changes.
2015-11-27 03:28:19 +00:00
3c98243201
Some more guardian stuff
2015-11-27 15:56:56 +13:00
0a4416381b
Fix guardian
2015-11-27 15:55:02 +13:00
98d988584d
titan cosmetics
2015-11-27 13:35:25 +11:00
0d43ffc7b2
fixessss
2015-11-26 06:54:49 +00:00
de82806fc0
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-11-25 22:53:06 -05:00
3e8a53562e
Add new hologram interaction thingy so holograms can catch interactions that they would normally block
2015-11-26 15:49:28 +13:00
1306137cb2
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-25 14:51:00 -05:00
ff5d828dd7
Merge with master, lots of clans fixes/work
2015-11-25 14:50:49 -05:00
2adfef41ca
bug fixes and new stuff ( https://docs.google.com/spreadsheets/d/1jrKJIXhIF0TZvYKLyAC50IYfN8ylLZK_M8lSexEZTkc/edit#gid=0&vpid=A10 )
2015-11-25 16:46:53 +00:00
3b89d65a09
Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java
2015-11-25 15:59:18 +01:00
ca81265b9e
Readded PacketHandler debug message
2015-11-25 13:42:11 +13:00
46362a3d5f
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-11-24 15:38:52 +01:00
837be048a6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-24 21:38:47 +11:00
f8d8b75586
Changed how timings is used.
2015-11-24 04:36:18 -06:00
f300fd2c98
Merge remote-tracking branch 'origin/master' into foo
2015-11-23 15:34:27 -08:00
ef7c26c04c
Clans changes
2015-11-23 15:57:13 -05:00
Shaun Bennett
Cheese
Jonathan Williams
Virizion
William Burns
Shaun Bennett
xGamingDudex
Sarah
Mysticate
libraryaddict
Keir
fooify
NewGarbo