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

Jump to bottom

Frag - Fix Formatting on ace_frag_fnc_addBlacklist #10323

Merged
merged 368 commits into from
Sep 18, 2024
Merged

Frag - Fix Formatting on ace_frag_fnc_addBlacklist #10323

merged 368 commits into from
Sep 18, 2024

Conversation

lambdatiger
Copy link
Contributor

@lambdatiger lambdatiger commented Sep 18, 2024 •
edited
Loading

When merged this pull request will:

  • Removes extraneous semicolons from return values

image

IMPORTANT

  • If the contribution affects the documentation, please include your changes in this pull request so the documentation will appear on the website.
  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

lambdatiger and others added 30 commits January 15, 2024 16:05
@lambdatiger @johnb432
Really obvious isNull instead of isEqualTo
c7a2769 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@lambdatiger
Fixed array of double spaced format errors
8683e0a
@lambdatiger
renamed files to fit proper format
fa4de59
@lambdatiger
Merge branch 'master' of https://github.com/lambdatiger/ace_frag-over…
96dc215 
…haul
@lambdatiger
fixed more spacing issues
054b9cd
@lambdatiger
formatting
c05be02
@lambdatiger
Fixed debug mode init, a few things pointed out by johnb432 that I wa…
3957a07 
…s dumb not to do
@lambdatiger
formatting
3874146
@lambdatiger
Updated type checks in line with recommendation from johnb432
133f0b1
@lambdatiger
fixed comment to properly state variable purpose
dd7fc86
@lambdatiger
Comments fixed
6fc950a
@lambdatiger @johnb432
slight performance increase using forEach loops
6e209ba 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@lambdatiger
Merge branch 'master' of https://github.com/lambdatiger/ace_frag-over…
d683be8 
…haul
@lambdatiger @johnb432
Small optimization to optimize config lookup
4ef1166 
quick testing shows a whole 600ns increase in

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@lambdatiger @johnb432
avoid mismatch sides when debugging frags with unconcious or captive …
902af64 
…shooters

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@lambdatiger
removed return of sphere object, not required or useful.
bd33ab0
@lambdatiger
Merge branch 'master' of https://github.com/lambdatiger/ace_frag-over…
e3c8e8d 
…haul
@lambdatiger
fixed a loop that got caught in the merge crossfire
f713791
@lambdatiger @johnb432
Optimized approach to classifying blacklist type
a8e268c 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@lambdatiger
Implemented changes discussed here acemod#9728 (comment)
c4a93c7
@lambdatiger
Config lookup optimization mentioned by johnb432 here: acemod#9728 (c…
b2666fc 
…omment)
@lambdatiger
white space/formatting changes
b780704
@lambdatiger
Merge branch 'master' of https://github.com/lambdatiger/ace_frag-over…
67e125c 
…haul
@lambdatiger
removed old parameter changed in acemod@f28d5d2
85b566a
@lambdatiger
compacted text a bit
67ede76
@lambdatiger
formatting whitespace
572f909
@lambdatiger
Grammatical erros
7aa17aa
@lambdatiger
Changes as discussed here acemod#9728 (comment)
8dd76d1
@lambdatiger
Few quick optimizations of == to isEqualTo
6dacd38
@lambdatiger
Debug updated to be easier to control
9178611
@lambdatiger
missed comma, going to bed, sorry
61a1770
@lambdatiger
add newline and fix blacklist
7b282ec
@lambdatiger
legability formatting
22ca38f
@lambdatiger
removed extra newlines and double spaces
25cc22b
@lambdatiger
Updated function documentation
2e67d5d
@lambdatiger
Removed unused stringtable items
4092177
@lambdatiger
Debug sphere conditional was missing in frago
8c68f13
@lambdatiger
Added class blacklisting functionality
afd99c7
@lambdatiger
Converted addBlacklist function to be public
0a9119b
@lambdatiger
fixed glaring error
43b764c
@lambdatiger
Reformatted to be more concise and added argument defaults.
f2d6e77
@lambdatiger
Deleted one sentence too many
a7c4631
@lambdatiger
Merge branch 'acemod:master' into Frag-public-blacklist-functions
a487b97
@lambdatiger
Merge remote-tracking branch 'upstream/master' into Frag-public-black…
679405d 
…list-functions
@lambdatiger
Fixed info macro usage
251bc00
@lambdatiger
Forgot to consider someone might have explosion reflections on but no…
98e0029 
…t fragmentation
@lambdatiger
Merge remote-tracking branch 'upstream/master' into Frag-public-black…
5f9c3b7 
…list-functions
@lambdatiger
Fix some post merge errors
dbbd1ae
@lambdatiger
missed a few more merge errors
c67ec28
@lambdatiger
renamed classBlacklist function
aa50b3f
@lambdatiger
removed semicolons from a function return
3974a06
@lambdatiger
Merge remote-tracking branch 'upstream/master' into Frag-public-black…
a1b2231 
…list-functions
@lambdatiger
Removed occurenes of doubled up lines
4a8bbf4
@lambdatiger
Somehow still missed one
496e7a5
@lambdatiger
Copy link
Contributor Author

There may also be an issue with how the function headers are formatted based on the current state of master. Let me know what changes need to be made.

@LinkIsGrim LinkIsGrim added ignore-changelog Release Notes: Excluded impact/trivial labels Sep 18, 2024
@LinkIsGrim LinkIsGrim added this to the 3.18.0 milestone Sep 18, 2024
@LinkIsGrim LinkIsGrim merged commit 64d49a6 into acemod:master Sep 18, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LinkIsGrim LinkIsGrim LinkIsGrim approved these changes

Assignees
No one assigned
Labels
ignore-changelog Release Notes: Excluded impact/trivial
Projects
None yet
Milestone
3.18.0
Development

Successfully merging this pull request may close these issues.
3 participants
@lambdatiger @LinkIsGrim @johnb432