mirror of
https://github.com/izzy2lost/Ghostship.git
synced 2026-03-10 11:52:18 -07:00
20674529ab
* Fixed GeoLayout loading and implemented mario loading from otr * Ported bobomb and coins * Ported cannon barrel * Ported blue_coin_switch * Fixed collision loading * Ported checkerboard_platform * Ported most of common0 to otr * Fixed amp on jp * Fixed some wrong yamls * Fixed faulty snow interpolation * Bump LUS * Extracted 99.99999% actors to be loaded from otr * Removed unnessesary print and added o2r mod support * Fixed headers * Added us support into geolayout parser * Fixed conflicts * Removed done indicators * Remove duplicated headers * Added bbh, bitdw, bitfs, bits, bob and lll loaded from otr * Bump torch * Fixed linux compilation * Pushed header generation * Got compiling on Linux working. (#59) * Added more data and hopefully fix more issues * Updated libultraship * bin dls and vtxs (#60) * Fixed master volume * Updated torch * Renamed otr files * Renamed otr en cmakelists * Updated libultraship and torch * Removed actors code * [WIP] The big one that removes almost all hardcoded assets from levels and actors * Updating cmake to match Starship * Updated more references * Updated cmake to add more targets * Updated o2r name * Removed unnecesary dma call * Updated gitmodules * Bump LUS, fixed cmake and fixed audio on windows * Update torch and wdw * Fixed some corrupted ptrs, cleaned up jp support and fixed bully * Added USE_GBI_TRACE * Fixed packaging.cmake and audio fixes * Removed old LUS * Updated torch and readded LUS * More compilation issues * Removed interpolation to use on the future the new system * Bump libs * Reimplemented skybox, and added synthesis overflow fix * Removed prints to use SPDLOG * This should had been on another branch but fuck it * Added more interpolation stuff * Fixed interpolation, fixed some random things and ported from GameInteractor to Lwyx's EventSystem * Removed some FrameInterpolation changes * Fixed gitignore and implemented PortEnhancements * Fixed interpolation crashes, WIP implemented reset among other fixes * Bump torch to fix paintings * Moved log to be a trace * Readded some frame tagging * Fixed rumble * Fixed skybox crashes * Bump LUS * Moved skybox and floats to float for better precision * Moved to health change and created lives change event * Fixed bubbles being broken * Fixed lives event not being registered * Fixed skybox crashes * Initialized mixer variables * Fixed some memory leaks * Fixed trajectory being exported incorrectly * Hopefully fixed us yamls * Fixed remaining us issues * Implemented o2r generation among some other things --------- Co-authored-by: KiritoDv <KiritoDv> Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com> Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>
76 lines
1.2 KiB
C
76 lines
1.2 KiB
C
#ifndef COMMON1_H
|
|
#define COMMON1_H
|
|
|
|
#include "types.h"
|
|
|
|
// blue_fish
|
|
#include "assets/actors/blue_fish.h"
|
|
|
|
// bowser_key
|
|
#include "assets/actors/bowser_key.h"
|
|
|
|
// butterfly
|
|
#include "assets/actors/butterfly.h"
|
|
|
|
// coin
|
|
#include "assets/actors/coin.h"
|
|
|
|
// dirt
|
|
#include "assets/actors/dirt.h"
|
|
|
|
// door
|
|
#include "assets/actors/door.h"
|
|
|
|
// explosion
|
|
#include "assets/actors/explosion.h"
|
|
|
|
// flame
|
|
#include "assets/actors/flame.h"
|
|
|
|
// leaves
|
|
#include "assets/actors/leaves.h"
|
|
|
|
// mario_cap
|
|
#include "assets/actors/mario_cap.h"
|
|
|
|
// mist
|
|
#include "assets/actors/mist.h"
|
|
|
|
// mushroom_1up
|
|
#include "assets/actors/mushroom_1up.h"
|
|
|
|
// number
|
|
#include "assets/actors/number/geo.h"
|
|
|
|
// pebble
|
|
#include "assets/actors/pebble.h"
|
|
|
|
// power_meter
|
|
#include "assets/actors/power_meter.h"
|
|
|
|
// sand
|
|
#include "assets/actors/sand.h"
|
|
|
|
// star
|
|
#include "assets/actors/star.h"
|
|
|
|
// transparent_star
|
|
#include "assets/actors/transparent_star.h"
|
|
|
|
// tree
|
|
#include "assets/actors/tree.h"
|
|
|
|
// warp_collision
|
|
#include "assets/actors/warp_collision.h"
|
|
|
|
// warp_pipe
|
|
#include "assets/actors/warp_pipe.h"
|
|
|
|
// white_particle
|
|
#include "assets/actors/white_particle.h"
|
|
|
|
// wooden_signpost
|
|
#include "assets/actors/wooden_signpost.h"
|
|
|
|
#endif
|