Ty Sayers
|
227a077dba
|
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
Conflicts:
Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java
|
2015-08-29 15:53:42 -07:00 |
|
Ty Sayers
|
197309b914
|
Commit left-over changes to merge and pull.
|
2015-08-29 15:44:29 -07:00 |
|
Shaun Bennett
|
5db4a55dda
|
Enable clans login manager
|
2015-08-29 15:41:37 -07:00 |
|
Shaun Bennett
|
16b317a877
|
Forgot to remove debug code
|
2015-08-29 15:17:03 -07:00 |
|
Shaun Bennett
|
9ad39c1fe7
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-08-29 15:09:08 -07:00 |
|
Shaun Bennett
|
4aee4f8fd7
|
Fix generators
|
2015-08-29 15:09:02 -07:00 |
|
libraryaddict
|
6ae801314c
|
Fix spawning
|
2015-08-29 15:07:51 -07:00 |
|
libraryaddict
|
9a1469f6b0
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
|
2015-08-29 15:03:32 -07:00 |
|
libraryaddict
|
5030ae7d57
|
For Chiss, may the code never break.
|
2015-08-29 15:03:22 -07:00 |
|
Jonathan Williams
|
c2c23c22e5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-08-29 14:55:04 -07:00 |
|
Jonathan Williams
|
4e32bad8dd
|
Fixed bug with stats pulling as int.
Fixed bug with Poll recording selections wrong.
|
2015-08-29 14:54:57 -07:00 |
|
Ty Sayers
|
088068be80
|
Add 'Clans' to the ignored server groups for ServerMonitor to prevent interference with live Clans servers.
|
2015-08-29 14:51:17 -07: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 |
|
Shaun Bennett
|
5b534313f5
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-08-29 14:37:43 -07:00 |
|
Shaun Bennett
|
8f1da698d2
|
TNT generator storage in mysql (needs testing still)
|
2015-08-29 14:37:35 -07:00 |
|
Mini-Chiss
|
eb6a0c9e38
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
|
2015-08-29 14:27:54 -07:00 |
|
Mini-Chiss
|
efd435396f
|
snake
|
2015-08-29 14:27:40 -07:00 |
|
Shaun Bennett
|
16d807db2e
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-08-29 14:01:45 -07:00 |
|
Shaun Bennett
|
62cf58bd55
|
Fix a bug where claiming a new land would display that land as neutral
|
2015-08-29 13:56:26 -07:00 |
|
libraryaddict
|
f0f9a4c674
|
Push it like a pushy pushy lady.
|
2015-08-29 13:46:09 -07:00 |
|
Mini-Chiss
|
b7b81ecaaa
|
snake
|
2015-08-29 13:38:40 -07:00 |
|
Shaun Bennett
|
fae27df496
|
Add ClansLoginManager, TNT Generators (Still needs persistence)
|
2015-08-29 13:35:31 -07:00 |
|
Mysticate
|
046fa4f8b6
|
Fixed possible NPE
|
2015-08-29 14:30:22 -06:00 |
|
Mysticate
|
736d88c82f
|
All achievements fixed. ^_^
|
2015-08-29 14:13:15 -06:00 |
|
Mini-Chiss
|
d2bc4b8cb4
|
SNAAAKE
|
2015-08-29 13:13:04 -07:00 |
|
libraryaddict
|
5d28509474
|
Snakes tail final location instead of rel movement
|
2015-08-29 12:38:19 -07:00 |
|
libraryaddict
|
bd2fda17b0
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
|
2015-08-29 12:07:23 -07:00 |
|
libraryaddict
|
7cd98c82e9
|
Refactor and move BossAbiliy
|
2015-08-29 12:06:57 -07:00 |
|
libraryaddict
|
e7f861a6c2
|
Push golem changes, snakes code and rename bossability thingy
|
2015-08-29 12:04:53 -07:00 |
|
Mysticate
|
97c7980bbc
|
Fixed evolving into walls.
|
2015-08-29 10:54:04 -06:00 |
|
Mysticate
|
55a7ea0439
|
Fixed kit bug.
|
2015-08-29 10:44:11 -06:00 |
|
Mini-Chiss
|
9ebabed1a8
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-08-29 00:14:26 -07:00 |
|
Mini-Chiss
|
6a28845cb0
|
Merge branch 'Myst_EVO'
|
2015-08-29 00:14:15 -07:00 |
|
Mysticate
|
12d9888a1f
|
Fixed wins..
|
2015-08-29 00:58:53 -06:00 |
|
Jonathan Williams
|
f8729cbd66
|
Fixed Gadget.
|
2015-08-28 23:47:27 -07:00 |
|
Mini-Chiss
|
d35b5940fc
|
fixed achievements
|
2015-08-28 23:30:21 -07:00 |
|
Mini-Chiss
|
5ae01f95a8
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-08-28 23:27:35 -07:00 |
|
Mini-Chiss
|
181afaa2d6
|
Merge branch 'Myst_EVO'
|
2015-08-28 23:25:51 -07:00 |
|
Mysticate
|
b71bcfab4b
|
Fixed achievements. Merge ASAP
|
2015-08-29 00:19:39 -06:00 |
|
Jonathan Williams
|
d4d0c4bed6
|
Updated Motd.
|
2015-08-28 23:17:14 -07:00 |
|
Jonathan Williams
|
c98a85c2ba
|
Added local storage of login time.
Hooked in onlineTime bonus feature to real values.
|
2015-08-28 22:09:42 -07:00 |
|
Jonathan Williams
|
ba4da32939
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-08-28 21:44:07 -07:00 |
|
Jonathan Williams
|
e47662f855
|
Added LoginTime setting as RedisTime for use in calculating time on server.
Optimized redis util for time calls to calculate time different and only pull redis time once.
|
2015-08-28 21:44:00 -07:00 |
|
Mini-Chiss
|
829c1d2ae8
|
Merge branch 'Myst_EVO'
|
2015-08-28 21:30:10 -07:00 |
|
Mysticate
|
c40fecb03f
|
Removed warning from private servers
|
2015-08-28 22:06:13 -06:00 |
|
Mini-Chiss
|
041c5ab53c
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-08-28 21:00:34 -07:00 |
|
Mini-Chiss
|
3f1c4d24b9
|
Merge branch 'Myst_EVO'
|
2015-08-28 21:00:00 -07:00 |
|
Jonathan Williams
|
ad4ba010b7
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-08-28 20:59:08 -07:00 |
|
Jonathan Williams
|
6f0309622c
|
Removed AccountCache.
Converted that to PlayerCache and store account id in there.
|
2015-08-28 20:58:58 -07:00 |
|
Mysticate
|
bb09720450
|
removed previous commit jesus
|
2015-08-28 21:56:35 -06:00 |
|