Commit graph

101 commits

Author SHA1 Message Date
Agent X
fe114133ff Fix headless compilation and do some formatting 2024-06-30 20:55:47 -04:00
Agent X
30e11da29e Actually fix toad spots 2024-06-30 16:48:40 -04:00
Agent X
dfc55faa5b Fix Waluigi 2024-06-30 15:09:07 -04:00
Agent X
fad91e03b1 Update Toad spots 2024-06-30 08:23:39 -04:00
FluffaMario
5cba5bede1
Updated Player Characters (#85)
* Update Player Characters

* Oops...

* Slipped through

* Hopefully this is good now?
2024-06-30 07:40:29 -04:00
Agent X
c5237b2d30 Fix mantas and sushis being unshadable by Lua 2024-06-22 10:33:02 -04:00
Agent X
a6648cf517 Make coins able to be shaded by Lua 2024-06-21 22:38:08 -04:00
Agent X
270244d02d Make metal cap use EMBLEM on the models 2024-06-21 14:06:37 -04:00
Agent X
ceb7aa4649 Palette system overhaul and preset rewrite 2024-05-21 17:09:59 -04:00
Agent X
a6b938df75 Shorten include paths by removing unnecessary "src/" 2024-04-17 17:28:38 -04:00
Isaac0-dev
663e4549d8
extract assets from rom at runtime (#4)
* Proof of concept for loading rom assets at runtime

* Added skybox textures

* Adjusted format

* Load all texture assets from rom

* Adjusted rom asset loading

* Load all Vtx lists from rom

* clean up toad, wario and his cap conflicts

* Load sound samples from rom

* fix toad sounds

* Loaded sequences from rom

* Load collisions from rom

* Object animations are now loaded from the rom

* Load player animations from rom

* Load goddard anims from rom

* whoops

* fix some compile errors

* drag and drop rom checker, everything works now.

* fix errors due to merge conflicts

* fix compile errors on windows, switch to md5

* fix vertex colors during load

Co-Authored-By: Agent X <44549182+agent-11@users.noreply.github.com>

* Load dialogs from rom

* Loaded course/act names from rom

* Loaded ingame text from rom

* rerun autogen & blacklist smlua_text_utils_init

* fix ttc_seg7_vertex_0700B238 colors

---------

Co-authored-by: MysterD <myster@d>
Co-authored-by: Agent X <44549182+agent-11@users.noreply.github.com>
2024-03-23 16:11:30 -04:00
Agent X
6d114b3736 Fix invisible hoot wings 2024-03-10 19:21:01 -04:00
Agent X
8c6102d1e1 Make dirt particle shadable 2024-03-05 21:14:01 -05:00
Agent X
396d5c730b Make Mario & Luigi cap emblems use the shirt color
At best, some palettes look better and at worst some palettes look the same.
2024-03-02 11:42:26 -05:00
FluffaMario
4f7da1288f It's better this way... 2023-12-09 14:05:19 -06:00
FluffaMario
f469a9fb77 Fix Toad's Cap Textures 2023-12-08 23:32:33 -06:00
FluffaMario
4337aeca0e Update Toad 2023-12-08 23:20:54 -06:00
FluffaMario
aed5353e61 Double Oops 2023-12-08 03:52:17 -06:00
FluffaMario
d9dd7adc95 Oops 2023-12-08 03:45:26 -06:00
FluffaMario
1df1cc9558 Update Wario, hope this works... 2023-12-08 03:38:52 -06:00
MysterD
406959e568 Make all player models reset texture2 2023-11-26 21:42:09 -05:00
MysterD
55673e1f3c Prevent new caps from corrupting romhack graphics 2023-11-26 21:32:03 -05:00
David Joslin
0fcfaa147d Prevent multitexture corruption in new Mario/Luigi models 2023-11-21 16:42:13 -05:00
FluffaMario
b758a391d8
Merge branch 'coop-deluxe:main' into main 2023-11-19 19:15:01 -06:00
FluffaMario
528e4f592a Fixed an oversight involving multitextures 2023-11-19 19:12:51 -06:00
David Joslin
5fd26a5f68 Update Mario & Luigi models, provided by FluffaMario 2023-11-17 18:32:03 -05:00
FluffaMario
efc7935ab0 Further Fixes 2023-11-15 19:20:07 -06:00
FluffaMario
ebcf2e846e Added Luigi 2023-11-15 19:04:40 -06:00
FluffaMario
f955b5d92c Brighter Logo for Mario 2023-11-15 16:53:11 -06:00
FluffaMario
ab4b797ff8 Updated Mario, Added code for mirror culling. 2023-11-14 00:34:13 -06:00
Agent X
4df5037399 April Fools 2023-11-12 09:59:04 -05:00
Agent X
49bca1cc01 sm64coopdx
Co-Authored-By: Yuyake <140215214+AngelicMiracles@users.noreply.github.com>
Co-Authored-By: FluffaMario <50761036+FluffaMario@users.noreply.github.com>
Co-Authored-By: Gregory Heskett <gheskett@gmail.com>
Co-Authored-By: iZePlayzYT <69536095+iZePlayzYT@users.noreply.github.com>
Co-Authored-By: Isaac0-dev <62234577+Isaac0-dev@users.noreply.github.com>
Co-Authored-By: eros71 <16540103+eros71-dev@users.noreply.github.com>
2023-10-30 01:03:36 -04:00
Sonicxryan
c3fba60a2b
Waluigi model update (#435)
Fixed mistake in model.inc.c
2023-07-04 16:24:20 -07:00
FluffaLuigi
2a52b4af4e
Update Mario, Luigi and Wario's Models (#434)
Updated Luigi and Wario's models to their latest revision.
Mario, Luigi and Wario's sideburns now match the color of the rest of their hair with the player's palette.
Mario and Luigi's Logos were made into IA16 textures and are now shaded to look a bit better with the rest of the cap.
Cap inside was made a darker variant of the regular cap color across both the held and item caps.
Fixed an oversight with the cap wings, though mostly so that they're more consistent.
Removed Mario's unused model data since none of it is ever getting used as far as I'm aware.
2023-07-04 16:23:34 -07:00
Sonicxryan
53f5783193
Updated Waluigi's Model (#430)
Consistency with FluffaLuigi's emblem updates.
2023-07-04 14:16:34 -07:00
MysterD
5fdc7b67e8 Fixed corruption of toad player's spots 2023-06-11 14:18:39 -07:00
MysterD
41a4fcf516 Keep animations in-bounds 2023-05-18 12:42:18 -07:00
MysterD
d30b1e61a6 Add a container to animation tables so that we can track their length and stay in bounds 2023-05-10 20:57:35 -07:00
PeachyPeach
1e175b5ce7
Make most used and useful features built-ins (#242)
* made all bools u8 for consistency with fixCollisionBugs
* preview blue coins + visible secrets
* preserve indexing
* star number
* hud cap timer
* red coins radar + secrets radar
* extended pause display
* autogen
* only sDynosBuiltinFuncs is sensitive to indexing
* rebased
2023-02-26 03:15:54 +01:00
Sonicxryan
f6fcf65ed2
Updated Waluigi Model (#261)
* Updated Waluigi Model

Waluigi model

* Add files via upload

* Few Waluigi Animations

* Revert "Few Waluigi Animations"

This reverts commit ba0a554290a021d8ee5b694cc52ff1b2cd94e9c9.
2023-02-21 01:43:52 -05:00
Prince Frizzy
336e3d3814 Fix Bomb-Ombs inherting an incorrect geometry mode and a incorrect combine mode from other objects. 2023-02-02 14:44:52 -05:00
PeachyPeach
a8e397047a
CAP color; near/far warning fix (#214)
Added CAP color part; Player's cap no longer uses the SHIRT color
    Added METAL color as an alias of CAP color; Metal characters now uses the CAP color to tint the metal texture (was SHIRT color)
    Fixed the cap inside color (was HAIR color)
    Fixed the near/far warning
2022-10-30 17:30:40 -07:00
PeachyPeach
6449b7d578
Complete color palettes; gfx macros (#191) 2022-09-18 17:30:13 -07:00
Llennpie
7056d27484
Fix black outline bug on model textures (#152) 2022-08-25 17:26:22 -07:00
TheGag96
dc3ca7c76d
Arbitrary shirt, pants, glove colors + settings menu (#145)
* Support for more granular player colors

You can now configure RGB values for shirt, pants, gloves, and shoes.
Due to some limitations, configuring shoes does nothing at the moment.

* Remove paletteIndex and friends

Restructured and filled in some remaining code to account for that.

* Add Edit Palette panel to Player panel

* Change PlayerPalette contents to an enum-indexed array, remove shoes

This gets rid of all the hokey code doing switch cases on the
different parts.

* Fix goof with player model selection box

Should actually have affect now even if a custom palette is being used.

* Fix gap in player color display list commands

The extra space was leftover from when I was trying to get shoes
working. Forgot to clean it up.

* Standardize PlayerParts enum, including for lua constants autogen

* djui_panel_player.c: Properly hook sending palette changes on unpause

Editing the palette and then unpausing should send out the packet to
everyone with the new palette changes (and update the palette preset
selection box), but since we weren't hooking that situation before, it
would stay changed only for you. You would have had to press the Back
button for it to work right.

* Allow Lua mods to continue using `paletteIndex`, `overridePaletteIndex`

This lets mod code like this still work unchanged:

if s.team == 2 then
    np.overridePaletteIndex = 7
elseif s.team == 1 then
    np.overridePaletteIndex = 15
else
    np.overridePaletteIndex = np.paletteIndex
end

It's essentially faked, and would work strangely if the value of either
variable was inspected more closely directly. This should at least
handle the typical use case, though.

Every frame, `overridePaletteIndex` is checked to see if it was modified
from its previous value. If so, `overridePalette` is set to the preset
corresponding to the index. `paletteIndex` contains a special value that
when used to assign to `overridePaletteIndex`, it copies `palette` into
`overridePalette` to restore the real colors, which of course may not
follow the presets at all.

* characters.h: Pack `PlayerPalette` to eliminate size differences between computers

* mario_misc.c: Remove remaining "TODO GAG"
2022-08-07 15:13:19 -07:00
MysterD
de2300f837 Fix clang/mac compile 2022-05-19 19:42:07 -07:00
PeachyPeach
68e1b72b99
3-digits orange numbers; Fixed red coins and secrets bugs; Correct red coins display during pause (#82)
Modified number_geo to allow it to display orange numbers from 0 to 999.
    Edited red coins/secrets code:
        Added two fields in the Area struct: numRedCoins and numSecrets
        The number of red coins/secrets in every area is computed during level script processing
        Removed the useless global gRedCoinsCollected
    These changes fix the following bugs:
        Wrong sound effect played and incorrect number displayed when there is more than 8 red coins/5 secrets
        Desynced red coins/secrets counter when going from an area to another
        Remotely spawning red coins/secrets stars in other areas without collecting all red coins/secrets
    Pausing the game now shows the correct number of collected red coins / the total number of red coins in the current area.
2022-05-07 19:09:37 -07:00
MysterD
ad6642a4bd Add support for custom HUD textures and faster texture packs w/o EXTERNAL_DATA 2022-05-06 22:03:12 -07:00
MysterD
8d10529061 Fix Luigi metal color 2022-04-16 23:53:10 -07:00
MysterD
af9b359227 Replace Luigi model with FluffaLuigi's 2022-04-14 22:02:33 -07:00