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
Shaun Bennett
7ad12d0a6b
Show Host Rank in private servers
2015-12-29 00:50:20 -06: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
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
Sarah
816da0f633
Fixing Gems
2015-12-20 12:00:32 +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
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
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
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
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
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
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
