Shaun Bennett
|
f8ef46abde
|
Merge master code into clans
|
2015-09-28 21:41:05 -04:00 |
|
Ty Sayers
|
aad5942242
|
Fix bug with converting gems to coins not properly displaying gem amounts converted. Fix bug with shop item data values not properly being used. Globalize clans to work cross-server and implement GUI to allow players to join clans servers, view clan info from hub, and transfer their clan from server to server.
|
2015-08-29 14:46:18 -07:00 |
|
Jonathan Williams
|
e9b33668bc
|
Added donorsOnline to MinecraftServer snapshot
Refactored Rank class to use lowercase methods.
|
2015-08-28 13:22:04 -07:00 |
|
libraryaddict
|
a1ea03f74b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events
Conflicts:
Plugins/.idea/misc.xml
Plugins/.idea/modules.xml
Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintballGun.java
Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
Plugins/Mineplex.Database/src/mineplex/database/Routines.java
Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java
Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
|
2015-08-14 19:44:56 +12:00 |
|
Shaun Bennett
|
94c00cdb72
|
Adding some comments
|
2015-08-13 04:05:28 -05:00 |
|
Shaun Bennett
|
05b1b91686
|
Carl!
|
2015-08-13 03:32:31 -05:00 |
|
Jonathan Williams
|
c32074e733
|
Fixed MPS/Event server guis so they open up like old.
Changed sticks to player heads in solo/team selection.
|
2015-08-03 00:53:06 -05:00 |
|
Jonathan Williams
|
bfaa0e6849
|
Fixed event/mps hardcode.
|
2015-08-02 23:51:43 -05:00 |
|
Jonathan Williams
|
d9a641fd92
|
Updated ServerManager to read server npc stuff from redis.
Updated ServerGroup to have NPC name in it.
|
2015-08-02 18:59:43 -05:00 |
|
Jonathan Williams
|
f520908f8d
|
Added team and portal location info to server group.
|
2015-08-02 17:52:51 -05:00 |
|
Shaun Bennett
|
5c5e7dd4a9
|
Merge master into clans
|
2015-07-13 20:42:10 -05:00 |
|
Ty Sayers
|
e15a2ad123
|
Add ClansRegions to handle the initialization of default server-side Clans representing special territories such as Spawn and Fields. Additionally, claim land with appropriate distribution according to the respective Clan. Fix bug with WeightSet generation not properly handling low amounts of uniformly likely elements. Fix bug with ClanInfo not properly handling creation of clans and initializing the date created field. Fix bug with Spawn region not properly protecting from claim and PvP settings.
|
2015-06-03 20:08:34 -04: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 |
|
Jonathan Williams
|
2dade32499
|
Added support for creating Event servers.
|
2015-03-15 20:50:54 -07:00 |
|
Ty Sayers
|
8279f0b17a
|
Add missing PlayerStatus object to ServerData for cross-server player tracking.
|
2015-03-15 13:00:15 -04:00 |
|
Ty Sayers
|
7811279b26
|
Convert friend system over to redis-based PlayerStatus data tracking from old SQL storage.
|
2015-03-14 17:41:16 -04:00 |
|
Ty Sayers
|
af898e3306
|
Convert PlayerStatus trackers, Bungee MOTD, and Bungee Server status' from MySQL storage to redis-based system using DataRepository's.
Re-organize structure of ServerData packaging.
|
2015-03-14 01:03:22 -04:00 |
|
Jonathan Williams
|
cb93769e03
|
Converted Bungee to redis.
Increased DBPool maximum connections to 5.
|
2015-03-13 17:53:36 -07:00 |
|