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
7ad12d0a6b
Show Host Rank in private servers
2015-12-29 00:50:20 -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
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
libraryaddict
1d4a5e5804
Clean up imports, set resource pack on clans.
2015-12-24 07:47:05 +13:00
Morten
14fd00a368
Bug fixes
2015-12-22 16:02:45 +01: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
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
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
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
Shaun Bennett
53f9a051c5
Fix spectator page sorting team list
2015-12-17 21:52:34 -05:00
William Burns
e7243d4b9c
Re-add getArcadePlayer(Player player)
2015-12-17 22:19:45 +00:00
