JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,654 Commits 1 Branch 0 Tags 481 MiB
51d4db5e46
Commit Graph

3057 Commits

Author SHA1 Message Date
NewGarbo
d88b14d9d6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-07 09:35:07 +00:00
Thanos paravantis
dafd336526 Add water horror challenge idea, fix death effect hologram height. 2016-01-07 00:06:32 +02:00
libraryaddict
de6f6cf5f0 Add a IsLive check in Spleef 2016-01-07 08:49:26 +13:00
Thanos paravantis
71a0cd44a2 Format anti hack fix class. 2016-01-06 14:47:34 +02:00
Morten
82163e376b Minor stuffs. Waiting for the build team to make us a chicken c: 2016-01-05 23:42:42 +01:00
Sarah
db2cddc443 Fixing Join/Quit messages 2016-01-05 19:10:40 +01:00
Shaun Bennett
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
Shaun Bennett
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
Thanos paravantis
3770211e66 Turf Wars: Include Teddy's border fix. 2016-01-04 22:58:11 +02:00
Morten
f24cc35ef8 Made some bugfixes and made a challenge harder 2016-01-04 21:13:12 +01:00
Thanos paravantis
982e684a45 Turf Wars: Undo bracket formatting. 2016-01-04 21:42:58 +02:00
Thanos paravantis
47c78bcba1 Turf Wars: Apply knockback on all players when there are only two in the match. 2016-01-04 17:19:40 +02:00
Thanos paravantis
f6ce98f65b Turf Wars: Add comment on block physics event. 2016-01-02 23:33:08 +02:00
Thanos paravantis
03c6395a30 Turf Wars: Fix sneaking near turf edge and wool placement near ladders. 2016-01-02 23:30:27 +02:00
Sarah
dd6d7b1b96 updating denial message 2016-01-02 16:45:15 +01:00
Thanos paravantis
5ac841dbf1 Merge branch 'master' into thanos-mineware 2016-01-02 16:34:30 +02:00
Thanos paravantis
a0d5a8229f Change /restrict command, update death effect. 2016-01-02 16:33:21 +02:00
Thanos paravantis
b3e2d67152 Change death effect skull and item spawn height, add /restrict <challenge> command. 2016-01-02 15:27:44 +02:00
Morten
7e1b0b9110 Love you Sarah <3 2016-01-02 03:19:39 +01:00
Thanos paravantis
c0a397b9fb Add particles on death effect, started working on chicken attack. 2016-01-01 17:39:16 +02:00
Thanos paravantis
e89785963a Change kit helmet to skull. 2016-01-01 15:35:45 +02:00
Thanos paravantis
bd63ff84e7 Add missing DeathEffectData and DeathText. 2016-01-01 15:30:16 +02:00
Thanos paravantis
49e3fabee5 Improve death effect, add death effect data and text. 2016-01-01 15:29:00 +02:00
Thanos paravantis
faa866fba1 Stable death effect version. 2016-01-01 01:35:05 +02:00
Thanos paravantis
edb6318f31 Add rotating chicken head when a player dies on a challenge. 2015-12-31 23:27:15 +02:00
Thanos paravantis
287f782b82 Spawn eggs with velocity when a player dies. 2015-12-31 20:15:47 +02:00
Sarah
8ef1a524c1 updating /disguise 2015-12-31 12:01:24 +01:00
Mysticate
efbd1c52d2 Merge remote-tracking branch 'origin/master' into feature/typewars-antimacrorekter 2015-12-31 03:01:23 -05:00
Mysticate
5ff9d1985b Monitoring for josh + the mods 2015-12-31 03:00:40 -05:00
William Burns
f1c7424939 Fixing hotbar 2015-12-29 15:19:09 +00:00
Shaun Bennett
7ad12d0a6b Show Host Rank in private servers 2015-12-29 00:50:20 -06:00
Virizion
8a8d5b088b Switch to 7x7 builds. 2015-12-28 16:48:03 -05:00
Virizion
3d9a252868 Added auto pickup and fixed some stuff. 2015-12-27 15:26:43 -05:00
Virizion
162b3eb33f Stopped a bunch of block events. 2015-12-27 14:34:24 -05:00
Thanos paravantis
a15f6f8473 Working on the new MineWare theme. 2015-12-26 22:33:54 +02:00
William Burns
1066becd68 push 2015-12-26 20:21:46 +00:00
Thanos paravantis
d5dd342af3 Start changing MineWare theme. 2015-12-26 14:45:54 +02:00
Thanos paravantis
499ad655c9 Merge branch 'MortensRawBugFixes' into thanos-mineware 
Conflicts:
	Plugins/Mineplex.Core/.classpath
 2015-12-26 12:29:26 +02:00
