cnr
8ca38b2598
Prepend http:// to resource pack locations
2016-04-30 18:54:17 -05:00
phobia
14204fba5c
Changed resource packs to home hosted ones
2016-04-30 16:02:26 -05:00
phobia
890ab9f67e
Uncommented ClansBanManager's instances
2016-04-30 16:02:26 -05:00
Conrad
d0d2de1e21
Revert "Report system (version 1)"
2016-04-30 14:53:59 -04:00
Keir Nellyer
6a00f26d5f
Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-29 23:42:27 +01:00
Keir Nellyer
81cebc4ce7
Swap static helpers for a much better solution
...
This allows for easier refactoring in the future when we move away
from retrieving the CoreClientManager from a static instance.
Mineplex coding standards are also against the use of static helpers
in scenarios such as this, therefore this commit brings this branch
to be in-line with the coding standards.
2016-04-29 23:37:40 +01:00
AlexTheCoder
b4c5be81f3
- Fixed random weather in MCL
...
- Added Elo Division display to /stats for applicable games
- Made fishing rods kept on death in MCL
2016-04-27 23:12:38 -04:00
Ben
a04f7c23c6
Disable incognito for staff in hub invisibility, and vice-versa
2016-04-08 20:18:56 +01:00
Keir Nellyer
390b2878dc
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-07 14:28:30 +01:00
Ben
7f92a3c048
incognito changes
2016-04-05 00:38:27 +01:00
Ben
7de23216f6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 20:41:10 +01:00
Ben
b3b72f1ca0
commenting out clans bans
2016-04-04 20:40:58 +01:00
Jonathan Williams
e2baf2b56c
Updated Clans to use the new ResourcePackManager.setResourcePack method.
2016-04-04 13:46:00 -05:00
Ben
14207c2073
clansbans
2016-04-04 14:56:20 +01:00
Shaun Bennett
e11a9379b9
More tutorial tweaking
2016-04-04 12:32:22 +10:00
Ben
40361acc9b
fixed cannon becoming off-center
2016-04-03 17:51:56 +01:00
Ben
ccdd1f901f
cannon 1.9 fixes
2016-04-03 17:23:55 +01:00
Ben
66a18dcc87
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java
2016-04-03 13:55:17 +01:00
Ben
c1b659e738
npcs on enemy base
2016-04-03 13:50:11 +01:00
Jonathan Williams
ff41ad248a
Removed PvpTimer
...
Fixed issue where StatManager and FriendManager were created twice.
2016-04-02 02:47:17 -05:00
Shaun Bennett
d161d83d12
Maps and other various fixes
2016-04-02 15:43:03 +11:00
Ben
b4d340a655
cb fixed
2016-03-27 06:21:32 +01:00
Ben
2ef604aeaf
attack enemy goal
2016-03-24 19:11:05 +00:00
Ben
2cf59ced8b
new pvp timer management, fixed build house task, fixed incognito
2016-03-18 01:18:35 +00:00
Ben
b164ff0729
Update res pack
2016-03-16 23:56:39 +00:00
Ben
4638ba909d
siege weapon finalizations & analytics (wip)
2016-03-15 22:52:13 +00:00
Ben
e08ba29ac1
Final fixing of cannon saving/loading
2016-03-14 22:48:31 +00:00
Shaun Bennett
1228ca227e
Add support for 1.9 resource packs, Text Tutorials
2016-03-11 11:50:08 -06:00
Ben
0e276474c5
fixerroooniissssss
2016-03-11 02:20:18 +00:00
Ben
57c65cf5ff
some changes and vanish fixes maybe?
2016-03-11 01:47:14 +00:00
Ben
9b40496a1e
siege weapon picking up
2016-03-09 23:56:25 +00:00
Ben
5b3da3d06f
Consistency. (Changed Vanish to Incognito)
2016-03-09 01:53:01 +00:00
Ben
befb27d3db
Finalized Vanish system
2016-03-09 01:45:17 +00:00
Keir Nellyer
99150db2d7
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
2016-02-22 19:02:54 +00:00
Shaun Bennett
4f5625d63e
Clans Alpha 1.0 changes
2016-02-05 18:42:22 -05:00
NewGarbo
8c1ae12d19
beta stuff
2016-02-04 23:29:48 +00:00
NewGarbo
50c2da2a95
forgot to include this; version getter thingy in Clans
2016-02-04 16:10:14 +00:00
Keir Nellyer
9601eabfeb
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-01-31 17:38:08 +00:00
Keir Nellyer
8cf32ef8bf
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-01-30 00:46:43 +00:00
Shaun Bennett
1c3c800a66
Update fixes - @Teddy!
2016-01-29 14:05:09 -05:00
NewGarbo
7f7e73a101
more catapults!
2016-01-26 21:10:58 +00:00
NewGarbo
7f1c74ced5
bumped version up to 0.19
2016-01-25 17:11:08 +00:00
Keir
53133d51ee
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-01-13 11:47:13 +00:00
NewGarbo
d4ccb82791
didn't push this earlier
2016-01-10 23:03:16 +00:00
Keir
5f362a878a
Run some Redis functions async (as it sometimes blocks).
2016-01-09 22:21:15 +00:00
NewGarbo
025615d080
Clans Alpha 0.18b fixes
2016-01-08 11:24:36 +00:00
NewGarbo
fff6d8e03f
added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around.
2016-01-07 19:36:52 +00:00
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
NewGarbo
ef929b39b3
updated clans version
2016-01-06 22:38:45 +00:00
NewGarbo
b47665e115
lots of work on outposts,
...
fixed gold dupe glitch,
fixed clans ban gui title being "Customize New Gear".
2016-01-02 14:02:50 +00:00
