5f362a878a
Run some Redis functions async (as it sometimes blocks).
2016-01-09 22:21:15 +00:00
942460b471
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2016-01-09 13:05:44 -08:00
263e1326cd
JSON progress
2016-01-09 20:22:29 +00:00
0f587ba5d9
fixing "Kicked for flying again" again...
2016-01-09 12:07:57 +01:00
2df626b35e
Fix CustomDataManager crash
2016-01-08 18:06:33 -05:00
511b39caa7
Merge branch 'master' into develop
2016-01-08 17:05:54 -05:00
7ce028203b
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-01-08 13:59:43 +00:00
5cb91bb315
Allow reuse of ReportManager instance (for later use).
2016-01-08 13:59:30 +00:00
5482d1dc40
Fixing "kicked for Flying"
2016-01-08 12:17:28 +01:00
6096fcad42
Fix hotbar issues
2016-01-08 04:06:11 -05:00
504d9d508c
Slightly reduce Squid's Ink Blast damage in SSM
2016-01-08 03:15:30 -05:00
d361ce948e
Merge branch 'develop' into william-gladiators
...
# Conflicts:
# Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilMath.java
2016-01-08 02:21:32 -05:00
19bb44cb9a
Disable HolidayManager and HolidayGiftManager
2016-01-08 01:41:02 -05:00
003af1b87c
Disable Holiday Words in DMT and Build
2016-01-08 01:38:49 -05:00
b6b455c1c0
Merge pull request #117 in MIN/mineplex from clans/alpha to develop
...
* commit '15d2118bc1701b79576f6d73dc1d4aeca500f11e': (23 commits)
Added C.Mod rank, and started on rank info.
changed outpost forcefields to be a bit larger to surround the outpost more.
made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request.
added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around.
fixed npe on cleanup() because it doesn't check if the holograms are null or not. (they may or may not be null at the time of cleanup() being called depending on the current state of the outpost)
fixed outpost being built instantly on output block place.
holograms above outpost block should be centered in the block and made them despawn on outpost death
legendary pickkup message fix (FINALLY FIXED NOW )
quick modification to outposts, and fixed the legendary announcements being weird
updated clans version
quikc change
outpost changes, and some other things
lots of work on outposts, fixed gold dupe glitch, fixed clans ban gui title being "Customize New Gear".
fixes (?)
lots of changes that i can't remember at this point
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.
player gold exploit checking. i know this code is strange but please don't delete it. we need it for now.
a couple more prettificatons to pvp timer messages.
one more quick message change/fix
qa changes to pvp safety
...
2016-01-08 00:35:15 -06:00
fff6d8e03f
added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around.
2016-01-07 19:36:52 +00:00
d88b14d9d6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-07 09:35:07 +00:00
de6f6cf5f0
Add a IsLive check in Spleef
2016-01-07 08:49:26 +13:00
db2cddc443
Fixing Join/Quit messages
2016-01-05 19:10:40 +01:00
10eb65a8d6
Merge pull request #114 in MIN/mineplex from bugfix/disguise-command to develop
...
* commit 'dd6d7b1b96947a400911bc5fa310039ab147c159':
updating denial message
Love you Sarah <3
Fixing Disguise File
update /Disguise for Hub as well
updating /disguise
2016-01-04 15:58:43 -06:00
652084d071
Merge pull request #115 in MIN/mineplex from bugfix/thanos to develop
...
* commit '3770211e66b41e16440609a0a79b3999b9b6cca7':
Turf Wars: Include Teddy's border fix.
Turf Wars: Undo bracket formatting.
Turf Wars: Apply knockback on all players when there are only two in the match.
Turf Wars: Add comment on block physics event.
Turf Wars: Fix sneaking near turf edge and wool placement near ladders.
2016-01-04 15:56:32 -06:00
3770211e66
Turf Wars: Include Teddy's border fix.
2016-01-04 22:58:11 +02:00
982e684a45
Turf Wars: Undo bracket formatting.
2016-01-04 21:42:58 +02:00
47c78bcba1
Turf Wars: Apply knockback on all players when there are only two in the match.
2016-01-04 17:19:40 +02:00
f6ce98f65b
Turf Wars: Add comment on block physics event.
2016-01-02 23:33:08 +02:00
03c6395a30
Turf Wars: Fix sneaking near turf edge and wool placement near ladders.
2016-01-02 23:30:27 +02:00
dd6d7b1b96
updating denial message
2016-01-02 16:45:15 +01:00
7e1b0b9110
Love you Sarah <3
2016-01-02 03:19:39 +01:00
8ef1a524c1
updating /disguise
2015-12-31 12:01:24 +01:00
efbd1c52d2
Merge remote-tracking branch 'origin/master' into feature/typewars-antimacrorekter
2015-12-31 03:01:23 -05:00
5ff9d1985b
Monitoring for josh + the mods
2015-12-31 03:00:40 -05:00
5841ab1101
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2015-12-29 23:47:00 +00:00
f1c7424939
Fixing hotbar
2015-12-29 15:19:09 +00:00
7ad12d0a6b
Show Host Rank in private servers
2015-12-29 00:50:20 -06: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
c680d91b56
Nerf TypeWars gems (again)
2015-12-25 03:12:04 -06:00
cc421c1435
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2015-12-24 21:19:30 +00: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
08b5e7b4db
Working loadouts.
2015-12-23 09:21:43 +00:00
592fcbd282
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2015-12-22 10:55:11 -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
c63014b51f
Type-Wars merge
2015-12-21 12:49:10 -05: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
5469289d82
Wrong iterator!
2015-12-21 06:57:56 -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
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
f57304764c
Added a hotbar layout editor
2015-12-18 15:16:00 +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
5f506e3810
Moved team generation.
2015-12-17 21:49:15 -05:00
e7243d4b9c
Re-add getArcadePlayer(Player player)
2015-12-17 22:19:45 +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
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
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
6f82f8349d
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/.idea/modules.xml
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
2015-12-16 14:07:56 +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
b36bf37197
Merge remote-tracking branch 'origin/master' into update-paintball
2015-12-15 19:22:38 -05:00
6d9bcb8e66
Reworked serialization and store more data in json files for later parsing.
...
Internally store UUIDs for reports and convert them as needed for display to user.
Many other misc. changes and refactorings.
2015-12-15 21:30:45 +00:00
92b82d786b
Don't give Winter Holiday Chests to offline players
2015-12-15 13:34:47 -05:00
40ae7743c6
reverting last "fix"
2015-12-15 14:20:21 +01:00
cf58fdee4a
trying to fix the spigot Chat spam thingy.
2015-12-15 05:29:59 +01: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
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
4afca01ad0
Treasures!
2015-12-14 02:49:51 -05:00
93c13d138d
Remove some debug stuff I forgot to remove.
2015-12-14 00:10:45 -05: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
5be91de006
Merge master
2015-12-13 23:40:18 -05:00
f26c31b7ec
xmas a little harder
2015-12-14 15:33:09 +11:00
1073981778
Merge branch 'master' into update-xmaschaos
2015-12-14 15:30:15 +11:00
c34ac3ec52
xmas
2015-12-14 15:21:43 +11: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
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
d91e4ab4f7
Another door bug, and a title fix.
2015-12-13 20:27:37 +00: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
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
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
ac6d3c2c8f
merge with master
2015-12-11 06:27:23 -05:00
d7f39bdfd8
costume sets
2015-12-11 20:59:55 +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
222173ab17
Improved and implemented GameProfile caching.
2015-12-11 01:24:59 -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
563a0f0ec7
remove tutorial and no flicker
2015-12-11 02:30:44 +00:00
2694787590
Reverting
2015-12-10 20:59:57 -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
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
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
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
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
8459cf0f95
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
2015-12-09 18:13:26 +00:00
a5c46545df
fixing timer being shown.
2015-12-09 14:44:22 +01: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
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
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
Keir
fooify
Teddy
Sarah
Shaun Bennett
NewGarbo
libraryaddict
Thanos paravantis
Morten
William Burns
Virizion
Cheese
xGamingDudex
Shaun Bennett
Jonathan Williams