Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Arithmetic is dead. And compare_int. And compare_num. Kinda. Long live the math! #70936

Merged
merged 27 commits into from
Jan 16, 2024
Merged

Arithmetic is dead. And compare_int. And compare_num. Kinda. Long live the math! #70936

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
27f24b8
more math
GuardianDll Jan 10, 2024
3a7c1d7
more math
GuardianDll Jan 10, 2024
3639415
Merge branch 'mathmathmath' of https://github.com/GuardianDll/Catacly…
GuardianDll Jan 10, 2024
0df6d06
a bit more
GuardianDll Jan 11, 2024
af80ac7
compare_int to be gone
GuardianDll Jan 12, 2024
db82205
compare_int to be gone
GuardianDll Jan 12, 2024
19630fc
and more
GuardianDll Jan 14, 2024
04dd66d
compare_num be gone
GuardianDll Jan 14, 2024
3e09029
arithmetic be gone
GuardianDll Jan 14, 2024
45c9d8e
Merge branch 'master' into mathmathmath
GuardianDll Jan 14, 2024
00a69af
lint
GuardianDll Jan 14, 2024
fe37336
fix stuff
GuardianDll Jan 14, 2024
70b3f85
fix stuff
GuardianDll Jan 14, 2024
3404fea
Merge branch 'mathmathmath' of https://github.com/GuardianDll/Catacly…
GuardianDll Jan 14, 2024
f793333
revert u_val('power')
GuardianDll Jan 15, 2024
d556797
jmathify and fix addictions
GuardianDll Jan 15, 2024
5c24df6
Apply suggestions from code review
GuardianDll Jan 15, 2024
11f6cef
migrate u_know_jaryi, mention talked_to_hub and know_jaryi should be …
GuardianDll Jan 15, 2024
4dee051
Merge branch 'master' into mathmathmath
GuardianDll Jan 15, 2024
e6b9737
revert item_rad RAD_DETECT
GuardianDll Jan 15, 2024
9149eea
replace the only place with spell level school; add to another place …
GuardianDll Jan 15, 2024
16da755
"=" -> "=="
GuardianDll Jan 15, 2024
315cb1b
Update data/json/npcs/TALK_TEST.json
GuardianDll Jan 16, 2024
e78e80c
Merge branch 'master' into mathmathmath
GuardianDll Jan 16, 2024
e0d4306
lint
GuardianDll Jan 16, 2024
46d98c3
replace all addiction formulas to use same jmath
GuardianDll Jan 16, 2024
5b3b284
Merge branch 'CleverRaven:master' into mathmathmath
GuardianDll Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'CleverRaven:master' into mathmathmath
  • Loading branch information
@GuardianDll
GuardianDll authored Jan 16, 2024
commit 5b3b2845bc27f9b70c8700b8bfb28fe3d72b9b60

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.