Commit Graph

2279 Commits

Author SHA1 Message Date
Chiss
731b0d89dd Merge 2014-11-26 12:33:39 +11:00
libraryaddict
03075fecae You have your HologramManager presented in a light most fair.
Should be worth noting I didn't test it thoroughly
2014-11-26 10:28:37 +13:00
Jonathan Williams
d9c06e0fd3 Shauny! 2014-11-25 13:26:30 -08:00
Jonathan Williams
484dfaaea9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-25 13:25:41 -08:00
Jonathan Williams
3b54789767 Optimized logins dealing with mysql with multiqueries.
Added lazy loading of Pool data and Loaded check before performing anything.

Refactored MiniClientPlugin and created MiniDbClientPlugin

Renamed RankBenefitManager9000 to BenefitManager

Removed /send ability for now.
2014-11-25 13:25:13 -08:00
libraryaddict
3c76fde190 Ignore wither skulls for CustomTagFix 2014-11-26 09:51:08 +13:00
libraryaddict
141c08ceb8 Remove old holograms and add new holograms 2014-11-26 09:18:36 +13:00
Shaun Bennett
f1fbc21570 Merge remote-tracking branch 'origin/master'
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-11-23 20:02:09 -06:00
Shaun Bennett
c7f2a8072e Antistack replacement 2014-11-23 19:51:23 -06:00
Jonathan Williams
1198426d8d Little more work on Clans. 2014-11-23 05:08:33 -08:00
Jonathan Williams
cb43bc04d3 Added /lobby 2014-11-23 03:35:16 -08:00
Chiss
2871446f74 reduced max amount of blocks from explosions 2014-11-23 15:01:04 +11:00
Chiss
0c5ec503be reduced fireworks in dragons 2014-11-23 15:00:05 +11:00
Chiss
089fdf8a64 sparklers no longer attract once they're in water or below 0 2014-11-23 14:55:06 +11:00
Chiss
d4a127b8ad reduced fps lag in runner 2014-11-23 14:47:28 +11:00
Chiss
50b2870705 changed locked ability icon to diamond 2014-11-23 14:13:00 +11:00
Jonathan Williams
dc5584d51b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-22 17:52:30 -08:00
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
Chiss
0e4b21e6b1 disabled charge skills being usable in hub 2014-11-23 11:46:47 +11:00
Chiss
f0c87e439a fixed nametag color in paintball 2014-11-23 11:16:01 +11:00
Chiss
b3a9410e54 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-23 10:36:11 +11:00
Chiss
01f0e5fab4 fixed static laser not doing less dmg when not charged 2014-11-23 10:35:56 +11:00
Jonathan Williams
695ed95b5d Fixed StaffServer commands for inventory. 2014-11-21 18:34:28 -08:00
Jonathan Williams
390c0dfff3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-21 18:30:38 -08:00
Jonathan Williams
6efa416d81 Fixed glitching dom items in Hub due to portal throw. 2014-11-21 18:30:26 -08:00
Chiss
19d3bba461 fixed fence glitch in dom 2014-11-22 13:20:34 +11:00
Chiss
8a4de9bbdc Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-22 10:29:12 +11:00
Chiss
6dfcdce027 increased illusion cooldown
cleaned axethrow
2014-11-22 10:29:00 +11: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
3dfd7e6036 Fixed Champions bug with losing builds. 2014-11-21 14:39:51 -08:00
Jonathan Williams
64a1426463 Added custom build load check on login. 2014-11-20 23:52:56 -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
0d78433bd2 updated mapparser
buffed withers a little
2014-11-21 10:36:41 +11: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
Shaun Bennett
a73ee4e306 Structure for Mail system, not finished yet. 2014-11-20 14:41:25 -06:00
Jonathan Williams
77b47c9e13 Fixed UI achievement skill stuff. 2014-11-20 08:50:25 -08:00
Chiss
972911fe05 set achievement skills 2014-11-20 18:01:46 +11:00
Jonathan Williams
d1a4080cbd Added GUI support for achievement skills. 2014-11-19 22:47:10 -08: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
1a6b80b08e More work on clans..
Finished ClansDataAccessLayer
Finished ClansAdmin
Finished ClansDisplay
2014-11-19 22:24:36 -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
Chiss
4961b55986 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-18 16:43:53 +11:00
Chiss
f5022ecf16 Fixed dupe glitch (all games)
Some champions skill fixes
created GameSpectatorManager to handle spec stuffz
2014-11-18 16:43:39 +11:00
Shaun Bennett
e99a3f6544 Merge remote-tracking branch 'origin/master' 2014-11-17 18:19:06 -06:00