William Burns
e31124e212
Health looks nicer.
2015-12-13 13:29:46 +00:00
William Burns
4fad564e15
Bug fixes. Title shortened.
2015-12-13 12:50:06 +00:00
Cheese
b095fa9efe
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-13 21:15:32 +11:00
Cheese
011a194dc6
fixed exploit
2015-12-13 21:14:57 +11:00
Virizion
8bcc36adb1
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-13 01:39:42 -05:00
Virizion
ec86cad7ee
Changed descriptions.
2015-12-13 01:38:38 -05:00
libraryaddict
e7213fdb7e
Remove project specific settings
2015-12-13 16:41:37 +13:00
libraryaddict
9058428484
Change ItemBuilder to have ItemFlag, change hub icons to not display weapon damage
2015-12-13 16:40:46 +13:00
Sarah
a92361f2fe
some more descriptions for Tutorials
2015-12-12 20:03:35 +01:00
Thanos paravantis
4e35b398d3
Change challenge start message format.
2015-12-12 15:57:31 +02:00
Thanos paravantis
ac69b33f3e
Merge branch 'MortensRawBugFixes' into thanos-mineware
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
2015-12-12 10:14:29 +02:00
Thanos paravantis
2773518e30
Merge branch 'MortensRawBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes
2015-12-12 10:12:42 +02:00
Thanos paravantis
92e23b2e1b
Rename method on Fast Food challenge.
2015-12-12 10:11:42 +02:00
Virizion
2a45018fcd
array thing
2015-12-11 23:41:46 -05:00
Virizion
7a82cf04f0
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-11 23:02:16 -05:00
Shaun Bennett
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
Shaun Bennett
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
Morten
2626e1869b
Merge conflitchs... Yey
2015-12-12 00:12:05 +01:00
Morten
5ca997f2a8
Merge branch 'BotspamImprovement' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java
2015-12-12 00:11:27 +01:00
Morten
cecc7d8141
Updated to JAVA 8... Weird bugs happened :(
2015-12-12 00:06:28 +01:00
William Burns
0d4bd91b57
lag detection thing
2015-12-11 22:47:07 +00:00
Sarah
09e5aed6e7
Adding some descriptions.
2015-12-11 22:06:23 +01:00
Thanos paravantis
ba271cd566
Commiting some eclipse workspace files.
2015-12-11 22:02:54 +02:00
Morten
bfaaf0a33b
Did some reguested bug fixed and challenge changes
2015-12-11 20:49:39 +01:00
xGamingDudex
6d1e4b6cab
Merge remote-tracking branch 'origin/master' into project-cosmetics
2015-12-11 18:09:09 +01:00
xGamingDudex
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
William Burns
6456d7bd66
Scoreboard change and breaking blocks.
2015-12-11 16:55:15 +00:00
William Burns
1dcbf5f7fd
Couple of fixes
2015-12-11 16:34:04 +00:00
xGamingDudex
ba087d119a
Small tweaks
2015-12-11 17:31:05 +01:00
Thanos paravantis
d7bef0d117
Fishing Day and Anvil Dance fixes and minor changes.
...
- Changed TNT spawn criteria, now only spawning while fishing hook is in water.
- Changed grass on Fishing Day map, excluded possible spawn locations that are included in spawn points.
- Fixed fireworks from Anvil Dance spawning on other challenges.
2015-12-11 18:12:06 +02:00
Thanos paravantis
d4fd466029
Update local workspace with new Eclipse version.
2015-12-11 17:10:00 +02:00
Cheese
2ffd1d4595
BOB ROSS
2015-12-11 23:11:33 +11:00
Cheese
d5612a8f27
added a hint to how many more coal you need to your next prize.
2015-12-11 23:09:06 +11:00
Cheese
39f5f70a5f
fixing up coal things
2015-12-11 22:43:34 +11:00
Thanos paravantis
3f4980a90f
Merge branch 'master' into thanos-mineware
2015-12-11 13:32:24 +02:00
Thanos paravantis
0b56c01c2f
Commit before pulling from master.
2015-12-11 13:30:20 +02:00
Shaun Bennett
1a922da1c3
Merge pull request #93 in MIN/mineplex from william-gladiators to master
...
* commit 'ac6d3c2c8fb8cc39ae6fb99bd5f3d62478653479': (56 commits)
fix
i lied.
final push goodnight
title + debug
remove tutorial and no flicker
Reverting
before revert
work
Many changes
Tutorial changes!
Added the ability to have title AND subtitle per TutorialText.
Tutorial changes/additions.
Added back the tutorial.
Lots of bug fixes / additions since the testing 12/9/15.
FIX
debug
fight man
iter
work
fix
...
2015-12-11 05:27:44 -06:00
Shaun Bennett
ac6d3c2c8f
merge with master
2015-12-11 06:27:23 -05:00
Cheese
7c432461c9
changed coal item rewards to 3 tier :)
2015-12-11 22:25:14 +11:00
Cheese
e01a5369fd
set bonuses
...
item gadget gui update
2015-12-11 21:53:39 +11:00
Cheese
40c2fdc3fc
fixed suits
2015-12-11 21:11:35 +11:00
Cheese
d7f39bdfd8
costume sets
2015-12-11 20:59:55 +11:00
Cheese
7fc08f34a7
fixed typo
2015-12-11 20:34:01 +11:00
Cheese
f717a5f8cc
more set stuff
2015-12-11 20:30:41 +11:00
Cheese
0cda29e135
improved cosmetic set implementation
2015-12-11 20:08:36 +11:00
Cheese
a6f664006f
set display in gui
2015-12-11 20:01:54 +11:00
Cheese
d8a5edf9e9
fixed up gui items
2015-12-11 19:24:19 +11:00
Cheese
61a8d2825e
gadget gui overhaul
2015-12-11 19:20:13 +11:00
William Burns
523c1875ef
fix
2015-12-11 06:58:11 +00:00
Jonathan Williams
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
