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
Sam
9acfa361ad
Add mosted valued player to the map
2017-05-17 19:21:19 +01:00
Sam
fb50acc4cc
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters-11-5
2017-05-17 17:31:06 +01:00
AlexTheCoder
3abcb441bf
Properly take into account server regions
2017-05-15 18:10:06 -07:00
AlexTheCoder
b73958ec96
Fix several issues on Gem Hunters, including a duping attack vector resulting from combat logger inventory desync
2017-05-15 18:10:06 -07:00
cnr
cc98f4fdd5
Disable banner service calls
2017-05-15 17:59:56 -07:00
cnr
9bc118dc41
Fix Anticheat ban lengths
2017-05-15 16:38:42 -07:00
Sam
d493a61d3d
Polish the hub event
2017-05-13 17:13:47 +01:00
Sam
9a96ce5018
Reward title ingame
2017-05-13 17:13:34 +01:00
Sam
b52bc80985
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2017-05-13 15:18:10 +01:00
Sam
c8f20f3df5
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion
2017-05-13 15:15:52 +01:00
Sam
5454c00163
Hub integration
2017-05-13 15:15:51 +01:00
AlexTheCoder
9cf5fda540
Update leaderboards system to use more malleable seasons system
2017-05-13 01:05:18 -04:00
AlexTheCoder
37d3b47995
Rebalance tank kit and set final values for kill streak crown rewards
2017-05-13 01:05:18 -04:00
AlexTheCoder
a42e6ed9e4
Change crown calculations again
2017-05-13 01:05:18 -04:00
AlexTheCoder
ea4f9aee62
Tweak crown kill streak multipliers
2017-05-13 01:05:18 -04:00
AlexTheCoder
130d1dc05e
Fix TNT being stuck on head
2017-05-13 01:05:18 -04:00
Sam
a6ec243a02
Sneak cancels CreeperExplode
2017-05-12 23:19:12 +01:00
Sam
dc2d317652
Fix merging with develop
2017-05-12 23:07:20 +01:00
Sam
ff07d38d00
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2017-05-12 23:04:47 +01:00
Sam
b18aa7e840
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion
2017-05-12 22:59:03 +01:00
Sam
42ef7d0590
Lobby class
2017-05-12 22:58:58 +01:00
Sam
6ecbf85dc8
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion
2017-05-12 22:22:01 +01:00
Sam
ab35e96ca1
Add more polish
2017-05-12 22:21:59 +01:00
Dan Mulloy
35ed1099f9
Avoid instantiating HologramManager twice
2017-05-12 12:32:19 -07:00
Sam
abb983ac04
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion
2017-05-12 17:34:55 +01:00
AlexTheCoder
7b7b91ed3f
Fix small gameplay issues and update kit selection data points for TDM
2017-05-11 21:48:21 -07:00
cnr
b18d36b361
Merge branch 'feature/castlesiege2.0' into develop
2017-05-11 20:29:46 -07:00
Sam
5c968890d3
Just implement logging
2017-05-11 19:58:57 -07:00
samczsun
7658046d62
Change messages
2017-05-11 19:29:32 -07:00
samczsun
1390ea1579
Implement triggers
2017-05-11 19:29:32 -07:00
samczsun
ecef2fe9db
New messages/durations
2017-05-11 19:29:31 -07:00
samczsun
c8a1035591
Comped accounts
2017-05-11 19:29:31 -07:00
AlexTheCoder
7ad86c435c
More nitpicks
2017-05-11 21:40:06 -04:00
AlexTheCoder
3023c64c35
Jon is actually OCD
2017-05-11 21:34:41 -04:00
AlexTheCoder
1e93ad0b1e
Proper resource management for leaderboard statements
2017-05-11 21:18:05 -04:00
AlexTheCoder
a76572f6d7
Change table names and add date indexes based on Jon's request
2017-05-11 20:49:38 -04:00
AlexTheCoder
4a05149743
Use correct data loc pool for kit locations
2017-05-11 18:29:42 -04:00
AlexTheCoder
0091cbe2a8
Change kit data loc formatting
2017-05-11 18:15:33 -04:00
Sam
b446a7640e
Hours not seconds
2017-05-11 22:56:48 +01:00
Sam
d7e3c25027
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters-11-5
2017-05-11 22:55:31 +01:00
Sam
7df87a7d7e
Lots of fixes
2017-05-11 22:55:30 +01:00
AlexTheCoder
86c66d3a44
Add specific kit spawn data locs
2017-05-11 16:05:19 -04:00
AlexTheCoder
7f240bb5a4
Fix some leaderboards not cleaning up after themselves
2017-05-11 15:53:58 -04:00
AlexTheCoder
aa898d74da
Fix incorrectly named tables in fetch query
2017-05-11 15:25:22 -04:00
Sarah
a07aa7abdc
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests
2017-05-11 20:57:04 +02:00
AlexTheCoder
5d1199634d
Rewrite leaderboard backend (again)
2017-05-11 14:48:35 -04:00
Sarah
8d8e064125
Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests
2017-05-11 18:09:11 +02:00
Sarah
16e0f38dcf
Menu Improvements and more Quest Trackers
2017-05-11 18:08:55 +02:00
cnr
85c06c11cd
Merge branch 'update/mayitems' into develop
2017-05-10 19:55:11 -07:00
cnr
0f98637024
Disallow players from switching between Gem Hunters via party
2017-05-10 19:54:28 -07:00
LCastr0
ac0339fc59
Fixed sync with dragon and fixed guardian not showing
2017-05-10 21:20:23 -03:00
LCastr0
5fe5c613e5
Fixed win rooms again
2017-05-10 19:25:14 -03:00
LCastr0
3dbed769c9
Fix for win rooms
2017-05-10 17:27:17 -03:00
Sam
1d4d56e792
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters-11-5
2017-05-10 19:27:14 +01:00
AlexTheCoder
b4c27307ba
Further leaderboard repository tweaks
2017-05-10 04:40:14 -04:00
AlexTheCoder
f34a2946c4
Final leaderboard repository changes for Jon
2017-05-10 03:28:55 -04:00
AlexTheCoder
fa1cd00c22
Tidy up leaderboard repository class a bit
2017-05-10 02:56:00 -04:00
AlexTheCoder
adf6e35a1f
Update leaderboard backend based on discussion with Jon
2017-05-10 02:49:21 -04:00
AlexTheCoder
3b3436d1af
Remove TNT from TDM chest loot
2017-05-10 02:06:25 -04:00
Sam
0fce5a9490
Emergency infinite shard fix
2017-05-09 19:49:25 -07:00
LCastr0
92eaf4f8d8
Merge branch 'develop' into update/mayitems
2017-05-09 23:31:43 -03:00
LCastr0
8bb638c969
Removed unused code
2017-05-09 23:30:52 -03:00
LCastr0
9018a3cc50
Fixed kit selectors
2017-05-09 23:30:24 -03:00
LCastr0
bcd60d325b
Fixed win rooms
2017-05-09 23:06:49 -03:00
AlexTheCoder
f2ff546d47
Clean up game classes a bit
2017-05-09 20:35:48 -04:00
Sam
10b0f1e1ed
Add an armour decay for offline players
2017-05-09 16:27:56 +01:00
Sam
26df99a4cf
Don't spawn combat NPCs in the lobby
2017-05-09 16:27:43 +01:00
Sam
1fbeaa6ecd
Add a random teleport npc in the safezones
2017-05-09 16:27:21 +01:00
Sam
9d3957cd54
Increase time after switching servers to kick player
2017-05-09 16:27:06 +01:00
AlexTheCoder
834c537bc8
Block spectators obtaining TNT
2017-05-08 23:22:48 -04:00
AlexTheCoder
79560fd415
Implement Castle Assault into the selection compass and re-add old Castle Siege
2017-05-08 17:24:12 -04:00
AlexTheCoder
d13610251f
Rename Castle Siege 2.0 to Castle Assault and re-implement the old game
2017-05-08 17:05:30 -04:00
Kenny
9b38558268
Have servers request active quests from quest service on startup
2017-05-08 15:24:12 -04:00
LCastr0
00981cf846
Fixed all ranks having all win effects
2017-05-08 14:56:33 -03:00
LCastr0
5c265cfd66
Lock to other ranks, unlock on join
2017-05-08 10:35:21 -03:00
AlexTheCoder
452eaeeba9
Fix incorrect GameType association with TDM
2017-05-08 02:08:45 -04:00
AlexTheCoder
49aaaa5301
Leaderboard changes
2017-05-08 02:08:03 -04:00
AlexTheCoder
6ef7608f20
Fix incorrect repository method name
2017-05-08 01:24:52 -04:00
AlexTheCoder
b9fd597370
Replace old castle siege with new castle siege
2017-05-08 01:14:17 -04:00
AlexTheCoder
49575e794f
Clean up castle siege leaderboards upon game end
2017-05-08 00:11:19 -04:00
AlexTheCoder
d7341de2f5
Final tweaks to Castle Siege and implementation of leaderboards in arcade
2017-05-08 00:09:04 -04:00
AlexTheCoder
68205a71a1
Implement proper stat leaderboard system
2017-05-08 00:08:36 -04:00
AlexTheCoder
941310b5aa
Change kit prices
2017-05-08 00:07:42 -04:00
Sam
24c81101a1
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2017-05-07 22:36:44 +01:00
LCastr0
8604eb2e09
Teleport the creeper so it's visible
2017-05-06 22:54:24 -03:00
LCastr0
dc77dde98b
Use correct slot
2017-05-06 21:29:41 -03:00
LCastr0
8befa61b8a
Set force on creature module before spawning entities
2017-05-06 21:29:15 -03:00
LCastr0
8e58b974f3
Add line
2017-05-06 21:18:36 -03:00
LCastr0
c5b62e0ec4
Add all the win-effects to the page
2017-05-06 20:42:53 -03:00
AlexTheCoder
0b7789328a
Add game tips and remove medals from initial release
2017-05-06 17:01:31 -04:00
AlexTheCoder
a47c4291c5
Update tiered achievement UI
2017-05-05 22:06:18 -04:00
AlexTheCoder
4d6824c27c
Update Castle Siege mechanics
2017-05-05 22:05:58 -04:00
Sarah
f2c5268df1
Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests
2017-05-05 23:02:30 +02:00
Sarah
20281648c2
Add Quest triggers, add a Repository, add Spreadsheet parsing, and add menus.
2017-05-05 23:02:15 +02:00
Kenny
ad79245252
Merge branch 'feature/quest-manager-service' into feature/quests
2017-05-05 15:25:33 -04:00
Kenny
54858e14ee
Convert questmanager to read quests from google sheets
2017-05-05 15:22:37 -04:00
AlexTheCoder
a635793ede
Add new Castle Siege modes
2017-05-04 23:20:50 -04:00
AlexTheCoder
00d31ffad3
Fix item builder to properly use null item titles
2017-05-04 23:20:50 -04:00
AlexTheCoder
455e09a9da
More implementation of xp toggles for kit progression, and display achievement rewards properly for tiered leveling
2017-05-04 23:20:50 -04:00
AlexTheCoder
97a4b8e94d
Add implementation for crown and xp toggles in ProgressingKit
2017-05-04 23:20:50 -04:00
AlexTheCoder
ac98213d28
Update several perks to support vanilla damage system and kit progression
2017-05-04 23:20:50 -04:00
AlexTheCoder
7b70695e12
Update arcade games with new crown/gem toggle and flint and steel permission flag
2017-05-04 23:20:50 -04:00
AlexTheCoder
901fecb49a
Support multi named tiers of achievements, allow rewarding of xp/gems/crowns upon increasing achievement tiers, and replace old castle siege achievements with new ones
2017-05-04 23:20:50 -04:00
AlexTheCoder
43739743bf
Add new castle siege game types to Core
2017-05-04 23:20:50 -04:00
AlexTheCoder
6684e812d1
Implement xp-less and crown kit upgrading and slightly modify kit progression gui
2017-05-04 23:20:50 -04:00
AlexTheCoder
39f997faf1
Give ProgressiveKits the ability to not use xp or use crowns instead of gems for leveling
2017-05-04 23:20:50 -04:00
AlexTheCoder
6ffd10133e
Implement a new crown currency
2017-05-04 23:20:50 -04:00
AlexTheCoder
f9f2e362c4
Make ItemBuilder properly clone all options and implement a builder to create enchanted books
2017-05-04 23:20:50 -04:00
Sam
2e3d19bd3a
Bug fixes
2017-05-04 21:49:44 +01:00
cnr
b0407cfc51
Send players to normal hubs from Gem Hunters
...
This changes the behavior of both /hub and update restarts
2017-05-04 12:43:20 -07:00
Sam
f6cb654e12
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2017-05-04 20:20:59 +01:00
Sam
ee0971443e
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion
2017-05-04 17:32:16 +01:00
Sam
8032133f4d
Sort the scores
2017-05-04 17:16:16 +01:00
Sam
808885ea04
Add leaper kit
2017-05-04 17:15:55 +01:00
cnr
53eb499236
Use correct region when searching for Gem Hunters
2017-05-04 01:48:05 -07:00
cnr
e6c7aa469b
Merge branch 'feature/gem-hunters-persistence' into develop
2017-05-03 22:03:29 -07:00
cnr
840b50d56a
Disable beta whitelist for open beta
2017-05-03 22:02:02 -07:00
cnr
6fdf926d51
Add temporary(!!) gem hunters server sender
...
In the near future, with more time, we'll abstract out the MOTD parsing
hackiness from ServerInfo and add the same mechanism to Gem Hunters, so
it gets a ServerNpcPage for free.
2017-05-03 22:02:02 -07:00
LCastr0
f23016df28
Change to blaze powder
2017-05-03 23:59:16 -03:00
LCastr0
58078ae4bd
Added kit selectors to chests
2017-05-03 23:42:18 -03:00
LCastr0
b3f46ad4fc
Added names, icons and lores
2017-05-03 23:30:16 -03:00
cnr
779256e1ca
Enable the Skyfall booster kit
2017-05-03 18:45:39 -07:00
Sarah
4da069b244
Fix Booster Kit making you fly
2017-05-03 18:44:53 -07:00
cnr
3d37fab71f
Disable movement checks in Dragons
2017-05-03 18:44:05 -07:00
cnr
404733cd34
Disable Speed UHC
2017-05-03 18:42:31 -07:00
cnr
66136a035b
Change scoreboard tag for Event Moderator
...
This ensures that they're sorted next to Sr Mods in the tab list
2017-05-03 18:30:36 -07:00
LCastr0
196e0b9688
Reduce the amount of lines in the Shimmering Ring
2017-05-03 22:29:06 -03:00
LCastr0
229c888498
Reduce amount of particles spawned with the water wings
2017-05-03 22:27:38 -03:00
LCastr0
cf56dfb9cf
Increase amount of smoke particles
2017-05-03 22:22:16 -03:00
LCastr0
ddd196ba0c
Revert temporary folder for schematics
2017-05-03 22:08:31 -03:00
LCastr0
bbfa632106
Add all the mechanics to the win effects
2017-05-03 22:05:54 -03:00
Sam
4a984f3c41
More fixes!
2017-05-03 22:05:10 +01:00
Sam
bd52e63dc3
More alien stuff
2017-05-03 20:48:19 +01:00
Kenny
87c01f994c
Port questmanager service from PE
2017-05-02 20:31:40 -04:00
Kenny
ff13d07a7c
Port redis pubsub messaging API from PE
2017-05-02 20:29:36 -04:00
Sam
10258d66b8
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion
2017-05-02 23:18:38 +01:00
Sam
3a1fb3cb86
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence
2017-05-02 23:17:09 +01:00
Sam
6d8c65ed08
Lots of great fixes
2017-05-02 23:17:06 +01:00
LCastr0
4e56d2133b
Merge branch 'develop' into update/mayitems
2017-05-02 19:13:43 -03:00
Sam
82ebd28400
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence
2017-05-02 21:02:26 +01:00
Sam
034837030d
Initial commit
2017-05-02 21:01:17 +01:00
Sarah
8d32c35f88
Add basic Quest system
2017-05-02 18:57:20 +02:00
cnr
2a92d312b2
Merge branch 'update/kingppc' into develop
2017-05-01 22:07:46 -07:00
Sarah
4652b09f78
Change /ea message layout, make /ea not usable by muted players, make /ea not usable without content and fix hub forcefield for event mod
2017-05-01 22:06:30 -07:00
LCastr0
923f991df3
Merge branch 'develop' into update/kingppc
2017-05-02 00:09:19 -03:00
