Malkierian cd32181415 Fix incorrect merge conflict resolution.

2025-06-12 22:41:19 -07:00

..

config

Fix warnings (#5516)

2025-05-23 14:21:25 -07:00

Enhancements

Fix incorrect merge conflict resolution.

2025-06-12 22:41:19 -07:00

Extractor

Apply clang-format to files (#5273)

2025-04-01 22:33:38 -04:00

Network

Cleanup whitespace (#5281)

2025-04-03 00:16:52 -04:00

Notification

Apply final specifier to classes inheriting from Ship::GuiWindow (#5443)

2025-05-01 19:00:10 -07:00

ObjectExtension

Add ObjectExtension system (#5429)

2025-05-23 14:05:33 -07:00

resource

Fix warnings (#5516)

2025-05-23 14:21:25 -07:00

SohGui

Merge branch 'develop-blair' of github.com:Malkierian/Shipwright into develop

2025-06-12 17:46:47 -07:00

ActorDB.cpp

Apply clang-format to files (#5273)

2025-04-01 22:33:38 -04:00

ActorDB.h

Apply clang-format to files (#5273)

2025-04-01 22:33:38 -04:00

CrashHandlerExp.h

Apply clang-format to files (#5273)

2025-04-01 22:33:38 -04:00

CrashHandlerExt.cpp

Apply clang-format to files (#5273)

2025-04-01 22:33:38 -04:00

cvar_prefixes.h

Prevent GameplayStats and TimeDisplay from getting reset on ship json drag and drop (#5269)

2025-03-31 21:28:48 +02:00

frame_interpolation.cpp

Apply clang-format to files (#5273)

2025-04-01 22:33:38 -04:00

frame_interpolation.h

Experimental interpolation (#309)

2022-05-13 18:43:55 -04:00

framebuffer_effects.c

Port pause menu framebuffer handling from 2Ship (#4346)

2024-10-10 16:45:11 -07:00

framebuffer_effects.h

Port pause menu framebuffer handling from 2Ship (#4346)

2024-10-10 16:45:11 -07:00

GameVersions.h

bump lus/support lus changes (#4701)

2024-12-16 21:12:45 -05:00

GbiWrap.cpp

Apply clang-format to files (#5273)

2025-04-01 22:33:38 -04:00

gu_pc.c

add support for clang compiler (#592)

2022-07-10 10:51:12 -04:00

mixer.c

Apply clang-format to files (#5273)

2025-04-01 22:33:38 -04:00

mixer.h

Moves SoH mixer to SoH from LUS. (#2361)

2023-01-17 22:03:55 -05:00

mq_asset_hacks.h

[OTR Archive] Move shared scenes out of nonmq/mq folders (#3191)

2023-11-06 16:44:49 -06:00

OTRAudio.h

Import libultraship as a submodule (#1943)

2022-11-14 11:22:34 +01:00

OTRGlobals.cpp

Merge branch 'develop-blair' of github.com:Malkierian/Shipwright into develop

2025-06-12 17:46:47 -07:00

OTRGlobals.h

Merge branch 'develop-blair' of github.com:Malkierian/Shipwright into develop

2025-06-12 17:46:47 -07:00

ResourceManagerHelpers.cpp

Bump LUS to latest, and handle tinyxml and gfx_pc changes. (#5470)

2025-05-16 21:14:55 -07:00

ResourceManagerHelpers.h

Apply clang-format to files (#5273)

2025-04-01 22:33:38 -04:00

SaveManager.cpp

Merge branch 'develop-blair' of github.com:Malkierian/Shipwright into develop

2025-06-12 17:46:47 -07:00

SaveManager.h

Save and Randomizer Version Control (#5557)

2025-06-11 14:39:15 -07:00

ShipInit.hpp

Add ShuffleSongs.cpp & RO_SONG_SHUFFLE_OFF (#5534)

2025-05-30 12:51:21 -07:00

ShipUtils.cpp

Apply clang-format to files (#5273)

2025-04-01 22:33:38 -04:00

ShipUtils.h

Replace old methods with ShipUtils (#5151)

2025-03-30 13:54:40 -04:00

stubs.c

fix link voice missing when hanging off ledges (#5506)

2025-05-18 21:24:57 -07:00

util.cpp

Merge branch 'develop-blair' of github.com:Malkierian/Shipwright into develop

2025-06-12 17:46:47 -07:00

util.h

Apply clang-format to files (#5273)

2025-04-01 22:33:38 -04:00

z_message_OTR.cpp

skip bottling big poes (#5247)

2025-05-23 14:00:35 -07:00

z_play_otr.cpp

Fix Entrance Rando weather override behavior (#5403)

2025-04-14 19:11:36 -04:00

z_scene_otr.cpp

Apply clang-format to files (#5273)

2025-04-01 22:33:38 -04:00