Ty Sayers
8c509c5bd1
Merge pull request #51 in MIN/mineplex from clans_custom_gear to clans-beta
...
* commit '138a4cf6380316ff60ca9d51defcd1a72f18449a':
Fix bug where transferring a clan to destination server would not load properly server-side.
2015-08-29 19:43:31 -05:00
Ty Sayers
138a4cf638
Fix bug where transferring a clan to destination server would not load properly server-side.
2015-08-29 17:43:12 -07:00
Ty Sayers
7284093786
Merge pull request #50 in MIN/mineplex from clans_custom_gear to clans-beta
...
* commit 'f47c1b5c144cdc143d1d3750b970edd63373d5d6':
Fix bug where generator location per-clan wasn't being reset properly on server transfer.
Fix bugs related to multiple server UI and clan server transferring.
2015-08-29 19:33:42 -05:00
Ty Sayers
f47c1b5c14
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-29 17:33:08 -07:00
Ty Sayers
b0c657b5c0
Fix bug where generator location per-clan wasn't being reset properly on server transfer.
2015-08-29 17:33:01 -07:00
Ty Sayers
5df7a5e0c9
Fix bugs related to multiple server UI and clan server transferring.
2015-08-29 17:31:54 -07:00
Shaun Bennett
4dbd2d3586
Reduce login kick time
2015-08-29 17:28:47 -07:00
Shaun Bennett
caf82ad606
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-29 17:18:24 -07:00
Shaun Bennett
c27fdf023c
Fix login manager and stats manager
2015-08-29 17:18:14 -07:00
libraryaddict
f4ade8e9f7
Snnkes
2015-08-29 17:05:47 -07:00
Shaun Bennett
820bc1af44
Setup new module for intellij, fix field ore
2015-08-29 16:56:26 -07:00
Mini-Chiss
50b6bfbe1a
snake
2015-08-29 16:54:23 -07:00
Mini-Chiss
a76610e21e
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/snake/SnakeCreature.java
2015-08-29 16:47:47 -07:00
Mini-Chiss
6bd29394b3
snake
2015-08-29 16:46:55 -07:00
libraryaddict
e2e0756b9f
Snakes anyone?
2015-08-29 16:43:40 -07:00
Mini-Chiss
05ecfb8ff0
snake workin!
2015-08-29 16:33:35 -07:00
Mini-Chiss
110222e5f3
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-08-29 16:02:21 -07:00
Mini-Chiss
64b9cd201c
snake crap
2015-08-29 16:02:14 -07:00
Ty Sayers
c754e41492
Merge pull request #49 in MIN/mineplex from clans_custom_gear to clans-beta
...
* commit '227a077dba76a4199b7cf4b5768298e353e2d376':
Commit left-over changes to merge and pull.
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.
Fix bug where certain chunks around Fields could not have blocks broken but could have blocks placed. Add a particle effect to combat tagged players in safe zones. Restructure Spawn claiming so that the center chunk is a Safe Zone and all other chunks are regular non-safe zones.
2015-08-29 17:54:24 -05:00
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
