Commit Graph

185 Commits

Author SHA1 Message Date
AlexTheCoder
58b48f2a5d Fix merge conflicts 2017-11-08 21:48:17 -08:00
Sam
4a9689bd17 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover 2017-10-01 14:41:38 +01:00
cnr
2dd42805ef Fix cashout item duplication in Gem Hunters 2017-09-30 22:08:00 -05:00
AlexTheCoder
eecf960613 Fixed Merge Conflicts 2017-09-23 03:40:21 -04:00
Sam
2b4e9e62e1 The mess that is now this 2017-09-16 23:33:42 +01:00
Sam
554aeb6af5 Bug fixes 2017-09-08 16:51:13 +01:00
Sam
7b1245077f Finish everything 2017-09-08 11:10:24 +01:00
Sam
f41e94a3f4 Fix compilation errors 2017-09-01 16:57:15 +01:00
Sam
cd99700eda Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-09-01 16:12:51 +01:00
cnr
994f957bc3 Eliminate GroupPermission 2017-08-28 13:06:59 -05:00
Sam
8e327e86b4 Huge improvement on the Cosmetic System 2017-08-26 16:14:22 +01:00
Sam
930f90fdf3 GH Mount fixes 2017-08-22 20:12:15 +01:00
Sam
e412c2cc05 Gem Hunter Mount Skins 2017-08-21 21:11:13 +01:00
Sam
849fa93c7c Mount base 2017-08-16 15:00:08 +01:00
cnr
ba8f4e0d5a De-stringify permission groups 2017-08-09 22:26:55 -04:00
AlexTheCoder
aa79e9338d Implement permission requests from admin team 2017-08-09 15:19:48 -04:00
AlexTheCoder
ef4aeaaf64 Initial rank rewrite and quest database fixes 2017-08-09 15:19:48 -04:00
Sam
89e820e442 Remove all GameModifiers and replace them with GameCosmetics 2017-07-31 16:48:56 +01:00
Sam
8b6f79a5ee Delay persistence data get 2017-07-20 00:32:50 -04:00
Sam
17ba7ffe8a Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-07-13 15:50:05 +01:00
cnr
cecc3614b8 Set the correct key in QuitNPCRepository 2017-07-11 23:17:58 -07:00
Sam
84752f0b17 Item maps 2017-07-08 01:34:19 +01:00
AlexTheCoder
dd12824402 Fix NPE in LootModule 2017-07-07 07:13:31 -04:00
AlexTheCoder
f73c78809a Whoops, forgot to change a line 2017-07-07 06:47:15 -04:00
AlexTheCoder
ce6ee670ed Use a try-with-resources for gem hunters redis calls 2017-07-07 06:44:19 -04:00
cnr
c341671ffc Move GH quit NPCs to redis; use region when saving GH data 2017-07-05 21:33:55 -07:00
Sam
ed3455db68 No need to update primary key 2017-07-06 00:59:43 +01:00
Sam
dca43b6c57 Separate Gem Hunters inventories by region 2017-07-03 00:36:54 +01:00
cnr
5ba1630fae Merge branch 'update/july-cosmetics' into develop 2017-06-30 22:15:31 -07:00
cnr
dfe2a61b8f Revert freedom chest cosmetics 2017-06-28 23:43:30 -07:00
Graphica
7d17fa0f29 Update hubs with new CosmeticManager constructor 2017-06-28 20:38:58 -07:00
Graphica
9d1c3930b3 Update hubs with new CosmeticManager constructor 2017-06-28 01:37:33 -04:00
cnr
ed541b7a4f Disable automatic timings reports 2017-06-26 20:17:50 -07:00
Sam
b8d160388f Removed dropped exp from entity kills and fishing 2017-06-16 22:27:11 -05:00
cnr
3d8998ee13 Change missed BETA_HUB -> HUB in GH server-sending 2017-06-12 15:43:29 -05:00
Sam
1d64bb63c4 Add a check to prevent a possible duplication bug 2017-06-08 02:18:57 +01:00
Sam
b59e57dfb6 Fixed Players not being given their Gem Hunters rewards for the final time! 2017-06-08 02:10:24 +01:00
Sam
8c821af9de Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters 2017-06-08 02:09:24 +01:00
cnr
7cc7769378 Send gem hunters players to normal hub upon cashout 2017-06-07 18:26:56 -05:00
Sam
a63399943d Leaderboards and UFO world event 2017-06-06 19:28:41 +01:00
Sam
4a91d2821b Achievements 2017-06-05 20:57:30 +01:00
Sam
674253c89a Gen Hunters Title 2017-06-03 14:53:33 +01:00
Sam
092c5db6b2 Merge remote-tracking branch 'refs/remotes/origin/update/gem-hunters-11-5' into update/gem-hunters 2017-06-02 20:10:51 +01:00
Sam
670e9db9d2 Add Region to the slack logging 2017-05-20 17:33:00 +01:00
Sam
474c2e78f2 Check to make user the player has the itemstack when cashing out 2017-05-20 17:32:44 +01:00
cnr
a50587a8de Merge commit 'b446a76' into develop
This contains changes originally planned for May 11th from the
update/gem-hunters-11-5 branch. The other changes in that branch will be
pushed at a later date.
2017-05-17 19:19:00 -06:00
Sam
c042af4a5a Buying -> Buy 2017-05-18 01:52:26 +01:00
Sam
d51cc4f56e Swap buying and selling 2017-05-18 01:23:41 +01:00
Sam
95b124e2f5 Fix Millionair and Middle Class causing players to be disconnected 2017-05-18 00:30:07 +01:00
Sam
81a869c264 Implement progression titles 2017-05-18 00:28:08 +01:00