Thanos paravantis
fcc1cd46a5 Make bouncing block red wool traps less strict when player walks on them. 2015-12-26 12:28:07 +02:00
Thanos paravantis
dcff689faf Merge branch 'master' into thanos-mineware 
Conflicts:
	Plugins/Mineplex.Core/.classpath
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-12-26 11:55:57 +02:00
Shaun Bennett
c680d91b56 Nerf TypeWars gems (again) 2015-12-25 03:12:04 -06:00
fooify
41f56e9853 Lots of typo fixes and such 2015-12-24 11:13:54 -08:00
fooify
b356bce177 Merge remote-tracking branch 'origin/develop' into bugfix/foo 2015-12-24 11:09:08 -08:00
Virizion
b0f8edb0f9 Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2015-12-23 18:25:52 -05:00
NewGarbo
aa50c4762f fixes (?) 2015-12-23 18:55:44 +00:00
libraryaddict
1d4a5e5804 Clean up imports, set resource pack on clans. 2015-12-24 07:47:05 +13:00
William Burns
79dea726aa Added check for falling from map. 2015-12-23 10:59:12 +00:00
William Burns
c48df36459 Canvas reset with starting picture. 2015-12-23 10:26:14 +00:00
William Burns
ad1d444af8 Kit changes and new words. 2015-12-23 09:52:52 +00:00
William Burns
08b5e7b4db Working loadouts. 2015-12-23 09:21:43 +00:00
fooify
592fcbd282 Merge remote-tracking branch 'origin/develop' into bugfix/foo 2015-12-22 10:55:11 -08:00
Morten
14fd00a368 Bug fixes 2015-12-22 16:02:45 +01:00
Virizion
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
William Burns
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
Shaun Bennett
c63014b51f Type-Wars merge 2015-12-21 12:49:10 -05:00
Sarah
082b5e156c fixing Kit NPEs 2015-12-21 17:48:17 +01:00
Sarah
ff5761cc1d Fixing ending Stats. 2015-12-21 17:44:15 +01:00
Sarah
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
Shaun Bennett
5469289d82 Wrong iterator! 2015-12-21 06:57:56 -05:00
Shaun Bennett
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
Morten
c683ce5f0a Improved minors bugs and implemented a more efficient Challenge rotation system 2015-12-20 21:08:32 +01:00
Sarah
816da0f633 Fixing Gems 2015-12-20 12:00:32 +01:00
fooify
fe658b30a1 Grammatical errors hath been fixed! 2015-12-19 15:03:42 -08:00
Morten
7c52b813f9 Merge branch 'MortensRawBugFixes' 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/mineware/challenges/ChallengeBouncingBlock.java
 2015-12-19 23:32:21 +01:00
