water111 / jak-project

47%

master: 47%

LAST BUILD ON BRANCH w/merc

branch: w/merc

CHANGE BRANCH

x

Reset

Sync Branches

• w/merc
• add-prs-welcome
• add_sym_link_dir
• additional-debugging
• all-types-polish
• all-types/heap-base
• arch-fixes
• asan
• auto-process-ss
• bitfields/inspect-method
• case-switch-construct
• ci/actions-improvements
• ci/build-times
• ci/codecov
• ci/retry-choco
• cleanup/s6-casts
• cleanup/states
• cmake-pprint-workaround
• compiler-logging
• d/anim-tester-new
• d/asserts
• d/bat-updates
• d/build-finish
• d/bulk-cleanup
• d/cleanup
• d/collectables
• d/compiler-psize-of
• d/cpad-macros
• d/cpad-test
• d/debugger-improves
• d/decomp-debug1
• d/decomp-fact-h-step-1
• d/decomp-finalboss-package
• d/decomp-joint
• d/decomp-more-graphics
• d/decomp-most-level-and-game-loop
• d/decomp-things-1
• d/defpartgroup
• d/defskelgroup
• d/display-gfx-test
• d/dm-cleanup
• d/dma-macros
• d/entities-give-birth
• d/enum-utils
• d/fix-vagwad-tool
• d/fix-windows-scrolling
• d/fixes
• d/force-enable-assert-windows
• d/goal-user-profiles
• d/joint-attempt-1
• d/lbd-gen
• d/major-game-cleanup
• d/memdump-support-basic-array
• d/merge-objects
• d/mood-sky-tod-art-h
• d/new-defstate
• d/new-new-vag-tool
• d/new-secs
• d/new-text-tool
• d/newbie-update
• d/ogre-flying-lurkers
• d/orb-cache-top
• d/pad-fixes
• d/pal-main
• d/pal-support-quote-on-quote
• d/pckernel
• d/progress-and-main-cleanup
• d/progress-fix
• d/random-cleanup
• d/readmefixes
• d/repl-connect-state-fix
• d/res-more
• d/res-more-more
• d/res-more-more-more
• d/sced-support
• d/something-i-missed
• d/sprite-gpu
• d/sprite-v2
• d/start-decomp-game-loop
• d/start-decomp-res
• d/temp
• d/test-actors
• d/vm-deadlock
• d/windows-debugger-and-process-drawable
• decomp-anim-tester
• decomp-font-h
• decomp-glist
• decomp-gs-types
• decomp-stuff-1
• decomp-sync-info-1
• decomp/air
• decomp/aligner
• decomp/aligner-h
• decomp/anim-tester
• decomp/auto-offline-tests
• decomp/babak-batch
• decomp/basebutton
• decomp/batch
• decomp/battlecontroller
• decomp/camera
• decomp/camera-master
• decomp/cast-files-part-1
• decomp/cave-trap
• decomp/cleanup-alltypes
• decomp/collectables-ref
• decomp/collide-frag
• decomp/collision
• decomp/collision-followup
• decomp/credits2
• decomp/default-menu
• decomp/depth-cue
• decomp/drawable-inline-array
• decomp/effect-ctrl
• decomp/entity-h
• decomp/entity-table
• decomp/evilbro
• decomp/eye
• decomp/eye-h
• decomp/generic
• decomp/generic-obs-2
• decomp/handle-cast-files-part-2
• decomp/handle-cast-final
• decomp/handle-casts-part-3
• decomp/hint-control-menu
• decomp/hud-classes
• decomp/joint-explode
• decomp/jungle-elevator
• decomp/junglesnakes
• decomp/kermit
• decomp/lights
• decomp/literal-fix
• decomp/main-collide
• decomp/mayor
• decomp/merge-s6-vars
• decomp/misty-convey
• decomp/misty-teetertotter
• decomp/mistycannon
• decomp/mood-table
• decomp/moodv3
• decomp/mother-spider
• decomp/nav-enemy
• decomp/navigate
• decomp/next-batch
• decomp/obs-files
• decomp/ocean-transition
• decomp/ogreboss
• decomp/orbit-plat-and-more
• decomp/part-files
• decomp/path
• decomp/plant-boss
• decomp/plat
• decomp/povcamerah-hudh
• decomp/powerups
• decomp/powerups-et-all
• decomp/projectiles
• decomp/reattempt-def-state-files
• decomp/relocate
• decomp/remaining-gameplay
• decomp/ripplev2
• decomp/settings
• decomp/shadow
• decomp/sharkey
• decomp/shrub-work
• decomp/sp-launch-group-cleanup
• decomp/stats-h
• decomp/sunken-elevator
• decomp/target-h_shadow-h
• decomp/target-ice
• decomp/target-part
• decomp/target-racer-and-tube
• decomp/target-util
• decomp/task-control
• decomp/tfrag-work
• decomp/the-final-batch
• decomp/ticky
• decomp/tippy
• decomp/trajectory
• decomp/transformq
• decomp/twister
• decomp/vector-rewrite
• decomp/vol-new
• decomp/wateranim-rigid-body
• decomp/weather-part
• decomp/wind
• decomp/wobbler
• decompiler-logging
• decompwork-timer
• decompwork-timer-h
• dependabot/github_actions/EndBug/add-and-commit-7.3.0
• dependabot/github_actions/EndBug/add-and-commit-7.4.0
• dependabot/github_actions/EndBug/add-and-commit-7.5.0
• dependabot/github_actions/EndBug/add-and-commit-8.0.1
• dependabot/github_actions/actions/cache-v2.1.4
• deps/update-fmt
• dgounpacker-windows-directory-fix
• display-step-1
• docs/add-tfrag-docs
• docs/avoid-build-timestamps
• docs/change-progress
• docs/compress-img
• docs/first-pass
• docs/fix
• docs/gallery-and-readme
• docs/gh-pages
• docs/readme-update
• docs/refresh
• docs/try-to-fix-doc-building
• docs/update-progress
• ee-analysis/json
• emu-dmac-test
• fake-asm-macro
• file-io
• fix-headers
• fix-outer-product
• fix-rgba16_to_rgba32
• fix-taskfile
• fix_runtime_err
• float-simplify
• game/camera
• generative-tests
• gfx-cleanup
• gh/ignore-third-party
• goalc-test-fix-cmd-color
• goalc/auto-inspect
• load-vf0-macro
• logging
• macro-fix-also-timer
• macro-string-format
• master
• minilzo-alternative
• more-vector-instructs
• more-vector-ops
• musictweak
• new-enum-types
• nix
• opengl-glfw-test
• organize-all-types
• patch-1
• pragma-once
• proj/vscode-settings
• remove-perf-stats
• repl/auto-connect
• repl/help
• repl/history
• repl/more-features
• socket_fix
• temp/test-pr-comment
• tests/add-missing-refs
• tests/additional-decomp-tests
• texture-h-fixes
• types-fix-gs-main-h
• update-remotes
• vs-2022-support
• w/actor-link-h-bugs
• w/add-countdown
• w/add-debug-file-mode
• w/add-gstring
• w/add-imgui
• w/add-macros-to-autocomplete
• w/add-more-ref-tests
• w/add-sqrtf
• w/add-types-to-all-types
• w/add-zstd
• w/add-zydis
• w/addition-improvements
• w/addr-to-line
• w/and-or-fix
• w/another-small-state-fix
• w/asan-build
• w/asm-branching
• w/atomic-op-builder
• w/auto-float-type
• w/automatic-label
• w/avx-support
• w/behavior
• w/better-array-indexing
• w/better-declare-type
• w/better-matrix-ctor
• w/bg-rendering-investigation
• w/bitfield-decomp
• w/bitfield-fixes
• w/bitfield-types
• w/bitfield128-64bit-fix
• w/bitfield128-decompiler
• w/bones-1
• w/boxed-array-length
• w/build-speedup
• w/cfg-debug
• w/cfg_2_ir
• w/clean-up-all-fwd-defs
• w/clean-up-early-stuff
• w/clean-up-printing
• w/clean-up-sync-info
• w/clean-up-until-geometry
• w/clean-up-warnings
• w/cleanup-4
• w/cleanup-5
• w/cleanup-display-h
• w/cleanup-gcommon
• w/cleanup-part2
• w/cleanup-sparticle-loader
• w/cleanup-texture
• w/cleanup3
• w/cleanup4
• w/cleanup5
• w/cmake-spdlog-shared-lib-fix
• w/codecov_cmake_tweaks
• w/collide-2
• w/collide-func-mips2c
• w/collision-1
• w/collision-3
• w/collision-4
• w/collision-5
• w/compiler-bitfield-128
• w/compiler-bug-fixes-return-fix
• w/compiler-bugfixes-for-gcommon
• w/compiler-bugs
• w/compiler-cleanup2
• w/compiler-features
• w/compiler-fixes
• w/compiler-i128
• w/compiler-set-field-of-partially-defined-type
• w/compiler-stack-variables
• w/compiler-static-data
• w/compiler_cleanup
• w/compiler_cleanup_2
• w/connect-2
• w/constants-in-conditions
• w/cpp17
• w/create-output-folder-in-decompiler
• w/debug-method-12-level
• w/debugger
• w/debugger-and-docs
• w/debugger-mem-functions
• w/debugger-stack-frames
• w/decomp-2
• w/decomp-3
• w/decomp-4
• w/decomp-5
• w/decomp-and-asize-bug-fix
• w/decomp-bitfield-fix
• w/decomp-bsp
• w/decomp-bugs-2
• w/decomp-bugs-3
• w/decomp-clean-up-state-type
• w/decomp-connec
• w/decomp-decomp
• w/decomp-entity
• w/decomp-fact-h
• w/decomp-file-io
• w/decomp-fix-bg
• w/decomp-game-info
• w/decomp-load-stuff
• w/decomp-process-init
• w/decomp-small-fixes
• w/decomp-some-drawable-stuff
• w/decomp-transform
• w/decompile-bsp-h
• w/decompile-gcommon
• w/decompile-process-drawable-h
• w/decompile-vector-for-real
• w/decompiler-cleaner-output
• w/decompiler-cleanup
• w/decompiler-crash-fixes
• w/decompiler-errors-1
• w/decompiler-gcommon-fixes
• w/decompiler-go
• w/decompiler-gui-prototype
• w/decompiler-lambda
• w/decompiler-method-name
• w/decompiler-obj-names
• w/decompiler-st
• w/decompiler-stacku8-and-cfg
• w/decompiler-type-analysis
• w/decompiler-types
• w/decompiler_ir
• w/define-perm-decompiler
• w/defmethod
• w/deftype
• w/dgo-tools
• w/dgo-unpacker-compression
• w/dir-tpages
• w/discord-rpc
• w/display
• w/dma-bucket-bitfields
• w/dma-disasm-fixes
• w/dma-for-font
• w/dynamic-bitfields-in-compiler
• w/early-return-and-break
• w/emacs-config
• w/engine-types-decomp
• w/enum-list-form
• w/enums
• w/escaped-strings-in-reader
• w/expression-building-improvements
• w/expressions-2
• w/expressions-3
• w/expressions-4
• w/expressions-5
• w/fater-compile-time
• w/features-for-gkernel-1
• w/features-for-gkernel-2
• w/final-methods
• w/finish-actor-link-h
• w/finish-mood
• w/fix-actor-compaction
• w/fix-array-access
• w/fix-coloring-moves
• w/fix-compiler-array-bug
• w/fix-decompiler-crash-on-ud
• w/fix-disassembly
• w/fix-flipped-add
• w/fix-float-loads
• w/fix-gcommon-2
• w/fix-goal-build
• w/fix-high-cpu-usage
• w/fix-inline-basic-index-decompiler
• w/fix-lambda-defs
• w/fix-let-bug
• w/fix-let-print-and-win-warnings
• w/fix-logior-weird-order
• w/fix-method-peek
• w/fix-missing-cast
• w/fix-missing-casts
• w/fix-pointer-#f-in-statics
• w/fix-pretty-print-and-state-docs
• w/fix-self-as-function-arg
• w/fix-store-constant-signed-bitfield
• w/fix-str-and-readme
• w/fix-stuck-inline-test
• w/fix-tod
• w/fix-types-in-defun
• w/fix-vsqrt-vrsqrt-vdiv
• w/fix-zip-lib-bugs
• w/fix-zydis-submodule
• w/fixes-for-task-control
• w/float-printer
• w/form-utilities
• w/format-asm-cleanup
• w/game-info
• w/game-text
• w/gcommon-decompiler-experiment
• w/gcommon-fixes-round-2
• w/gfx-bug-fixes
• w/gkernel
• w/gkernel-2
• w/gkernel-3
• w/gkernel-decompiler-test
• w/gkernel-fixes
• w/gkernel-more
• w/gkernel-more-tests
• w/goal_manual
• w/gpr-fpr-decompiler
• w/gstate-and-misc-fixes
• w/gstring
• w/heap-base
• w/i128-decompiler
• w/improve-until-decomp
• w/improved-regalloc
• w/in-order-logging
• w/inline-array-on-stack
• w/inline-asm
• w/inspect-inspector
• w/ir
• w/ir2-form
• w/ir2-regression-tests
• w/ir2-stacking
• w/kernel-type-prop
• w/label-and-stack-fixes
• w/lambda
• w/level-inspection
• w/level-load-test
• w/likely-branch-as-separate-block
• w/listener-on-win-fixes
• w/load-boundaries
• w/loader-better
• w/logging
• w/make-system
• w/math_1
• w/math_2
• w/math_3
• w/math_4
• w/math_5
• w/matrix-decomp
• w/mem-tool-args
• w/mem-tool-chase-pointers
• w/mem-tool-handles
• w/memcards
• w/memory-dump-tool
• w/memory-usage-decomp
• w/meters
• w/method-calls
• w/methods
• w/mips-to-c
• w/more-bitfields
• w/more-decompiler-macros
• w/more-inline-vector
• w/more-level-stuff
• w/move_to_common_util
• w/names-in-ref-test-fails
• w/nest-floating-point-add-multiply
• w/nested-bitfields
• w/nested-expression-stack
• w/new-calling-convention
• w/new-decompiler-ir
• w/new-type-reverse-deref
• w/none-in-cond-fix
• w/not-equal-small-int-optimization
• w/ocean-heights
• w/offline-decompiler-tests
• w/overlord-streaming
• w/pad-bitfield
• w/pad-cleanup
• w/part-tester-fixes
• w/pp2-improper-list
• w/pretty-print-quoted
• w/pretty-print-v2
• w/pretty-printer-adjust
• w/print-strings-in-disasm
• w/process-allocations
• w/process-tpage-in-decompiler
• w/put-goal-stack-on-goal-heap
• w/racer-states-fixes
• w/recognize-dotimes
• w/reg-usage-ir2
• w/regalloc-and-spill
• w/regalloc-improvements
• w/region-scripts
• w/register-allocation-change
• w/relocate-method-call-in-link
• w/remove-form
• w/remove-global-config
• w/remove-ir1-part-1
• w/remove-match-param
• w/render-perf
• w/replace-spdlog
• w/res-decomp
• w/res-macros
• w/rider-bugs
• w/rlet-fixes
• w/runtime-fixes
• w/s6-merge-changes
• w/sc-with-eliminated-move
• w/send-event-macro
• w/shift-mult-div
• w/simplify-build
• w/small-cleanups
• w/small-decompiler-fixes
• w/small-state-fixes
• w/source-line-debugging
• w/sparticle-decomp
• w/sprite-3d-hack
• w/sprite-distort-stub
• w/ssa-experiments
• w/ssa-expression-prop
• w/stack-new-fix
• w/stack-spills
• w/stack-vars
• w/static-data-decomp
• w/str-data-in-decompiler
• w/streamed-audio
• w/support-break-in-decompiler
• w/support-non-virtual-defstate
• w/symbol-info
• w/symbol-order
• w/test-freeze-fix
• w/tests-and-fixes-for-math
• w/text-fixes
• w/text-ref
• w/texture-and-loading
• w/tfrag-extractor
• w/tfrag-improvements-1
• w/tfrag-ref
• w/tie
• w/tie-wind
• w/time-of-day
• w/try-catch-static-refs
• w/try-multiple-fields-in-data-decomp
• w/type-analysis-2
• w/type-cleanup
• w/type-prop-dev
• w/type-prop-gstring
• w/type-utils-decompiler
• w/types-and-objects
• w/types-for-joint-mod-h
• w/u64-float-set
• w/update-docs-and-cleanup
• w/update-readme
• w/update-readme-fix-labels
• w/use-def-fix
• w/useless-set-elimination
• w/vector-asm-check
• w/vector-detect-v2
• w/vector-inline-detection
• w/vector4-dot
• w/vis
• w/vis-and-fps
• w/vu-disasm
• w/win-format
• w/windows-release-debugging
• w/workaround-dgo-size-bug
• w/zero-comparisons
• windows/compiler-warnings

Merge e5c27d5d9 into 3d7228ec7