Shaun Bennett
|
f82396d485
|
Clans changes/fixes
|
2015-11-29 02:41:53 -05:00 |
|
Jonathan Williams
|
0d5fa70632
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-28 23:05:32 -06:00 |
|
Jonathan Williams
|
5acf6b19a4
|
Fixed bed checking interval.
Added timing logging to map rendering.
|
2015-11-28 23:05:22 -06:00 |
|
NewGarbo
|
b88a842f1c
|
stuff
|
2015-11-29 03:22:52 +00:00 |
|
NewGarbo
|
c870d99e0e
|
teleport stuff
|
2015-11-29 02:55:45 +00:00 |
|
NewGarbo
|
a9afe1f068
|
added self clan create/delete messages
|
2015-11-29 02:54:40 +00:00 |
|
NewGarbo
|
84303234fd
|
fixed task 2
|
2015-11-29 02:48:03 +00:00 |
|
NewGarbo
|
392ab601c2
|
tutorial tasks reset
|
2015-11-29 02:43:12 +00:00 |
|
NewGarbo
|
d7658f3838
|
fixed stuck manager taking 0 seconds
|
2015-11-29 02:39:09 +00:00 |
|
NewGarbo
|
dc5aec33b4
|
tutorial ending message
|
2015-11-29 02:37:20 +00:00 |
|
NewGarbo
|
8dca384d35
|
force join command
|
2015-11-29 02:31:14 +00:00 |
|
NewGarbo
|
9ff9724fc8
|
tutorial revamp 2.0
|
2015-11-29 02:10:39 +00:00 |
|
NewGarbo
|
ace4548b1e
|
don't cull an entity if a player is nearby
|
2015-11-28 20:14:48 +00:00 |
|
NewGarbo
|
afbccba36f
|
added force join command for ADMIN+
|
2015-11-28 19:56:47 +00:00 |
|
NewGarbo
|
75ef42d8c9
|
fixed the clan claim box check
|
2015-11-28 19:37:03 +00:00 |
|
NewGarbo
|
f5384a1382
|
staff mode
|
2015-11-28 09:31:18 +00:00 |
|
NewGarbo
|
d8ae035f84
|
creative scoreboard team. and fixed npe in tutorials
|
2015-11-28 09:20:42 +00:00 |
|
NewGarbo
|
a0ae500876
|
tutorial revamp [clans]
|
2015-11-28 09:03:58 +00:00 |
|
NewGarbo
|
260002c9cf
|
final changes
|
2015-11-27 21:02:20 +00:00 |
|
NewGarbo
|
9e84029e04
|
fixes
|
2015-11-27 20:50:00 +00:00 |
|
NewGarbo
|
b36642b22b
|
remove trust command
|
2015-11-27 20:27:33 +00:00 |
|
NewGarbo
|
d5502500b6
|
fixes & changes
|
2015-11-27 20:24:07 +00:00 |
|
NewGarbo
|
6ac871f04c
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-27 19:43:48 +00:00 |
|
NewGarbo
|
fe085c1571
|
loaaads of stuff
|
2015-11-27 19:42:15 +00:00 |
|
Shaun Bennett
|
f06ceab277
|
Adjustments
|
2015-11-27 09:33:31 -05:00 |
|
NewGarbo
|
0c463cf7cd
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-27 14:24:25 +00:00 |
|
NewGarbo
|
4d23b2a39f
|
fixed (I BELIEVE) chests not opening in own territory
|
2015-11-27 14:24:02 +00:00 |
|
Cheese
|
def46c715e
|
fixer
|
2015-11-28 00:52:54 +11:00 |
|
NewGarbo
|
627fbc7df2
|
add info into chat if a player is in creative
|
2015-11-27 13:50:18 +00:00 |
|
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 |
|