Sarah
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
Sarah
c56cd0d56e adjusting some timings 2015-12-19 13:08:53 +01:00
Sarah
35966d88cf Fixing Tutorial Minion 2015-12-19 13:05:39 +01:00
Sarah
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
Sarah
8a54388480 fixing last commit 2015-12-19 13:00:12 +01:00
Sarah
32a0dd6668 adding Tutorial notification 2015-12-19 12:59:37 +01:00
Sarah
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
Sarah
7cb002ca86 Adding Tutorial notification 2015-12-19 12:55:28 +01:00
Sarah
f8bffc9f88 nuke delay and Stats 2015-12-19 12:45:06 +01:00
Virizion
c0ab31fdac Finished up fixes. 2015-12-19 00:19:50 -05:00
Virizion
a5c18f4677 Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2015-12-18 20:05:03 -05:00
Sarah
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
Sarah
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
Sarah
6c5e3d7509 Fixing visibility. 2015-12-19 00:48:42 +01:00
Thanos paravantis
3128e9766f Remove arrow trail from arrow rampage challenge. 2015-12-18 21:55:44 +02:00
William Burns
f57304764c Added a hotbar layout editor 2015-12-18 15:16:00 +00:00
Shaun Bennett
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
Shaun Bennett
f80648bfbc Update DBPool to load from file 2015-12-18 00:32:07 -05:00
Mysticate
d561915fd3 FORMATTING CHANG EI'M GOING TO CRY UGH 2015-12-17 23:16:57 -05:00
Mysticate
2bf734a15c DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D 2015-12-17 23:08:07 -05:00
Shaun Bennett
2c09fd969b Attempt at fixing spectator page 2015-12-17 22:24:44 -05:00
Virizion
806b656dcf Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2015-12-17 21:56:01 -05:00
Shaun Bennett
53f9a051c5 Fix spectator page sorting team list 2015-12-17 21:52:34 -05:00
Virizion
5f506e3810 Moved team generation. 2015-12-17 21:49:15 -05:00
William Burns
e7243d4b9c Re-add getArcadePlayer(Player player) 2015-12-17 22:19:45 +00:00
William Burns
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
William Burns
5c045bfce4 Changes to core client manager, and finishing custom data! 2015-12-17 21:27:44 +00:00
libraryaddict
7f188072ad Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop 2015-12-18 10:03:41 +13:00
libraryaddict
66372c397b First version of ResourcePackManager that handles all resource packs globally 2015-12-18 10:03:03 +13:00
Thanos paravantis
9a1a652e85 Merge branch 'master' into thanos-mineware 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerTypePage.java
	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
 2015-12-17 20:54:28 +02:00
Thanos paravantis
51c572bf44 Prevent game countdown if there is only one player, fix typo on Dog vs Cat challenge. 2015-12-17 20:48:55 +02:00
Thanos paravantis
d38276d23d MineWare updates and several changes on challenges. 2015-12-17 17:57:33 +02:00
William Burns
7d9b97180d Testing ArcadePlayer implementation 2015-12-17 01:48:55 +00:00
Mysticate
d28c2be1c3 Epic chnage that saved the day omg 2015-12-16 20:26:04 -05:00
William Burns
ee202bc7f5 Add MineplexPlayer -> ArcadePlayer 2015-12-16 22:32:34 +00:00
William Burns
4077aa808f Add to Arcade and Hub 2015-12-16 22:01:51 +00:00
Sarah
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
Thanos paravantis
81f03e4b68 Update anti-hack jump fix for Bouncing Block and Arrow Rampage. 2015-12-16 17:18:19 +02:00
Morten
ba7c4dc4ce Small fixes 2015-12-16 15:41:08 +01:00
Virizion
628ee8a137 Some small fixes. 2015-12-16 00:02:21 -05:00
Virizion
7fa1963268 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-15 23:06:13 -05:00
Mysticate
d16dd4a9d2 Merge remote-tracking branch 'origin/master' into update-paintball 2015-12-15 19:35:55 -05:00
Mysticate
b36bf37197 Merge remote-tracking branch 'origin/master' into update-paintball 2015-12-15 19:22:38 -05:00
Thanos paravantis
7e3bcae0d4 Mineware Challenge Updates. 
- Prevent challenge from ending if all players alive have the 'spectating' property to true.
- Prevent MAC from triggering when players jump high on Bouncing Block challenge.
- Minor changes to challenge descriptions.
- Remove Evolution of Combat challenge (unused).
 2015-12-15 21:12:01 +02:00
