NewGarbo
|
002be01ef1
|
MAVEN TEST COMMIT
|
2016-01-31 16:21:04 +00:00 |
Shaun Bennett
|
50fc1f5a10
|
merge with develop
|
2016-01-29 03:44:04 -05:00 |
md_5
|
bb4091c7a6
|
Use Maven for Compilation
|
2016-01-20 11:20:58 +11:00 |
|
NewGarbo
|
d3452772ed
|
outposts work (grr git is weird trying to switch over to clans/beta)
|
2016-01-12 07:02:03 +00:00 |
|
Shaun Bennett
|
f80648bfbc
|
Update DBPool to load from file
|
2015-12-18 00:32:07 -05:00 |
Jonathan Williams
|
b5c157c123
|
Changed PlayerCache to Cache
|
2015-12-11 01:24:16 -05:00 |
|
NewGarbo
|
0d43ffc7b2
|
fixessss
|
2015-11-26 06:54:49 +00:00 |
|
Shaun Bennett
|
f6cfc36e9f
|
War Invasion, GUI Improvements, New ClanRelation for Winning/Losing War, Update Clan Map for new relation, Show invasions in scoreboard
|
2015-11-17 17:59:35 -05:00 |
|
Shaun Bennett
|
5b30cfb67e
|
Fix War Points bug
|
2015-11-16 17:27:56 -05:00 |
Shaun Bennett
|
2627aa9933
|
War/War Points Update
|
2015-11-16 14:37:32 -05:00 |
|
Shaun Bennett
|
5944b734be
|
More war fixes - still needs tweaking
|
2015-10-23 02:17:47 -04:00 |
|
Shaun Bennett
|
00a689ea03
|
War work
|
2015-10-21 14:48:27 -04:00 |
|
Shaun Bennett
|
523378aae7
|
Clans War updates
|
2015-10-17 22:55:21 -04:00 |
Ty Sayers
|
bc7615a5c3
|
Fix Illusion bug causing the Illusion clone to not properly function and spawn inside Clan territories. Fix bug where Carrots and Potatoes purchased from the Produce shop could not be eaten. Fix bug with SQL query when adding new enemies and not initialized 'initiator' field with a proper value. Modify starting score values for clan wars to 0 instead of 20. Update CustomItem descriptions with bullet points instead of hyphens for more readable stats. Reword error messages associated with trusting non-allied clans to be more intuitive to players.
|
2015-09-29 17:36:42 -04:00 |
|
Shaun Bennett
|
908d11ead5
|
Disable staff from joining the full server, Fix clans login manager, fix undead camp not spawning, fix clans admin command for all players, enable server for mapdev+, add TNT, generator, and class shop back to pvp shop, fix land claiming query
|
2015-08-30 12:00:58 -07:00 |
|
Ty Sayers
|
606e9e8318
|
Fix bug where serverId column was referenced.
|
2015-08-29 18:08:18 -07:00 |
|
Ty Sayers
|
f5b9aca708
|
Fix bug where serverId column was being referenced in table after it's removal.
|
2015-08-29 18:04:50 -07:00 |
|
Ty Sayers
|
da3810e5a3
|
Fix bug where any server initializing the ClanRepository was marked as a clans server in the database. Fix bug where administrative clans were being duplicated across different clans servers.
|
2015-08-29 17:57:18 -07: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
|
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
|
820bc1af44
|
Setup new module for intellij, fix field ore
|
2015-08-29 16:56:26 -07: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 |
|
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 |