f1c7424939
Fixing hotbar
2015-12-29 15:19:09 +00:00
55cdf4148a
Merge branch 'develop'
2015-12-29 03:21:03 -06:00
16ee74885e
Add maintenance line
2015-12-29 02:52:53 -06:00
7ad12d0a6b
Show Host Rank in private servers
2015-12-29 00:50:20 -06:00
7104f1363a
Give YT rank access to extra preferences
2015-12-29 00:34:18 -06:00
fe337986bf
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2015-12-28 16:16:10 -08:00
8a8d5b088b
Switch to 7x7 builds.
2015-12-28 16:48:03 -05:00
3d9a252868
Added auto pickup and fixed some stuff.
2015-12-27 15:26:43 -05:00
162b3eb33f
Stopped a bunch of block events.
2015-12-27 14:34:24 -05:00
845014b677
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2015-12-25 15:49:41 -05:00
c680d91b56
Nerf TypeWars gems (again)
2015-12-25 03:12:04 -06:00
dd8e91e463
Update MOTD
2015-12-25 03:03:53 -06:00
25d36b546a
Remove unnecessary files
2015-12-25 01:53:00 -06:00
d08cfa0c4c
Holiday Gifts
2015-12-25 01:51:36 -06:00
41f56e9853
Lots of typo fixes and such
2015-12-24 11:13:54 -08:00
b356bce177
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2015-12-24 11:09:08 -08:00
b0f8edb0f9
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2015-12-23 18:25:52 -05:00
aa50c4762f
fixes (?)
2015-12-23 18:55:44 +00:00
1d4a5e5804
Clean up imports, set resource pack on clans.
2015-12-24 07:47:05 +13:00
000b1f85b7
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop
2015-12-24 07:41:55 +13:00
67bdc6832f
Tentative beginnings for clans resource packs
2015-12-24 07:40:49 +13:00
369687b5dd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
...
Conflicts:
Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs
2015-12-23 18:31:51 +00:00
ff24ebc9f4
lots of changes that i can't remember at this point
2015-12-23 18:22:20 +00:00
08b5e7b4db
Working loadouts.
2015-12-23 09:21:43 +00:00
f83016e007
Also really quickly fixed the Invisibility in lobby bug (hopefully)
2015-12-23 00:39:16 +01:00
8c399f03da
Removed a weird query :/
...
Status: Finished
2015-12-22 21:36:19 +01:00
9336eb19fa
Finished up the Unban feature...
2015-12-22 21:31:57 +01:00
0ac2158988
i before e!
2015-12-22 11:02:57 -08:00
255dd0bdb3
fixed cosmetic menu item dropping bug
2015-12-22 11:02:37 -08:00
592fcbd282
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2015-12-22 10:55:11 -08:00
a8d9956846
more grammatical errors hast been fixed
2015-12-22 10:35:20 -08:00
0322ae1217
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-12-22 00:02:21 -05:00
b255c58653
Merge branches 'develop' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-21 21:56:08 +00:00
2ccd7a5de0
Fix Type Wars stat icon
2015-12-21 13:20:04 -05:00
7a72762c78
Update MOTD
2015-12-21 12:56:37 -05:00
c63014b51f
Type-Wars merge
2015-12-21 12:49:10 -05:00
a5436d63c0
Updating Holiday Achievements
2015-12-21 18:45:26 +01:00
7c66bdbbde
Updating Stats GUI
2015-12-21 18:25:44 +01:00
010b1b0a5d
Achievements....
2015-12-21 18:08:11 +01:00
6e3274ff2f
changing Category
2015-12-21 18:06:00 +01:00
f15c318e5c
adding PM message.
2015-12-21 18:02:25 +01:00
082b5e156c
fixing Kit NPEs
2015-12-21 17:48:17 +01:00
ff5761cc1d
Fixing ending Stats.
2015-12-21 17:44:15 +01:00
590da2128c
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
2015-12-21 17:43:51 +01:00
1726aa2530
Added a feature to unban clients across the network
...
But there still a bug when you type a username of a none registered member.
Will fix ASAP - likely after Mineware
2015-12-21 12:58:19 +01:00
5469289d82
Wrong iterator!
2015-12-21 06:57:56 -05:00
fae2a5d2bf
Update game display
2015-12-21 04:40:30 -05:00
a235103066
Merge pull request #106 in MIN/mineplex from update-menu to develop
...
* commit 'f4050fb1ff54dbe4639b0258eff53360d800d0b9':
Adjust GUI, fix beta button
Yo shaun debug this m8 ty
2015-12-21 03:36:46 -06:00
f4050fb1ff
Adjust GUI, fix beta button
2015-12-21 04:35:57 -05:00
99285b2ac8
Merge remote-tracking branch 'remotes/origin/type-wars' into develop
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
2015-12-21 03:50:55 -05:00
0f5be6444b
Yo shaun debug this m8 ty
2015-12-21 02:23:59 -05:00
816da0f633
Fixing Gems
2015-12-20 12:00:32 +01:00
fe658b30a1
Grammatical errors hath been fixed!
2015-12-19 15:03:42 -08:00
f1188529f2
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-12-19 13:09:26 +01:00
c56cd0d56e
adjusting some timings
2015-12-19 13:08:53 +01:00
35966d88cf
Fixing Tutorial Minion
2015-12-19 13:05:39 +01:00
7327d9463f
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-12-19 13:00:49 +01:00
8a54388480
fixing last commit
2015-12-19 13:00:12 +01:00
32a0dd6668
adding Tutorial notification
2015-12-19 12:59:37 +01:00
152e759c10
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-12-19 12:56:05 +01:00
7cb002ca86
Adding Tutorial notification
2015-12-19 12:55:28 +01:00
f8bffc9f88
nuke delay and Stats
2015-12-19 12:45:06 +01:00
c0ab31fdac
Finished up fixes.
2015-12-19 00:19:50 -05:00
a5c18f4677
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2015-12-18 20:05:03 -05:00
b3afa0094e
Fixing some nuke stuff, Giant noises only for own Team and "Giant under attack message", spelling fixes
2015-12-19 00:59:15 +01:00
dab2416ccd
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-12-19 00:49:16 +01:00
6c5e3d7509
Fixing visibility.
2015-12-19 00:48:42 +01:00
c2e88c2794
Merge branch 'develop' of ssh://184.154.0.242:25565/min/mineplex into feature/player-data
2015-12-18 18:16:32 +00:00
13cfc0e12a
Updated to a better check
2015-12-18 18:16:20 +00:00
f57304764c
Added a hotbar layout editor
2015-12-18 15:16:00 +00:00
1840572c49
Lots of changes, specifics:
...
Fixed clans having more than max energy.
Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory.
/c <clan> now works with clans with 18+ players.
2015-12-18 11:13:38 +00:00
298ea1e5e6
Merge pull request #101 in MIN/mineplex from update-paintball to develop
...
* commit 'd561915fd32885036b55cc6a05899934a544e131':
FORMATTING CHANG EI'M GOING TO CRY UGH
DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D
Changed dns api key to new key. Prevent server monitor redis calls to cause restarts. Added winter chests to customer support.
Epic chnage that saved the day omg
Die player cache
Quick changes to improve things.
Uncommented bouncy balls
Final tweaks to random armorstand
Quick thing before merge
Worked on double.
Switching branches
Formatting
Reformatted
Fixed paintball to the max. :>>
Class
Switching branches c:
Sniper work
Work. Deemed unsuitable due to an issue with the paintballs flying wide.
Added a sniper kit! :D
2015-12-17 23:32:22 -06:00
f80648bfbc
Update DBPool to load from file
2015-12-18 00:32:07 -05:00
d561915fd3
FORMATTING CHANG EI'M GOING TO CRY UGH
2015-12-17 23:16:57 -05:00
2bf734a15c
DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D
2015-12-17 23:08:07 -05:00
2c09fd969b
Attempt at fixing spectator page
2015-12-17 22:24:44 -05:00
806b656dcf
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2015-12-17 21:56:01 -05:00
53f9a051c5
Fix spectator page sorting team list
2015-12-17 21:52:34 -05:00
7621fe793d
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-17 21:50:32 -05:00
5f506e3810
Moved team generation.
2015-12-17 21:49:15 -05:00
066d0a861f
Merge remote-tracking branch 'origin/master' into update-paintball
2015-12-17 21:00:15 -05:00
4bf7e15055
player gold exploit checking. i know this code is strange but please don't delete it. we need it for now.
2015-12-18 01:05:02 +00:00
c2fb6e6c15
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-17 18:34:25 -05:00
2953fe395f
Changed dns api key to new key.
...
Prevent server monitor redis calls to cause restarts.
Added winter chests to customer support.
2015-12-17 18:33:49 -05:00
e7243d4b9c
Re-add getArcadePlayer(Player player)
2015-12-17 22:19:45 +00:00
3e8c3cb928
Changed to setData in PlayerCustomData
2015-12-17 22:16:05 +00:00
2ac28c4fd5
Merge branches 'develop' and 'feature/player-data' of ssh://184.154.0.242:25565/min/mineplex into feature/player-data
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-12-17 21:44:31 +00:00
5c045bfce4
Changes to core client manager, and finishing custom data!
2015-12-17 21:27:44 +00:00
7f188072ad
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop
2015-12-18 10:03:41 +13:00
66372c397b
First version of ResourcePackManager that handles all resource packs globally
2015-12-18 10:03:03 +13:00
7d9b97180d
Testing ArcadePlayer implementation
2015-12-17 01:48:55 +00:00
d28c2be1c3
Epic chnage that saved the day omg
2015-12-16 20:26:04 -05:00
b4c3ce9fba
a couple more prettificatons to pvp timer messages.
2015-12-16 23:19:04 +00:00
eb9ba92fb1
one more quick message change/fix
2015-12-16 22:53:24 +00:00
2ee1ccbcf9
qa changes to pvp safety
2015-12-16 22:48:55 +00:00
ee202bc7f5
Add MineplexPlayer -> ArcadePlayer
2015-12-16 22:32:34 +00:00
4077aa808f
Add to Arcade and Hub
2015-12-16 22:01:51 +00:00
370c59ce75
Added custom data
2015-12-16 21:52:41 +00:00
d619a9644b
few changes to pvp timer, and fixed bugs etc
2015-12-16 18:25:30 +00:00
4e9e0243cd
Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
# Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
2015-12-16 18:16:08 +01:00
baf0f254bb
Custom data, waiting for JLO
2015-12-16 14:41:57 +00:00
628ee8a137
Some small fixes.
2015-12-16 00:02:21 -05:00
7fa1963268
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-15 23:06:13 -05:00
d16dd4a9d2
Merge remote-tracking branch 'origin/master' into update-paintball
2015-12-15 19:35:55 -05:00
4566577c68
Die player cache
2015-12-15 19:26:09 -05:00
b36bf37197
Merge remote-tracking branch 'origin/master' into update-paintball
2015-12-15 19:22:38 -05:00
7ac1fd86b4
made pvp timer players immune to skills
2015-12-15 21:12:49 +00:00
baef84f4d9
fixed pvp timer subtitles bugged out
2015-12-15 20:09:54 +00:00
211e440e67
Merge remote-tracking branch 'remotes/origin/master' into develop
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
2015-12-15 15:00:14 -05:00
aef704d972
Slight winter reward rarity changes
2015-12-15 14:58:09 -05:00
5f14d6675f
Fix shard values
2015-12-15 14:56:19 -05:00
07f610d4bd
More Fixes
2015-12-15 14:45:12 -05:00
607c164753
Merge remote-tracking branch 'remotes/origin/clans/alpha' into develop
2015-12-15 13:55:01 -05:00
92b82d786b
Don't give Winter Holiday Chests to offline players
2015-12-15 13:34:47 -05:00
b9a688c4e7
Update monthly bonuses
2015-12-15 13:07:49 -05:00
e3e757da8a
Fix mounts owned count
2015-12-15 13:06:11 -05:00
3edba0fac6
Fix Grinch Hat
2015-12-15 12:28:06 -05:00
f2107b7b79
Merge remote-tracking branch 'origin/develop' into develop
2015-12-15 12:07:40 -05:00
2216fdc52c
Dont disable new gadgets in games
2015-12-15 12:07:34 -05:00
40ae7743c6
reverting last "fix"
2015-12-15 14:20:21 +01:00
6a346790f7
disable tutorial
2015-12-15 12:00:56 +00:00
1da04b84b5
test push (change version to 0.17d)
2015-12-15 11:57:33 +00:00
c63bac6433
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-12-15 11:42:16 +00:00
47ad563596
Spawn nametags far far away from players
2015-12-15 22:46:30 +13:00
cf58fdee4a
trying to fix the spigot Chat spam thingy.
2015-12-15 05:29:59 +01:00
871c97f7af
changed chest %'s
2015-12-15 09:25:44 +11:00
afa45c47ca
Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into pregametutorial
2015-12-14 14:23:42 +01:00
9137fcfe40
loads of changes (pvp timer, unsafe stuff)
2015-12-14 12:39:00 +00:00
0f38c7b287
increased minimum coal
2015-12-14 22:12:50 +11:00
951cd65903
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 22:05:22 +11:00
045bc760c2
increassed cooldown, people getting trapped perm
2015-12-14 22:05:08 +11:00
809ff649be
lowered rarities a bit
2015-12-14 22:03:09 +11:00
7181a26e58
Remove pointless equals()
2015-12-14 05:56:39 -05:00
9e72e5adf1
nicer text
2015-12-14 21:43:11 +11:00
daa9f165b1
removed coins from gadgets
2015-12-14 21:41:47 +11:00
52394c89dd
fixed skins beign wrong way around
2015-12-14 21:34:27 +11:00
0ecd5a05f5
fixed hat ownership
...
reduced coal cost
2015-12-14 21:32:06 +11:00
00de6880ba
fixed wrong types
2015-12-14 21:25:30 +11:00
342e9f2345
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 20:53:49 +11:00
1189535748
icon fixes
2015-12-14 20:53:34 +11:00
816c057eb3
Notify server about opening chest
2015-12-14 04:49:44 -05:00
6ec8ec4c01
Merge pull request #97 in MIN/mineplex from william-gladiators to master
...
* commit 'd91e4ab4f756746b31c7ebdd3e7d33c139ea7d30':
Another door bug, and a title fix.
Health looks nicer.
Bug fixes. Title shortened.
2015-12-14 03:45:55 -06:00
daf1d29ce0
Fix Carl
2015-12-14 04:44:11 -05:00
50bf97ae4a
Fancy treasure changes
2015-12-14 04:19:15 -05:00
670eaa1954
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 19:16:03 +11:00
e4fd97467f
More treasure changes
2015-12-14 03:14:52 -05:00
288c20fc74
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 19:13:05 +11:00
9e35399d1d
rarities tweaked + shards
2015-12-14 19:09:55 +11:00
db9db558a0
Update GUI slots
2015-12-14 02:56:07 -05:00
4afca01ad0
Treasures!
2015-12-14 02:49:51 -05:00
c508b5ea96
chest visuals
2015-12-14 18:13:19 +11:00
063c87c4fe
Merge remote-tracking branch 'origin/master'
2015-12-14 00:29:11 -05:00
cdbcae7e3e
Cosmetic Menu Update
2015-12-14 00:28:28 -05:00
048a9a81b8
gadget ammo should no logner be purchasable
2015-12-14 16:20:39 +11:00
93c13d138d
Remove some debug stuff I forgot to remove.
2015-12-14 00:10:45 -05:00
09643d3e61
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-14 00:08:32 -05:00
7f9e5c4ec9
more coal
2015-12-14 16:06:49 +11:00
f6f04fe256
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 16:04:05 +11:00
55fffdad59
fixed some colors
2015-12-14 16:03:51 +11:00
b3b41e453b
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-14 00:01:41 -05:00
d8f44434ff
Fixed a bunch of bugs. Still need to fix clicking compass ending game.
2015-12-14 00:00:40 -05:00
e8b0e5dd8e
Fix IntellIJ Files
2015-12-13 23:51:47 -05:00
8e31c79c58
Merge remote-tracking branch 'origin/master'
2015-12-13 23:46:46 -05:00
bccade55bc
reduced coal fumes size
2015-12-14 15:43:45 +11:00
5be91de006
Merge master
2015-12-13 23:40:18 -05:00
f26c31b7ec
xmas a little harder
2015-12-14 15:33:09 +11:00
fe3431ba04
Cosmetic Menu Update
2015-12-13 23:31:21 -05:00
1073981778
Merge branch 'master' into update-xmaschaos
2015-12-14 15:30:15 +11:00
94169a5b8a
it made me push it :(
2015-12-14 15:29:34 +11:00
c34ac3ec52
xmas
2015-12-14 15:21:43 +11:00
dcf3c1ea88
Deleted and added new Cache since renaming was jacked up.
2015-12-13 23:14:17 -05:00
42244ae798
Snowman AI fix
2015-12-13 22:43:11 -05:00
a04eaddc42
Fixed bump
2015-12-13 22:25:18 -05:00
f90484c37f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-12-14 15:43:03 +13:00
b5bdf7ced4
Remove custom name on players on join and arcade spectator
2015-12-14 15:42:32 +13:00
54911bb213
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-13 19:54:57 -05:00
12eba41975
Fixed corner stairs.
2015-12-13 19:52:32 -05:00
0dd7db27cd
FIXED FORAMTTING
2015-12-13 19:49:41 -05:00
a827f95eb4
Fixed scoreboard. VIVA LA FIESTA
2015-12-13 19:24:24 -05:00
0e9e8c155f
Quick fix that I don't think i caused.
2015-12-13 19:11:06 -05:00
0c383f8bf4
Remove bad message
2015-12-13 18:58:03 -05:00
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
35ab40727b
XMAS UPDATE OMG :O
2015-12-13 18:55:21 -05:00
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
d91e4ab4f7
Another door bug, and a title fix.
2015-12-13 20:27:37 +00:00
677e95a7fd
Update IntellIJ grouping
2015-12-13 14:05:28 -05:00
63f5794c79
Only fix Giant facings is prepare Phase
2015-12-13 14:31:21 +01:00
e31124e212
Health looks nicer.
2015-12-13 13:29:46 +00:00
4fad564e15
Bug fixes. Title shortened.
2015-12-13 12:50:06 +00:00
b095fa9efe
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-13 21:15:32 +11:00
011a194dc6
fixed exploit
2015-12-13 21:14:57 +11:00
8bcc36adb1
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-13 01:39:42 -05:00
ec86cad7ee
Changed descriptions.
2015-12-13 01:38:38 -05:00
e7213fdb7e
Remove project specific settings
2015-12-13 16:41:37 +13:00
9058428484
Change ItemBuilder to have ItemFlag, change hub icons to not display weapon damage
2015-12-13 16:40:46 +13:00
a92361f2fe
some more descriptions for Tutorials
2015-12-12 20:03:35 +01:00
2a45018fcd
array thing
2015-12-11 23:41:46 -05:00
7a82cf04f0
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-11 23:02:16 -05:00
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
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
0d4bd91b57
lag detection thing
2015-12-11 22:47:07 +00:00
09e5aed6e7
Adding some descriptions.
2015-12-11 22:06:23 +01:00
6d1e4b6cab
Merge remote-tracking branch 'origin/master' into project-cosmetics
2015-12-11 18:09:09 +01:00
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
6456d7bd66
Scoreboard change and breaking blocks.
2015-12-11 16:55:15 +00:00
1dcbf5f7fd
Couple of fixes
2015-12-11 16:34:04 +00:00
ba087d119a
Small tweaks
2015-12-11 17:31:05 +01:00
2ffd1d4595
BOB ROSS
2015-12-11 23:11:33 +11:00
d5612a8f27
added a hint to how many more coal you need to your next prize.
2015-12-11 23:09:06 +11:00
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
14b5a9453a
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-10 22:18:00 -05:00
68360c6705
shortened if
2015-12-10 22:17:10 -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
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
c73bd54aec
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-10 15:38:17 -05: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
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
9b53e15b4f
More stuff.
2015-12-09 21:38:00 -05:00
662d3b464f
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-09 21:15:39 -05:00
0ff87cf134
Stuff.
2015-12-09 21:14:45 -05: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
be6f9ac6dc
Capitalize enum names.
2015-12-09 19:17:12 -05: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
507761d5b0
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-08 21:24:21 -05: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
8051486fcb
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-08 16:14:41 -05: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
48a5776fb7
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-07 23:30:30 -05:00
d22a905206
Lot more stuff! :D
2015-12-07 23:29:33 -05: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
f837fd14db
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-07 18:45:42 -05: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
ec4a21a282
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-07 18:19:16 -05: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
William Burns
Shaun Bennett
fooify
Virizion
NewGarbo
libraryaddict
Morten
Sarah
Jonathan Williams
Cheese
xGamingDudex
Shaun Bennett
Teddy