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

2976 Commits

Author SHA1 Message Date
Thanos paravantis
854ebf70c4 Merge branch 'master' into thanos-mineware 
Conflicts:
	Plugins/Mineplex.Core/.classpath
	Plugins/Mineplex.Queuer/.settings/org.eclipse.jdt.core.prefs
	Plugins/Nautilus.Game.Arcade/.classpath
	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
 2016-02-02 17:11:22 +02:00
Thanos paravantis
96cc73fcb7 Change challenge death handling, refatoring. 2016-02-02 17:07:04 +02:00
Thanos paravantis
de1ee4f6cb Spectator and chicken attack changes. 2016-01-31 23:50:23 +02:00
Mysticate
ace7d1764c Fixed various ways of players going invisible through Spec mode. 2016-01-31 10:22:59 -05:00
Thanos paravantis
1f22883c13 Refactoring challenge selection and updating. 2016-01-31 16:57:54 +02:00
Thanos paravantis
0e1a14a0c3 Countdown modifications, refactoring, dogs vs cats challenge changes. 2016-01-30 21:52:18 +02:00
Thanos paravantis
69dc888657 Refactoring. 2016-01-30 21:07:00 +02:00
Thanos paravantis
215fe68575 Start code refactoring. 2016-01-30 17:19:33 +02:00
Thanos paravantis
e3a9f4f2f7 Chicken attack changes, refactoring, update map crumble variable access. 2016-01-30 14:14:55 +02:00
Shaun Bennett
52b6779a4f Merge pull request #146 in MIN/mineplex from bugfix/bridges-ore-stealing to develop 
* commit 'b45e00796d66cf8aeb39510e0bd23bc5bd59327b':
  Fixed explosions dropping right items.
  Made block define its own drops.
  Removed an nunnecesarry method
  Fixed items not dropping their regular counterpart.
 2016-01-30 01:45:00 -06:00
Thanos paravantis
c5a9f0c42c Chicken attack bug fixes, death effect improvements. 2016-01-30 00:13:41 +02:00
Mysticate
b45e00796d Fixed explosions dropping right items. 2016-01-29 15:58:49 -05:00
Shaun Bennett
1c3c800a66 Update fixes - @Teddy! 2016-01-29 14:05:09 -05:00
Thanos paravantis
0530ea28e7 Improve chicken attack, fix mini oitq arrow damage. 2016-01-29 19:15:37 +02:00
Mysticate
1e29bd6936 Made block define its own drops. 2016-01-29 11:44:40 -05:00
Mysticate
447583aa2a Removed an nunnecesarry method 2016-01-29 09:41:45 -05:00
Mysticate
075a1141f1 Fixed items not dropping their regular counterpart. 2016-01-29 09:36:09 -05:00
Shaun Bennett
a1f9f41910 Merge remote-tracking branch 'origin/develop' into develop 2016-01-29 03:37:03 -05:00
Shaun Bennett
863be023d9 Prep for update 2016-01-29 03:36:52 -05:00
Shaun Bennett
ba0dd3da44 Merge pull request #141 in MIN/mineplex from bugfix/bridges-ore-stealing to develop 
* commit 'b92ddc75759bc848b409b5626f0fbeb9d71154b5':
  Added proper ore pickup delay.
 2016-01-29 02:33:23 -06:00
Shaun Bennett
a0e9a82327 Merge pull request #143 in MIN/mineplex from bugfix/achievements-misc to develop 
* commit '7d33e76055eb160e58d63443a72117e654df9468':
  Fixed ForTheKing achievement.
  Made sure Sniper achievement in Bridges is always fulfilled.
  Fixed + Tidied Gladiators Precision achievement.
 2016-01-29 02:32:50 -06:00
Shaun Bennett
63fa942789 Merge pull request #144 in MIN/mineplex from bugfix/uhc-hearts to develop 
* commit 'caa5d922b520da30223230b58754a77dd3b72186':
  Prevent hearts changing colors in UHC tab.
 2016-01-29 02:27:20 -06:00
