Jonathan Williams
37b5e495b8
Update local cache of inventory and if fail, revert change.
...
Removed full lock on login.
Removed Thanskgiving benefit.
2014-11-22 17:52:22 -08:00
Jonathan Williams
d1578b12d4
Removed extra console logging.
2014-11-21 14:45:55 -08:00
Jonathan Williams
7bd12ab850
Re-did benefits and inventory to only update locally if db succeeeds......DOH
2014-11-21 14:41:25 -08:00
Jonathan Williams
29204de987
Removed old benefits.
...
Added youtube rank application from Owner
Fixed Dom bug : https://trello.com/c/OtwrpFXg/90-champions-24-skill-tokens-2-item-tokens-in-champions-so-broken
2014-11-20 21:58:39 -08:00
Jonathan Williams
2446e6d64d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-20 21:42:40 -08:00
Jonathan Williams
1f5be77880
Fixed text in Dom shop.
...
Cleaned up some code in benefit stuff.
2014-11-20 21:42:33 -08:00
Chiss
f1ba5947a4
Some more wither updates
2014-11-21 16:32:12 +11:00
Jonathan Williams
6c63552480
Refactored RankBenefitsGiver9000
...
Added Thanksgiving benefits (1 treasure key).
ServerMonitor now ignores Testing group.
2014-11-20 21:24:23 -08:00
Chiss
7a8759dfba
updated disguisemanager so it uses player arg
...
fixed invisibility bug on disguises for specific players
updated champs skills
made some hard achievements a bit easier
2014-11-21 09:42:05 +11:00
Jonathan Williams
ab78b4b89d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-19 22:25:17 -08:00
Jonathan Williams
828b866fc1
Added functionality to RepositoryBase to return generated keys.
...
Prevent invalid UUID from jacking up web call in Enjin listener.
2014-11-19 22:23:42 -08:00
Chiss
450cc9ada2
Champions achievement update
...
Wither update
2014-11-20 17:21:22 +11:00
Shaun Bennett
e99a3f6544
Merge remote-tracking branch 'origin/master'
2014-11-17 18:19:06 -06:00
Shaun Bennett
f071d2e727
Fix for TNT explosion in Bridges
2014-11-17 18:09:58 -06:00
Jonathan Williams
13ba32f2f4
Added command queueing for failed commands in EnjinTranslator.
...
Added verification of coin/gem application in Web api.
Added code to support polling last 100 purchases with EnjinTranslator
Added UUId lookup to CoreClientManager and fixed Async to Async calls with DatabaseRunnable.
2014-11-17 14:06:38 -08:00
Jonathan Williams
857ff29461
Removed buggy player disguises.
...
Removed datavalues from wither disguise.
2014-11-15 03:21:48 -08:00
Jonathan Williams
48c522a86b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-15 03:03:52 -08:00
Chiss
8d6793060c
made early levels a little easier to progress through
2014-11-15 21:33:28 +11:00
Jonathan Williams
2af66c99e7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-15 01:17:21 -08:00
Jonathan Williams
df76f6be10
More work on Clans.
2014-11-15 01:13:14 -08:00
Jonathan Williams
685a2899ca
Added custom name to wither disguise.
2014-11-15 01:12:58 -08:00
Chiss
51bc53262d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-15 19:32:08 +11:00
Chiss
ca4eec20ed
Wither Assault update
2014-11-15 19:31:56 +11:00
Shaun Bennett
521b1e5f3b
Merge remote-tracking branch 'origin/master'
2014-11-13 21:54:15 -06:00
Jonathan Williams
2cf76ae5b4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-13 19:15:05 -08:00
Jonathan Williams
4812da2cd9
More work on Clans - Clan repository.
2014-11-13 19:14:56 -08:00
Jonathan Williams
62fbeeda20
Added Wither disguise.
2014-11-13 19:14:14 -08:00
Shaun Bennett
af31f4cd42
Add Tab handling for MultiCommandBase and "game set" command
2014-11-13 18:22:00 -06:00
Shaun Bennett
48c09aa311
Making spectator gui look better
2014-11-13 18:05:28 -06:00
Shaun Bennett
eb4b451e12
Fixing some spectator gui bugs
2014-11-13 16:41:42 -06:00
Chiss
9eaacd20ab
fixed slime healing
...
fixed sheep quest brute not dropping sheep
updated punish page
2014-11-13 18:09:54 +11:00
Chiss
c5a873ffab
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-13 14:40:26 +11:00
Chiss
f9f7a834c2
geno morf
2014-11-13 14:38:33 +11:00
Jonathan Williams
7cad40044a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
Plugins/Mineplex.Core/src/mineplex/core/report/ReportPlugin.java
2014-11-12 19:36:00 -08:00
Jonathan Williams
1372f74921
Refactored some names in MiniPlugin
...
Work on clans.
2014-11-12 19:21:12 -08:00
Jonathan Williams
0193c397fb
Added Kit unlocks to staff server
...
Added password persistence in db.
2014-11-12 19:20:41 -08:00
Jonathan Williams
2e848c2ac2
Fixed some of twiggy conflicts.
2014-11-12 05:13:58 -08:00
Jonathan Williams
8d62966abc
Created Clans project.
...
Converted Fields code complete (not tested).
2014-11-12 05:13:16 -08:00
Chiss
71a93bead5
Updated punish to be even less confuse.
2014-11-12 09:49:03 +11:00
Chiss
d7141e4943
Added warning note to punish
2014-11-11 20:02:35 +11:00
Chiss
f7ad986503
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-11 19:05:58 +11:00
Shaun Bennett
c0f2f8a88c
Remove useless comment/import
2014-11-11 01:47:03 -06:00
Shaun Bennett
23ab9756dc
Merge remote-tracking branch 'origin/master'
2014-11-11 01:32:55 -06:00
Jonathan Williams
b08cd54666
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-10 23:31:38 -08:00
Jonathan Williams
827fef535f
Some commented out testing code in DisguiseManager
2014-11-10 23:30:41 -08:00
Jonathan Williams
108421164c
Added support for stats with spaces in them for GiveStat.
2014-11-10 23:30:16 -08:00
Shaun Bennett
5b9b7347c6
Add tab complete processing for commands
2014-11-10 23:49:35 -06:00
Chiss
6c6c51e950
fixed compilation problems
2014-11-11 14:28:35 +11:00
MrTwiggy
e3c50bfb39
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
Plugins/Mineplex.ServerData/src/mineplex/serverdata/ServerCommandManager.java
2014-11-10 18:55:57 -05:00
MrTwiggy
920bdad64c
Player report system commit, including functionality for long-form MySQL storage of report logs as well as real-time redis based report sessions.
2014-11-10 18:44:46 -05:00
