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

6049 Commits

Author SHA1 Message Date
Thanos paravantis 45c40f5568 Fix map generation on mine a diamond challenge. 2016-01-08 17:35:17 +02:00
Thanos paravantis e114b623bd Update water horror challenge to the latest version. Fix NPE on player quit. 2016-01-08 15:03:58 +02:00
Thanos paravantis 7d79a47093 Update water horror challenge to the latest version. Change death effect skull, hologram and particle height. 2016-01-08 13:21:20 +02:00
Thanos paravantis dafd336526 Add water horror challenge idea, fix death effect hologram height. 2016-01-07 00:06:32 +02: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
Morten f24cc35ef8 Made some bugfixes and made a challenge harder 2016-01-04 21:13:12 +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
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
Shaun Bennett 55cdf4148a Merge branch 'develop' 2015-12-29 03:21:03 -06:00
Shaun Bennett 16ee74885e Add maintenance line 2015-12-29 02:52:53 -06:00
Shaun Bennett 7ad12d0a6b Show Host Rank in private servers 2015-12-29 00:50:20 -06:00
Shaun Bennett 7104f1363a Give YT rank access to extra preferences 2015-12-29 00:34:18 -06:00
Thanos paravantis a15f6f8473 Working on the new MineWare theme. 2015-12-26 22:33:54 +02:00
Thanos paravantis d5dd342af3 Start changing MineWare theme. 2015-12-26 14:45:54 +02:00
Thanos paravantis 317f5799fe Fix classpath on mineplex core. 2015-12-26 12:54:47 +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
Shaun Bennett dd8e91e463 Update MOTD 2015-12-25 03:03:53 -06:00
Shaun Bennett 25d36b546a Remove unnecessary files 2015-12-25 01:53:00 -06:00
Shaun Bennett d08cfa0c4c Holiday Gifts 2015-12-25 01:51:36 -06:00
libraryaddict 1d4a5e5804 Clean up imports, set resource pack on clans. 2015-12-24 07:47:05 +13:00
libraryaddict 000b1f85b7 Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop 2015-12-24 07:41:55 +13:00
libraryaddict 67bdc6832f Tentative beginnings for clans resource packs 2015-12-24 07:40:49 +13:00
Morten 14fd00a368 Bug fixes 2015-12-22 16:02:45 +01:00
Shaun Bennett 2ccd7a5de0 Fix Type Wars stat icon 2015-12-21 13:20:04 -05:00
Shaun Bennett 893fea49ab Merge pull request #108 in MIN/mineplex from develop to master 
* commit '7a72762c78ff56b3390fef809e3f57f51e755d14': (81 commits)
  Update MOTD
  Updating Holiday Achievements
  Updating Stats GUI
  Achievements....
  changing Category
  adding PM message.
  fixing Kit NPEs
  Fixing ending Stats.
  Wrong iterator!
  Update game display
  Adjust GUI, fix beta button
  Yo shaun debug this m8 ty
  Fixing Gems
  adjusting some timings
  Fixing Tutorial Minion
  fixing last commit
  adding Tutorial notification
  Adding Tutorial notification
  nuke delay and Stats
  Fixing some nuke stuff, Giant noises only for own Team and "Giant under attack message", spelling fixes
  ...
 2015-12-21 12:19:10 -06:00
Shaun Bennett 7a72762c78 Update MOTD 2015-12-21 12:56:37 -05:00
Shaun Bennett c63014b51f Type-Wars merge 2015-12-21 12:49:10 -05:00
Sarah a5436d63c0 Updating Holiday Achievements 2015-12-21 18:45:26 +01:00
Sarah 7c66bdbbde Updating Stats GUI 2015-12-21 18:25:44 +01:00
Sarah 010b1b0a5d Achievements.... 2015-12-21 18:08:11 +01:00
Sarah 6e3274ff2f changing Category 2015-12-21 18:06:00 +01:00
Sarah f15c318e5c adding PM message. 2015-12-21 18:02:25 +01: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 fae2a5d2bf Update game display 2015-12-21 04:40:30 -05:00
Shaun Bennett 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