Commit Graph

4358 Commits

Author SHA1 Message Date
Sam
abb983ac04 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-12 17:34:55 +01:00
cnr
b18d36b361 Merge branch 'feature/castlesiege2.0' into develop 2017-05-11 20:29:46 -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
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
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
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
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
d13610251f Rename Castle Siege 2.0 to Castle Assault and re-implement the old game 2017-05-08 17:05:30 -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
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
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
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
a47c4291c5 Update tiered achievement UI 2017-05-05 22:06:18 -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
00d31ffad3 Fix item builder to properly use null item titles 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
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
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
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
bd52e63dc3 More alien stuff 2017-05-03 20:48:19 +01: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
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
LCastr0
923f991df3 Merge branch 'develop' into update/kingppc 2017-05-02 00:09:19 -03:00
LCastr0
b8d2f784c7 Fix NPE, actually call PetSpawnEvent when spawning a pet 2017-05-01 22:19:50 -03:00
LCastr0
8f117e744e More stuff in ultra effect 2017-05-01 22:14:46 -03:00
LCastr0
e7c171749c Set pitch and yaw for npc 2017-05-01 12:25:03 -03:00
Sam
6d4a68acdf Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-01 10:41:49 +01:00
Sam
8c2b8935df Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-01 10:37:13 +01:00
cnr
e2b43bb995 Don't show holograms in non-lobby servers 2017-05-01 00:49:25 -07:00
cnr
d62006a426 Add King item to PPC rewards 2017-05-01 00:45:24 -07:00
LCastr0
fc5c420176 Changed to update event 2017-04-30 21:19:02 -03:00
LCastr0
734aa920bf Fixed jukebox message 2017-04-30 20:00:29 -03:00
LCastr0
a37cf3b1c5 Fixed pets and mounts not having any message when they are inside castle, fixed item despawning, stopped players from placing jukeboxes inside castle 2017-04-30 19:33:38 -03:00
LCastr0
e3521c06fd This shouldn't be there... 2017-04-30 19:14:27 -03:00
LCastr0
5d3dbbb44b Checks for the correct world 2017-04-30 19:06:44 -03:00
LCastr0
9e0424ea46 Checks if it's hub before doing event related stuff 2017-04-30 19:00:53 -03:00
LCastr0
d205d5fada Fixed item being despawned, fixed holograms not being updated, fixed king never being removed on leave 2017-04-30 18:56:37 -03:00
LCastr0
8ec6ebd060 Fix particles being sent to everyone 2017-04-30 18:42:16 -03:00
LCastr0
04c0c63390 Fix positions 2017-04-30 18:26:02 -03:00
LCastr0
d88f183726 Fixed bug with gadgets and kings not being updated 2017-04-30 17:52:36 -03:00
LCastr0
d04e29a473 Tests 2017-04-30 14:46:15 -03:00
LCastr0
0b2d0d348c Merge branch 'develop' into update/mayitems 2017-04-30 13:38:26 -03:00
LCastr0
49fd8d3941 Fixed item and king not resetting after disabling 2017-04-30 12:52:00 -03:00
LCastr0
91fb50cc8b Fixed conflicts 2017-04-30 12:05:04 -03:00
LCastr0
28a5a438f5 Fix item being thrown from the throne 2017-04-30 12:02:00 -03:00
LCastr0
95e4170cc1 Added creeper 2017-04-30 11:47:57 -03:00
LCastr0
08150b2c0f Added rank-based win effects 2017-04-30 11:28:40 -03:00
cnr
6ae6f7b627 Revert "Rate limit book/sign edits as a temporary measure against a crash exploit"
This reverts commit f5cba1eb1e.
2017-04-30 01:54:43 -07:00
Sarah
dda09d51e5 Fix Commit 2017-04-30 01:38:04 -07:00
Sarah
a0c00e86c4 Implement LoggedCommand into Event Commands 2017-04-30 01:38:04 -07:00
Sarah
8a33eabe3d Add a way to log commands 2017-04-30 01:38:04 -07:00
Sarah
fdee6b1163 Add some more event commands, fix some existing event commands and change permissions for event related commands to be executeable by EVENT_MODERATOR 2017-04-30 01:38:04 -07:00
Sam
ee8f970673 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-04-29 23:40:16 +01:00