39f5f70a5f
fixing up coal things
2015-12-11 22:43:34 +11:00
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
523c1875ef
fix
2015-12-11 06:58:11 +00: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
66011cde8c
fixed player count
2015-12-11 17:25:23 +11: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
9a4006df27
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-12-11 17:18:07 +13:00
c5f0624bf7
Add build file
2015-12-11 17:17:52 +13: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
3cd187ff04
Move LineFormat.java
2015-12-11 16:57:21 +13:00
bc46518a05
Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics
2015-12-10 22:54:53 -05:00
1ab13d2ef5
Treasure Shards!
2015-12-10 22:52:15 -05:00
4cfa7c436b
Add missing file
2015-12-11 16:48:40 +13:00
a760dba783
i lied.
2015-12-11 02:59:16 +00:00
7a597d90b7
final push goodnight
2015-12-11 02:48:06 +00:00
1607345f04
title + debug
2015-12-11 02:41:44 +00:00
557f3e97a5
Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics
2015-12-10 21:32:35 -05: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
563a0f0ec7
remove tutorial and no flicker
2015-12-11 02:30:44 +00:00
a0b7870acc
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-12-11 15:21:18 +13:00
1661c056c1
Added line stuff
2015-12-11 15:21:05 +13: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
f8d7aeb5ea
before revert
2015-12-11 01:32:32 +00:00
dda5ac6728
work
2015-12-11 01:20:36 +00:00
4abad9e1c4
fixing chat and test commands.
2015-12-11 02:00:26 +01:00
ffb75a7832
Adding CustomEnding
2015-12-11 01:44:19 +01: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
5d96ceb41e
Let owner+ disguise as staff - easy way to check a player's rank
2015-12-10 19:20:11 -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
5b0909012d
Renamed GadgetActivateEvent to GadgetEnable event
...
Some files didn't make it to prev commit
2015-12-11 01:07:47 +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
ab16bf89e5
Merge remote-tracking branch 'origin/master'
2015-12-10 17:04:25 -05:00
851b613d2e
Now playing fix
2015-12-10 17:04:15 -05:00
4cf33eef05
Tutorial changes!
2015-12-10 21:32:14 +00:00
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
0bd276c16a
Merge branch 'pregametutorial' of ssh://184.154.0.242:25565/min/mineplex into pregametutorial
2015-12-10 20:53:01 +00:00
8d7b03e3f6
Added the ability to have title AND subtitle per TutorialText.
2015-12-10 20:52:41 +00:00
2951088005
Tutorial changes/additions.
2015-12-10 20:48:13 +00:00
3586642414
Added back the tutorial.
2015-12-10 19:32:25 +00:00
af7c058f22
Lots of bug fixes / additions since the testing 12/9/15.
2015-12-10 19:06:07 +00: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
1ee1e7a04b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-12-10 20:02:39 +13:00
eaf3937004
Fix the damage while walking on falling block
2015-12-10 20:02:12 +13:00
fabf3dab59
updated blocksearch
2015-12-10 13:12:01 +11: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
87a834c01b
FIX
2015-12-10 00:03:57 +00:00
90896073d4
debug
2015-12-10 00:03:17 +00:00
cea2716851
fight man
2015-12-09 23:59:20 +00:00
05bd55f720
iter
2015-12-09 23:53:04 +00:00
b8a2304edd
work
2015-12-09 23:39:00 +00:00
3ad0a3db6e
fix
2015-12-09 23:14:08 +00:00
17c989d941
Less per-player arena stuff
2015-12-09 22:39:04 +00:00
513db5dd8d
doing byes
2015-12-09 21:33:31 +00:00
852be97bae
Work
2015-12-09 20:16:16 +00:00
a5c46545df
fixing timer being shown.
2015-12-09 14:44:22 +01:00
667f076202
fixed unsafe timer
2015-12-09 10:46:05 +00:00
c021fbf9ed
Bounce baby bounce.
2015-12-08 23:27:38 +00:00
d709071feb
Much fix, many wow.
2015-12-08 23:20:42 +00:00
2e49611035
LinkedHashMaps, Buttons
2015-12-08 17:45:27 -05:00
7f75749194
Merge remote-tracking branch 'origin/master'
2015-12-08 16:55:14 -05:00
26c5c419f8
fixed a bug where old displayName would be used after name was updated.
2015-12-09 08:38:05 +11: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
a83ede3caa
Handling slow movers
2015-12-08 21:14:19 +00:00
7bdbd5a6af
Woo almost done!
2015-12-08 21:10:27 +00:00
2decc049c5
fixed my muddling of perks
2015-12-09 07:47:07 +11:00
09d8367b4b
fixed method
2015-12-09 07:32:36 +11:00
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
ca71f1f64f
Merge remote-tracking branch 'origin/master'
2015-12-08 14:32:17 -05:00
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
Cheese
Shaun Bennett
William Burns
Jonathan Williams
libraryaddict
Shaun Bennett
Sarah
xGamingDudex
NewGarbo
Teddy
Mysticate
Keir
fooify