Commit Graph

79 Commits (ce044fcb69732e0b1518e80f470a6dbd8a803729)

Author SHA1 Message Date
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
MysterD 93beb2001e Prevent generating extra geos for player models, allow referencing mario textures 2022-04-14 21:49:41 -07:00
MysterD 4cc80f65e2 Fixed metal toad corrupting held, or nearby, objects 2022-04-14 21:02:33 -07:00
MysterD 1508f07fef Added actor textures to dynos builtin list; added shadow_spike_ext 2022-04-13 19:13:25 -07:00
MysterD 469e4ac4e4 Load Super Keeberghrh's ERROR model when DynOS can't find the model 2022-03-16 01:34:18 -07:00
Sonicxryan 2802d0e7a4
Color metal textures based on palette (#26) 2022-03-13 17:32:27 -07:00
Prince Frizzy 75bb9b7912
Update to Refresh 13 (#19)
* Refresh 13

Co-authored-by: n64 <n64>
2022-03-13 00:17:10 -08:00
MysterD 4ddf7ddf81 Updated Wario model by FluffaLuigi
Fixed Wario's hip offset
Updated UV and textures
2022-03-09 21:24:39 -08:00
MysterD 99192aabb5 Fix Wario textures when EXTERNAL_DATA is set 2022-02-18 19:04:25 -08:00
MysterD eb22894ca7 Revert "Fixed rendering of metal Toad's held objects"
This reverts commit efcf78dee1.
2022-02-18 18:48:43 -08:00
MysterD efcf78dee1 Fixed rendering of metal Toad's held objects 2022-02-16 23:15:59 -08:00
MysterD 6f8714c764 Added FluffaLuigi's Wario model 2022-02-13 21:52:35 -08:00
MysterD 0d2358d4c6 Adjust waluigi_cap's compilation order 2022-01-15 20:43:49 -08:00
MysterD 5a507afe8d Renamed waluigi textures so they can be committed 2021-09-05 15:39:50 -07:00
MysterD 4cebce4864 Added Waluigi - model provided by Super Keeberghrh 2021-09-05 14:23:47 -07:00
MysterD 4b3276afbf Fixed rendering of metal-Luigi's held object 2021-09-01 18:25:19 -07:00
MysterD 8fa8fc4799 Prevented Toad's face from getting corrupted in certain areas 2021-08-22 16:30:27 -07:00
MysterD 4688ffe1f0 Added toad player character 2021-08-18 22:55:31 -07:00
MysterD 8a40aeddea Refactored how enemies display a cap in their hand 2021-08-18 21:39:39 -07:00
MysterD 43932249c6 Added support for spawning Luigi-versions of metal/vanish/wing cap as items 2021-08-15 11:46:28 -07:00
MysterD 1b5ceda89d Split luigi/custom character models into custom and zcustom 2021-08-15 01:06:25 -07:00
MysterD d772764c4e Fixed cap-on-ground colorization behavior 2021-08-09 23:39:29 -07:00
Llennpie e8fd9c723b Fix strange black outline that appears on custom cap textures 2021-08-09 00:45:14 -04:00