Commit Graph

4750 Commits

Author SHA1 Message Date
Sam
d70cd38049 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-26 18:34:23 +01:00
Sam
5c8a36b024 Sigils bug fixes 2017-05-26 18:33:06 +01:00
Sam
5ae32de83c Reduce the cooldown from 6 to 3 seconds 2017-05-24 21:05:58 -05:00
cnr
fd1cd148cb Implement Alien Event service calls on Hub/Arcade 2017-05-24 20:52:24 -05:00
Sarah
b7ba532568 Add quest stats page, make rewards be able to be items as well, fix some quest trackers, fix spelling mistakes 2017-05-25 00:40:41 +02:00
Sam
a134c1da5c Sign off changes 2017-05-24 19:19:52 +01:00
Sam
a6c1e6c892 Make minions target each other 2017-05-24 18:27:10 +01:00
Sam
6f48d0ee43 Improve the path finding ai 2017-05-23 22:57:13 +01:00
Sam
78b10e3cb8 Fix the majority of bugs for the 1 lane game 2017-05-23 20:37:31 +01:00
Sam
40543a5034 Fix gametype import 2017-05-22 23:00:22 +01:00
Sam
9df9fb80da Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-22 22:59:46 +01:00
Sam
4ed3135cdf Implement improved targetting system 2017-05-22 20:53:22 +01:00
Sam
176253faec Remove minion command 2017-05-21 17:33:33 +01:00
Sam
1db7454e81 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-20 17:45:19 +01:00
Sam
f1ac67f049 Fix skeletons dropping items 2017-05-19 21:55:51 +01:00
Sam
3794686f58 Velocity and armour fix 2017-05-17 20:15:14 -06:00
Sam
500367b473 Premtive hotfix 2017-05-17 20:15:11 -06:00
cnr
06a6d1914d Add new words to DMT and MB 2017-05-17 20:03:54 -06:00
AlexTheCoder
f69203884c Only allow kills to damage king/crystals if tnt has spawned at least once 2017-05-17 19:25:37 -06:00
AlexTheCoder
eb0e9c0504 Make speed potions level 1 and drinkable 2017-05-17 19:25:37 -06:00
AlexTheCoder
c3bd123ea1 Live op numero uno 2017-05-17 19:25:37 -06:00
cnr
eec20cc620 Merge branch 'update/ssm' into develop 2017-05-17 19:22:59 -06: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
Sam
5d63a19506 Minion AI Base 2017-05-16 22:33:08 +01:00
Sam
604804ff96 Fix tower explosions not working as intended 2017-05-16 18:02:50 +01:00
Sam
833ebd310e Reorganise of code 2017-05-16 18:02:34 +01:00
Sam
4148af9214 Teleport players "correctly" to their lanes 2017-05-16 12:16:50 +01:00
Sam
73ac34ec3d Enable teleporting to lanes 2017-05-16 11:58:11 +01:00
Sam
0874458754 Make the wither display its health 2017-05-16 11:58:00 +01:00
Sam
119b041ec1 Fix second towers being invincible 2017-05-16 11:57:04 +01:00
Sam
977907de61 Fix NPCs not spawning for some players 2017-05-16 11:56:50 +01:00
cnr
cc98f4fdd5 Disable banner service calls 2017-05-15 17:59:56 -07:00
Sam
f9cdddf1ad Towers 2017-05-15 23:16:30 +01:00
Sam
4b6b04d4eb Fix incorrect custom location 2017-05-15 19:55:58 +01:00
Sam
989c9a028c End the game when a wither is killed 2017-05-15 19:55:39 +01:00
Sam
a450b23d22 Wither and AI base 2017-05-15 19:32:25 +01:00
Sam
d510dd9f58 Increase Fountain damage range 2017-05-14 11:46:24 +01:00
Sam
f2130515f3 Add suffixes to the scoreboard 2017-05-14 11:41:26 +01:00
Sam
c3b5b9a8bd Implement shops for all roles 2017-05-14 11:41:09 +01:00
Sam
f23e778d92 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-13 17:31:00 +01:00
Sam
5edbddb3d2 Make MobaItemEffect abstract 2017-05-13 17:30:59 +01:00
Sam
9a96ce5018 Reward title ingame 2017-05-13 17:13:34 +01:00
Sam
bc5a9a1d5e Healing particle standard 2017-05-13 15:34:49 +01:00
Sam
85a384bad7 Unneeded if statement 2017-05-13 15:34:39 +01:00
Sam
321acce3c3 Make Bob Ross an invisible kit 2017-05-13 15:34:13 +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
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
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
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
samczsun
1390ea1579 Implement triggers 2017-05-11 19:29:32 -07: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
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
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
Sam
dcb676c57b Item upgrade effects 2017-05-10 19:25:56 +01:00
AlexTheCoder
b4c27307ba Further leaderboard repository tweaks 2017-05-10 04:40:14 -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
LCastr0
92eaf4f8d8 Merge branch 'develop' into update/mayitems 2017-05-09 23:31:43 -03:00
AlexTheCoder
f2ff546d47 Clean up game classes a bit 2017-05-09 20:35:48 -04:00
Sam
eec8e5143d Per player scoreboards 2017-05-09 23:16:34 +01:00
AlexTheCoder
834c537bc8 Block spectators obtaining TNT 2017-05-08 23:22:48 -04:00
Sam
5f7574a0af Increase particles displayed when selecting a kit 2017-05-08 22:07:14 +01: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
Sam
50da713947 Remove the previous upgrade when switching upgrades 2017-05-08 22:01:27 +01:00
Sam
d107c8d6f4 Bob Ross 2017-05-08 21:09:09 +01: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
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
Sam
5398bf5e81 More progress 2017-05-07 22:35:15 +01:00
AlexTheCoder
0b7789328a Add game tips and remove medals from initial release 2017-05-06 17:01:31 -04:00
Sam
23d924f137 Kit system 2017-05-06 20:51:49 +01: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
Sam
a32ae91996 Gotta go fast! 2017-05-05 22:30:37 +01: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
AlexTheCoder
a635793ede Add new Castle Siege modes 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
Sam
2e3d19bd3a Bug fixes 2017-05-04 21:49:44 +01:00
Sam
f6cb654e12 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-04 20:20:59 +01:00
Sam
3210843395 Capture point fix 2017-05-04 20:20:48 +01:00
Sam
8f01015df9 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-04 17:35:41 +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
Sam
47c816087e MOBA base 2017-05-04 15:45:04 +01: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
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
LCastr0
4e56d2133b Merge branch 'develop' into update/mayitems 2017-05-02 19:13:43 -03:00
Sam
034837030d Initial commit 2017-05-02 21:01:17 +01: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
LCastr0
030157fdb5 Fix constructors 2017-05-01 23:18:03 -03:00
Sam
41b7e4bf38 Fix Zombie's Deaths Grasp hitting spectating players 2017-05-01 14:26:41 +01:00
Sam
b89e3c4abc Sheep code cleanup 2017-05-01 14:10:08 +01:00
Sam
0f1cea013c Guardian changes 2017-05-01 14:05:18 +01:00
Sam
ff93ca9705 Pig changes 2017-05-01 13:48:49 +01:00
Sam
5138e6ad54 Blaze changes 2017-05-01 13:48:41 +01:00
Sam
76835654e8 Chicken, unless cast 2017-05-01 13:48:32 +01:00
Sam
110d8946d5 Zombie changes 2017-05-01 13:48:09 +01:00
Sam
cc3ac9800b Skeletal horse changes 2017-05-01 13:48:01 +01:00
Sam
607893a872 Cow changes 2017-05-01 13:47:52 +01:00
Sam
3c852f091d Witch changes 2017-05-01 13:13:40 +01:00
Sam
69ed0c7c24 Magma Cube changes 2017-05-01 12:07:47 +01:00
Sam
20c05518f3 Wolf changes 2017-05-01 12:07:35 +01:00
Sam
9c9200605a Creeper Sulphur Bomb changes 2017-05-01 11:10:29 +01:00
Sam
1cc9888e58 Creeper Explode damage reduction 2017-05-01 11:10:19 +01:00
Sam
0f925dd655 Ink Blaster changes 2017-05-01 11:10:06 +01: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
Sam
6d105a0499 All remaining kits converted to Google Sheets 2017-05-01 10:37:11 +01:00
Sam
0f5fcc7670 Remove entity bots 2017-05-01 10:36:45 +01:00
cnr
e65f269a9a Merge branch 'update/kingppc' into develop 2017-04-30 21:11:37 -07:00
cnr
63fae06831 Revert "Enable 2x XP"
This reverts commit 7994ed082e.
2017-04-30 21:09:11 -07: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
0b2d0d348c Merge branch 'develop' into update/mayitems 2017-04-30 13:38:26 -03:00
LCastr0
91fb50cc8b Fixed conflicts 2017-04-30 12:05:04 -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
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
0bbd0659a0 Fix the water not being replaced bug 2017-04-30 01:38:04 -07:00
Sam
fd31706333 5 seconds rather than 50 2017-04-30 01:38:04 -07:00
Sam
ee7a29d387 Stop command spam 2017-04-30 01:38:04 -07:00
Sam
f315689dda Staff Oscars 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
Sam
acb5963dd4 Balance changes 2017-04-29 23:25:13 +01:00
Kenny
26c772b8b8 Merge branch '2xXP' into develop 2017-04-29 02:19:40 -04:00
Kenny
7994ed082e Enable 2x XP 2017-04-29 02:16:31 -04:00
Kenny
f5cba1eb1e Rate limit book/sign edits as a temporary measure against a crash exploit 2017-04-29 02:05:07 -04:00
Sam
8a54e19695 Fix Fissure skipping snow blocks 2017-04-28 19:30:19 +01:00
Sam
6beeec20d6 Disable morphs when changing kits 2017-04-28 19:30:00 +01:00
Sam
26d97bf7eb Up the water damage check rate 2017-04-28 19:29:23 +01:00
Sam
59699f930e Re-implemented triple jumps 2017-04-28 16:26:02 +01:00
LCastr0
d33aac9fd4 Fixed args 2017-04-27 16:34:35 -03:00
LCastr0
124d22ce31 Added new class for peasants 2017-04-26 22:52:40 -03:00
LCastr0
6bf1b6c1dc Fixed arguments 2017-04-26 16:25:32 -03:00
Sam
d3cb99f431 Skeletal Horse converted to Google Sheets 2017-04-26 19:11:48 +01:00
LCastr0
19138eb501 Added castle stuff for hub 2017-04-26 01:12:43 -03:00
Sam
7f1b1d72b9 Chicken converted to Google Sheets 2017-04-25 19:33:00 +01:00
Sam
af25aa0b00 Witch converted to Google Sheets 2017-04-25 18:20:34 +01:00
Sam
044a3754cf Fix incorrect key 2017-04-24 23:14:01 +01:00
Sam
f16ea648f9 Blazr converted to Google Sheets 2017-04-24 23:13:03 +01:00
Sam
99fa347cf1 Wolf converted to Google Sheets 2017-04-24 20:21:19 +01:00
Sam
27cff85189 Fix Perk variables being overriden when multiple kits used the same perk 2017-04-24 18:04:16 +01:00
Sam
5bc2b9d34c Revert "Make Perks not static, this fixings all kits having the same stats 😨"
This reverts commit 1d0f28689f.
2017-04-24 17:40:48 +01:00
Sam
1d0f28689f Make Perks not static, this fixings all kits having the same stats 😨 2017-04-23 19:06:33 +01:00
Sam
c8d891ef31 Snowman converted to Google Sheets 2017-04-23 18:54:29 +01:00
Sam
9e6ab9a696 Enderman converted to Google Sheets 2017-04-23 17:07:45 +01:00
Sam
24b73d27e7 Fix the infinite Giga Slime 2017-04-23 16:10:54 +01:00
Sam
9d48a5f1a5 Creeper converted to Google Sheets 2017-04-23 16:08:45 +01:00
Sam
02ffec8618 Fix players being affected by velocity inside on the spawn island 2017-04-23 14:42:26 +01:00
Sam
09300b499f Adjust the time before the player recieves kit information after death 2017-04-23 14:41:59 +01:00
Sam
f1b45bc29e Slime converted to Google Sheets 2017-04-23 14:37:29 +01:00
Sam
43d703d9b7 Spider converted to Google Sheets 2017-04-22 23:53:01 +01:00
Sam
1d7fb77bc4 Deleted some code by accident 2017-04-22 23:10:08 +01:00
Sam
e350c62f54 Iron Golem and Skeleton converted to Google Sheets 2017-04-22 23:07:44 +01:00
Sam
2f478e46f3 Fix various bugs found in testing 2017-04-21 21:53:16 +01:00
Sam
ca6789d92a Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-04-21 17:35:12 +01:00
Sam
01f74a3e12 SSM Training Ground 2017-04-21 17:35:10 +01:00
Sam
30fb899bee Move debug commands over to the proper system 2017-04-20 18:26:22 +01:00
cnr
87b829b411 Disable easter egg baskets in games 2017-04-19 22:33:32 -07:00
cnr
2263e8bfcb Ignore movement checks in Runner 2017-04-16 01:09:12 -06:00
cnr
b30a706543 Disable Skyfall booster kit 2017-04-14 22:33:54 -06:00
cnr
c7e855ee16 Merge branch 'feature/eastereggs' into develop 2017-04-13 22:56:41 -06:00
samczsun
498df70a1f Implement basic canDamage 2017-04-13 00:02:32 -06:00
cnr
490fe56b34 Merge branch 'update/skyfall-nolag' into develop 2017-04-12 23:39:01 -06:00
samczsun
e1fee19aff Optimize chunk updating and fix invis players 2017-04-13 01:09:05 -04:00
Sarah
4775fccb9a Improve Island rot and misc fixes 2017-04-12 22:35:33 +02:00
AlexTheCoder
5a225b9332 Properly check the spring chest rewards 2017-04-12 16:01:24 -04:00
AlexTheCoder
fe1cda820f Merge branch 'update/aprilchest' of github.com:Mineplex-LLC/Minecraft-PC into feature/eastereggs 2017-04-12 16:00:37 -04:00
AlexTheCoder
c3ff494f94 Update Arcade and Hub to use skinned easter eggs 2017-04-12 03:06:32 -04:00
LCastr0
1904990f84 Fixed merging issues 2017-04-11 23:16:42 -03:00
AlexTheCoder
9a58cd792e Implement easter egg baskets in games which can give fantastic rewards 2017-04-11 20:18:09 -04:00
LCastr0
6f1c062182 Removed GameType, using GameDisplay instead 2017-04-08 23:06:55 -03:00
LCastr0
8bcb5bc948 Added event to be called when game stops 2017-04-07 14:13:53 -03:00
LCastr0
b441dc5edf Calls event when arcade game starts 2017-04-07 14:12:23 -03:00
LCastr0
6a668004e0 Added game start event to core, to be called inside arcade and handled inside core 2017-04-07 14:06:44 -03:00