Ty Sayers
|
13f47ad903
|
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/CustomItem.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
|
2015-07-24 13:59:01 -05:00 |
|
Ty Sayers
|
0b49d053fe
|
Fix memory leak in player gear management. Update custom gear display design for title and description to fit CJ's specified design, as well as updating attribute descriptions to match google doc more closely. Fix bug with damage reduction attributes adding instead of reducing damage. Fix bug with parse errors causing defective attribute bugs and console spam with certain custom gear attributes. Fix bug where legend was not being properly displayed for /c map command. Fix bug where chunks could be claimed diagonally to opposing enemy clans. Fix bug with redstone not properly being disabled. Fix bug with attribute effects taking place even when damage events were cancelled, such as in safe zones. Fix bug with dispensers being able to place lava and water blocks. Fix bug where holding a book caused debug chat spam for players in regards to custom damage events.
|
2015-07-20 15:57:57 -05:00 |
|
Jonathan Williams
|
0772f2e91e
|
Fixes for GoldManager
|
2015-07-19 21:04:59 -07:00 |
|
Jonathan Williams
|
3b47b01aea
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-07-19 20:18:08 -07:00 |
|
Jonathan Williams
|
73aea85876
|
GoldManager now uses stored procedure.
Deductions automatically process gold queue and return if transaction succeeded.
|
2015-07-19 19:32:46 -07:00 |
|
Jonathan Williams
|
3660b348cd
|
Work on Gold.
|
2015-07-19 18:15:50 -07:00 |
|
Shaun Bennett
|
d94f4f96a7
|
Observer mode changes
|
2015-07-18 16:40:50 -05:00 |
|
Shaun Bennett
|
1ef6fe3ed6
|
Observer changes
|
2015-07-17 15:37:33 -05:00 |
|
Shaun Bennett
|
096491f15d
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-07-16 15:51:29 -05:00 |
|
Shaun Bennett
|
2b2e5e5c97
|
Spelling fixes + Observer mode
|
2015-07-16 15:51:21 -05:00 |
|
Jonathan Williams
|
9cf4ff005a
|
Added some debug checks.
|
2015-07-16 01:26:38 -05:00 |
|
Cheese
|
917839af0e
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-07-16 12:48:10 +10:00 |
|
Cheese
|
ef4a575d28
|
fixed blocktoss exploits
|
2015-07-16 12:47:39 +10:00 |
|
Shaun Bennett
|
6a598690b0
|
Jooq Update, Async Clans calls, Clan name in scoreboard, block toss fix
|
2015-07-15 21:43:35 -05:00 |
|
Shaun Bennett
|
05b1e03598
|
Remove BungeeSigns Module?
|
2015-07-14 21:57:30 -05:00 |
|
Shaun Bennett
|
40bfa05cd4
|
Merge remote-tracking branch 'remotes/origin/master' into clans-beta
|
2015-07-14 21:57:02 -05:00 |
|
Shaun Bennett
|
7f98157890
|
More work/fixes
|
2015-07-14 20:38:30 -05:00 |
|
Aaron Brock
|
5f73e50b2a
|
fix
|
2015-07-14 04:05:06 -04:00 |
|
Aaron Brock
|
6c01e0a9ea
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-14 03:38:52 -04:00 |
|
Aaron Brock
|
ca27591485
|
Added ChestComponent
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-14 03:36:41 -04:00 |
|
Shaun Bennett
|
ae71de30db
|
Fixes and changes
|
2015-07-14 01:57:53 -05:00 |
|
Shaun Bennett
|
5c5e7dd4a9
|
Merge master into clans
|
2015-07-13 20:42:10 -05:00 |
|
Shaun Bennett
|
231d4bd494
|
Merge remote-tracking branch 'origin/clans/world-events' into clans/world-events
|
2015-07-13 20:23:51 -05:00 |
|
Cheese
|
f2cc2a2c86
|
youtubers wont get kicked by mac
|
2015-07-14 10:16:42 +10:00 |
|
Shaun Bennett
|
dc1fe5fc2c
|
Fix schematic material id bug, add new schematics from build team, fix field ore bug, make /gear admin+, enable server join for staff ranks, remove annoying log spam from VisibilityManager
|
2015-07-13 19:11:17 -05:00 |
|
Cheese
|
cb05049c4a
|
youtubes can turn off vel in hubs
|
2015-07-14 10:08:41 +10:00 |
|
Cheese
|
5797f6bc00
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-14 09:58:22 +10:00 |
|
Cheese
|
1425875f7c
|
art assets
|
2015-07-14 09:56:58 +10:00 |
|
Jonathan Williams
|
f652ad8448
|
Removing ancient projects that are no longer used.
|
2015-07-13 13:41:57 -05:00 |
|
Aaron Brock
|
d5a144f377
|
Teams
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-13 07:02:33 -04:00 |
|
libraryaddict
|
66bef4ac00
|
Maps: 100 deaths before maps freeze, sends a warning message when switching servers from clans
|
2015-07-13 21:21:17 +12:00 |
|
Aaron Brock
|
7377094e86
|
stuff
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-11 03:51:19 -04:00 |
|
Aaron Brock
|
6bacbce463
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-11 02:57:33 -04:00 |
|
Aaron Brock
|
7c571e20d4
|
Switched to '/' to DIRECTORY_SEPARATOR
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-11 02:54:27 -04:00 |
|
Jonathan Williams
|
96a93b6786
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-10 15:32:25 -05:00 |
|
Jonathan Williams
|
7684e1837d
|
Added new support staff to whitelist.
|
2015-07-10 15:31:38 -05:00 |
|
Cheese
|
361d090171
|
server config
|
2015-07-10 17:38:04 +10:00 |
|
Cheese
|
233d3f0144
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-10 17:31:35 +10:00 |
|
Aaron Brock
|
31d6cbd7ce
|
Meh
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-10 02:46:12 -04:00 |
|
Jonathan Williams
|
581d58c313
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-09 18:34:20 -05:00 |
|
Aaron Brock
|
4b800340d8
|
Added things...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-09 18:52:40 -04:00 |
|
Jonathan Williams
|
f8b3431305
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-09 11:08:22 -05:00 |
|
Jonathan Williams
|
a20a9ba9e7
|
Fixed issue and updated bungee motd manager.
|
2015-07-09 11:07:43 -05:00 |
|
Jonathan Williams
|
77a63f72cc
|
Updated staff server white list.
|
2015-07-09 11:07:16 -05:00 |
|
Jonathan Williams
|
ecd8e3d7b0
|
Increased wait time for redis.
|
2015-07-09 11:07:00 -05:00 |
|
Aaron Brock
|
b4b0d6fa6f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-09 01:30:48 -04:00 |
|
Aaron Brock
|
d6fd7f4dd9
|
sutff
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-09 01:30:28 -04:00 |
|
Cheese
|
49daf597b5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-09 12:47:57 +10:00 |
|
Cheese
|
7d073fdc0d
|
fixed skywars icon
changed LOSSES to GAMESPLAYED for consistency
|
2015-07-09 12:47:40 +10:00 |
|
Shaun Bennett
|
a9e68ff777
|
Completed Energy
|
2015-07-08 21:39:31 -05:00 |
|