pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-16 14:32:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,667 Commits 4 Branches 0 Tags 202 MiB
main
Commit Graph

30 Commits

Author SHA1 Message Date
Alex Bates
82b09bd69e
support modded NPC sprites (#1146) 
* support modded NPC sprites

- improve compatibility with Star Rod SpriteSheet.xml files
  - SR's intention is to move to the decomp xml but the current release of SR emitted incompatible xml
- use npc.xml instead of npc_sprite_names.yaml to generate linker entries. this allows mods to add new sprites

* black

why does it want two spaces before line comments!?

* Doxygen (#1142)

* use doxygen
* add documenting guide based on https://github.com/zeldaret/oot/blob/main/docs/Documenting.md
* exclude stdlib readme from doxygen
* refuse to configure matching iQue on macOS (EGCS compiler is not built for macOS, so iQue won't build. We still enable iQue builds on macOS by using gcc-papermario via --non-matching.)
* use proper doxygen bug comment style
* document common EVT API funcs nicely
* add doxygen ci
* add \vars command

* s/master/main

* use Doxygen 1.10.0

* fix doxygen ci

* fix doxygen ci

* fix doxygen (final)

* fix doxygen (final real)

* Fix Doxygen CI (#1147)

* remove old doxygen ci line

* fix warns

Thanks @Ponmander for reporting this
 2024-01-11 19:33:39 +09:00
Alex Bates
fdb4428cc6
Fix Doxygen CI (#1147) 2024-01-10 00:29:18 +00:00
Alex Bates
380eabdba3 fix doxygen (final real) 2024-01-10 00:12:25 +00:00
Alex Bates
44e2da93e0 fix doxygen (final) 2024-01-10 00:11:24 +00:00
Alex Bates
2e62ed9f7d fix doxygen ci 2024-01-10 00:08:53 +00:00
Alex Bates
8f0522ca0a fix doxygen ci 2024-01-10 00:07:18 +00:00
Alex Bates
2edffb080c use Doxygen 1.10.0 2024-01-10 00:02:55 +00:00
Alex Bates
6fc2e1a74f
s/master/main 2024-01-09 23:57:35 +00:00
Alex Bates
37f59877e5
Doxygen (#1142) 
* use doxygen
* add documenting guide based on https://github.com/zeldaret/oot/blob/main/docs/Documenting.md
* exclude stdlib readme from doxygen
* refuse to configure matching iQue on macOS (EGCS compiler is not built for macOS, so iQue won't build. We still enable iQue builds on macOS by using gcc-papermario via --non-matching.)
* use proper doxygen bug comment style
* document common EVT API funcs nicely
* add doxygen ci
* add \vars command
 2024-01-09 23:56:08 +00:00
lshamis
ae66312d8c
Add Python linter to github actions (#1100) 
* Add Python linter to github actions

* wip

* Add back splat_ext

* Format files

* C++ -> C

* format 2 files

* split workflow into separate file, line length 120, fix excludes

* -l 120 in ci

* update black locally and apply formatting changes

* pyproject.toject

---------

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2023-07-30 02:03:17 +09:00
Ethan Roseman
53fac51608
Remove outdated / unused tools and such from the repo (#1093) 
* Remove outdated / unused tools and such from the repo

* Remove shtuff from SETUP.md
 2023-07-23 02:20:18 +09:00
Alex Bates
4680a74e0b
Introduce clang-format (#1004) 
* add basic .clang-format

* configure vscode clang-format modified lines on save

* update clang-format to only run on C files

* add ci action to print clang-format diff

* use GITHUB_BASE_REF

* --binary

* clang-format-14

* move workflow to pr.yaml

* oops

* checkout fetch-depth 0

* use cpp-linter-action

* test

* fail if step fails

* log depth

* fetch main

* set fetch-depth

* limit diff and run clang-format

* use versioned clang-format

* untiy actual code

* fix argument order

* colorize output

* Clean up #989

* move cpp lint job to lint.yaml

* disable vscode autoformat

* add git hook to make sure assets/$version has been gitignored (#1006)

* add git hook to make sure assets/ hasn't been gitignored

* echo to stderr

* quiet git check-ignore

* add .v64 and .n64 to gitignore

* Changed some variable names in state_title_screen (#1003)

* Changed some variable names in state_title_screen.c

* resolving pull request items

* changed TitleData to TitleScreenGfxData across sys

* replace gbi names with understandable ones

* accidentally switched logo and pressStart

* changed GfxData to ImgList

* Renaming and b32

* Doing this but more

* pause menu cleanup (#1008)

* minor pause cleanup

* macro

* comments

* second macro

* delete macros

* hm

* pause message names

* unused tutorial messages

* oops

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>

* fold doc 1 (#1009)

* minor fold cleanup

* fold doc I

* enough

* rename

* last

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>

* appendGfx_shading_palette (#1010)

* cleanup & warnings for modern gcc

* clean

* stuff

* diff.py update

* Fix offset problem in struct

* Fix texture issue in chapter_change

* appendGfx_shading_palette

* Convert tabs to spaces (#1012)

* Add .git-blame-ignore-revs (#1014)

# 1213a4adf0aa515d0c7c7e37db396363914fda2egit-blame

* func_E02000AC (#1013)

* draw_image_with_clipping (#1016)

* draw_image_with_clipping

Co-authored-by: Unnunu <serge_zorkin@mail.ru>

* tiny fix

---------

Co-authored-by: Unnunu <serge_zorkin@mail.ru>

* npc_do_player_collision (#1017)

* appendGfx_animator_node  (#1018)

* appendGfx_animator_node

Co-authored-by: Mr-Wiseguy <68165316+Mr-Wiseguy@users.noreply.github.com>

* find_similar_areas improvements

* oopz

---------

Co-authored-by: Mr-Wiseguy <68165316+Mr-Wiseguy@users.noreply.github.com>

* lol 100% (#1019)

Co-authored-by: Rainchus <rainmachus@gmail.com>
Co-authored-by: Unnunu <serge_zorkin@mail.ru>

* image fx (#1015)

* more fold

* fold render modes

* fold rename 1

* fold rename 2

* fold rename 3

* imgfx struct reorg

* post merge

* the rest

* extras

* forgot these

* done

* ImgFx

* ImgFX

* check

* misc cam stuff

* ws

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>

* Pal pause (#1011)

* PAL pause segment

* PAL pause_gfx_en segment

* Apply name changes

* Merge gPauseBadgesElements

* Rename ITEM_TYPE_FLAG_ENTITY_COLLECTIBLE

* Split PAL and monolingual arrays

* Nix support (#1020)

Very hacky
Will be maintained by @NotNite

* use ARRAY_COUNT(ExtraDoubleRecipes) (#1023)

* Replace python-githooks with manual command (#1027)

* ui_images (#1021)

* ui_images

* Move French assets to their own folder

* imgfx data (#1029)

* various cleanup (#1030)

* more fold

* fold render modes

* fold rename 1

* fold rename 2

* fold rename 3

* imgfx struct reorg

* post merge

* the rest

* extras

* forgot these

* done

* ImgFx

* ImgFX

* check

* misc cam stuff

* ws

* misc

* btl msg

* 3 combine modes

* 3 more

* many more

* screen overlays

* stencil types

* all screen transitions

* jp build fix

* another jp fix

* iq fix

* mystery battle enum added oOoOoOoOooo

* DMG_SRC

* starting battle cam presets

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>

* btl cam modes (#1035)

* some btl cam

* couple things

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>

* Add version option to diff.py (#1037)

* Clean trailing whitespace (#1038)

* Add missing newlines

* Remove trailing whitepace

* split em (#1040)

Co-authored-by: HailSanta <Hail2Santa@gmail.com>

* Update .git-blame-ignore-revs (#1039)

* standardized battle script names (#1043)

* damage intensity

* standardized battle script names

* few more

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>

* Dump PAL filemenu section (#1036)

* Dump PAL filemenu section

Co-authored-by: Unnunu <serge_zorkin@mail.ru>

* Clean up numbers

* Use more constants

* Find more constants

* Clean up a bit

* eth cleanup

* Clean up

* Fix brace style

* rename new file & funcs

---------

Co-authored-by: Unnunu <serge_zorkin@mail.ru>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>

* revert test change

* update clang-format config

* indent case labels

---------

Co-authored-by: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Co-authored-by: CreateSource <72283721+abnormalhare@users.noreply.github.com>
Co-authored-by: HailSanta <53960937+HailSanta@users.noreply.github.com>
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
Co-authored-by: Mr-Wiseguy <68165316+Mr-Wiseguy@users.noreply.github.com>
Co-authored-by: Rainchus <rainmachus@gmail.com>
Co-authored-by: Julian <hi@notnite.com>
Co-authored-by: Devon R <Gorialis@users.noreply.github.com>
 2023-05-02 05:07:31 +09:00
Ethan Roseman
2340b15e97
Master to main (#970) 
* step 1

* gMasterGfxPos -> gMainGfxPos

* change label name
 2023-03-09 01:55:54 +09:00
Alex Bates
e8e5aee522
Add pull request template (#479) 2021-10-17 15:34:52 +01:00
alex
d726b26287
Enforce warnings count in pull requests (#380) 
* add warnings_count

Stolen from https://github.com/zeldaret/mm.

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* emit only new warnings

* add jp warnings

* fix ccache (lmao)

* slug comments about warnings

* oops

* oops again

* oops again again

* adjust message

* truncate warnings list if there are more than 100

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
 2021-08-24 22:30:35 +09:00
Alex Bates
5c5fbf8f0c run coverage on all PRs/pushes 2021-08-02 17:06:17 +01:00
Ethan Roseman
ee7f09bb2b
Snibblets, Tidbits, and Morsels (#188) 
* fixing segment

* redoing subtree

* git subrepo clone https://github.com/ethteck/splat.git tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "99cf514297"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "99cf514297"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* fix symbol_addrs

* sweet victory

* reformat collision_main_lateral.s

* Lots of matches, fixed diff.py issue, improved coverage.py

* some more

* update symbol_addrs

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "c46026725a"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "c46026725a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* update symbol_addrs

* fix disasm

* 2 mo

* Jenkinsfile

* PR comments
 2021-02-18 20:54:07 +09:00
Alex Bates
6a5a200601
fix doxygen 2020-10-20 21:40:49 +01:00
Ethan Roseman
54d5f4f08e
Merge pull request #85 from nanaian/doxygen 
Doxygen
 2020-10-20 15:59:35 -04:00
Alex Bates
c648cb6b69
deploy docs to gh-pages 2020-10-20 18:46:50 +01:00
Alex Bates
6d3d3b5fca
fix coverage workflow 2020-10-20 04:33:27 +01:00
Alex Bates
8a4c4fbbf5
fix coverage, remove extraneous nusys asm 2020-10-14 21:48:16 +01:00
Alex Bates
6cd56e72c1
fix lint failing on first commit to branch 
We now lint ALL files in the repository, not just those detected as changed in the commit (the procedure to do this failed when HEAD was exactly 1 commit ahead of the base branch). Also we now only lint pull requests, not in-progress pushes to any branch.
 2020-10-13 20:53:45 +01:00
Alex Bates
b37ca1583c
ci: don't fail lint on first push to new branch 2020-08-24 13:53:19 +01:00
Alex Bates
130ebd5401
ci: fix coverage 2020-08-20 17:06:48 +01:00
Alex Bates
4f2261c5d9
resolve conflicts with master 2020-08-20 17:02:57 +01:00
Alex Bates
54fc47a0eb
fix lint workflow 2020-08-19 23:33:22 +01:00
Alex Bates
cc7cd275e6
ci: require matched asm files are deleted 2020-08-19 01:53:24 +01:00
Alex Bates
0c318f87ab
add github action to lint on push/pr 2020-08-19 01:12:20 +01:00
Alex Bates
b5256e31ee
add astyle, update clang-tidy config 2020-08-19 01:11:25 +01:00