51227ae4f3
fixed leak
2015-11-29 01:25:15 +11:00
f5384a1382
staff mode
2015-11-28 09:31:18 +00:00
d8ae035f84
creative scoreboard team. and fixed npe in tutorials
2015-11-28 09:20:42 +00:00
0dceca5cfc
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-28 09:04:15 +00:00
a0ae500876
tutorial revamp [clans]
2015-11-28 09:03:58 +00:00
b6f6d4458e
Fixed StaffServer.
2015-11-28 01:43:00 -06:00
700cf51206
titan stuff almost done
2015-11-28 16:35:11 +11:00
963caae719
Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes'
2015-11-28 16:00:28 +11:00
8af545af80
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitanData.java
2015-11-28 15:59:26 +11:00
0871663498
titan stuff
...
I HATE YOU SNAKE.
2015-11-28 15:57:07 +11:00
bcbc5244c6
Add Clans.core to hub build (IntelliJ)
2015-11-27 23:14:54 -05:00
1a87d85174
Merge remote-tracking branch 'remotes/origin/master' into clans-beta
2015-11-27 23:13:43 -05:00
24f8a98545
Added titan particle trail.
2015-11-28 02:22:41 +01:00
260002c9cf
final changes
2015-11-27 21:02:20 +00:00
9e84029e04
fixes
2015-11-27 20:50:00 +00:00
b36642b22b
remove trust command
2015-11-27 20:27:33 +00:00
d5502500b6
fixes & changes
2015-11-27 20:24:07 +00:00
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
fe085c1571
loaaads of stuff
2015-11-27 19:42:15 +00:00
636dcdf9f7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitan.java
2015-11-28 05:28:04 +13:00
5f8f643d95
What snake mount code I did
2015-11-28 05:26:43 +13:00
f06ceab277
Adjustments
2015-11-27 09:33:31 -05:00
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
4d23b2a39f
fixed (I BELIEVE) chests not opening in own territory
2015-11-27 14:24:02 +00:00
def46c715e
fixer
2015-11-28 00:52:54 +11:00
627fbc7df2
add info into chat if a player is in creative
2015-11-27 13:50:18 +00:00
b45eb53dff
remove old items
2015-11-28 00:43:01 +11:00
ad0c161f16
set players time to day during tutorial
2015-11-27 13:28:37 +00:00
3be2986cea
sethome command now places bed even if theres grass
2015-11-27 13:26:12 +00:00
691105b2cb
force place bed on first claim
2015-11-27 13:23:37 +00:00
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
ab3d2ba098
updated tutorials.
...
added worldmanager to cull entities.
2015-11-28 00:23:18 +11:00
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
f0669cb610
fixed undead camp item naming being italic
2015-11-27 13:15:26 +00:00
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
53da9c97d0
item frame cancel!
2015-11-27 22:27:20 +11:00
b996dc20ca
Enable tutorial, fix stuck command
2015-11-27 06:26:32 -05:00
a5ebf9b059
Fixes for release
2015-11-27 05:53:57 -05:00
ec0e2d2d64
fixed colors
2015-11-27 21:09:25 +11:00
3e37a63aa8
fixed chome teleport height
2015-11-27 20:59:23 +11:00
dda0e827e1
FGIXEXFSD
2015-11-27 20:46:33 +11:00
9ce4440679
extra cmds
2015-11-27 20:36:00 +11:00
6428d28275
travel hub bed fix
2015-11-27 20:31:19 +11:00
797dcf8d8e
fxied song again T_T
2015-11-27 20:01:48 +11:00
936e61de57
gui changes :)
2015-11-27 19:42:04 +11:00
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
5d40a57df8
sound fix
2015-11-27 19:29:17 +11:00
0b0710458f
Hub updates/try to fix chiss stuff
2015-11-27 03:22:17 -05:00
4e2f48b37e
Merge branch 'master' into clans-beta
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
2015-11-27 19:16:30 +11:00
f55b6761a8
disabled titan gadgets!
2015-11-27 19:14:35 +11:00
e25df8739d
EAST 2 WEST
2015-11-27 18:46:15 +11:00
4085c998cd
MUSIC 4 LIFE
2015-11-27 18:44:33 +11:00
408c2cf72a
im an idiot
2015-11-27 01:40:28 -05:00
bdbb75e196
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-27 01:35:16 -05:00
34368722a9
Fix gold manager again
2015-11-27 01:35:10 -05:00
7efcf5426d
no hunger depletion in safe zones
2015-11-27 06:34:29 +00:00
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
42d39a40e9
WIND
2015-11-27 06:25:58 +00:00
94090c9434
adjust gold drops
2015-11-27 01:24:03 -05:00
e211fe182d
Adjust gem conversion rate
2015-11-27 01:06:53 -05:00
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
a9669ade31
Immolate fix hopefully
2015-11-27 06:05:22 +00:00
0aeca96746
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-27 01:05:16 -05:00
32c17cad7e
Shop price changes
2015-11-27 01:04:51 -05:00
77be81c216
pet changes
2015-11-27 16:50:22 +11:00
2b047cdde8
more titan stuff
2015-11-27 16:46:48 +11:00
9082ace3f3
wind blade fall damage
2015-11-27 05:46:37 +00:00
20a9ed5a6e
staff not being able to join fix
2015-11-27 05:13:47 +00:00
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
b22c766c94
more clans modificatons
2015-11-27 05:04:24 +00:00
05e7183b65
titan stuff update
2015-11-27 15:55:00 +11:00
a46bed53fa
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 23:42:22 -05:00
31f083387d
Use Castle icon on travel page
2015-11-26 23:42:16 -05:00
174825776b
meow clams
2015-11-27 04:39:04 +00:00
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
6119500b68
changes
2015-11-27 04:23:02 +00:00
faaa1fcf0b
Use castle clan icon for /c <clan>
2015-11-26 23:15:14 -05:00
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
dbda29e3f3
magnetic maul fixes
2015-11-27 04:05:47 +00:00
73f4450fa3
clans fixes
2015-11-27 04:04:29 +00:00
ef511f1704
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 22:38:03 -05:00
6da10950da
Update clan icons, fix client class
2015-11-26 22:37:54 -05:00
0274bf2847
loads of changes.
2015-11-27 03:28:19 +00:00
3c98243201
Some more guardian stuff
2015-11-27 15:56:56 +13:00
0a4416381b
Fix guardian
2015-11-27 15:55:02 +13:00
98d988584d
titan cosmetics
2015-11-27 13:35:25 +11:00
e849484670
bunch of changes and fixes and bugs and stuff and things
2015-11-26 23:59:47 +00:00
0ee042f192
Implement equals and hashCode, move compareTo into MessageSnap class.
2015-11-26 23:59:17 +00:00
3e06451ac1
Whoops, this should be 30 SECONDS, not MINUTES.
2015-11-26 23:50:45 +00:00
d47b494628
Add /chatcache (mainly for debugging).
...
Fix cache not being able to store more than 1 value per sender.
Add comparator to sort all messages chronologically.
2015-11-26 23:29:43 +00:00
055702b36e
changes and fixes and woo
2015-11-26 23:08:33 +00:00
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
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
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
27e214a643
Region fix
2015-11-26 16:12:29 -05:00
dd33d9587d
made power recharge a tad faster with Wind Blade
2015-11-26 21:12:09 +00:00
0aaee24600
fixed gear UI display stuff incorrectly
2015-11-26 21:06:33 +00:00
bb3ea0115d
fixed classes not loading
2015-11-26 20:41:42 +00:00
67a28a94fb
bunch of fixes
2015-11-26 20:32:01 +00:00
edf93ec43f
Initial ChatSnap implementation.
2015-11-26 16:55:27 +00:00
2bce722539
some code polishing. fixed some mispositioning with Spawn holograms.
2015-11-26 13:29:40 +00:00
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
009ddaaee1
stop players in tutorial from receiving/sending chat.
2015-11-26 13:16:50 +00:00
bbfd319bcd
Spawn holograms
2015-11-26 13:14:10 +00:00
1ce2a362c6
disallow item frames being rotated in Spawn
2015-11-26 12:34:12 +00:00
be19c17fee
fixed gem -> gold conversion rate
2015-11-26 12:33:29 +00:00
9aaad0b4a1
fixed formatting in /spawn command
2015-11-26 12:31:55 +00:00
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
d4f3786b1c
Fixes
2015-11-26 03:31:03 -05:00
94a0f3244d
corrected typo in WindBlade.java
2015-11-26 07:53:37 +00:00
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
97e903f403
updated regions
2015-11-26 07:51:10 +00:00
75ff5bb3da
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 02:46:56 -05:00
56d5c10481
oops util ent new method didn't commit in last commit
2015-11-26 07:29:59 +00:00
c0cfdf9785
fixed windblade not recharging whilst jumping
2015-11-26 07:29:39 +00:00
e80c1097b5
corrected regions
2015-11-26 07:08:30 +00:00
0d43ffc7b2
fixessss
2015-11-26 06:54:49 +00:00
6de7b8a73e
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 01:46:43 -05:00
972a2d151a
simplified combat log npc title
2015-11-26 06:21:01 +00:00
f92849f796
that doesn't do what i thought it did
2015-11-26 05:32:59 +00:00
1e4b6b4d0f
fixed formatting error in clan tip
2015-11-26 05:30:13 +00:00
7da8b8e3bf
fix players hurting each other in safe zones
2015-11-26 05:29:35 +00:00
48ebfc219d
removed travel npcs from shops
2015-11-26 05:24:33 +00:00
389956240b
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 00:20:41 -05:00
76d009e0de
Unstuck (Spawn) command
2015-11-26 05:18:18 +00:00
33cdd5400d
fixed some coloring issues
2015-11-26 04:32:41 +00:00
193c5fe487
fixed static
2015-11-26 15:26:57 +11:00
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
7a663b4f7b
Fix legendaries
2015-11-25 23:24:07 -05:00
8bd1f4b3c8
reduced hyper axe damage. OP as heck
2015-11-26 04:21:30 +00:00
abcee009dd
stuff
2015-11-26 04:07:33 +00:00
059a9a32cd
fixed method
2015-11-26 14:51:45 +11:00
83a7b398bc
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-26 14:47:24 +11:00
1a5dbc073d
recursive block find method
2015-11-26 14:47:01 +11:00
670afc17ef
clans chat is being weird
2015-11-26 03:26:15 +00:00
5230b25dfd
fixed suicide command (?)
2015-11-26 03:24:48 +00:00
4f275d79fa
fixed staff tags only displaying if player is in clan
2015-11-26 03:19:40 +00:00
5fb58b1dad
added suicide command
2015-11-26 03:17:05 +00:00
8a64a2f4ce
fixed world events spawning floating on grass and other boundless blocks
2015-11-26 03:06:27 +00:00
b43cf0b28a
got rid of enchanted effect on rare items
2015-11-26 03:00:59 +00:00
55ff04ca93
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-11-26 15:49:54 +13:00
3e8a53562e
Add new hologram interaction thingy so holograms can catch interactions that they would normally block
2015-11-26 15:49:28 +13:00
7e23f896ca
changes
2015-11-26 02:49:01 +00:00
55f5f95869
added no ammo display
2015-11-26 13:05:27 +11:00
65a1441e1f
-Fixed smoke being removed when bomb was planted in it
...
-Fixed being unable to defuse bomb in smoke
-Fixed older smokes removing newer intersecting smokes
-Grenades will still detonate after being burned
-Bizon now gives $600 per kill
-Added replacement smoke on gun fire
-Added shell ejecting particles on gun fire
-Removed gun bobbing when firing
-Changed ammo display location
2015-11-26 12:56:26 +11:00
a19ade0739
rain rain go away
2015-11-26 00:53:01 +00:00
11deec75dd
fixed illusion
2015-11-26 00:44:13 +00:00
c150ea6175
Potatoes and Tornadoes
2015-11-25 19:08:13 -05:00
cc75bafb4c
Bugs and thugs
2015-11-25 16:45:04 -05:00
1306137cb2
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-25 14:51:00 -05:00
Cheese
NewGarbo
Jonathan Williams
Shaun Bennett
xGamingDudex
libraryaddict
Keir
Shaun Bennett