Shaun Bennett
|
7f98157890
|
More work/fixes
|
2015-07-14 20:38:30 -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
|
231d4bd494
|
Merge remote-tracking branch 'origin/clans/world-events' into clans/world-events
|
2015-07-13 20:23:51 -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 |
|
libraryaddict
|
66bef4ac00
|
Maps: 100 deaths before maps freeze, sends a warning message when switching servers from clans
|
2015-07-13 21:21:17 +12:00 |
|
Shaun Bennett
|
a9e68ff777
|
Completed Energy
|
2015-07-08 21:39:31 -05:00 |
|
libraryaddict
|
27c7e7be03
|
Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events
|
2015-07-04 09:07:29 +12:00 |
|
libraryaddict
|
fbf2935b19
|
Don't display dead players
|
2015-07-04 09:07:14 +12:00 |
|
Shaun Bennett
|
384d1814d7
|
Scoreboard teams display clan relationships
|
2015-07-03 15:12:46 -05:00 |
|
libraryaddict
|
c021c6cc19
|
Added missing but not forgotten MapCommand
|
2015-07-04 07:12:50 +12:00 |
|
libraryaddict
|
24294237ea
|
Add /map command
|
2015-07-04 04:11:35 +12:00 |
|
libraryaddict
|
89a4541275
|
If inventory is empty, add clans map
|
2015-07-04 04:09:18 +12:00 |
|
libraryaddict
|
c75f22b5e0
|
Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2015-07-04 03:44:59 +12:00 |
|
libraryaddict
|
68f7bd533d
|
Clans Map stuff
|
2015-07-03 14:23:37 +12:00 |
|
Shaun Bennett
|
9ccc85a79e
|
Improved block restore for Events
|
2015-06-30 22:30:49 -05:00 |
|
Shaun Bennett
|
0fce46f504
|
Finished Undead Camp Event (Loot tables still need adjusting)
|
2015-06-30 15:28:50 -05:00 |
|
Shaun Bennett
|
0fdc4e0008
|
Merge remote-tracking branch 'origin/clans/world-events' into clans/world-events
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/event/undead/UndeadCamp.java
|
2015-06-30 14:04:35 -05:00 |
|
Shaun Bennett
|
be974bfaac
|
Work from laptop
|
2015-06-30 14:02:39 -05:00 |
|
Shaun Bennett
|
e0284e2eb0
|
Loot for World Events
|
2015-06-29 22:32:40 -05:00 |
|
Shaun Bennett
|
d07c319581
|
Saving some work
|
2015-06-27 22:22:02 -05:00 |
|
Shaun Bennett
|
1865e41144
|
Undead Camp
|
2015-06-26 01:05:36 -05:00 |
|
Shaun Bennett
|
7f530f6593
|
New border dimensions
|
2015-06-24 23:18:18 -05:00 |
|
Shaun Bennett
|
a0d97d5d99
|
Scoreboard changes, Fix region values, add 1.8 Border for map
|
2015-06-24 22:44:41 -05:00 |
|
Shaun Bennett
|
2735c81205
|
Fix bug with leaving and joining clans: online player list wouldnt update
|
2015-06-23 23:00:07 -05:00 |
|
Shaun Bennett
|
fa612c9c86
|
Chat filter clan names, Fix scoreboard bug
|
2015-06-23 22:48:51 -05:00 |
|
Shaun Bennett
|
935aba9c16
|
Some world event tweaks, refactor clans and clanTerritory to use new clanServer table with serverId, updated jooq classes
|
2015-06-23 21:45:55 -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 |
|
Jeremiah Bishop
|
dd9e6a6866
|
Started adding SkyWars game mechanics
|
2015-06-18 14:54:26 -04:00 |
|
Shaun Bennett
|
71da87a5ae
|
Some cleanup
|
2015-06-17 21:36:47 -05:00 |
|
Shaun Bennett
|
b5f4574b1b
|
Show region on scoreboard, moving on to event finishes
|
2015-06-17 20:37:45 -05:00 |
|
Shaun Bennett
|
dbdb2b3fc5
|
Scoreboards and WorldEvent work
|
2015-06-17 17:40:16 -05:00 |
|
Shaun Bennett
|
8245b6c466
|
Schematic generation over time, fixes to gold manager drops
|
2015-06-14 17:30:02 -05:00 |
|
Shaun Bennett
|
d24f01ba86
|
More event stuff!
|
2015-06-11 23:35:29 -05:00 |
|
Shaun Bennett
|
9cdf69b19d
|
More work on events
|
2015-06-09 22:58:52 -05:00 |
|
Ty Sayers
|
4dd1cf43de
|
Add ability to convert Gems into Gold daily to Bank Shop, including redis-based system for tracking most recent transfers. Fix bug with item attributes that reference potions not properly displaying potion value effects (uses roman numerals). Prepare for custom textured Legendary items by modifying over to record-based materials. Add base for organic produce / farming shop.
|
2015-06-09 15:46:38 -04:00 |
|
Shaun Bennett
|
d1a7d16810
|
Fixes GoldManager
|
2015-06-08 15:04:30 -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 |
|
Shaun Bennett
|
aa9aba92cd
|
Commit for merge
|
2015-06-08 14:59:06 -05:00 |
|
Shaun Bennett
|
8c7faf27dd
|
Store gold drop amounts in item metadata (might be worth switching to our own storage?)
|
2015-06-06 16:04:11 -05:00 |
|
Shaun Bennett
|
24a1016836
|
Slime enrage
|
2015-06-06 15:39:51 -05:00 |
|
Shaun Bennett
|
6ea000fd22
|
Remove slimes when server stops
|
2015-06-06 15:16:03 -05:00 |
|
Shaun Bennett
|
1f92564ea1
|
Changes to Slime Boss, ability to drop gold with GoldManager, small KOTH changes. [ALL UNTESTED]
|
2015-06-06 14:49:41 -05:00 |
|
Ty Sayers
|
971612a538
|
Fix bug relating to Energy Shop purchases and item functionality. Fix bug with GoldManager not being properly initialized on plugin start-up. Add Shops safe-zone to region claims for default clans across world. Create BankShop for all interactions related to economy management, specifically buying & selling GoldTokens as well as converting Gems into Gold on a daily basis.
|
2015-06-05 19:18:06 -04:00 |
|