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
ff5d828dd7
Merge with master, lots of clans fixes/work
2015-11-25 14:50:49 -05:00
c5211e0368
buuugs
2015-11-25 17:40:12 +00:00
9a8fba543d
auto-replanting trees
2015-11-25 17:03:48 +00:00
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
f668ae6082
ms smoke
2015-11-25 17:49:18 +11:00
360f3db2ed
fixed grenade vertical rebound bug
2015-11-25 17:48:32 +11:00
8ceb6ccfca
minestrike update!
2015-11-25 17:41:00 +11:00
7e9dc7968e
gear gui fixes and legendaries changes
2015-11-25 01:32:05 +00:00
bbdbb209c5
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-25 00:55:37 +00:00
3a6dab7224
stuff
2015-11-25 00:55:11 +00:00
3cb22c8cb7
uuid bug fixed finally!
2015-11-25 00:47:35 +00:00
ecf42803f9
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-11-25 13:42:31 +13:00
ca81265b9e
Readded PacketHandler debug message
2015-11-25 13:42:11 +13:00
aa52c1be27
custom item stuff
2015-11-25 00:14:34 +00:00
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
98edd0a452
dissallow chests, doors, furnaces, etc. from being accessed in territories that are not yours
2015-11-24 23:03:19 +00:00
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
31afe9f886
removed debug message from undead camp
2015-11-24 22:29:20 +00:00
57302221df
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-24 17:27:46 -05:00
cb7422b4fe
Re-enable world events
2015-11-24 17:27:35 -05:00
befe4d129d
formatted PlayerGear.java (to avoid further confusion)
2015-11-24 22:21:01 +00:00
459e1beeff
clans buggy fixers
2015-11-24 22:18:48 +00:00
d66bad572f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-24 22:19:59 +11:00
5799edae50
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-11-24 23:45:42 +13:00
ddf7528796
Updated CB
2015-11-24 23:45:22 +13:00
837be048a6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-24 21:38:47 +11:00
f8d8b75586
Changed how timings is used.
2015-11-24 04:36:18 -06:00
7e2f5f0657
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-24 21:30:45 +11:00
11a60a86a9
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-24 21:30:17 +11:00
fbea0e702b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-24 02:56:40 -06:00
c5b5d07627
evade timing
2015-11-24 16:07:11 +11:00
913d079623
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-24 15:23:53 +11:00
Cheese
NewGarbo
libraryaddict
Shaun Bennett
Shaun Bennett
Jonathan Williams