Shaun Bennett
92b82d786b Don't give Winter Holiday Chests to offline players 2015-12-15 13:34:47 -05:00
Sarah
40ae7743c6 reverting last "fix" 2015-12-15 14:20:21 +01:00
Sarah
cf58fdee4a trying to fix the spigot Chat spam thingy. 2015-12-15 05:29:59 +01:00
Sarah
afa45c47ca Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into pregametutorial 2015-12-14 14:23:42 +01:00
Shaun Bennett
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
Shaun Bennett
4afca01ad0 Treasures! 2015-12-14 02:49:51 -05:00
Virizion
93c13d138d Remove some debug stuff I forgot to remove. 2015-12-14 00:10:45 -05:00
Virizion
b3b41e453b Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-14 00:01:41 -05:00
Virizion
d8f44434ff Fixed a bunch of bugs. Still need to fix clicking compass ending game. 2015-12-14 00:00:40 -05:00
Shaun Bennett
5be91de006 Merge master 2015-12-13 23:40:18 -05:00
Cheese
f26c31b7ec xmas a little harder 2015-12-14 15:33:09 +11:00
Cheese
1073981778 Merge branch 'master' into update-xmaschaos 2015-12-14 15:30:15 +11:00
Cheese
c34ac3ec52 xmas 2015-12-14 15:21:43 +11:00
Mysticate
42244ae798 Snowman AI fix 2015-12-13 22:43:11 -05:00
Mysticate
a04eaddc42 Fixed bump 2015-12-13 22:25:18 -05:00
libraryaddict
f90484c37f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-12-14 15:43:03 +13:00
libraryaddict
b5bdf7ced4 Remove custom name on players on join and arcade spectator 2015-12-14 15:42:32 +13:00
Virizion
54911bb213 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-13 19:54:57 -05:00
Virizion
12eba41975 Fixed corner stairs. 2015-12-13 19:52:32 -05:00
Mysticate
0dd7db27cd FIXED FORAMTTING 2015-12-13 19:49:41 -05:00
Mysticate
a827f95eb4 Fixed scoreboard. VIVA LA FIESTA 2015-12-13 19:24:24 -05:00
Mysticate
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
Mysticate
35ab40727b XMAS UPDATE OMG :O 2015-12-13 18:55:21 -05:00
William Burns
d91e4ab4f7 Another door bug, and a title fix. 2015-12-13 20:27:37 +00:00
Sarah
63f5794c79 Only fix Giant facings is prepare Phase 2015-12-13 14:31:21 +01:00
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
ec86cad7ee Changed descriptions. 2015-12-13 01:38:38 -05: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
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
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
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
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
3f4980a90f Merge branch 'master' into thanos-mineware 2015-12-11 13:32:24 +02:00
Shaun Bennett
ac6d3c2c8f merge with master 2015-12-11 06:27:23 -05:00
Cheese
d7f39bdfd8 costume sets 2015-12-11 20:59:55 +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
Jonathan Williams
222173ab17 Improved and implemented GameProfile caching. 2015-12-11 01:24:59 -05:00
Virizion
68360c6705 shortened if 2015-12-10 22:17:10 -05:00
William Burns
a760dba783 i lied. 2015-12-11 02:59:16 +00:00
William Burns
7a597d90b7 final push goodnight 2015-12-11 02:48:06 +00:00
William Burns
1607345f04 title + debug 2015-12-11 02:41:44 +00:00
William Burns
563a0f0ec7 remove tutorial and no flicker 2015-12-11 02:30:44 +00:00
Shaun Bennett
2694787590 Reverting 2015-12-10 20:59:57 -05:00
William Burns
f8d7aeb5ea before revert 2015-12-11 01:32:32 +00:00
William Burns
dda5ac6728 work 2015-12-11 01:20:36 +00:00
Sarah
4abad9e1c4 fixing chat and test commands. 2015-12-11 02:00:26 +01:00
Sarah
ffb75a7832 Adding CustomEnding 2015-12-11 01:44:19 +01:00
William Burns
626a812844 Many changes 2015-12-11 00:40:54 +00:00
Shaun Bennett
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
Shaun Bennett
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
xGamingDudex
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
William Burns
4cf33eef05 Tutorial changes! 2015-12-10 21:32:14 +00:00
William Burns
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
William Burns
0bd276c16a Merge branch 'pregametutorial' of ssh://184.154.0.242:25565/min/mineplex into pregametutorial 2015-12-10 20:53:01 +00:00
William Burns
8d7b03e3f6 Added the ability to have title AND subtitle per TutorialText. 2015-12-10 20:52:41 +00:00
William Burns
2951088005 Tutorial changes/additions. 2015-12-10 20:48:13 +00:00
Virizion
c73bd54aec Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-10 15:38:17 -05:00
William Burns
3586642414 Added back the tutorial. 2015-12-10 19:32:25 +00:00
William Burns
af7c058f22 Lots of bug fixes / additions since the testing 12/9/15. 2015-12-10 19:06:07 +00:00
Sarah
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
Thanos paravantis
e17669427e Merge branch 'master' into thanos-mineware 
Conflicts:
	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
 2015-12-10 10:03:41 +02:00