Mysticate
caa5d922b5 Prevent hearts changing colors in UHC tab. 2016-01-28 22:54:20 -05:00
Mysticate
7d33e76055 Fixed ForTheKing achievement. 2016-01-28 22:51:19 -05:00
Mysticate
733ba067fe Made sure Sniper achievement in Bridges is always fulfilled. 2016-01-28 22:49:51 -05:00
Mysticate
fffa1d5926 Fixed + Tidied Gladiators Precision achievement. 2016-01-28 22:48:52 -05:00
Mysticate
b92ddc7575 Added proper ore pickup delay. 2016-01-28 22:39:48 -05:00
Shaun Bennett
eb29c6b367 Fix constructor 2016-01-28 22:28:18 -05:00
Shaun Bennett
0177cf91bb Merge with develop 2016-01-28 22:23:17 -05:00
Shaun Bennett
40f6969413 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2016-01-28 22:16:15 -05:00
Shaun Bennett
051d70771b Facebook Command 2016-01-28 22:15:35 -05:00
Shaun Bennett
251fb53f29 Merge pull request #124 in MIN/mineplex from bugfix/morph to develop 
* commit '2e433d8b0654507a9a41d9bbae313ab90e92471f':
  Made sure that the active morph gets disabled on clear
 2016-01-28 21:08:32 -06:00
Shaun Bennett
bf273708f9 Merge pull request #136 in MIN/mineplex from feature/entity-spectating to develop 
* commit '53132a248f9d899e2b4b275a31cfd69376533688':
  the L
  Updateting spectator Menu layout.
  fixing spec item in menu
  Removing right clicking.
  removing switching players until spigot patch is on.
  adding spectator rotation.
  adding entity spectating by right clicking and right clicking head in compass menu.
 2016-01-28 21:08:13 -06:00
Shaun Bennett
015cca57b6 Merge pull request #138 in MIN/mineplex from bugfix/gladiators-hotbar-editor to develop 
* commit '75629055d851265e91eb7d0679a40a1357552e17':
  Un-register HotbarEditor MiniPlugin and fix /spec bug.
  Un-register the hotbar page listener on disable.
 2016-01-28 21:03:48 -06:00
Shaun Bennett
f72ee95759 Merge pull request #139 in MIN/mineplex from virizion_speed_builder to develop 
* commit 'b6db99806ab171774ffd9c9db11cf361ad76dc94': (83 commits)
  Remove debug message.
  Fix flickering judge laser.
  Borders for spec are fixed.
  Leaves fix.
  Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket.
  Make dependable require 50 perfect builds instead of 10.
  Multiply by less
  negative!
  Trying different hologram location
  Fix messages, fix /stats
  Center hologram
  Make achievement category classics
  hologram changes
  Holograms maybe?
  Chiss' checklist.
  Remove unnecessary tabs. Make the judge guardian use it's own laser again.
  Fixed builds with only mobs not loading.
  Fixed mobs.
  TICK TICK TICK TICK.
  all players equal, no one loses
  ...
 2016-01-28 21:02:23 -06:00
Virizion
b6db99806a Remove debug message. 2016-01-28 18:28:43 -05:00
teddy
96ea001291 Clean up 2016-01-28 23:05:27 +00:00
teddy
da8a55f99c Final edits 2016-01-28 22:57:54 +00:00
William Burns
75629055d8 Un-register HotbarEditor MiniPlugin and fix /spec bug. 2016-01-28 20:43:58 +00:00
Virizion
04544c2b8d Fix flickering judge laser. 2016-01-28 14:28:47 -05:00
William Burns
d44d4c2278 Un-register the hotbar page listener on disable. 2016-01-28 19:21:42 +00:00
teddy
63cea58f05 Waiting for a testing session. 2016-01-28 17:18:24 +00:00
teddy
eed55b48ac Descriptions changed 2016-01-28 09:55:48 +00:00
Teddy
70be135a40 Merge branch 'feature/hoverable-chat' of http://dev.mineplex.com:7990/scm/min/mineplex into rankdescriptions 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/TypeWars.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
 2016-01-27 19:42:11 +00:00
Virizion
40113f99d3 Borders for spec are fixed. 2016-01-26 17:14:21 -05:00
Virizion
2f4146c243 Leaves fix. 2016-01-25 21:12:28 -05:00
Virizion
c5dfddd710 Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket. 2016-01-25 20:54:01 -05:00
Sarah
53132a248f the L 2016-01-25 12:28:21 +01:00
Sarah
c7733bb068 Updateting spectator Menu layout. 2016-01-25 12:27:19 +01:00
Sarah
91b6ae8b09 fixing spec item in menu 2016-01-25 12:14:56 +01:00