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
libraryaddict
1d4a5e5804
Clean up imports, set resource pack on clans.
2015-12-24 07:47:05 +13:00
libraryaddict
67bdc6832f
Tentative beginnings for clans resource packs
2015-12-24 07:40:49 +13:00
NewGarbo
ff24ebc9f4
lots of changes that i can't remember at this point
2015-12-23 18:22:20 +00:00
NewGarbo
1840572c49
Lots of changes, specifics:
...
Fixed clans having more than max energy.
Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory.
/c <clan> now works with clans with 18+ players.
2015-12-18 11:13:38 +00:00
NewGarbo
1da04b84b5
test push (change version to 0.17d)
2015-12-15 11:57:33 +00:00
Shaun Bennett
d5a9a92913
Forgot to push these changes last update!
2015-12-05 21:36:07 -05:00
Shaun Bennett
5c575b41fc
Clans alpha 0.17
2015-12-04 05:15:28 -05:00
Shaun Bennett
58d7e8562b
update clans version for next release
2015-11-29 17:58:29 -05:00
Cheese
ab3d2ba098
updated tutorials.
...
added worldmanager to cull entities.
2015-11-28 00:23:18 +11:00
Shaun Bennett
a5ebf9b059
Fixes for release
2015-11-27 05:53:57 -05:00
Shaun Bennett
0b0710458f
Hub updates/try to fix chiss stuff
2015-11-27 03:22:17 -05:00
Shaun Bennett
c150ea6175
Potatoes and Tornadoes
2015-11-25 19:08:13 -05:00
Shaun Bennett
cc75bafb4c
Bugs and thugs
2015-11-25 16:45:04 -05:00
NewGarbo
2adfef41ca
bug fixes and new stuff ( https://docs.google.com/spreadsheets/d/1jrKJIXhIF0TZvYKLyAC50IYfN8ylLZK_M8lSexEZTkc/edit#gid=0&vpid=A10 )
2015-11-25 16:46:53 +00:00
NewGarbo
3cb22c8cb7
uuid bug fixed finally!
2015-11-25 00:47:35 +00:00
Shaun Bennett
ef7c26c04c
Clans changes
2015-11-23 15:57:13 -05:00
Shaun Bennett
bbc7bf770c
1.8 Fixes - Still doing map fix
2015-11-12 19:18:42 -05:00
NewGarbo
b835823230
Preferences page changes to free up space, as the current preferences layout is completely full.
...
Removed unnecessary Spawn variable in Clans.java, as it was causing a warning and warnings look ugly.
2015-11-06 13:19:02 +00:00
NewGarbo
3ff044fddb
Added PlayerUnClaimTerritoryEvent, and added some new stuff to TutorialClanTips
2015-11-04 11:32:06 +00:00
NewGarbo
4bf92ce0a0
gah why isn't this working?! git is annoying!!!
2015-11-03 23:47:35 +00:00
NewGarbo
eb350a79c3
Added RareItemFactory (will add shine when lib helps me with it) and other small little fixes. Added a way to specify the amount of items in a single line in GearPage, so that armor and weapon type listings look more aesthetically pleasing.
2015-10-26 12:21:33 +00:00
NewGarbo
63406e9ce1
Moved GearManager back to it's original package, and stopped using it in GearPage. Removed commented code from GearCommand, as the gui is now finished and it is not needed anymore.
2015-10-26 07:57:00 +00:00
NewGarbo
63bc492f2c
Almost completely finished the /gear ui, still a few bugs and missing features, but it's getting there. Logging off now, don't want to lose code.
2015-10-24 20:36:53 +01:00
NewGarbo
089c4420b2
Lots of progress towards a /gear gui, not finished though. commiting now because I'm leaving and don't want to lose the code.
2015-10-24 07:16:13 +01:00
Shaun Bennett
177e482dbc
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2015-10-18 12:35:31 -04:00
Shaun Bennett
f683e932ae
Clans merge fixes
2015-10-13 22:24:15 -04:00
Shaun Bennett
5bce1b5f2e
Fix merge issues, fix observer command
2015-10-01 22:57:39 -04:00
Ty Sayers
b4c9bfbb57
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/.idea/compiler.xml
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
Plugins/Mineplex.Core/.classpath
Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
Plugins/Mineplex.Hub/.classpath
Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
2015-09-29 18:09:52 -04:00
Jonathan Williams
6f0309622c
Removed AccountCache.
...
Converted that to PlayerCache and store account id in there.
2015-08-28 20:58:58 -07:00
Shaun Bennett
c51a449df3
Enable caching for clans, update craftbukkit jar
2015-08-28 13:10:30 -07:00
Shaun Bennett
4f2d861b21
Fix chat bug, enable TablistFix for clans
2015-08-27 14:53:52 -07:00
Shaun Bennett
6841cbac69
Clans bug fixes + shop updates
2015-08-24 22:03:26 -05:00
Shaun Bennett
1ef6fe3ed6
Observer changes
2015-07-17 15:37:33 -05:00
Shaun Bennett
ae71de30db
Fixes and changes
2015-07-14 01:57:53 -05:00
Shaun Bennett
5c5e7dd4a9
Merge master into clans
2015-07-13 20:42:10 -05:00
Shaun Bennett
dc1fe5fc2c
Fix schematic material id bug, add new schematics from build team, fix field ore bug, make /gear admin+, enable server join for staff ranks, remove annoying log spam from VisibilityManager
2015-07-13 19:11:17 -05:00
Shaun Bennett
e0284e2eb0
Loot for World Events
2015-06-29 22:32:40 -05:00
Shaun Bennett
fa612c9c86
Chat filter clan names, Fix scoreboard bug
2015-06-23 22:48:51 -05:00
Shaun Bennett
e34324b864
Disable auto event now while location and abilities are tweaked
2015-06-23 17:05:47 -05:00
Shaun Bennett
76a1f2b1f0
Reset timer when no players are online
2015-06-23 16:37:49 -05:00
Shaun Bennett
009f8a6764
Merge with twiggy
2015-06-23 16:36:21 -05:00
Shaun Bennett
50ddd23251
Event auto starting, Terrain Finder, Scoreboard Tweaks, Event idle, other random tweaks
2015-06-22 20:34:13 -05:00
Ty Sayers
1541dc329e
Merge branch 'clans/test-server' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldManager.java
2015-06-22 16:24:31 -04:00
Ty Sayers
2ffe2badf2
Reimplement clan energy-draining over time. Add combat-logging NPC for players that prematurely log off. Fix bug regarding /logout command for safe-logging. Reduce Shop territory side by 1 chunk radius. Add organic farming shop for purchasing/selling farm produce. Add travel hub for transporting between different spawn and shop locations. Add missing BowAttributes implementations for custom bows, and re-add in probability for dropping bows on custom gear drops. Fix bug related to custom-bow items not properly formatting item descriptions and display name. Update Redis default host IP. Fix bug where ranged attacks triggered melee-based custom gear attributes. Add clan management command for managing/deleting clans during testing phase of alpha/beta Clans.
2015-06-22 16:20:20 -04:00
Jeremiah Bishop
03c45116ef
Various fixes, and added the new data to Zoologist kit
2015-06-21 23:38:25 -04:00
Shaun Bennett
8245b6c466
Schematic generation over time, fixes to gold manager drops
2015-06-14 17:30:02 -05:00
Shaun Bennett
6a0584d419
Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans/world-events
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldManager.java
2015-06-08 15:03:51 -05:00