Thanos paravantis
e6125b74ef Commit all changes before pulling from master. 2015-12-10 09:59:37 +02:00
libraryaddict
1ee1e7a04b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-12-10 20:02:39 +13:00
libraryaddict
eaf3937004 Fix the damage while walking on falling block 2015-12-10 20:02:12 +13:00
Virizion
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
Virizion
9b53e15b4f More stuff. 2015-12-09 21:38:00 -05:00
Virizion
662d3b464f Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-09 21:15:39 -05:00
Virizion
0ff87cf134 Stuff. 2015-12-09 21:14:45 -05:00
Cheese
fabf3dab59 updated blocksearch 2015-12-10 13:12:01 +11:00
Sarah
c94c84f203 Some fixes 2015-12-10 02:59:22 +01:00
Sarah
76b29756ff Fixing some stats and disabling Chat spam messages. 2015-12-10 02:02:36 +01:00
Virizion
be6f9ac6dc Capitalize enum names. 2015-12-09 19:17:12 -05:00
William Burns
87a834c01b FIX 2015-12-10 00:03:57 +00:00
William Burns
90896073d4 debug 2015-12-10 00:03:17 +00:00
William Burns
cea2716851 fight man 2015-12-09 23:59:20 +00:00
William Burns
05bd55f720 iter 2015-12-09 23:53:04 +00:00
William Burns
b8a2304edd work 2015-12-09 23:39:00 +00:00
William Burns
3ad0a3db6e fix 2015-12-09 23:14:08 +00:00
William Burns
17c989d941 Less per-player arena stuff 2015-12-09 22:39:04 +00:00
William Burns
513db5dd8d doing byes 2015-12-09 21:33:31 +00:00
William Burns
852be97bae Work 2015-12-09 20:16:16 +00:00
Sarah
a5c46545df fixing timer being shown. 2015-12-09 14:44:22 +01:00
Virizion
507761d5b0 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-08 21:24:21 -05:00
William Burns
c021fbf9ed Bounce baby bounce. 2015-12-08 23:27:38 +00:00
William Burns
d709071feb Much fix, many wow. 2015-12-08 23:20:42 +00:00
Shaun Bennett
2e49611035 LinkedHashMaps, Buttons 2015-12-08 17:45:27 -05:00
Shaun Bennett
7f75749194 Merge remote-tracking branch 'origin/master' 2015-12-08 16:55:14 -05:00
Cheese
26c5c419f8 fixed a bug where old displayName would be used after name was updated. 2015-12-09 08:38:05 +11:00
Sarah
484dce18e1 Changing some Achievement things, to allow double values and dividing, Adding WPM, fixing some bugs. 2015-12-08 22:34:42 +01:00
Virizion
8051486fcb Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-08 16:14:41 -05:00
William Burns
a83ede3caa Handling slow movers 2015-12-08 21:14:19 +00:00
William Burns
7bdbd5a6af Woo almost done! 2015-12-08 21:10:27 +00:00
Cheese
2decc049c5 fixed my muddling of perks 2015-12-09 07:47:07 +11:00
Christopher Jozsa
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
Shaun Bennett
ca71f1f64f Merge remote-tracking branch 'origin/master' 2015-12-08 14:32:17 -05:00
William Burns
d598f83ec0 More progress 2015-12-08 18:17:43 +00:00
Teddy
504a49278c SSM kit description change, grammar mistake 2015-12-08 16:35:49 +00:00
William Burns
f8f95c64e5 Fixing arena moving 2015-12-08 15:10:29 +00:00
William Burns
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
William Burns
2b12016e14 Progress 2015-12-08 13:12:30 +00:00
Shaun Bennett
addb2c8c0e Fix java 8 compiler issue 2015-12-08 08:02:40 -05:00
William Burns
e6d995008e Arenas 2015-12-08 10:44:24 +00:00
Virizion
d22a905206 Lot more stuff! :D 2015-12-07 23:29:33 -05:00
Shaun Bennett
42a0354c9e Now Playing, Preference to disable ads 2015-12-07 18:28:05 -05:00
William Burns
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
William Burns
55f0453897 Start of re-write 2015-12-07 23:20:03 +00:00
Virizion
ec4a21a282 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-07 18:19:16 -05:00
Sarah
0619fb857f fixing invisibility. 2015-12-07 23:44:02 +01:00
Sarah
3f7eef35d5 Forcefield range. 2015-12-07 18:59:06 +01:00
Sarah
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
Shaun Bennett
7984c0ac31 Add ! 2015-12-07 06:12:49 -05:00
Cheese
a39b11ce67 slowed meteors 2015-12-07 21:56:00 +11:00
Cheese
d318a5cf87 interacto! 2015-12-07 21:53:34 +11:00
Cheese
e1efcabfbf chat sale msgs 2015-12-07 20:39:31 +11:00
Cheese
7b11baf24b Christmas sale bossbars 2015-12-07 20:20:49 +11:00
Cheese
8c4615203c sale message 2015-12-07 20:07:20 +11:00
Cheese
ed3bea8e85 DONE! 2015-12-07 18:36:05 +11:00
Cheese
5c632a1e3a sharper target 2015-12-07 18:20:12 +11:00
Cheese
1a0d90a495 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-07 18:06:43 +11:00
Cheese
fea637db80 fixed some freeze 2015-12-07 18:06:26 +11:00
Shaun Bennett
ecde1dd314 Merge remote-tracking branch 'origin/master' 2015-12-07 02:06:09 -05:00
Shaun Bennett
44a5bcb793 remove titan chest message, update pumkin message, holiday MB/DMT words 2015-12-07 02:06:00 -05:00
Cheese
d75d7a2c8f snowfight finish 2015-12-07 17:56:35 +11:00
Cheese
1ada06af91 rewrote lots! 2015-12-07 17:36:45 +11:00
Virizion
6904f7c9a9 Tons more stuff on the checklist. 2015-12-06 22:54:45 -05:00
Cheese
5486d8acf6 more prep 2015-12-07 13:42:59 +11:00
Cheese
54ec0e39bb more polisshhhh on snowfight 
enabled xmas chests
 2015-12-07 13:25:32 +11:00
