fooify
|
8149d61343
|
Merge remote-tracking branch 'origin/master' into foo
|
2015-07-07 07:59:46 -07:00 |
|
Jonathan Williams
|
7bf440f786
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-07 05:18:15 -04:00 |
|
libraryaddict
|
2bec753a34
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-07 12:30:37 +12:00 |
|
libraryaddict
|
bff3897fab
|
Perks and kits: Change priority for unregistering to high, add new method to Perk firing when perk listener is registered.
|
2015-07-07 12:30:20 +12:00 |
|
Shaun Bennett
|
6c8c3946a3
|
Revert "Add IntelliJ IDE library files"
This reverts commit 71d696278d .
|
2015-07-06 17:06:29 -05:00 |
|
Ben Sihota
|
71d696278d
|
Add IntelliJ IDE library files
|
2015-07-06 13:48:47 -07:00 |
|
Cheese
|
cca26165cd
|
swapped sale back to 50%
|
2015-07-06 11:42:54 +10:00 |
|
libraryaddict
|
2c249e37b5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-06 07:07:56 +12:00 |
|
libraryaddict
|
e16cb4cef7
|
Disguise: Initite armorstand vector
|
2015-07-06 07:07:41 +12:00 |
|
libraryaddict
|
3d0dda382b
|
Stacker: Fixed an infinite loop
|
2015-07-06 07:07:19 +12:00 |
|
Shaun Bennett
|
abaa0ddee8
|
Level for Bobby
|
2015-07-05 13:30:16 -05:00 |
|
Cheese
|
7182205fde
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-05 15:13:33 +10:00 |
|
Cheese
|
8d2b1650af
|
world component for MCPE
|
2015-07-05 15:13:18 +10:00 |
|
libraryaddict
|
e002e4af18
|
Disguises: Added ArmorStandDisguise, removed unused DisguiseType and added ability to add fake armor to disguises
|
2015-07-05 13:37:07 +12:00 |
|
Jonathan Williams
|
cf035eeb37
|
Fixed Bungee issues with new redis configs.
|
2015-07-03 02:17:27 -04:00 |
|
Cheese
|
556e524e18
|
changed notifications back to 75% sale
|
2015-07-02 16:14:47 +10:00 |
|
Cheese
|
1e26ebe0bd
|
disabled ice forming
|
2015-07-02 10:09:39 +10:00 |
|
fooify
|
70d351adae
|
fix getting snowballs from bedrock
|
2015-07-01 16:58:16 -07:00 |
|
Cheese
|
0100ca1b8c
|
fixed a derp bug
|
2015-07-02 09:41:33 +10:00 |
|
fooify
|
e7b51ac1c1
|
add jnr_dev to updaterank
|
2015-07-01 16:40:15 -07:00 |
|
fooify
|
d1e4306684
|
fix this agaaaaain
|
2015-07-01 16:38:10 -07:00 |
|
fooify
|
04c863c0eb
|
FOOIFY IS A NOOB OKAY
|
2015-07-01 16:10:41 -07:00 |
|
fooify
|
4495468c7f
|
fix concurrentmodificationexception
|
2015-07-01 15:50:07 -07:00 |
|
fooify
|
8574c0bdeb
|
fix turfforts bug
|
2015-07-01 09:58:45 -07:00 |
|
fooify
|
b7476cec5e
|
prevent STATIONARY_LAVA from breaking in creeper smash
|
2015-07-01 08:25:17 -07:00 |
|
fooify
|
6dc7384c82
|
fix creeper smash exploding lava and bedrock
|
2015-07-01 08:16:14 -07:00 |
|
fooify
|
6d42be4d13
|
fix spleef lava issue
|
2015-07-01 07:17:41 -07:00 |
|
Cheese
|
dd9fc8e7c6
|
bridge speed increase
|
2015-07-01 15:14:46 +10:00 |
|
Cheese
|
0650b73374
|
more bridge tweaks
|
2015-07-01 14:16:56 +10:00 |
|
Cheese
|
190e58c37e
|
bridges update
|
2015-07-01 12:58:54 +10:00 |
|
fooify
|
b9b9c5f801
|
ishh also wanted this :P (let me know if I should remove it)
|
2015-06-30 13:37:46 -07:00 |
|
fooify
|
c824a39058
|
ishh wanted it...k
|
2015-06-30 13:33:41 -07:00 |
|
fooify
|
a72eee9cf3
|
Merge remote-tracking branch 'origin/master' into foo
|
2015-06-30 09:20:43 -07:00 |
|
fooify
|
d2cc8d5077
|
fix grammar bug
|
2015-06-30 09:19:21 -07:00 |
|
fooify
|
11fb02a594
|
add stained glass to list of blocks that can be broken in quiver
|
2015-06-30 09:03:43 -07:00 |
|
Cheese
|
de36e3d8e4
|
added WATER_DAMAGE support for maps
modified some bridges code
|
2015-07-01 00:18:06 +10:00 |
|
Jonathan Williams
|
c6e4c5c5e4
|
Fixed mineplexer server status link.
Fixed issue with ServerManager and default connection.
|
2015-06-30 03:49:53 -04:00 |
|
Cheese
|
e3d060376b
|
disabled double gem
|
2015-06-30 13:10:08 +10:00 |
|
Ty Sayers
|
cd4bebbeee
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
|
2015-06-29 19:27:23 -04:00 |
|
Ty Sayers
|
1992205393
|
Modify RedisConfiguration deserialization options to allow for more dynamic distribution of redis server types and data handling. Servers are now defined individually with metadata representing server type (master/slave) and custom connection names for data redirection on server start up.
|
2015-06-29 19:27:05 -04:00 |
|
Jonathan Williams
|
2069524f15
|
Merge remote-tracking branch 'remotes/origin/foo'
|
2015-06-29 18:14:07 -04:00 |
|
Jonathan Williams
|
bbb661d686
|
Fixed up BenefitManager.
|
2015-06-29 18:07:06 -04:00 |
|
fooify
|
4ff456b722
|
Merge remote-tracking branch 'origin/master' into foo
|
2015-06-29 11:29:22 -07:00 |
|
Jonathan Williams
|
d426c24970
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-29 06:14:30 -04:00 |
|
Cheese
|
da3c5eeaaf
|
40k b enefit
|
2015-06-29 20:14:15 +10:00 |
|
Jonathan Williams
|
9f384b0d3e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-29 06:02:57 -04:00 |
|
Cheese
|
48f5fa118a
|
fixed a few sky bugs
|
2015-06-29 14:26:00 +10:00 |
|
Cheese
|
2963f7a61c
|
stacker wont give too many msgs
|
2015-06-29 10:13:33 +10:00 |
|
Cheese
|
b0f8369bcd
|
lowered block falling speed.
fixed a bug where some chests didnt fall
|
2015-06-29 10:09:36 +10:00 |
|
Cheese
|
0ea388379a
|
reduced win req for skywars ach
enabled beenfit for 40k reward
|
2015-06-28 15:16:05 +10:00 |
|
Cheese
|
ead402d026
|
skywars art
|
2015-06-28 14:31:25 +10:00 |
|
Cheese
|
08e4ef199e
|
added twitch to dguisecmd
|
2015-06-28 12:53:18 +10:00 |
|
Cheese
|
faca14dd23
|
fixed disguise permission
|
2015-06-28 12:50:27 +10:00 |
|
Cheese
|
840ebabf2a
|
added delay on mad scientist eggSpawn
fixed Exp bug
|
2015-06-27 20:39:05 +10:00 |
|
Jonathan Williams
|
65a10461cd
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/donation/command/CoinCommand.java
|
2015-06-27 02:29:07 -05:00 |
|
Jonathan Williams
|
9a4bcd29a1
|
Fixed Sparks problems...
|
2015-06-27 02:26:29 -05:00 |
|
Cheese
|
1f34bc40a3
|
increased time you can hold TNT for in CS
|
2015-06-27 14:08:16 +10:00 |
|
Cheese
|
4c164ce2a6
|
enabled double gems
|
2015-06-27 12:44:43 +10:00 |
|
Cheese
|
d0368a19d8
|
Players who quit early do not get full game worth of EXP.
|
2015-06-27 12:38:04 +10:00 |
|
Cheese
|
754026f403
|
chicken teleport fix
scientist minion name fix
|
2015-06-27 12:18:12 +10:00 |
|
Cheese
|
4183d6f21d
|
some balance
|
2015-06-27 11:40:40 +10:00 |
|
Cheese
|
270a2e4107
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-27 11:24:33 +10:00 |
|
Cheese
|
4e06a1aae3
|
fixed a few skywars bugs
improved warning for bridges
|
2015-06-27 11:24:01 +10:00 |
|
fooify
|
4b634d1bc3
|
Fix slashes (this won't affect windows users, right?)
|
2015-06-26 10:14:37 -07:00 |
|
fooify
|
333c54cff9
|
Merge branch 'master' into foo
|
2015-06-26 10:07:13 -07:00 |
|
Shaun Bennett
|
8ef52ea103
|
Mineplex Gold Rush 2.0
|
2015-06-26 10:50:37 -05:00 |
|
Cheese
|
9a0ac821a2
|
fixed stat bug
|
2015-06-26 19:44:13 +10:00 |
|
Cheese
|
c0bc522614
|
split achievement text over 2 lines
|
2015-06-26 19:32:18 +10:00 |
|
Cheese
|
750769d03a
|
fixed gem thing
|
2015-06-26 19:12:34 +10:00 |
|
Cheese
|
62a7fd6a99
|
you now get levels for kills/assists
fixed scoreboard bug
|
2015-06-26 19:12:11 +10:00 |
|
Cheese
|
b0019242e7
|
skywars scoreboard fix
|
2015-06-26 19:02:34 +10:00 |
|
Jonathan Williams
|
8c427bee24
|
Fix _gameDisplay bug.
Fix Skywars quickmenu link.
|
2015-06-26 03:57:39 -05:00 |
|
Jonathan Williams
|
8f2c0cf9d8
|
Fix file names.
|
2015-06-26 03:15:16 -05:00 |
|
Jonathan Williams
|
62cfa215b2
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-26 03:12:09 -05:00 |
|
Jonathan Williams
|
c1ef96bdcd
|
Fixed jre for staff server
|
2015-06-26 03:12:00 -05:00 |
|
Shaun Bennett
|
c158a6f89f
|
Merge remote-tracking branch 'origin/master'
|
2015-06-26 03:10:53 -05:00 |
|
Shaun Bennett
|
3b6a692a2a
|
Ooops
|
2015-06-26 03:10:44 -05:00 |
|
Cheese
|
1aa0832bb9
|
SkyWars to Skywars
|
2015-06-26 17:55:49 +10:00 |
|
Cheese
|
9bf58a2d98
|
disabled pistons
|
2015-06-26 17:47:04 +10:00 |
|
Cheese
|
1564a8bc51
|
disabled hoppers
|
2015-06-26 17:46:05 +10:00 |
|
Cheese
|
17af562f19
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-26 17:36:25 +10:00 |
|
Cheese
|
59f730ae9d
|
changed sky text and icon to feather
|
2015-06-26 17:36:12 +10:00 |
|
Jonathan Williams
|
f906f08a18
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-26 02:34:36 -05:00 |
|
Shaun Bennett
|
2657ef336a
|
Merge remote-tracking branch 'origin/master'
|
2015-06-26 02:33:00 -05:00 |
|
Shaun Bennett
|
60901cc17e
|
Merge remote-tracking branch 'origin/master'
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
|
2015-06-26 02:32:51 -05:00 |
|
Cheese
|
c31d3609bb
|
soup no longer spawns in stacks
|
2015-06-26 17:32:46 +10:00 |
|
Shaun Bennett
|
7c698f65cf
|
Quick Menu, and Stats adjustments for SkyWars. Updated Private server page to show game icon instead of player heads
|
2015-06-26 02:31:35 -05:00 |
|
Jonathan Williams
|
c78ef9d93d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-26 02:30:01 -05:00 |
|
Cheese
|
a5aa2bc0e9
|
text changes
|
2015-06-26 17:28:23 +10:00 |
|
Cheese
|
2498f7756c
|
skyawrs stats icon
|
2015-06-26 17:16:16 +10:00 |
|
Cheese
|
c514cacd5d
|
more skywars fixes
|
2015-06-26 17:05:29 +10:00 |
|
Cheese
|
015ba53bbe
|
skywars hub text
|
2015-06-26 16:39:25 +10:00 |
|
Cheese
|
027efe02fc
|
skywars!
|
2015-06-26 16:38:44 +10:00 |
|
Jonathan Williams
|
efa06d370b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-26 01:13:42 -05:00 |
|
Jonathan Williams
|
86e2514e37
|
Fixed callbacks for gem/coin rewards.
|
2015-06-26 01:13:28 -05:00 |
|
Cheese
|
257c088948
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-26 16:08:17 +10:00 |
|
Cheese
|
b744320ecc
|
pearl trail fix
|
2015-06-26 16:08:04 +10:00 |
|
Cheese
|
caa51d0e89
|
Merge branch 'SkyWars'
|
2015-06-26 16:04:46 +10:00 |
|
Cheese
|
16af8453e3
|
pearl fix
|
2015-06-26 16:04:07 +10:00 |
|
Cheese
|
338797f4a6
|
skywars update
|
2015-06-26 15:57:47 +10:00 |
|
Cheese
|
aef8a00017
|
update!
|
2015-06-26 15:25:43 +10:00 |
|
Cheese
|
8f3d0ad84b
|
fixed some bugs :O
|
2015-06-26 14:38:39 +10:00 |
|
Cheese
|
0874178973
|
skywars update!
|
2015-06-26 14:14:22 +10:00 |
|
Cheese
|
2d1d65b239
|
skywars fixes
|
2015-06-26 13:15:03 +10:00 |
|
fooify
|
7f7edddf42
|
Fix TNT bug in SG - tested, works fine! :)
|
2015-06-25 19:36:31 -07:00 |
|
Cheese
|
5710831777
|
fixed webs dropping webs
|
2015-06-26 12:34:26 +10:00 |
|
Cheese
|
7d4e36651f
|
less random chests
|
2015-06-26 12:26:57 +10:00 |
|
Cheese
|
fdbaa4e9c7
|
dont allow overfill
|
2015-06-26 12:18:25 +10:00 |
|
Cheese
|
f1da68a82a
|
fixed chickens not spawning
|
2015-06-26 12:14:35 +10:00 |
|
Cheese
|
00da27a3d6
|
added middle chests
added chicken spawns
added zombie/chicken loot
|
2015-06-26 12:06:40 +10:00 |
|
Cheese
|
beb78270e5
|
skywars loot changes
|
2015-06-26 11:54:35 +10:00 |
|
Cheese
|
bb569a26e2
|
skywars update
|
2015-06-26 11:22:33 +10:00 |
|
Cheese
|
b48820a753
|
ore gen fixed!
|
2015-06-26 10:50:38 +10:00 |
|
Cheese
|
d9a8d2b6ab
|
ore changes
|
2015-06-26 10:36:45 +10:00 |
|
Jeremiah Bishop
|
0342a5ac61
|
Fixed Achievements
Reordered Kits
Added new Kit
etc, etc, etc...
|
2015-06-25 19:03:25 -04:00 |
|
fooify
|
2679d19a81
|
Missed a spot.
|
2015-06-25 08:19:12 -07:00 |
|
fooify
|
ba9e4ba5d9
|
Fix staff server not hiding in friends list
|
2015-06-25 08:17:28 -07:00 |
|
Cheese
|
2179795677
|
Merge branch 'SkyWars' of ssh://184.154.0.242:7999/min/Mineplex into SkyWars
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SkyWars.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
|
2015-06-25 20:48:34 +10:00 |
|
Cheese
|
2bf1faa70d
|
fixed a few skywars bugs
added ore generation (but theres some wierd bug, still working on it)
|
2015-06-25 20:24:31 +10:00 |
|
Jonathan Williams
|
526b0dadb6
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-25 04:58:26 -05:00 |
|
Jonathan Williams
|
567bb5cd6c
|
Fixed up MotdManager so that old values don't overwrite in the db.
|
2015-06-25 04:58:16 -05:00 |
|
Jonathan Williams
|
5bdb90b459
|
Changed disguise perm to YOUTUBE
|
2015-06-25 04:57:56 -05:00 |
|
Jeremiah Bishop
|
ed667fedee
|
Added more achievements
|
2015-06-24 22:59:28 -04:00 |
|
Cheese
|
b77279a160
|
fixed notif msg
|
2015-06-25 11:22:23 +10:00 |
|
Jeremiah Bishop
|
cd10a2ad79
|
Fixed both kits
Added game achievements.
|
2015-06-24 20:08:31 -04:00 |
|
fooify
|
a36af0acc4
|
Remove space :) I assume this isn't intended
|
2015-06-24 10:28:39 -07:00 |
|
fooify
|
ea3c04b8c1
|
Add fooify to list of AFKers
|
2015-06-24 10:24:08 -07:00 |
|
Jeremiah Bishop
|
5b4a3249ca
|
Added chest loot and such.
|
2015-06-22 21:42:45 -04:00 |
|
Jeremiah Bishop
|
7583e4170b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars
|
2015-06-22 21:40:43 -04:00 |
|
Cheese
|
3a06b54b7f
|
Changed notifications to 50% off sale
|
2015-06-22 17:10:03 +10:00 |
|
Jeremiah Bishop
|
03c45116ef
|
Various fixes, and added the new data to Zoologist kit
|
2015-06-21 23:38:25 -04:00 |
|
Cheese
|
648355ac17
|
mapparser skywars
|
2015-06-22 11:33:25 +10:00 |
|
Jeremiah Bishop
|
a05c2d085d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars
|
2015-06-21 16:17:51 -04:00 |
|
Jeremiah Bishop
|
e12ff7ef7d
|
Fixed?
|
2015-06-20 22:20:30 -04:00 |
|
Jeremiah Bishop
|
3cf1297d89
|
Added SkyWars ;)
|
2015-06-20 22:08:15 -04:00 |
|
Aaron Brock
|
5280433dbd
|
Added the Pair class for simple 2 object storing, and added upperCaseCount and lowerCaseCount to UtilText.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-06-20 10:03:53 -04:00 |
|
Aaron Brock
|
3532dea892
|
Allowed Helper+ to bypass anti-hackusating
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-06-20 10:01:50 -04:00 |
|
Jonathan Williams
|
91b5beaff2
|
Fixed new Chat constructor requirement.
|
2015-06-20 03:43:38 -05:00 |
|
Jonathan Williams
|
90e13b4b9e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-20 03:37:33 -05:00 |
|
Jonathan Williams
|
f92e864c30
|
Updated motd.
|
2015-06-20 03:37:22 -05:00 |
|
Jonathan Williams
|
dbde6890a0
|
Add fallback to load by name if no uuid.
|
2015-06-20 03:36:55 -05:00 |
|
Aaron Brock
|
8ea23f96fc
|
Froze time using doDayNightCycle instead of setting the time on UpdateEvent.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-06-20 01:36:05 -04:00 |
|
Aaron Brock
|
da981980df
|
Added world.setThundering(false);
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-06-20 01:35:11 -04:00 |
|
Aaron Brock
|
9cedb3b742
|
Rewrote how hackusations are detected.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-06-20 01:10:26 -04:00 |
|
Aaron Brock
|
1f0accd2a1
|
Fixed a little boolean derp that stopped people from breaking blocks.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-06-20 01:09:21 -04:00 |
|
Cheese
|
478a3c8591
|
some champs fixes/balance
duplicate message improvement
|
2015-06-20 15:00:16 +10:00 |
|
Cheese
|
77bf332c29
|
level 25 is uneffected by chat delay
|
2015-06-20 11:18:31 +10:00 |
|
Cheese
|
2c43dc76c9
|
DMT no longer effected by 3s chat delay
Minestrike no longer has 'terrorists'
Jr.Dev rank up!
|
2015-06-20 11:12:24 +10:00 |
|
Aaron Brock
|
750dddeabc
|
Editing .classpath and a main testing method in UtilBlock
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-06-19 21:10:10 -04:00 |
|
Aaron Brock
|
61494f93ba
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into bench
|
2015-06-19 18:13:48 -04:00 |
|
Cheese
|
13ae7a19db
|
jr.dev rank up
|
2015-06-19 18:06:40 +10:00 |
|
Cheese
|
cf152c4897
|
fixed notifs being sent to people who didnt need them
|
2015-06-19 13:46:56 +10:00 |
|
Cheese
|
de83e58e75
|
removed debug
|
2015-06-19 13:29:32 +10:00 |
|
Cheese
|
8a224950b3
|
Added sale notifications
Added 3s chat delay
|
2015-06-19 13:27:59 +10:00 |
|
Aaron Brock
|
76e4dc6056
|
Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-06-18 19:50:06 -04:00 |
|
Jeremiah Bishop
|
dd9e6a6866
|
Started adding SkyWars game mechanics
|
2015-06-18 14:54:26 -04:00 |
|
Cheese
|
9a3a014dd5
|
removed debug!
|
2015-06-18 12:04:49 +10:00 |
|
Aaron Brock
|
b0ca5ca4aa
|
Freezes the time using doDayLightCycle instead of using a UpdateEvent.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-06-17 20:54:28 -04:00 |
|
Aaron Brock
|
41e77b1ade
|
Fixed double-half-slabs (line 68)
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-06-17 20:49:35 -04:00 |
|
Cheese
|
6886484d79
|
Fixed Micro Battles lag (stupid lava)
cmds for jnr devs
smaller head hitbox in MS
added MB to parser plugin
|
2015-06-17 13:02:12 +10:00 |
|
Cheese
|
47744a80e9
|
jnr dev
|
2015-06-17 10:44:29 +10:00 |
|
Cheese
|
3014521e79
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-17 10:43:01 +10:00 |
|
Cheese
|
c8843aa2b2
|
jnr dev rank
|
2015-06-17 10:42:20 +10:00 |
|
Jonathan Williams
|
0d12a2c12d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-16 12:43:04 -05:00 |
|
libraryaddict
|
b0c026e67c
|
Mineware: Commit what I have, fix DisguiseVillager not extending agable and adding new option to disable auto respawn
|
2015-06-16 14:01:52 +12:00 |
|
Jonathan Williams
|
88328148d1
|
Modified hardcoded IPs for Bungee player counts.
Added Jr Dev rank.
|
2015-06-15 12:52:59 -05:00 |
|
Jonathan Williams
|
47099a0b20
|
Changed default redis ip to new us redis.
Changed previous server to gold text when sending to new server.
|
2015-06-12 15:45:54 -05:00 |
|
Cheese
|
a141cec104
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-11 08:57:04 +10:00 |
|
Cheese
|
390ffcab6d
|
bridges support for lillypads map
|
2015-06-11 08:56:32 +10:00 |
|
Jonathan Williams
|
f0ce43ca5a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-09 13:22:45 -05:00 |
|
Shaun Bennett
|
a20f41be09
|
Merge remote-tracking branch 'origin/master'
|
2015-06-09 13:21:26 -05:00 |
|
Shaun Bennett
|
3f9010fb7a
|
Fix GameScore comparator
|
2015-06-09 13:21:15 -05:00 |
|
libraryaddict
|
37c6593753
|
Hub: Fix rulebook
|
2015-06-10 05:27:19 +12:00 |
|
libraryaddict
|
2971761a5e
|
Game stop command: Move unregister of game listener after the gamestate has been changed
|
2015-06-09 22:19:03 +12:00 |
|
Jonathan Williams
|
c6352445cf
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-08 23:18:06 -05:00 |
|
libraryaddict
|
1f08c989b5
|
Minestrike: Enforce resource pack
|
2015-06-09 03:31:24 +12:00 |
|
libraryaddict
|
8cf10afb1b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-06-06 18:31:08 +12:00 |
|
libraryaddict
|
fd3232f45d
|
Mineware: Rename old MineWare and move packages
|
2015-06-06 18:30:47 +12:00 |
|
libraryaddict
|
ef9c69f356
|
UtilShapes: Fix a method, add a space in OldMineWare in GameType
|
2015-06-06 18:08:37 +12:00 |
|
libraryaddict
|
5f2810ae37
|
SurvivalGames: Fix anyone able to start game
|
2015-06-06 18:07:55 +12:00 |
|
Cheese
|
f9b49caeed
|
More gems for bridges/sg kills
Changed Al'Jaha MS name to Bombers
Added Reporting functionality to Builders
Nerfed Iron Hook
Allowed longer AFk during games
|
2015-06-05 12:21:20 +10:00 |
|
libraryaddict
|
3a6c030f01
|
ConditionManager: Use a scheduler if the potion effect is being removed due to potion effect's doing something
|
2015-06-04 16:01:52 +12:00 |
|
libraryaddict
|
a961e5f0d5
|
Wizards: Don't gain wands from stats page
|
2015-06-02 18:49:50 +12:00 |
|
libraryaddict
|
4d8a54e7ba
|
Wizards: Add spellbook on /spec
|
2015-06-02 18:49:27 +12:00 |
|
libraryaddict
|
bcdb851e21
|
Teleport: Don't disqualify staff if they are not alive
|
2015-06-02 18:48:45 +12:00 |
|
libraryaddict
|
35c005feb8
|
Game: add isInsideMap(Player) and have border call that on Game.java in order to have games able to define specific borders for players
|
2015-05-30 10:30:30 +12:00 |
|
libraryaddict
|
092447170e
|
Game Border: Fix typo that offsets border by one block
|
2015-05-30 10:24:15 +12:00 |
|
libraryaddict
|
ae41f232b0
|
GameType: Change to reflection for creating game instances
|
2015-05-30 10:23:46 +12:00 |
|
libraryaddict
|
574dd16022
|
Hub: Modify rulebook
|
2015-05-30 10:20:28 +12:00 |
|
libraryaddict
|
6c9963e1b3
|
CommandCenter: Cancel command event straight after verifying that its been registered
|
2015-05-30 05:44:49 +12:00 |
|
Shaun Bennett
|
7d43b146b7
|
[Core] Display Games Played instead of Losses for a bunch of the arcade games where losses will be greater than wins
|
2015-05-28 19:05:45 -05:00 |
|
Shaun Bennett
|
cc1219fd38
|
[Spigot] Spigot class change for Ty
|
2015-05-28 15:24:10 -05:00 |
|
Jonathan Williams
|
2c5471cb34
|
Added ability to see which server you were sent from.
|
2015-05-28 09:33:49 -05:00 |
|
libraryaddict
|
d84bd4ffe4
|
Messaging: Now with censors!
|
2015-05-28 10:13:31 +12:00 |
|
Shaun Bennett
|
a900a2a70a
|
[Arcade] Another attempt at fixing spectator gui.... :^)
|
2015-05-26 19:50:01 -05:00 |
|
Shaun Bennett
|
25ba20e411
|
[Arcade] Fixes for DMT and DT not counting loses properly
|
2015-05-26 19:28:42 -05:00 |
|
Shaun Bennett
|
0499e1acf1
|
Merge remote-tracking branch 'origin/master'
|
2015-05-26 18:55:42 -05:00 |
|
libraryaddict
|
e15e42afae
|
UHC: Expanded from 32 blocks to 36
|
2015-05-27 02:40:27 +12:00 |
|
libraryaddict
|
b8cd2aaece
|
UHC: Expand anti-build protection from 16 blocks to 32
|
2015-05-26 11:04:27 +12:00 |
|
libraryaddict
|
c53d52ee42
|
UHC: Disable gadgets
|
2015-05-24 20:17:39 +12:00 |
|
libraryaddict
|
21aa97b3b9
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-24 20:13:43 +12:00 |
|
libraryaddict
|
63e28e25c9
|
HoleInTheWall: Push the failed game
|
2015-05-24 20:10:56 +12:00 |
|
libraryaddict
|
0d0d5eea64
|
Game: Change GameFlagManager to use Game.isInsideMap(), change isInsideMap to treat MaxX,Y,Z with a +1
|
2015-05-24 20:10:16 +12:00 |
|
Jonathan Williams
|
96b1df4ee0
|
Fixed global player count.
Fixed tasks.
|
2015-05-22 14:33:25 -07:00 |
|
Jonathan Williams
|
303cfd02fa
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-05-17 23:12:27 -07:00 |
|
Jonathan Williams
|
f0c7f2fe76
|
Merge branch 'MSSQL_Conversion'
Conflicts:
Website/LOCWebsite.suo
|
2015-05-17 23:11:50 -07:00 |
|
Jonathan Williams
|
476dd17ffe
|
Fix for null rank in /c staff server.
|
2015-05-17 23:11:04 -07:00 |
|
Shaun Bennett
|
c107f4d0d9
|
[Arcade] Working on private servers
|
2015-05-17 16:31:09 -05:00 |
|
Shaun Bennett
|
5cd191f582
|
Merge remote-tracking branch 'origin/master'
|
2015-05-17 16:29:01 -05:00 |
|
Jonathan Williams
|
375b23db3c
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-05-17 13:46:46 -07:00 |
|
Ty Sayers
|
afb0b1cfdf
|
Add Charset argument for reading File lines in ServerManager, ideally to prevent compilation issues with other java versions.
|
2015-05-17 14:50:22 -04:00 |
|
Jonathan Williams
|
e728edb44d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-05-17 01:29:49 -07:00 |
|
Jonathan Williams
|
47ff9101fd
|
Finished up changes for game task conversion.
|
2015-05-17 01:28:44 -07:00 |
|
Ty Sayers
|
e8d5d50162
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
|
2015-05-16 13:13:53 -04:00 |
|
Ty Sayers
|
672fc99a3e
|
Add fail-safe default connection in case of issue in proper redis-config.dat generation. Add documentation to clarify purposes related to redis configuration.
|
2015-05-16 13:12:20 -04:00 |
|
Ty Sayers
|
a8b0dddf17
|
Add support for redis configuration file to determine viable redis master and slave connections, that can be set to be region-dependant. Fix leakage issue with command manager with not properly returning broken jedis resources. Funnel all redis connection requests through ServerManager for easier configuration use.
|
2015-05-16 13:01:21 -04:00 |
|
Shaun Bennett
|
1e9abaf002
|
[Arcade] Add more games to private servers
|
2015-05-15 23:38:43 -05:00 |
|
libraryaddict
|
f899194e3b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-15 12:23:27 +12:00 |
|
libraryaddict
|
091f98fa9d
|
DrawMyThing: Remove all found words from the checked string when looking for multiple guesses
|
2015-05-15 12:23:05 +12:00 |
|
Shaun Bennett
|
6b7c52cb87
|
[Arcade] Add additional hub clock check
|
2015-05-14 15:17:45 -05:00 |
|
Jonathan Williams
|
5a8f93f3db
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-05-14 00:12:22 -07:00 |
|
Jonathan Williams
|
b7cdc82cd2
|
Fixed server sorter for UHC.
Work on converting to UltraDNS api.
|
2015-05-14 00:12:13 -07:00 |
|
Mini-Chiss
|
d390d83dd1
|
removed some meh words
|
2015-05-13 22:35:26 -05:00 |
|
Mini-Chiss
|
f49c2ca546
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-13 22:27:41 -05:00 |
|
Shaun Bennett
|
0d2157b4f3
|
[Core] Fix /stats lava bucket bug
|
2015-05-13 23:23:43 -05:00 |
|
Shaun Bennett
|
2c020d10a6
|
Merge remote-tracking branch 'origin/master'
|
2015-05-13 22:52:22 -05:00 |
|
Shaun Bennett
|
84c53347f8
|
[Hub] Add UHC to Quick server menu. Better formatting coming soon!
|
2015-05-13 22:52:14 -05:00 |
|
Mini-Chiss
|
e68a2775e8
|
ex p chnage
|
2015-05-13 22:27:33 -05:00 |
|
libraryaddict
|
67f1e4ad1f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-14 14:29:43 +12:00 |
|
libraryaddict
|
0fc1d680af
|
UHC: Add 20 seconds of invincibility on game start
|
2015-05-14 14:29:30 +12:00 |
|
Mini-Chiss
|
44cb6d8a62
|
increased exp more
|
2015-05-13 17:08:56 -05:00 |
|
libraryaddict
|
4bc38e3396
|
Arcade: Removed ocean, river and swampland from biome generation for UHC
|
2015-05-14 09:55:22 +12:00 |
|
Jonathan Williams
|
a6cf1309ff
|
Fix for ranks not applying.
|
2015-05-13 14:33:31 -07:00 |
|
Jonathan Williams
|
5bb91f4167
|
Catch null taskList
|
2015-05-13 14:27:35 -07:00 |
|
libraryaddict
|
c46bdfd2dc
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-14 09:18:51 +12:00 |
|
libraryaddict
|
1b27e84e54
|
DrawMyThing: Fixed a check being in the wrong brackets
|
2015-05-14 09:18:35 +12:00 |
|
Mini-Chiss
|
093bbde792
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-13 15:45:41 -05:00 |
|
Mini-Chiss
|
2c3116a7a6
|
removed firework and sound from legend join
|
2015-05-13 15:45:29 -05:00 |
|
Mini-Chiss
|
bd58c06017
|
fixed being able to team with self in UHC
fixed eventgame admin toggle
|
2015-05-13 13:32:20 -05:00 |
|
Mini-Chiss
|
c34cac42ee
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-13 13:20:14 -05:00 |
|
Mini-Chiss
|
c26174ffa2
|
fixed team name
|
2015-05-13 13:20:05 -05:00 |
|
Jonathan Williams
|
3b024de521
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-05-13 01:35:05 -07:00 |
|
Jonathan Williams
|
1c6a12528c
|
Added ability for LT to modify Admin ranks.
Added Twithc rank to the updateRank list.
Fixed server sorting issues with UHC Generating servers.
|
2015-05-13 00:58:45 -07:00 |
|
libraryaddict
|
bfb5e85efd
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-13 19:14:56 +12:00 |
|
libraryaddict
|
938386bf77
|
Wizards: Removed chainmail loot, added gold armor instead
|
2015-05-13 19:14:40 +12:00 |
|
Jonathan Williams
|
98dcb9747a
|
Added UHC support to server sorter.
|
2015-05-13 00:10:17 -07:00 |
|
Jonathan Williams
|
82903fde47
|
Updates for task conversion.
|
2015-05-13 00:00:37 -07:00 |
|
Mini-Chiss
|
a744a466a3
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-13 00:05:10 -05:00 |
|
Mini-Chiss
|
f9735006b8
|
removed hub uhc hourly announcements
|
2015-05-13 00:05:00 -05:00 |
|
libraryaddict
|
20aeccb3be
|
Wizards: Lowered ice shards max level to 3, removed damage from web shot
|
2015-05-13 14:04:19 +12:00 |
|
libraryaddict
|
744c867990
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-13 13:19:09 +12:00 |
|
libraryaddict
|
d2e37df4ca
|
DrawMyThing: Prevented all multiple guesses, not just when it contains an accurate word
|
2015-05-13 13:18:54 +12:00 |
|
libraryaddict
|
a75aab7f98
|
DrawMyThing: Added more words, fixed the multiple guesses prevention never firing.
|
2015-05-13 13:15:53 +12:00 |
|
Shaun Bennett
|
678c2c514a
|
Oops!
|
2015-05-12 18:45:01 -05:00 |
|
Shaun Bennett
|
aa5898e1db
|
Merge remote-tracking branch 'origin/master'
|
2015-05-12 18:43:48 -05:00 |
|
Shaun Bennett
|
f9269b534f
|
[Core] Add look AI to NPC's
|
2015-05-12 18:43:26 -05:00 |
|
Shaun Bennett
|
32338cfce4
|
[MB] More words for update
|
2015-05-12 17:25:37 -05:00 |
|
Shaun Bennett
|
d703070810
|
[Core] Shrink stat page
|
2015-05-12 17:20:58 -05:00 |
|
Shaun Bennett
|
bdfffa3a4c
|
Merge remote-tracking branch 'origin/master'
|
2015-05-12 17:14:57 -05:00 |
|
Shaun Bennett
|
53555a42cd
|
[Core] Add MB Stats in gui, Add MB Achievement, Update stat gui layout, add ability to display combined stats
|
2015-05-12 17:14:50 -05:00 |
|
libraryaddict
|
03c384e7e6
|
Wizards: Remove boat from loot, fix napalm typo
|
2015-05-13 10:04:05 +12:00 |
|
Shaun Bennett
|
26db4fa269
|
[MB] Add more build themes
|
2015-05-12 16:15:44 -05:00 |
|
Mini-Chiss
|
e1dd3a318e
|
UHC!!!!!
|
2015-05-12 15:52:19 -05:00 |
|
Mini-Chiss
|
2928c73767
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-12 14:46:30 -05:00 |
|
Mini-Chiss
|
e13e735246
|
UHC updates!
|
2015-05-12 14:46:21 -05:00 |
|
Shaun Bennett
|
90fc4656fa
|
[Core] Attempt at mitigating spam bots without hurting normal players
|
2015-05-12 08:09:13 -05:00 |
|
Shaun Bennett
|
5d13b6a144
|
[Core] Disable writing on signs for muted players
|
2015-05-12 07:11:35 -05:00 |
|
Shaun Bennett
|
87f495e376
|
[Core] Filter text on placed signs with Chat Module
|
2015-05-12 07:02:34 -05:00 |
|
Shaun Bennett
|
c7a9ae8cd5
|
[Arcade] Attempt at fixing spectator gui bugs
|
2015-05-12 06:23:32 -05:00 |
|
Shaun Bennett
|
06a0f3d0d5
|
Merge remote-tracking branch 'origin/master'
|
2015-05-12 00:37:40 -05:00 |
|
Shaun Bennett
|
270ef37a7c
|
[MB] More words and more ground types
|
2015-05-12 00:37:13 -05:00 |
|
Mini-Chiss
|
4cae02f2d8
|
set LT as higher than Owner for perms.
|
2015-05-11 21:31:37 -05:00 |
|
Mini-Chiss
|
e0e79d79a5
|
LT rank
|
2015-05-11 21:28:25 -05:00 |
|
Mini-Chiss
|
ed90e97c68
|
removed border attack stuff
|
2015-05-11 21:00:38 -05:00 |
|
Shaun Bennett
|
9d959ee7a3
|
Fix/Enable Look at me Button
|
2015-05-11 20:46:37 -05:00 |
|
Mini-Chiss
|
643ed2c047
|
Fixed most enchants not working
added commands to event
minor update to snowfight to make it more fun
|
2015-05-11 19:55:26 -05:00 |
|
libraryaddict
|
18c6022437
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-12 11:01:18 +12:00 |
|
libraryaddict
|
214a750f6e
|
UHC: Add borders from SG
|
2015-05-12 11:01:04 +12:00 |
|
Mini-Chiss
|
8d585ce807
|
admins can giveitem
|
2015-05-11 17:59:13 -05:00 |
|
Mini-Chiss
|
55b6d29468
|
Just shufflin some location
|
2015-05-11 17:57:21 -05:00 |
|
libraryaddict
|
a558995e12
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-12 09:52:21 +12:00 |
|
Shaun Bennett
|
d57bab7430
|
Merge remote-tracking branch 'origin/master'
|
2015-05-11 15:17:50 -05:00 |
|
Shaun Bennett
|
e799ea0909
|
[MB] Look at me Button (Disabled - not working properly), Villager profession button, Small bug fixes
|
2015-05-11 15:17:35 -05:00 |
|
Mini-Chiss
|
e3f2c02836
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-11 14:11:00 -05:00 |
|
Mini-Chiss
|
5e73441b9a
|
UHC world loading
|
2015-05-11 14:10:51 -05:00 |
|
Mini-Chiss
|
123af16bd2
|
UHC map gen
|
2015-05-11 13:25:05 -05:00 |
|
Shaun Bennett
|
c0dc531252
|
[MB] Allow Item Frames and Paintings
|
2015-05-11 12:38:21 -05:00 |
|
Mini-Chiss
|
5ec60d234a
|
UHC changes
|
2015-05-11 12:27:43 -05:00 |
|
Mini-Chiss
|
9b0736816b
|
UHC changes
abstracted out some common attribs
|
2015-05-11 12:21:32 -05:00 |
|
Jonathan Williams
|
b1a46d0f0d
|
Converted TaskManager
|
2015-05-11 01:21:27 -07:00 |
|
Shaun Bennett
|
46c07665e1
|
Merge remote-tracking branch 'origin/master'
|
2015-05-11 00:44:34 -05:00 |
|
Shaun Bennett
|
2e7428e79a
|
Temporary fletcher fix
|
2015-05-11 00:42:55 -05:00 |
|
libraryaddict
|
5ee3f48754
|
Wizards: Nerf rumble max level from level 5 to level 3
|
2015-05-11 14:08:40 +12:00 |
|
Shaun Bennett
|
800ce68637
|
Add Beta Games and Player Servers to Quick game menu (text probably needs tweaking)
|
2015-05-10 16:58:04 -05:00 |
|
libraryaddict
|
241935ef63
|
SurvivalGames: Removed description of deep freeze and updated to beware of borders
|
2015-05-11 09:13:04 +12:00 |
|
Mini-Chiss
|
3e64115f05
|
vote colors
|
2015-05-09 17:45:08 -05:00 |
|
Mini-Chiss
|
41599de06f
|
build vote update
|
2015-05-09 17:34:07 -05:00 |
|
Mini-Chiss
|
6e2b437e55
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-09 12:28:16 -05:00 |
|
Mini-Chiss
|
822718095d
|
cannot PM from spawn
first push of cards game
|
2015-05-09 12:23:07 -05:00 |
|
libraryaddict
|
7faee918af
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-09 14:13:03 +12:00 |
|
libraryaddict
|
0751876622
|
Wizards: Do a null check and event is cancelled check on damage
|
2015-05-09 14:12:46 +12:00 |
|
Shaun Bennett
|
ef86f8bb6f
|
merge
|
2015-05-08 12:22:58 -05:00 |
|
Shaun Bennett
|
bca162588f
|
Fix Achievement page bugs (layout needs to be reviewed by chiss)
|
2015-05-08 02:27:53 -05:00 |
|
libraryaddict
|
689ca94c57
|
Wizards: Nerf rainbow beam damage, rebalance gust spell, raise armor effectiveness
|
2015-05-08 18:57:33 +12:00 |
|
libraryaddict
|
29c4a033a7
|
Achievement: Fix wizards 10 win to 50 wins, change wizards to blaze rod, change stats layout
|
2015-05-08 18:56:00 +12:00 |
|
libraryaddict
|
5ec04263d4
|
Map stuff: First commit (or second?)
|
2015-05-08 07:31:03 +12:00 |
|
Jonathan Williams
|
f2c8086421
|
Updated default motd on bungees.
|
2015-05-06 22:41:36 -07:00 |
|
Jonathan Williams
|
e999f943b5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-05-06 20:20:07 -07:00 |
|
Jonathan Williams
|
d3e5dd9c8a
|
Fixed so name searching only returns the last account logged in with that name.
|
2015-05-06 20:19:58 -07:00 |
|
libraryaddict
|
3e02806b75
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-07 02:57:20 +12:00 |
|
libraryaddict
|
531fe11916
|
Maps: Rename Map.class to BlockMap.class
|
2015-05-07 02:57:12 +12:00 |
|
libraryaddict
|
7a8efee1e0
|
Modify builder to include png files in the built jar
|
2015-05-07 02:56:37 +12:00 |
|
libraryaddict
|
47acf7fb85
|
DrawMyThing: Ignore guesses containing more than two answers.
|
2015-05-07 02:54:55 +12:00 |
|
Jonathan Williams
|
a7407d8b8c
|
Added all minigames standalones into mixed arcade player count.
|
2015-05-04 22:51:21 -05:00 |
|
Jonathan Williams
|
f9f1d9b1ad
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-05-04 22:31:14 -05:00 |
|
Shaun Bennett
|
ae03743c63
|
Build sort of bug fix for teleported into block
|
2015-05-04 19:27:16 -05:00 |
|
Mini-Chiss
|
4cb0c01f59
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-04 15:35:10 -05:00 |
|
Mini-Chiss
|
7505bbc1a2
|
gravity fix
|
2015-05-04 15:34:57 -05:00 |
|
Peter Miller
|
4f54b9aa04
|
Bamboo...
|
2015-05-04 05:10:37 -04:00 |
|
Peter Miller
|
ad82e9733a
|
Moarerer Bamboo changes.
|
2015-05-04 04:33:28 -04:00 |
|
Peter Miller
|
93656f7659
|
Moarer Bamboo changes.
|
2015-05-04 04:28:34 -04:00 |
|
Peter Miller
|
c93cd0d36c
|
Moar Bamboo changes.
|
2015-05-04 04:25:44 -04:00 |
|
Peter Miller
|
3b518aec3f
|
More build changes for Bamboo.
|
2015-05-04 04:14:19 -04:00 |
|
Jonathan Williams
|
4252bf70df
|
Fix Master Builder game button in quick menu.
|
2015-05-04 01:40:57 -05:00 |
|
Mini-Chiss
|
0d1de153ec
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-04 00:56:19 -05:00 |
|
Mini-Chiss
|
b959bcaa90
|
fixed 1.8 req
|
2015-05-04 00:56:12 -05:00 |
|
Jonathan Williams
|
677c8d1198
|
Updated default MOTD.
|
2015-05-04 00:42:59 -05:00 |
|
Jonathan Williams
|
c8b5c84aa6
|
Added Master Builder quick game menu option.
Added player counts to quick game menu
|
2015-05-04 00:42:49 -05:00 |
|
Mini-Chiss
|
50cd692c62
|
fixed wither morph damaging blocks in grav lobby
|
2015-05-04 00:34:03 -05:00 |
|
Mini-Chiss
|
4f4aeac12c
|
fixed typo
|
2015-05-03 23:34:09 -05:00 |
|
Mini-Chiss
|
fa1ac52f78
|
grav balance
|
2015-05-03 20:21:00 -05:00 |
|
Mini-Chiss
|
838c369b7c
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-03 20:12:13 -05:00 |
|
Mini-Chiss
|
95c9be47b6
|
missing kit
|
2015-05-03 20:12:06 -05:00 |
|
Shaun Bennett
|
cb2666c4a5
|
Merge remote-tracking branch 'origin/master'
|
2015-05-03 20:06:19 -05:00 |
|
Shaun Bennett
|
af1f735a43
|
Add lightning packets, various gui improvements
|
2015-05-03 20:06:10 -05:00 |
|
Mini-Chiss
|
e013f8af8a
|
sky text for hub change
|
2015-05-03 19:49:16 -05:00 |
|
Mini-Chiss
|
58671fa229
|
more words
|
2015-05-03 19:36:50 -05:00 |
|
Mini-Chiss
|
6978a176b1
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-03 19:10:55 -05:00 |
|
Mini-Chiss
|
7f0e175ba1
|
build update
|
2015-05-03 19:10:49 -05:00 |
|
Shaun Bennett
|
044d1098f4
|
Merge remote-tracking branch 'origin/master'
|
2015-05-03 19:10:22 -05:00 |
|
Shaun Bennett
|
a435ed5bae
|
More build changes
|
2015-05-03 19:10:13 -05:00 |
|
Mini-Chiss
|
1576085d87
|
more words
|
2015-05-03 18:33:31 -05:00 |
|
Mini-Chiss
|
73132d96b9
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-03 18:33:03 -05:00 |
|
Mini-Chiss
|
f36d7774cc
|
Gravity update
|
2015-05-03 18:32:57 -05:00 |
|
Shaun Bennett
|
de1f432be4
|
Build bug fixes
|
2015-05-03 18:31:56 -05:00 |
|
Shaun Bennett
|
74474c6227
|
Use itemstackfactory for formatted name
|
2015-05-03 18:26:20 -05:00 |
|
Shaun Bennett
|
f98ac0874c
|
Merge remote-tracking branch 'origin/master'
|
2015-05-03 18:22:14 -05:00 |
|
Shaun Bennett
|
83ff3c96aa
|
Close inventory when game starts
|
2015-05-03 18:21:59 -05:00 |
|
Shaun Bennett
|
fbfb5e637e
|
Mob Gui + Ground Change Gui + UtilSkull for special mob skulls
|
2015-05-03 18:18:16 -05:00 |
|
Mini-Chiss
|
a42c71ebb8
|
more 1.8 stuff
|
2015-05-03 16:54:02 -05:00 |
|
Mini-Chiss
|
bd8bd2dfd6
|
Abstracted kicking non-1.8 players
Abstracted resource pack msg
|
2015-05-03 16:51:13 -05:00 |
|
Mini-Chiss
|
40d56c3500
|
Converted all code to updated UtilParticle methods
/suicide
|
2015-05-03 16:37:00 -05:00 |
|
Mini-Chiss
|
97a86fde90
|
builds!
|
2015-05-03 15:39:15 -05:00 |
|
Mini-Chiss
|
a07132df49
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-03 15:39:04 -05:00 |
|
Shaun Bennett
|
c3a7dcfcf8
|
Update craftbukkit jar
|
2015-05-03 15:35:42 -05:00 |
|
Shaun Bennett
|
73719e0df3
|
Fix world particles issues
|
2015-05-03 15:30:58 -05:00 |
|
Mini-Chiss
|
40c838b030
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-03 14:50:56 -05:00 |
|
Mini-Chiss
|
8224450b44
|
Build Update
|
2015-05-03 14:50:50 -05:00 |
|
Shaun Bennett
|
17cbcc3771
|
Craftbukkit changes for UtilParticle update, and UtilParticle fix
|
2015-05-03 14:42:31 -05:00 |
|
Shaun Bennett
|
74dbf7e827
|
Merge remote-tracking branch 'origin/master'
|
2015-05-03 14:41:18 -05:00 |
|
Shaun Bennett
|
ff6da92fb7
|
Some Build world, support for far rendered particles
|
2015-05-03 14:41:09 -05:00 |
|
libraryaddict
|
b58bef1bd8
|
ResourcePack: Lengthen timeout from 10 seconds to 20 seconds
|
2015-05-04 04:13:23 +12:00 |
|
libraryaddict
|
9986bd6ee5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-04 04:10:05 +12:00 |
|
libraryaddict
|
3fcec13e68
|
Wizards: Melee with wands should say it was wands that did it
|
2015-05-04 04:09:49 +12:00 |
|
Shaun Bennett
|
11b36e6b44
|
[Build] Show message to players to open inventory until they click something in their inventory
|
2015-05-02 22:50:27 -05:00 |
|
Mini-Chiss
|
9c08e57602
|
fixed NPE
|
2015-05-02 22:45:14 -05:00 |
|
Mini-Chiss
|
122dbad45c
|
added time setting and framework for lightning strikes
|
2015-05-02 22:26:03 -05:00 |
|
Mini-Chiss
|
6ad09f0ade
|
Master Builder update
|
2015-05-02 22:05:12 -05:00 |
|
Mini-Chiss
|
5b04d43400
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-02 17:45:39 -05:00 |
|
libraryaddict
|
08140f8863
|
ResourcePack: Resource pack refused now links to a forum guide
|
2015-05-03 08:10:25 +12:00 |
|
libraryaddict
|
8cb9493125
|
Wizards: Rainbow Road no longer lasts more than 20 seconds, cooldown never decreases
|
2015-05-02 16:39:20 +12:00 |
|
libraryaddict
|
9c268786aa
|
Wizards: Nerfed lightning strike damage
|
2015-05-02 16:22:59 +12:00 |
|
libraryaddict
|
efed6e129b
|
Wizards: Removed fishing rod from loot, fixed overtime locations not permitted to touch the highest block.
|
2015-05-02 16:11:57 +12:00 |
|
libraryaddict
|
3e9b64db66
|
Wizards Implode: Don't cast spell if no blocks are effected
|
2015-05-02 15:26:23 +12:00 |
|
libraryaddict
|
cd1a5793fa
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-02 15:24:16 +12:00 |
|
Jonathan Williams
|
707772d58b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-05-01 22:07:33 -05:00 |
|
Jonathan Williams
|
2902e6075f
|
Fix for n positive bug.
|
2015-05-01 22:05:03 -05:00 |
|
libraryaddict
|
05c9174491
|
Wizards: Prevent using keyboard shortcuts to drop hotbar locked items
|
2015-05-02 14:59:15 +12:00 |
|
Mini-Chiss
|
ab6937a525
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-01 18:05:55 -05:00 |
|
Shaun Bennett
|
e04b61a91d
|
Give build item when game starts
|
2015-05-01 18:03:56 -05:00 |
|
Shaun Bennett
|
244ffece8a
|
Fixes for build game + fix clans compile
|
2015-05-01 18:02:06 -05:00 |
|
Shaun Bennett
|
910cdff935
|
Merge remote-tracking branch 'origin/master'
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
|
2015-05-01 17:54:00 -05:00 |
|
Shaun Bennett
|
37f1f7eabb
|
Master Builders changes for chiss
|
2015-05-01 17:46:42 -05:00 |
|
libraryaddict
|
b136be0d47
|
ResourcePack: Removed code that demanded a enum and changed to boolean
|
2015-05-02 03:03:53 +12:00 |
|
libraryaddict
|
e8cbb2fc29
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-01 21:26:56 +12:00 |
|
libraryaddict
|
93a25d5a67
|
ResourcePack: Fixed links and declined message
|
2015-05-01 21:26:42 +12:00 |
|
Jonathan Williams
|
fb634c190e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-05-01 02:29:54 -05:00 |
|
Jonathan Williams
|
84a5e5e521
|
Added motd.
|
2015-05-01 02:29:34 -05:00 |
|
Jonathan Williams
|
e800d74976
|
Disabled Double Gems.
|
2015-05-01 02:29:20 -05:00 |
|
libraryaddict
|
c240a1752f
|
GameType: Update resource pack to use https not http
|
2015-05-01 19:28:42 +12:00 |
|
libraryaddict
|
f85d27db1a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-01 19:25:11 +12:00 |
|
libraryaddict
|
cc65830f9b
|
ResourcePack: Ignore ServerGroup's resource pack and set MineStrike to use new ResourcePack code
|
2015-05-01 19:24:20 +12:00 |
|
Jonathan Williams
|
283d550903
|
Added Wizards to quick game menu.
|
2015-05-01 01:24:01 -05:00 |
|
Mini-Chiss
|
1b8ab13160
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-01 00:51:52 -05:00 |
|
Mini-Chiss
|
ba5802cc14
|
wizards kit availability
|
2015-05-01 00:47:51 -05:00 |
|
Jonathan Williams
|
fa4466b6a9
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
|
2015-05-01 00:13:39 -05:00 |
|
libraryaddict
|
88bd99e11f
|
Wizards: Update UtilTextBottom text for the custom method
|
2015-05-01 16:57:11 +12:00 |
|
Jonathan Williams
|
af86586d74
|
Added 'Sloth' to draw my thing list.
|
2015-04-30 23:57:11 -05:00 |
|
Jonathan Williams
|
d161d62773
|
Added chat filtering to private messages.
|
2015-04-30 23:56:08 -05:00 |
|
Jonathan Williams
|
b33828f5a1
|
Added LibraryAddict's crash exploit patch for craftbukkit.jar
|
2015-04-30 23:48:58 -05:00 |
|
Mini-Chiss
|
21800d83c6
|
Build fixes
|
2015-04-30 23:16:30 -05:00 |
|
libraryaddict
|
319cde5c46
|
Wizards: Update resource pack url
|
2015-05-01 16:14:59 +12:00 |
|
libraryaddict
|
fbafeca150
|
Wizards: Remove block burn flag true
|
2015-05-01 15:44:11 +12:00 |
|
libraryaddict
|
82cd4208bd
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
|
2015-05-01 14:22:53 +12:00 |
|
libraryaddict
|
c660e0e3c7
|
Wizards: Re-sorted spells
|
2015-05-01 14:19:13 +12:00 |
|
libraryaddict
|
7bd133f704
|
Wizards: Temporary resource pack
|
2015-05-01 13:04:05 +12:00 |
|
Mini-Chiss
|
ed1c7e2336
|
Master Builders initial push (dont worry jon it doesnt effect anything for the update!)
|
2015-04-30 18:20:35 -05:00 |
|
libraryaddict
|
5d36ddce3a
|
Arcade: Close only non-player inventories at 5 seconds
|
2015-04-30 21:17:08 +12:00 |
|
libraryaddict
|
23ea7bbce4
|
Spectators: Set fire ticks to 0 on damage
|
2015-04-30 20:55:30 +12:00 |
|
Peter Miller
|
152f5d3046
|
Ditto previous commit...
|
2015-04-29 16:52:06 -04:00 |
|
Peter Miller
|
69d4d2dfdb
|
Another try at build changes.
|
2015-04-29 16:47:06 -04:00 |
|
libraryaddict
|
33bbe96964
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards
|
2015-04-30 01:33:43 +12:00 |
|
libraryaddict
|
497550549b
|
ResourcePackCode: Fixed the return to hub sender displaying the wrong message. Bad downloads are now sent back to hub.
|
2015-04-30 01:33:21 +12:00 |
|
libraryaddict
|
c2b7001fcc
|
Wizards: Current progress
|
2015-04-30 01:32:22 +12:00 |
|
Peter Miller
|
1e6084bfb2
|
Another compilation order change.
|
2015-04-28 10:31:25 -04:00 |
|
Peter Miller
|
93abe301c2
|
More compilation depedency changes.
|
2015-04-28 10:18:53 -04:00 |
|
Peter Miller
|
1dc9864e4c
|
Added necessary libraries to compilation targets.
|
2015-04-28 10:00:12 -04:00 |
|
Peter Miller
|
e1ddf55860
|
Adjusting build order of compile targets in common.xml.
|
2015-04-28 09:36:43 -04:00 |
|
Peter Miller
|
e68e99d1f6
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-04-28 09:25:05 -04:00 |
|
Peter Miller
|
0ce7f657e1
|
Added compilation targets for Arcade/Hub building with Ant.
|
2015-04-28 09:24:35 -04:00 |
|
Mini-Chiss
|
45b801ba81
|
hitbox changes
|
2015-04-27 19:21:33 -05:00 |
|
libraryaddict
|
1c1ab9bbe3
|
Throwing TNT: Fixed tnt not being movable from other inventories
|
2015-04-23 08:30:23 +12:00 |
|
Jonathan Williams
|
ae1480fb1e
|
Little bit of spacing fixed.
|
2015-04-21 23:36:33 -05:00 |
|
Jonathan Williams
|
a662c93a92
|
Fix so 0.0.0.0 doesn't get selected for DNS rotation.
|
2015-04-21 23:36:12 -05:00 |
|
Jonathan Williams
|
d8ed866ada
|
Fix for duplicate names in db.
Adjusted staff server whitelist and op list.
|
2015-04-21 23:35:41 -05:00 |
|
Shaun Bennett
|
5c6c4a23d5
|
Rename SDK to 1.8 instead of 1.7 (IDEA)
|
2015-04-21 20:10:01 -04:00 |
|
libraryaddict
|
2aaa93e58f
|
ResourcePack: Add constructors to GameType for resource pack urls, sorted the enum's by name
|
2015-04-22 05:38:32 +12:00 |
|
libraryaddict
|
b29893ff60
|
Merge branch 'ResourcePack' into Wizards
|
2015-04-22 03:46:25 +12:00 |
|
libraryaddict
|
9f8fe3bf78
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into ResourcePack
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
|
2015-04-22 03:45:59 +12:00 |
|
libraryaddict
|
aeff6bf4b9
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards
|
2015-04-22 00:25:56 +12:00 |
|
Shaun Bennett
|
2b8137fc66
|
Merge remote-tracking branch 'origin/master'
|
2015-04-21 00:20:40 -04:00 |
|
libraryaddict
|
0196a5c359
|
Wizards: Latest changes by Chiss
|
2015-04-21 13:54:19 +12:00 |
|
Shaun Bennett
|
3dddd7112c
|
Update MOTD to not use animation anymore (Bug fixed in 1.8.4!)
|
2015-04-20 17:16:57 -04:00 |
|
Cheese
|
c73a6ae62f
|
champs balance
|
2015-04-19 13:49:46 +10:00 |
|
Cheese
|
f4a91455f6
|
Champions Balance
|
2015-04-19 12:22:51 +10:00 |
|
libraryaddict
|
cd47da179a
|
Wizards: Added new food Cheese, removed other foods and raised spawn chance of remaining
|
2015-04-18 06:12:34 +12:00 |
|
libraryaddict
|
9db8aff37a
|
Wizards: Changed spell icons for resource pack
|
2015-04-18 06:10:23 +12:00 |
|
Cheese
|
91a70d6a04
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-04-16 21:06:19 +10:00 |
|
Cheese
|
b352b28fdc
|
fixed MAC still being disabled
|
2015-04-16 21:05:56 +10:00 |
|
libraryaddict
|
25dfeacb09
|
Wizards: Spell levels are now viewable on items in chest as item amount
|
2015-04-16 16:20:01 +12:00 |
|
libraryaddict
|
8803941bd8
|
Wizards: More changes as per demand.
|
2015-04-16 05:51:08 +12:00 |
|
Jonathan Williams
|
99436b4a42
|
Added Tab event back :D
|
2015-04-14 02:01:04 -05:00 |
|
Jonathan Williams
|
556a9df945
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-04-14 01:59:59 -05:00 |
|
Jonathan Williams
|
c454973398
|
Changed login deets for new new db cluster.
|
2015-04-14 01:59:29 -05:00 |
|
Jonathan Williams
|
eea4b98069
|
Removed unused AccountManager.java
|
2015-04-14 01:59:09 -05:00 |
|
Cheese
|
f7ef44b007
|
More hitbox nerfs
|
2015-04-14 16:43:02 +10:00 |
|
Cheese
|
6cc18b61d1
|
reduced hitbox on flesh hook and lightning orb
|
2015-04-14 16:38:11 +10:00 |
|
Jonathan Williams
|
3d6dce24ff
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-04-14 01:32:11 -05:00 |
|
Jonathan Williams
|
e3a328c70d
|
Revert "Work on FriendRepository, still not enabled yet."
This reverts commit 405d0fec18 .
Re-enabled friends.
|
2015-04-14 01:32:03 -05:00 |
|
Cheese
|
058e5b9045
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-04-14 09:44:58 +10:00 |
|
Cheese
|
482ee6eb79
|
changed builder rank name
|
2015-04-14 09:35:35 +10:00 |
|
libraryaddict
|
073c7d16c2
|
Wizards Napalm: Make glazed blocks more common, raise damage
|
2015-04-13 15:06:52 +12:00 |
|
libraryaddict
|
e0b0975195
|
Bridge: Prevent hoppers being crafted to prevent abuse
|
2015-04-13 14:38:32 +12:00 |
|
libraryaddict
|
c36c800bb5
|
AchievementManager: Add SnrMod as a min MP level of 15
|
2015-04-13 14:05:50 +12:00 |
|
libraryaddict
|
12b3a582b2
|
CustomExplosion: Fixed loop, added max damage
|
2015-04-12 23:21:19 +12:00 |
|
libraryaddict
|
be21968805
|
UtilBlock: Added a method that may or may not tell you the blocks destroyed in an explosion
|
2015-04-12 23:20:52 +12:00 |
|
libraryaddict
|
03fb8c203e
|
Wizards: Balancing
|
2015-04-12 23:20:15 +12:00 |
|
libraryaddict
|
81aeff86bf
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards
|
2015-04-12 20:15:28 +12:00 |
|
Cheese
|
d290078790
|
Damage multipliers now effect damage modifiers - this also fixes a bug!
|
2015-04-11 16:33:18 +10:00 |
|
Cheese
|
1378dcb815
|
Properly fixed MS spec bug
|
2015-04-11 11:45:27 +10:00 |
|
Cheese
|
9b2c4662c3
|
fixed minestrike bug where newly joined specs could buy/drop items
removed easter baskets
|
2015-04-11 11:25:25 +10:00 |
|
libraryaddict
|
afa372dca7
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards
Conflicts:
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/SpellButton.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellLightningStrike.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellSpeedBoost.java
|
2015-04-11 12:20:29 +12:00 |
|
libraryaddict
|
43163cd7d7
|
UtilParticle: Added lore for future reference on colored particles.
|
2015-04-11 12:14:12 +12:00 |
|
libraryaddict
|
28d0e28607
|
UtilShapes: Fixed getting BlockFace's being bugged and weird sometimes, added another method to get diagonal faces between two diagonals
|
2015-04-11 12:13:37 +12:00 |
|
libraryaddict
|
2d59bb4010
|
CustomExplosion: Added option to limit falling blocks that spawn, removed 'Reason' to prevent CustomDamageEvent from using a mod instead of initialDamage (wtf?)
|
2015-04-11 12:12:47 +12:00 |
|
libraryaddict
|
fc7c6e5831
|
Wizards changes
|
2015-04-11 12:11:50 +12:00 |
|
Jonathan Williams
|
49431da509
|
Fix for pulling account UUID with multiple.
|
2015-04-10 10:53:11 -05:00 |
|
Cheese
|
3d95a5cfa4
|
bloock toss fix
|
2015-04-10 14:09:21 +10:00 |
|
Cheese
|
85c9f9010e
|
Added Twitch Rank
fixes hitbox on glacial
|
2015-04-10 13:11:02 +10:00 |
|
Cheese
|
c3798834c3
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-04-07 08:30:45 +10:00 |
|
Cheese
|
18ba446764
|
re-enabled MAC
|
2015-04-07 08:30:32 +10:00 |
|
Jonathan Williams
|
9f6a89bfc6
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-04-06 04:14:12 -07:00 |
|
Jonathan Williams
|
679d5faa9b
|
Motd pull on start.
|
2015-04-06 04:14:04 -07:00 |
|
Jonathan Williams
|
4eb1f67d82
|
Removed code to set default motd.
|
2015-04-06 04:13:13 -07:00 |
|
Cheese
|
e0a58ba165
|
champions exploit fix update
|
2015-04-06 19:57:33 +10:00 |
|
Cheese
|
cdb86d3ebb
|
champions exploit fixes and balance
|
2015-04-06 17:17:36 +10:00 |
|
Cheese
|
6c3fc3009b
|
fixed sheep quest bug where players were unable to pick up sheep rapidly
fixed bug where falling blocks were instantly hitting players
|
2015-04-06 13:03:59 +10:00 |
|
Jonathan Williams
|
782db26d10
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-04-04 01:27:08 -07:00 |
|
Cheese
|
93abca0c01
|
can no logner break levers and other usables in SG
|
2015-04-04 16:12:33 +11:00 |
|
Cheese
|
db1a3afa19
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-04-04 16:02:24 +11:00 |
|
Cheese
|
dc84621b6c
|
blizzard snowballs expire
|
2015-04-04 16:01:48 +11:00 |
|
libraryaddict
|
9518d9f438
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-04-04 17:33:51 +13:00 |
|
libraryaddict
|
c1c4e8b417
|
Disguises: Fixed DisguisePlayer not using a random UUID to prevent conflicts, fixed non-player living entities not being disguisable
|
2015-04-04 17:33:33 +13:00 |
|
Cheese
|
c79432c8b9
|
Fixed projectile hitboxes and specific values
|
2015-04-04 10:54:03 +11:00 |
|
Jonathan Williams
|
d25b39058a
|
Fixed bunny morph name.
|
2015-04-03 04:19:48 -07:00 |
|
Cheese
|
ae298644e2
|
removed random egg color, looked ugly
|
2015-04-03 22:02:22 +11:00 |
|
Cheese
|
3cadbf3a34
|
fixed color in egg
|
2015-04-03 22:00:54 +11:00 |
|
Cheese
|
f87511331e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-04-03 21:47:57 +11:00 |
|
Cheese
|
ff0883e7d7
|
fixed easter egg duration
parser list improvement
|
2015-04-03 21:47:43 +11:00 |
|
Jonathan Williams
|
8567701e1d
|
Updated Motd.
|
2015-04-03 03:20:11 -07:00 |
|
Jonathan Williams
|
0119e99adf
|
Added EasterBunny package for support server.
|
2015-04-03 03:07:49 -07:00 |
|
Jonathan Williams
|
726c03af58
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-04-03 03:00:21 -07:00 |
|
Cheese
|
54948cc61e
|
disabled rabbit buying
|
2015-04-03 20:59:56 +11:00 |
|
Jonathan Williams
|
158cc0909b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-04-03 02:37:46 -07:00 |
|
Cheese
|
23df6daab0
|
Added Easter Morph
Added Eggs Baskets in games
Added double gem for 1.8
|
2015-04-03 20:31:23 +11:00 |
|
Jonathan Williams
|
c4de261b69
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-04-03 02:21:11 -07:00 |
|
Jonathan Williams
|
aa089314f0
|
Completely removed Testing group from dead checks and laggy checks in server monitor.
|
2015-04-03 01:56:36 -07:00 |
|
libraryaddict
|
66c83397e5
|
DisguiseManager: Add DisguiseRabbit
|
2015-04-03 20:52:09 +13:00 |
|
Jonathan Williams
|
a8aab1fea0
|
Motd changes.
|
2015-04-02 23:38:29 -07:00 |
|
Jonathan Williams
|
120420d35f
|
Really fixed disguise memory leak this time.
|
2015-04-02 23:37:43 -07:00 |
|
libraryaddict
|
23abf92722
|
IcePathData: Compare Material instead of integers
|
2015-04-03 19:37:27 +13:00 |
|
Jonathan Williams
|
fb4be35dfe
|
Let admins apply youtube rank.
Limit Lobby count to 250.
|
2015-04-02 23:36:54 -07:00 |
|
libraryaddict
|
290767c58d
|
CustomExplosion: Added method to change to customdamage, added method to change the block damage differently from the entity damage
|
2015-04-03 19:36:47 +13:00 |
|
Jonathan Williams
|
437c70e548
|
Fixed issue with double run() call in loadClientByName.
|
2015-04-02 23:36:16 -07:00 |
|
libraryaddict
|
d5137d9ec6
|
UtilParticle: Added option to send own particle strings, added two particles
|
2015-04-03 19:35:57 +13:00 |
|
libraryaddict
|
05319511ff
|
UtilBlock: Modified getInRadius() to allow option of a hollow sphere
|
2015-04-03 19:34:24 +13:00 |
|
libraryaddict
|
6faf5011a8
|
Wizards: Add spells: Gust, RainbowPath, SpectralArrow, IcePrison. Remove spells: ExplosiveRune, HealingRune, LaunchRune, Launch, TeleportRune. Explosions now launch blocks. Other changes done such as modified spells.
|
2015-04-03 19:33:49 +13:00 |
|
Cheese
|
d4e8c0c9a6
|
Added Respawn middle screen text
Added Champs capture point mid screen text
Fixed hitbox mults for projectiles
Fixed inconsistent arrow damage
Lots of Champions balance
|
2015-04-03 15:28:10 +11:00 |
|
Cheese
|
f682bb8f9c
|
fixed kit items not spawning
horse pet doesnt spawn when dead
|
2015-04-03 12:10:02 +11:00 |
|
libraryaddict
|
bb821996b1
|
Wizard modifications
|
2015-04-03 09:22:31 +13:00 |
|
Jonathan Williams
|
7a0f9d28bf
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-04-01 02:22:58 -07:00 |
|
Cheese
|
43c58bd31c
|
removed april fools from arcade :(
|
2015-04-01 20:22:13 +11:00 |
|
Jonathan Williams
|
24e65e7384
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-04-01 01:29:05 -07:00 |
|
Cheese
|
3355d2b457
|
disabled aprilfools cow for team games
|
2015-04-01 19:15:11 +11:00 |
|
Jonathan Williams
|
686f99031b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-04-01 00:26:30 -07:00 |
|
Cheese
|
5737df8d6a
|
final fixes for bacon brawl
|
2015-04-01 18:07:45 +11:00 |
|
Jonathan Williams
|
8d9d298f0f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-04-01 00:04:44 -07:00 |
|
Cheese
|
987bf266ee
|
fixed bug in moo
|
2015-04-01 18:02:56 +11:00 |
|
Cheese
|
da9e7892f0
|
fixed aprilfools bugs
mamapig debug :(
|
2015-04-01 18:01:09 +11:00 |
|
Cheese
|
24ba42cb16
|
fixed armor stands blocking attacks in bacon brawl
|
2015-04-01 17:49:49 +11:00 |
|
Jonathan Williams
|
38798d3baf
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-03-31 23:47:27 -07:00 |
|
Jonathan Williams
|
6037da6e0f
|
Improved fix for coinQueue memory leak.
|
2015-03-31 23:47:08 -07:00 |
|
Jonathan Williams
|
405d0fec18
|
Work on FriendRepository, still not enabled yet.
|
2015-03-31 23:46:43 -07:00 |
|
Cheese
|
8bd883cb26
|
fixed damage transfer for mama pigglez kit
|
2015-04-01 17:43:46 +11:00 |
|
Cheese
|
31ddeaac50
|
a little more moo
|
2015-04-01 17:28:05 +11:00 |
|
Jonathan Williams
|
10c7d06a88
|
Memory leak fixes for DisguiseManager and DonationManager.
|
2015-03-31 23:16:15 -07:00 |
|
Cheese
|
59fce1cd88
|
adding some mmoooo text
changed pig kit for baconbrawl
|
2015-04-01 17:15:56 +11:00 |
|
Cheese
|
ed35d2a992
|
April Fools update
|
2015-04-01 16:56:13 +11:00 |
|
Shaun Bennett
|
50c38dc467
|
April Fools Additions, Fix some errors in Clans code, Add PlayerCache to IntellIJ IDEA
|
2015-03-31 17:22:50 -04:00 |
|
libraryaddict
|
b84756ef7a
|
Revert wizard commits
|
2015-03-27 22:13:50 +13:00 |
|
libraryaddict
|
a772d4cbf2
|
BlockHunt: Use new setInvisible method in DisguiseChicken
|
2015-03-27 22:05:16 +13:00 |
|
libraryaddict
|
a27e6fba5c
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
|
2015-03-27 06:00:14 +13:00 |
|
Cheese
|
821c7f0cb6
|
Replaced bebe piggles kit with a new kit
|
2015-03-26 17:43:22 +11:00 |
|
Cheese
|
e3eda38c2c
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-03-26 10:10:11 +11:00 |
|
Cheese
|
6ab03e95ec
|
more timings for visman
|
2015-03-26 10:08:41 +11:00 |
|
Jonathan Williams
|
f4061854cd
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-03-25 15:11:17 -07:00 |
|
Jonathan Williams
|
6472194d44
|
Optimized queries to retrieve and update player information by removing inner join calls on the account.
Added account id retrieval on login.
Added account id caching in redis.
|
2015-03-25 15:10:59 -07:00 |
|
Jonathan Williams
|
294041b821
|
Removed Missing Coin application functionality from CustomerSupport server.
|
2015-03-25 15:05:06 -07:00 |
|
Jonathan Williams
|
09fe3ad6a8
|
NewsManager : Reduced dynamic string generation every time news changes
|
2015-03-25 15:04:00 -07:00 |
|
Jonathan Williams
|
589d4b1aae
|
CoreClientManager accessible to public in MiniDbClientPlugin now.
|
2015-03-25 15:03:08 -07:00 |
|
Jonathan Williams
|
16c41aba82
|
Retrofitted BungeeRotator to updating IP information.
|
2015-03-25 15:02:14 -07:00 |
|
Jonathan Williams
|
6c72bc2c36
|
Added playerStats caching via redis.
Fixed MotdManager's forced hardcoded motd.
|
2015-03-25 15:01:19 -07:00 |
|
Jonathan Williams
|
a8eaf1014f
|
Updated EnjinTranslator to new backend processing.
|
2015-03-25 15:00:27 -07:00 |
|
libraryaddict
|
d3e37d4578
|
CustomExplosion & explosion/Explosion.java: Add option to use falling block explosions on CustomExplosion by option in Explosion to only spawn falling blocks, not remove blocks so that CustomExplosion can handle that
|
2015-03-25 20:32:03 +13:00 |
|
libraryaddict
|
2d4dcdbd8e
|
CustomExplosion: Add method to change block explosion size separately
|
2015-03-25 19:26:25 +13:00 |
|
libraryaddict
|
db5e6ad745
|
Wizards: Summoned wolves are one-hittable, and one per spell level
|
2015-03-25 19:25:32 +13:00 |
|
libraryaddict
|
be5086e2a5
|
Wizards: Give warning before lightning spell hits
|
2015-03-25 19:22:08 +13:00 |
|
libraryaddict
|
be542b9ce4
|
Rebalance wizard spell SpeedBoost
|
2015-03-25 19:21:38 +13:00 |
|
libraryaddict
|
853e6420dd
|
Add instant-casting to wizards
|
2015-03-25 19:21:20 +13:00 |
|
Cheese
|
4a25265c7c
|
Added utility methods to check for players within a sight pyramid
|
2015-03-25 17:13:22 +11:00 |
|