Commit graph

834 commits

Author SHA1 Message Date
Talia-12
c29bccbe10 Fixed/patched lots of things with temporary solutions to get it to compile 2023-04-15 21:32:56 +10:00
Talia-12
a51aead089 removed unused methods from BlockEntityStoredPlayerImpetus, fixed sentinel now being nullable, and using null to indicate no sentinel. 2023-04-15 21:31:48 +10:00
Talia-12
7c712adac6 swapped over to using longs for media amounts everywhere. Added CircleMishapEnv. Setup CircleCastEnv more. 2023-04-15 21:31:47 +10:00
Talia-12
72efd81285 asdf tried to get things working but there's a lot broken! 2023-04-15 21:31:43 +10:00
petrak@
34f769a895 block out the spell circle executor, help me winfy-won kenobi 2023-04-15 21:31:11 +10:00
petrak@
6218f5a6e8
Merge pull request #437 from beholderface/main
Implement amethyst sconce orientation
2023-04-04 16:13:51 -04:00
petrak@
5a2ebae905
Merge pull request #350 from ChuijkYahus/main
Update zh_cn.json
2023-04-04 16:13:40 -04:00
ChuijkYahus
c9f67d9d97
typo 2023-03-25 03:15:39 +08:00
beholderface
5ac6d1df61 Implement amethyst sconce orientation
Properly rotates the direction of particles too. Also allows sconces to be waterlogged.
2023-03-12 23:31:14 -04:00
falkory
5f9f12ae2a Made the trinkets, cyphers and artifacts a bit brighter 2023-03-08 16:32:51 +00:00
Falkory220
126ecdb17b
Merge branch 'gamma-delta:main' into main 2023-03-08 16:26:44 +00:00
ChuijkYahus
29e4ceba57
bool to num 2023-02-27 13:00:43 +08:00
ChuijkYahus
128b1b9882
Merge branch 'gamma-delta:main' into main 2023-02-27 11:09:17 +08:00
petrak@
ed1c1b45e7 close #393 once this gets merged 2023-02-26 14:49:27 -06:00
petrak@
a3b62c4ab8 close the first half of #417 2023-02-26 14:47:21 -06:00
petrak@
b9a4e8c204 close #413 due to homestuck 2023-02-26 14:28:01 -06:00
falkory
816ada1f5d Update Large Scroll Textures 2023-02-26 11:27:58 +00:00
falkory
5b1669f065 New Lore Fragment Textures 2023-02-26 07:15:21 +00:00
falkory
afcfc1b6b0 Update Sprite Sheet 2023-02-26 06:56:42 +00:00
falkory
ca3ab08b68 New slate textures! 2023-02-26 06:55:11 +00:00
petrak@
e24e642432 meta-eval limit is dead, long live op limit 2023-02-24 20:22:41 -06:00
ChuijkYahus
4979328b51
Merge branch 'gamma-delta:main' into main 2023-02-25 01:54:00 +08:00
petrak@
c43ee4d2e2 close #424 2023-02-24 11:38:21 -06:00
petrak@
9d9f67ea79 close #419 2023-02-24 11:28:01 -06:00
petrak@
fae9a2eecd bang on #419. i'm half-convinced this is a bug in fabric events now? 2023-02-24 11:22:56 -06:00
ChuijkYahus
834213548e
atan2 math logic fix 2023-02-24 19:08:11 +08:00
ChuijkYahus
c1455ef148
atan2 2023-02-24 18:14:48 +08:00
ChuijkYahus
99202a9282
Merge branch 'gamma-delta:main' into main 2023-02-24 16:19:44 +08:00
petrak@
03e616ad15 Merge branch 'main' of https://github.com/gamma-delta/HexMod
alwinfy fixes
2023-02-23 23:11:40 -06:00
petrak@
81b6617972 close #422 2023-02-23 23:07:44 -06:00
Alwinfy
29074ab4fe
Merge remote-tracking branch 'origin/main' into eval/cc 2023-02-23 15:51:01 -05:00
ChuijkYahus
7e581e1c8f
Merge branch 'gamma-delta:main' into main 2023-02-20 12:03:32 +08:00
ChuijkYahus
f3edb5f0d1
fix action ids 2023-02-20 09:49:33 +08:00
Alwinfy
5cac215daa
Fix up more lang errors 2023-02-19 02:18:10 -05:00
ChuijkYahus
8c217cb986
lore wording & new features 2023-02-19 14:46:57 +08:00
ChuijkYahus
dee0a8c11a
Merge branch 'gamma-delta:main' into main 2023-02-19 11:33:10 +08:00
petrak@
9a231a634b waluigi 2023-02-18 19:19:49 -06:00
petrak@
a6b438dd76 to the joy of williewilluses everywhere, swap the discord link in the book to a forum link 2023-02-18 18:39:43 -06:00
petrak@
a501f774c3 i've been patching up the harness, all the live-long day 2023-02-18 17:53:27 -06:00
petrak@
ca5ccf60f6 merge from main 2023-02-18 17:21:35 -06:00
petrak@
cccaa3e3a7 document quenching 2023-02-18 12:36:54 -06:00
petrak@
f42a088c34 more staves! more shards! 2023-02-18 11:43:05 -06:00
ChuijkYahus
98e4558bc8
altiora and related stuff 2023-02-18 16:55:31 +08:00
ChuijkYahus
d693efc78d
Merge branch 'gamma-delta:main' into main 2023-02-18 14:50:10 +08:00
petrak@
70a71004fd add more gaslighting that probably doesn't work but i'm too tired to check 2023-02-17 23:47:46 -06:00
petrak@
293f96d8d7 yea wooh 2023-02-17 22:06:15 -06:00
petrak@
237e75e6da wowza what a texture 2023-02-17 21:44:16 -06:00
petrak@
e44892389c this isn't working 2023-02-17 20:56:39 -06:00
petrak@
74690580f6 woo, altiora works on fabric and forge 2023-02-17 19:30:41 -06:00
petrak@
cefd9439db ex altiora 2023-02-17 18:06:12 -06:00
petrak@
10d4b45c93 moar sfx 2023-02-17 16:44:11 -06:00
petrak@
e23d2a3da1 better flight 2023-02-17 14:11:16 -06:00
petrak@
182aabd032 make everything use the hexagonal particles (why did i have it otherwise?) 2023-02-16 15:12:19 -06:00
petrak@
07ab36ad34 aight, quenching is a go 2023-02-16 14:39:57 -06:00
petrak@
ac9e00f675 gas my own light, gate my own keep, and girl my own boss 2023-02-16 13:53:37 -06:00
ChuijkYahus
dd3f36902a
fix grammar in thought-knot's patchi entry 2023-02-16 22:35:35 +08:00
ChuijkYahus
9c36f6b6aa
update 2023-02-16 16:25:33 +08:00
ChuijkYahus
fdef4b0632
Merge branch 'gamma-delta:main' into main 2023-02-16 15:01:23 +08:00
petrak@
9e9413e340 eeeeee 2023-02-16 00:58:31 -06:00
petrak@
99e32ac84e yeah a BE was the way to go 2023-02-16 00:40:35 -06:00
petrak@
88a0234cec not sure if this is a good look? might go with a BER after all 2023-02-15 19:14:26 -06:00
petrak@
588a554efa document and add recipe for thought knots 2023-02-15 02:21:48 -06:00
petrak@
1dc3c88856 it thinks, therefore you aren't 2023-02-15 01:37:09 -06:00
petrak@
1750f29a69 fix up mishaps some more and fix a few spells 2023-02-15 00:50:46 -06:00
petrak@
2233c7697d block up mishap envs 2023-02-15 00:26:28 -06:00
petrak@
50554d5bf7 @Alwinfy ravenmind semantics 2023-02-08 09:58:02 -06:00
Alwinfy
a7a5073a74
Bring down the error count hopefully 2023-02-07 21:57:52 -05:00
petrak@
d5e65b5162 for kirin: cheapen break block and reduce packaged hex cooldowns 2023-02-04 18:52:00 -06:00
Alwinfy
7b0813d1b6
Update continuation docs 2023-02-04 18:34:08 -06:00
petrak@
fd86f57fbb awooga 2023-02-04 17:58:00 -06:00
petrak@
29b6f536b9 slightly updated docs 2023-02-04 12:49:04 -06:00
petrak@
1623d29653 GFM isn't real 2023-02-04 11:37:14 -06:00
petrak@
24367669e5 aaaaaugh. also document things 2023-02-04 11:35:26 -06:00
petrak@
117fbfb781 why couldn't i leave well enough alone 2023-02-03 11:22:21 -06:00
petrak@
b9a742f645 code doesn't have to compile it's not real 2023-02-03 10:28:43 -06:00
petrak@
e37d08d81e compiling is a myth invented by big code 2023-02-02 13:05:47 -06:00
petrak@
af03b8c321 close #401 2023-02-01 09:59:45 -06:00
petrak@
4f5cbb12fc fix #364 (good catch) 2023-01-31 19:04:15 -06:00
petrak@
cf79af662b fix #400 2023-01-31 18:56:48 -06:00
petrak@
f6cf4af59b telepig works now, close #402 2023-01-31 18:51:05 -06:00
petrak@
ca36dfa484 corporate needs you to tell the difference between [an arrow] and [a trident] 2023-01-30 13:53:36 -06:00
petrak@
42c1dc0e61 arrow vel fix also works for spectral arrows 2023-01-30 13:49:27 -06:00
petrak@
d1640d956a close #370 2023-01-30 13:36:52 -06:00
petrak@
abc2e7862b yatta! close #377 and make lore spawn lmao 2023-01-23 14:31:19 -06:00
petrak@
aca2c19be6 first smoketestable 2023-01-22 23:59:19 -06:00
petrak@
edc4012f69 loot cleanup wip! 2023-01-22 21:59:48 -06:00
petrak@
18cab3e0e3 fix #368 2023-01-22 21:19:22 -06:00
petrak@
e665432718 easiest bugfix ever, fix #352 2023-01-22 21:18:25 -06:00
petrak@
01f461f8c6 can no longer seal unwritten things 2023-01-22 21:15:45 -06:00
petrak@
91399cd5e0 finish close #360 2023-01-22 21:06:42 -06:00
petrak@
9d2d56916a fix bowlglimmer and ligature costs, re #360, closes #351 2023-01-22 20:06:54 -06:00
petrak@
c6c862d0f4 close #387 (picked 8192) 2023-01-22 19:47:18 -06:00
petrak@
eade2a5206 fix #362 2023-01-22 17:02:17 -06:00
petrak@
1845a11797 Close #371
Summoned rain lasts 0.5-1.5hrs; summoned sunshine lasts 2-3hrs.
2023-01-22 14:13:55 -06:00
petrak@
07df9298e8 fix localization of scrolls 2023-01-22 14:08:32 -06:00
petrak@
8d81adf258 close #384 (and also change scrolls) 2023-01-22 14:08:09 -06:00
petrak@
ebf43e15f2 prevent render brainsweep crash on fabric. todo: how to make villager regalia show up 2023-01-22 13:52:43 -06:00
petrak@
39ef925229 close #374 2023-01-22 12:47:26 -06:00
petrak@
dfc7bf59de close #375 2023-01-21 20:58:09 -06:00
petrak@
08a733fd7d close #382 2023-01-21 20:50:57 -06:00
petrak@
2c5309da40 close #380 2023-01-21 20:43:28 -06:00
petrak@
8b0a01e825 close #378 2023-01-21 20:29:09 -06:00
petrak@
57b415e025 re-impl halt 2023-01-21 17:40:54 -06:00
petrak@
4010ea6d9e move more things 2023-01-21 17:35:41 -06:00
petrak@
05e4114b97 fully make greatness a tag 2023-01-21 15:49:20 -06:00
petrak@
2f2ab69816 fixed action tags not working on fabc 2023-01-21 14:51:40 -06:00
petrak@
7e7b5ff3ae it appears to work?! 2023-01-21 14:08:31 -06:00
petrak@
4af930e7a7 data: genned 2023-01-21 13:23:24 -06:00
petrak@
e900e4d62b it's compiling! 2023-01-21 12:45:32 -06:00
petrak@
ede95c4b49 creeping towards compilation 2023-01-21 11:53:23 -06:00
petrak@
5d8b7a61eb this does not compile even a little bit but i'm pushing so i'm not anxious having code on my HD 2023-01-20 13:27:35 -06:00
petrak@
7748cf7387 that sucked 2022-12-30 17:00:52 -05:00
petrak@
baf74c64cc converting the ersatz registry. this mega sucks 2022-12-30 14:50:50 -05:00
petrak@
573fbb738a oh god, this is gonna suck 2022-12-30 13:43:38 -05:00
petrak@
5f9ced55fc clean up xplat 2022-12-30 13:07:21 -05:00
petrak@
bdbb8b0e83 MVP ready 2022-12-30 13:00:47 -05:00
petrak@
c3ebba18f0 finish logic for entity ingrs 2022-12-28 14:11:28 -05:00
petrak@
2acf7920b5 Merge branch 'main' into arbitrary-brainsweeps
Keep up to date with main
2022-12-28 13:33:15 -05:00
ChuijkYahus
bf4a6f504b
fix 2022-12-13 13:31:16 +08:00
ChuijkYahus
27b7a4e6c4
Merge branch 'gamma-delta:main' into main 2022-12-13 13:17:33 +08:00
petrak@
deec17376f at the behest of my friend Terabithia, who helped me write the lore, change the character's name to Cardamom 2022-12-03 12:05:38 -05:00
petrak@
9616b89979 redocument flock's refl, close #338 2022-12-03 11:52:45 -05:00
petrak@
11e576c7e5 Merge branch 'main' of https://github.com/gamma-delta/HexMod
Oh for god's sake just pull
2022-12-03 11:32:00 -05:00
petrak@
f070b271ff fixerman's gambit (close #345) 2022-12-03 11:31:19 -05:00
petrak@
59418e28fe
Merge pull request #346 from Cypher121/patch-2
Soft-fail if looking up action for mishap gets nothing back
2022-12-03 11:16:51 -05:00
petrak@
a0fde191d4 keep on mergin 2022-12-03 11:16:22 -05:00
June
a7d83782b6
More try-catch for getUpdate 2022-12-03 15:29:16 +01:00
June
503d5db16c
Fix #343 2022-12-03 06:22:05 +01:00
June
68db125848
Fix Hermes reading from bottom of the stack
Closes #339
2022-12-01 18:37:09 +01:00
ChuijkYahus
07dc07aaca
update 2022-11-30 10:39:50 +08:00
ChuijkYahus
416292c556
Merge branch 'gamma-delta:main' into main 2022-11-30 10:37:20 +08:00
petrak@
949e4bb292 fix #325 2022-11-29 15:24:44 -05:00
petrak@
8216dd984e fix #323 2022-11-29 14:25:53 -05:00
petrak@
725aa894d4 probably fix #327? 2022-11-29 14:21:38 -05:00
petrak@
3a8dfa6cc8 fix #329 and fix #332 2022-11-29 13:42:31 -05:00
ChuijkYahus
04cb6651bc
update 2022-11-30 01:43:21 +08:00
petrak@
de8e84cdbd probably fix #329? i wasn't able to reproduce 2022-11-29 12:35:12 -05:00
petrak@
30c81e2008 close #331, document 2dup, and clean up langfile 2022-11-29 12:18:01 -05:00
petrak@
33ba0ee4e1 rrgh 2022-11-29 12:07:08 -05:00
petrak@
f5a7a5fe82
Merge pull request #322 from ChuijkYahus/main
Update zh_cn.json
2022-11-29 10:51:56 -06:00
ChuijkYahus
71904e282c
fix 2022-11-24 09:35:01 +08:00
ChuijkYahus
71891078f8
fix 2022-11-24 01:32:24 +08:00
ChuijkYahus
4a26dbf706
fix 2022-11-23 18:09:47 +08:00
ChuijkYahus
8453410557
fix 2022-11-23 09:32:07 +08:00
petrak@
7c00cbaec8 possibly impl arbitrary brainsweeps. i don't know. i'm in offline mode 2022-11-22 19:31:09 -06:00
ChuijkYahus
fd80f45aca
fix 2022-11-23 09:30:56 +08:00
ChuijkYahus
7dc7698592
fix 2022-11-23 09:28:53 +08:00
ChuijkYahus
1518ce2a0d
fix 2022-11-23 09:28:39 +08:00
petrak@
30701702c7 Merge branch 'main' into arbitrary-brainsweeps 2022-11-22 09:44:20 -06:00
petrak@
0d90addd8d fix #321 2022-11-22 09:40:08 -06:00
ChuijkYahus
aa5c918525
config lines 2022-11-22 23:29:02 +08:00
Alwinfy
1da56cd2dc
Merge remote-tracking branch 'origin/main' into eval/cc 2022-11-22 00:31:38 -05:00
petrak@
1cf08a135c close #317 2022-11-21 22:20:29 -06:00
petrak@
fc62374f75 better particles for chronicler's gambit 2022-11-21 22:19:31 -06:00
petrak@
274bec11d6 fix 292 2022-11-21 21:59:22 -06:00
petrak@
79fea68588 close #301 2022-11-21 20:42:49 -06:00
petrak@
2736b3616d close #302 2022-11-21 20:33:59 -06:00
petrak@
d8715c3604 remove the default dot speed because there's no dot anymore 2022-11-21 20:05:30 -06:00
petrak@
8f43bdb5fe some day i will spell that goddamn word right (close #306) 2022-11-21 20:05:12 -06:00
petrak@
76006d72dc finish sound cleanup and also other things cleanup 2022-11-21 19:48:25 -06:00
petrak@
7699a5e468 start work on making sounds badnt 2022-11-21 17:55:36 -06:00
petrak@
979fc3aa35 close #316 2022-11-21 14:54:57 -06:00
petrak@
8fbb6acbf9 minor speling mistake 2022-11-21 14:08:06 -06:00
petrak@
3f9c3a4561 badn't config 2022-11-21 14:07:27 -06:00
petrak@
aecf017b06 fix conflicts 2022-11-21 12:20:56 -06:00
petrak@
138580cbf5
Merge pull request #298 from ChuijkYahus/main
Update zh_cn.json
2022-11-21 11:23:51 -06:00
petrak@
a43ead40d6 wall scrolls don't look like they were drawn with tank treads anymore 2022-11-21 11:17:16 -06:00
petrak@
9a276c70de clip the end of the pattern line in certain cases for visibility 2022-11-20 22:38:35 -06:00
petrak@
ef176058ea fix #309 2022-11-20 21:36:55 -06:00
petrak@
2878dcb0c1 close #280 and reduce conformity 2022-11-20 21:07:33 -06:00
petrak@
f4bc787551 re #280, use indexing instead of iterator abstraction 2022-11-20 20:15:33 -06:00
petrak@
220ac8bcab re #280, upload things to the GPU in bigger chunks 2022-11-20 19:59:00 -06:00
ChuijkYahus
6cdb34efbb
Update zh_cn.json 2022-11-21 07:45:52 +08:00
ChuijkYahus
85dca3d6f4
Merge branch 'gamma-delta:main' into main 2022-11-21 07:44:45 +08:00
petrak@
e535938368 nerd emoji (close #300) 2022-11-20 16:14:36 -06:00
petrak@
9376632128 close #299 2022-11-20 16:12:09 -06:00
petrak@
3d56f0f826 close #303 2022-11-20 16:09:06 -06:00
petrak@
ba42d97872 start work on arbitrary brainsweeps 2022-11-20 15:46:12 -06:00
ChuijkYahus
52726ba522
fix 2022-11-21 00:53:06 +08:00
ChuijkYahus
5956ad38d5
Update zh_cn.json 2022-11-21 00:42:56 +08:00
petrak@
30dc2e93c8 close #291 2022-11-19 23:18:40 -06:00
petrak@
5920e0b9a4 fix #294 2022-11-19 22:30:44 -06:00
petrak@
7dc05d2951 maybe fix #286 2022-11-19 21:21:42 -06:00
Alwinfy
cec40696d1
oops 2022-11-16 13:39:24 -05:00
Alwinfy
f76d71bfe0
oops fix the audio thing 2022-11-16 01:08:36 -05:00
Alwinfy
3b367dcd9b
Pay a cost for every continuation jump 2022-11-16 00:58:51 -05:00
Alwinfy
7467687fad
DRY eval/cc 2022-11-16 00:58:29 -05:00
Alwinfy
cc3691d9c9
Merge remote-tracking branch 'origin/main' into eval/cc 2022-11-16 00:48:06 -05:00
gamma-delta
5258208585 actually implement #291 ops with a generic-er class 2022-11-15 23:26:16 -06:00
gamma-delta
399f8c5cad re #291, nip 2022-11-15 22:12:29 -06:00
gamma-delta
22fe434328 re #291, pick 2022-11-15 22:11:04 -06:00
ChuijkYahus
cbeeb47705
Merge branch 'gamma-delta:main' into main 2022-11-16 11:32:13 +08:00
gamma-delta
9ca5738317 WITH CATLIKE TREAD! UPON OUR PREY WE STEAL! IN SILENCE DREAD! OUR CAUTIOUS WAY WE FEEL! NO SOUND AT ALL! WE NEVER SPEAK A WORD! A FLY'S FOOTFALL WOULD BE DISTINCTLY HEARD! 2022-11-15 21:09:30 -06:00
ChuijkYahus
b64ae8131b
fix stray list macros in en_us 2022-11-16 10:51:03 +08:00
ChuijkYahus
82902aaa3b
fix 2022-11-16 10:44:45 +08:00
ChuijkYahus
fcd76cf32c
update to fit en_us in main branch 2022-11-16 10:28:29 +08:00
ChuijkYahus
fd1e190d09
Merge branch 'gamma-delta:main' into main 2022-11-16 10:08:16 +08:00
Alwinfy
cd64f6394e
add eval/cc, aka continuation, aka OpEvalBreakable, aka Iris 2022-11-15 20:06:25 -05:00
gamma-delta
03dd09c6de amethyst dust now makes scrolls have the offset marks 2022-11-14 20:35:48 -06:00
gamma-delta
4aae1ed6b0 chronicler's gambit now has a particle spray 2022-11-13 23:37:35 -06:00