Cheese
cbafb2ba91 fixes 2015-12-07 13:04:45 +11:00
Cheese
0c397d6a81 simplified kits and intro 2015-12-07 13:02:26 +11:00
xGamingDudex
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
Cheese
b2a595b01b snwo fight changes 2015-12-07 12:02:53 +11:00
Mysticate
09f7a03444 Quick changes to improve things. 2015-12-06 20:00:22 -05:00
Sarah
072856be7d teleportations. 2015-12-06 23:19:53 +01:00
Mysticate
b5967a1205 Uncommented bouncy balls 2015-12-06 17:14:51 -05:00
Mysticate
e74b83f8f2 Merge remote-tracking branch 'origin/master' into update-paintball 2015-12-06 17:12:29 -05:00
Mysticate
5e57caa94d Final tweaks to random armorstand 2015-12-06 17:09:33 -05:00
Cheese
6f16eeead7 missin files 2015-12-07 08:48:55 +11:00
Sarah
10d26ca32b timer fixes. 2015-12-06 22:41:04 +01:00
Virizion
ca7e5d0d6d remove later 2015-12-06 16:37:00 -05:00
Sarah
64f8ee7280 fixing some timings. 2015-12-06 21:48:21 +01:00
Sarah
3260550368 adding proper forcefield for minions and giants. 2015-12-06 19:38:23 +01:00
Mysticate
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
Mysticate
11b2748a5a Quick thing before merge 2015-12-06 11:45:10 -05:00
Cheese
35c362b8bf small youtuber perms 2015-12-06 18:08:36 +11:00
Cheese
d095e14b4c Merge branch 'monster-league' 2015-12-06 16:33:21 +11:00
Cheese
9880e9a3c7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-06 16:32:59 +11:00
Cheese
040e94f1fb bouncy 2015-12-06 16:32:45 +11:00
Shaun Bennett
32a6d572ee Disable gadgets in arcade for player count > 40 2015-12-05 22:56:15 -05:00
Cheese
5aabd00972 set hub to christmas 
removed snowball pickup
disabled arrows sticking into players from ALL projectiles
 2015-12-06 14:55:28 +11:00
