Cheese
|
b45eb53dff
|
remove old items
|
2015-11-28 00:43:01 +11:00 |
|
NewGarbo
|
ad0c161f16
|
set players time to day during tutorial
|
2015-11-27 13:28:37 +00:00 |
|
NewGarbo
|
691105b2cb
|
force place bed on first claim
|
2015-11-27 13:23:37 +00:00 |
|
Cheese
|
fdb493d95d
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-28 00:23:32 +11:00 |
|
Cheese
|
ab3d2ba098
|
updated tutorials.
added worldmanager to cull entities.
|
2015-11-28 00:23:18 +11:00 |
|
NewGarbo
|
4423baca96
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-27 13:15:46 +00:00 |
|
NewGarbo
|
f0669cb610
|
fixed undead camp item naming being italic
|
2015-11-27 13:15:26 +00:00 |
|
Cheese
|
67b9755f0d
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-27 22:27:33 +11:00 |
|
Cheese
|
53da9c97d0
|
item frame cancel!
|
2015-11-27 22:27:20 +11:00 |
|
Shaun Bennett
|
b996dc20ca
|
Enable tutorial, fix stuck command
|
2015-11-27 06:26:32 -05:00 |
|
Shaun Bennett
|
a5ebf9b059
|
Fixes for release
|
2015-11-27 05:53:57 -05:00 |
|
Cheese
|
3e37a63aa8
|
fixed chome teleport height
|
2015-11-27 20:59:23 +11:00 |
|
Cheese
|
9ce4440679
|
extra cmds
|
2015-11-27 20:36:00 +11:00 |
|
Cheese
|
6428d28275
|
travel hub bed fix
|
2015-11-27 20:31:19 +11:00 |
|
Cheese
|
797dcf8d8e
|
fxied song again T_T
|
2015-11-27 20:01:48 +11:00 |
|
Cheese
|
c501a42094
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-27 19:29:33 +11:00 |
|
Cheese
|
5d40a57df8
|
sound fix
|
2015-11-27 19:29:17 +11:00 |
|
Shaun Bennett
|
0b0710458f
|
Hub updates/try to fix chiss stuff
|
2015-11-27 03:22:17 -05:00 |
|
Cheese
|
e25df8739d
|
EAST 2 WEST
|
2015-11-27 18:46:15 +11:00 |
|
Cheese
|
4085c998cd
|
MUSIC 4 LIFE
|
2015-11-27 18:44:33 +11:00 |
|
Shaun Bennett
|
408c2cf72a
|
im an idiot
|
2015-11-27 01:40:28 -05:00 |
|
Shaun Bennett
|
bdbb75e196
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-27 01:35:16 -05:00 |
|
Shaun Bennett
|
34368722a9
|
Fix gold manager again
|
2015-11-27 01:35:10 -05:00 |
|
NewGarbo
|
7efcf5426d
|
no hunger depletion in safe zones
|
2015-11-27 06:34:29 +00:00 |
|
NewGarbo
|
c96b0c529a
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-27 06:26:23 +00:00 |
|
NewGarbo
|
42d39a40e9
|
WIND
|
2015-11-27 06:25:58 +00:00 |
|
Shaun Bennett
|
94090c9434
|
adjust gold drops
|
2015-11-27 01:24:03 -05:00 |
|
Shaun Bennett
|
e211fe182d
|
Adjust gem conversion rate
|
2015-11-27 01:06:53 -05:00 |
|
NewGarbo
|
c33eea28a2
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-27 06:05:39 +00:00 |
|
NewGarbo
|
a9669ade31
|
Immolate fix hopefully
|
2015-11-27 06:05:22 +00:00 |
|
Shaun Bennett
|
0aeca96746
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-27 01:05:16 -05:00 |
|
Shaun Bennett
|
32c17cad7e
|
Shop price changes
|
2015-11-27 01:04:51 -05:00 |
|
NewGarbo
|
9082ace3f3
|
wind blade fall damage
|
2015-11-27 05:46:37 +00:00 |
|
NewGarbo
|
20a9ed5a6e
|
staff not being able to join fix
|
2015-11-27 05:13:47 +00:00 |
|
NewGarbo
|
f81d1d390a
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-27 05:04:46 +00:00 |
|
NewGarbo
|
b22c766c94
|
more clans modificatons
|
2015-11-27 05:04:24 +00:00 |
|
Shaun Bennett
|
a46bed53fa
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-26 23:42:22 -05:00 |
|
Shaun Bennett
|
31f083387d
|
Use Castle icon on travel page
|
2015-11-26 23:42:16 -05:00 |
|
NewGarbo
|
174825776b
|
meow clams
|
2015-11-27 04:39:04 +00:00 |
|
NewGarbo
|
9dcc048953
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-27 04:23:14 +00:00 |
|
NewGarbo
|
6119500b68
|
changes
|
2015-11-27 04:23:02 +00:00 |
|
Shaun Bennett
|
faaa1fcf0b
|
Use castle clan icon for /c <clan>
|
2015-11-26 23:15:14 -05:00 |
|
NewGarbo
|
5744178286
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-27 04:06:02 +00:00 |
|
NewGarbo
|
dbda29e3f3
|
magnetic maul fixes
|
2015-11-27 04:05:47 +00:00 |
|
NewGarbo
|
73f4450fa3
|
clans fixes
|
2015-11-27 04:04:29 +00:00 |
|
Shaun Bennett
|
ef511f1704
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-26 22:38:03 -05:00 |
|
Shaun Bennett
|
6da10950da
|
Update clan icons, fix client class
|
2015-11-26 22:37:54 -05:00 |
|
NewGarbo
|
0274bf2847
|
loads of changes.
|
2015-11-27 03:28:19 +00:00 |
|
NewGarbo
|
e849484670
|
bunch of changes and fixes and bugs and stuff and things
|
2015-11-26 23:59:47 +00:00 |
|
NewGarbo
|
055702b36e
|
changes and fixes and woo
|
2015-11-26 23:08:33 +00:00 |
|
NewGarbo
|
56d4b34969
|
fixed formatting on death notices.
Made world event middle texts longer lasting.
Fixed logout NPC timer
|
2015-11-26 21:57:26 +00:00 |
|
NewGarbo
|
5393d1d18c
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-26 21:16:21 +00:00 |
|
Shaun Bennett
|
6e416b1059
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
|
2015-11-26 16:12:54 -05:00 |
|
Shaun Bennett
|
27e214a643
|
Region fix
|
2015-11-26 16:12:29 -05:00 |
|
NewGarbo
|
dd33d9587d
|
made power recharge a tad faster with Wind Blade
|
2015-11-26 21:12:09 +00:00 |
|
NewGarbo
|
0aaee24600
|
fixed gear UI display stuff incorrectly
|
2015-11-26 21:06:33 +00:00 |
|
NewGarbo
|
bb3ea0115d
|
fixed classes not loading
|
2015-11-26 20:41:42 +00:00 |
|
NewGarbo
|
67a28a94fb
|
bunch of fixes
|
2015-11-26 20:32:01 +00:00 |
|
NewGarbo
|
2bce722539
|
some code polishing. fixed some mispositioning with Spawn holograms.
|
2015-11-26 13:29:40 +00:00 |
|
NewGarbo
|
e5fa59b8da
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-26 13:17:28 +00:00 |
|
NewGarbo
|
009ddaaee1
|
stop players in tutorial from receiving/sending chat.
|
2015-11-26 13:16:50 +00:00 |
|
NewGarbo
|
bbfd319bcd
|
Spawn holograms
|
2015-11-26 13:14:10 +00:00 |
|
NewGarbo
|
1ce2a362c6
|
disallow item frames being rotated in Spawn
|
2015-11-26 12:34:12 +00:00 |
|
NewGarbo
|
be19c17fee
|
fixed gem -> gold conversion rate
|
2015-11-26 12:33:29 +00:00 |
|
NewGarbo
|
9aaad0b4a1
|
fixed formatting in /spawn command
|
2015-11-26 12:31:55 +00:00 |
|
Shaun Bennett
|
bdc08676d9
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
|
2015-11-26 03:34:33 -05:00 |
|
Shaun Bennett
|
d4f3786b1c
|
Fixes
|
2015-11-26 03:31:03 -05:00 |
|
NewGarbo
|
94a0f3244d
|
corrected typo in WindBlade.java
|
2015-11-26 07:53:37 +00:00 |
|
NewGarbo
|
af0df835b8
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
|
2015-11-26 07:52:35 +00:00 |
|
NewGarbo
|
97e903f403
|
updated regions
|
2015-11-26 07:51:10 +00:00 |
|
Shaun Bennett
|
75ff5bb3da
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-26 02:46:56 -05:00 |
|
NewGarbo
|
c0cfdf9785
|
fixed windblade not recharging whilst jumping
|
2015-11-26 07:29:39 +00:00 |
|
NewGarbo
|
e80c1097b5
|
corrected regions
|
2015-11-26 07:08:30 +00:00 |
|
NewGarbo
|
0d43ffc7b2
|
fixessss
|
2015-11-26 06:54:49 +00:00 |
|
Shaun Bennett
|
6de7b8a73e
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-26 01:46:43 -05:00 |
|
NewGarbo
|
972a2d151a
|
simplified combat log npc title
|
2015-11-26 06:21:01 +00:00 |
|
NewGarbo
|
f92849f796
|
that doesn't do what i thought it did
|
2015-11-26 05:32:59 +00:00 |
|
NewGarbo
|
1e4b6b4d0f
|
fixed formatting error in clan tip
|
2015-11-26 05:30:13 +00:00 |
|
NewGarbo
|
7da8b8e3bf
|
fix players hurting each other in safe zones
|
2015-11-26 05:29:35 +00:00 |
|
NewGarbo
|
48ebfc219d
|
removed travel npcs from shops
|
2015-11-26 05:24:33 +00:00 |
|
Shaun Bennett
|
389956240b
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-26 00:20:41 -05:00 |
|
NewGarbo
|
76d009e0de
|
Unstuck (Spawn) command
|
2015-11-26 05:18:18 +00:00 |
|
NewGarbo
|
33cdd5400d
|
fixed some coloring issues
|
2015-11-26 04:32:41 +00:00 |
|
Shaun Bennett
|
8f14c8beae
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
|
2015-11-25 23:26:29 -05:00 |
|
Shaun Bennett
|
7a663b4f7b
|
Fix legendaries
|
2015-11-25 23:24:07 -05:00 |
|
NewGarbo
|
8bd1f4b3c8
|
reduced hyper axe damage. OP as heck
|
2015-11-26 04:21:30 +00:00 |
|
NewGarbo
|
abcee009dd
|
stuff
|
2015-11-26 04:07:33 +00:00 |
|
NewGarbo
|
670afc17ef
|
clans chat is being weird
|
2015-11-26 03:26:15 +00:00 |
|
NewGarbo
|
5230b25dfd
|
fixed suicide command (?)
|
2015-11-26 03:24:48 +00:00 |
|
NewGarbo
|
4f275d79fa
|
fixed staff tags only displaying if player is in clan
|
2015-11-26 03:19:40 +00:00 |
|
NewGarbo
|
5fb58b1dad
|
added suicide command
|
2015-11-26 03:17:05 +00:00 |
|
NewGarbo
|
8a64a2f4ce
|
fixed world events spawning floating on grass and other boundless blocks
|
2015-11-26 03:06:27 +00:00 |
|
NewGarbo
|
b43cf0b28a
|
got rid of enchanted effect on rare items
|
2015-11-26 03:00:59 +00:00 |
|
NewGarbo
|
7e23f896ca
|
changes
|
2015-11-26 02:49:01 +00:00 |
|
NewGarbo
|
a19ade0739
|
rain rain go away
|
2015-11-26 00:53:01 +00: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
|
c5211e0368
|
buuugs
|
2015-11-25 17:40:12 +00:00 |
|
NewGarbo
|
9a8fba543d
|
auto-replanting trees
|
2015-11-25 17:03:48 +00: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
|
7e9dc7968e
|
gear gui fixes and legendaries changes
|
2015-11-25 01:32:05 +00:00 |
|
NewGarbo
|
3a6dab7224
|
stuff
|
2015-11-25 00:55:11 +00:00 |
|
NewGarbo
|
3cb22c8cb7
|
uuid bug fixed finally!
|
2015-11-25 00:47:35 +00:00 |
|
NewGarbo
|
aa52c1be27
|
custom item stuff
|
2015-11-25 00:14:34 +00:00 |
|
NewGarbo
|
6220ce14fe
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-24 23:04:24 +00:00 |
|
NewGarbo
|
98edd0a452
|
dissallow chests, doors, furnaces, etc. from being accessed in territories that are not yours
|
2015-11-24 23:03:19 +00:00 |
|
NewGarbo
|
81c2d2a11f
|
*just pushing my current changes so that i can start fresh on recoding custom item serialization stuff*
|
2015-11-24 22:49:28 +00:00 |
|
NewGarbo
|
31afe9f886
|
removed debug message from undead camp
|
2015-11-24 22:29:20 +00:00 |
|
Shaun Bennett
|
57302221df
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-24 17:27:46 -05:00 |
|
Shaun Bennett
|
cb7422b4fe
|
Re-enable world events
|
2015-11-24 17:27:35 -05:00 |
|
NewGarbo
|
befe4d129d
|
formatted PlayerGear.java (to avoid further confusion)
|
2015-11-24 22:21:01 +00:00 |
|
NewGarbo
|
459e1beeff
|
clans buggy fixers
|
2015-11-24 22:18:48 +00:00 |
|
NewGarbo
|
8559a63887
|
Added all rank names to Clans name blacklist
|
2015-11-23 22:10:29 +00:00 |
|
NewGarbo
|
3fa0beceb7
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-23 21:39:53 +00:00 |
|
Shaun Bennett
|
ef7c26c04c
|
Clans changes
|
2015-11-23 15:57:13 -05:00 |
|
NewGarbo
|
91067535db
|
changed getting started tutorial gold reward to be proper (5000 now)
|
2015-11-23 18:09:50 +00:00 |
|
NewGarbo
|
175a6bc31a
|
cleaned up world event times stuff
|
2015-11-23 17:24:17 +00:00 |
|
NewGarbo
|
9bae314278
|
fixed null pointer exception when interacting with a block when your clan home is null
|
2015-11-23 17:19:00 +00:00 |
|
NewGarbo
|
6ca4d12d98
|
fixed potential nofall exploit with logout npc
|
2015-11-23 17:09:51 +00:00 |
|
NewGarbo
|
ce2e616c74
|
fixed /skiptutorial bugs, removed safe log out command, fixed tutorial bugs, and much more i can't remember ;-;
|
2015-11-23 16:57:50 +00:00 |
|
NewGarbo
|
da2c7d84a4
|
tutorial code cleanup. removed qa reset command
|
2015-11-23 11:19:23 +00:00 |
|
NewGarbo
|
a551e89310
|
fixed clans tips preferences, and changed World Event commands perms from being ALL to EVENT
|
2015-11-23 09:44:35 +00:00 |
|
NewGarbo
|
58ed9e586c
|
turned ClansTips into it's own miniplugin, as it doesn't fit as a subclass of Tutorial
|
2015-11-23 09:04:30 +00:00 |
|
NewGarbo
|
47abbfbedf
|
implemented skip tutorial being permanent
|
2015-11-22 20:01:54 +00:00 |
|
NewGarbo
|
2e047b54c2
|
removed stone weapons from loot
|
2015-11-22 11:54:38 +00:00 |
|
NewGarbo
|
0cdee95b87
|
formatted some classes
|
2015-11-22 11:23:19 +00:00 |
|
NewGarbo
|
17e62f1f5a
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-20 18:31:37 +00:00 |
|
NewGarbo
|
fb04fac0f6
|
removed debug message
|
2015-11-20 18:31:14 +00:00 |
|
NewGarbo
|
521aa8d965
|
fixed furnaces in undead camp
|
2015-11-20 09:14:57 +00:00 |
|
NewGarbo
|
08f683aa98
|
gave Archers in undead camps the barbed arrows effect
|
2015-11-20 07:49:28 +00:00 |
|
Shaun Bennett
|
c29fd242ca
|
Forgot to remove the unnecessary check
|
2015-11-19 14:46:01 -05:00 |
|
Shaun Bennett
|
f47a61e38e
|
Use bounds for energy tracker messages aren't displayed multiple times
|
2015-11-19 14:44:03 -05:00 |
|
Shaun Bennett
|
63e580404c
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyTracker.java
|
2015-11-19 14:36:08 -05:00 |
|
Shaun Bennett
|
3820035762
|
Cleaning up duplicate code/small optimizations (untested)
|
2015-11-19 14:35:59 -05:00 |
|
NewGarbo
|
b0c60fd1f4
|
sparkly rare items! woo. and fixed gold dropping waaayyy too much
|
2015-11-19 19:03:51 +00:00 |
|
NewGarbo
|
7d8e1b517d
|
Fixed dropped gold stacking...
|
2015-11-19 08:56:07 +00:00 |
|
NewGarbo
|
f262a22913
|
Fixed loot dropping in King of the Hill not dropping correct items/
|
2015-11-19 08:54:59 +00:00 |
|
NewGarbo
|
6372dfd629
|
fixed ArithmeticException / 0 in ClansEnergyTracker.
|
2015-11-19 08:29:50 +00:00 |
|
NewGarbo
|
0a667afeb1
|
finally fixed beds. major cleanup of code, much more organized now, thank you, Me!!!! oh my god both of my eyes are twitching
|
2015-11-18 22:27:01 +00:00 |
|
NewGarbo
|
eded09b1a9
|
fixed yet another bug with beds... argh it seems to be working fine now.
|
2015-11-18 21:02:39 +00:00 |
|
NewGarbo
|
6f3693f804
|
more bug fixes
|
2015-11-18 19:32:20 +00:00 |
|
NewGarbo
|
924504ac9f
|
fixed clans home NPE. also added GRASS to UtilItem's item property system.
|
2015-11-18 19:03:44 +00:00 |
|
NewGarbo
|
16eecdd112
|
fixed clan energy alerts going off incorrectly
|
2015-11-18 17:30:45 +00:00 |
|
NewGarbo
|
5c2569e822
|
revert certain permissions from being ALL or containing JR.DEV (that were used for testing)
|
2015-11-18 16:20:27 +00:00 |
|
NewGarbo
|
5c383a1df3
|
cleaned up /sethome old bed removal, as previous way would delete any beds around the home bed, which would destroy
|
2015-11-18 12:24:28 +00:00 |
|
NewGarbo
|
9eaffc8acf
|
Added methods into UtilBlock to place beds and doors. updated /sethome to use the new method for placing beds. i'm sure they'll come in handy later on.
|
2015-11-18 12:17:00 +00:00 |
|
NewGarbo
|
cd0ce57691
|
replaced useless looping with just checking the rotation of the bed.
|
2015-11-18 09:58:06 +00:00 |
|
NewGarbo
|
1ea87b8354
|
Fixed an NPE when destroying a Clan's Home
|
2015-11-18 09:37:32 +00:00 |
|
NewGarbo
|
03764ad480
|
removed the disallowing of interaction in ClansGame.java if the block that the player is hitting, is a Clan's Home. This was messing up the other code for Clan Home bed stuff.
|
2015-11-18 08:40:24 +00:00 |
|
NewGarbo
|
f5e12e5014
|
formatted ClansGame.java (separate commit because confusion otherwise)
|
2015-11-18 08:37:34 +00:00 |
|