Virizion
9144ab7b3f Fixed some demolition stuff. 2015-12-05 20:30:21 -05:00
Virizion
d3ce0d6434 Some more stuff on the checklist. 2015-12-05 19:57:48 -05:00
Sarah
114ae33d89 fixing spawns and monster slowdown. 2015-12-06 00:00:50 +01:00
Sarah
90c6d0a83f spelling fixes, disabling Particles, fixing mob limit. 2015-12-05 22:17:45 +01:00
Thanos paravantis
b64f561659 Merge branch 'MortensRawBugFixes' into thanos-mineware 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
 2015-12-05 22:54:50 +02:00
Thanos paravantis
a943808250 Remove old unused build race challenge. 2015-12-05 22:52:52 +02:00
Morten
e8f7b140df Added Achievements and fixed bugs. 2015-12-05 21:47:13 +01:00
Sarah
4c4b997453 fixing giant facing. 2015-12-05 19:00:44 +01:00
Virizion
62c49fa8e6 some more stuff on the checklist 2015-12-04 23:04:52 -05:00
Sarah
a3d6af884d spawns after tutorial and Giants facing each other. 2015-12-05 00:57:27 +01:00
Cheese
4a53667539 gadget restructure 
converted frost lord and titan particles into 4 subcategories.
 2015-12-05 10:22:00 +11:00
Thanos paravantis
91e0547612 Merge branch 'master' into thanos-mineware 
Conflicts:
	.gitignore
 2015-12-04 22:04:46 +02:00
Thanos paravantis
e27ce2587d Finalizing Fishing Day Challenge. 2015-12-04 22:01:47 +02:00
Sarah
35534afd4a overall runtime. 2015-12-04 19:54:02 +01:00
Sarah
1bb40b21d3 Tutorial/Phase Time. 2015-12-04 19:49:28 +01:00
Virizion
efbabb1519 Players now look at the middle of the middle block instead of the corner. 2015-12-03 21:27:10 -05:00
Virizion
465f8c28f6 Set FixSpawnFacing to false so that out looking at the middle feature would work. 2015-12-03 21:13:33 -05:00
Virizion
bb708911d6 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-03 21:10:31 -05:00
Virizion
9951701ded Added a FixSpawnFacing flag to Game which controls whether or not GameTeam will modify the yaw of a spawn when returning it. 2015-12-03 19:51:11 -05:00
fooify
91aaf5f2fb world's smallest bugfix - admin->co-host 2015-12-03 16:45:30 -08:00
fooify
348f2d8e4c Merge remote-tracking branch 'origin/master' into foo 2015-12-03 16:31:16 -08:00
Sarah
19254fc4a0 Prepare Timer flag. 2015-12-03 18:06:27 +01:00
Virizion
ee51766e1f Removed teleports. Made the spawns face the middle but it doesn't work yet because of GameTeam changing the direction again. 2015-12-02 22:12:53 -05:00
Virizion
f0c28e6234 Updated references to the util method. 2015-12-02 20:20:14 -05:00
Sarah
27f335779a adding tutorial sounds and flag for it. 2015-12-02 19:39:44 +01:00
Sarah
b0e16f6612 Zombie smash Color. 2015-12-01 17:05:55 +01:00