David Chavez 53229f0905 Merge branch 'develop-rachael' into rachael-zhora ... # Conflicts: # libultraship/libultraship/ImGuiImpl.cpp		2022-08-02 20:05:40 +02:00
..
actors	Merge branch 'develop-rachael' into rachael-zhora	2022-08-02 20:05:40 +02:00
effects	Use Macro for __FILE__ & __LINE__ when possible (#559)	2022-07-05 19:29:34 -04:00
gamestates	Fix height value for OptionsMenuSettings (#900)	2022-07-24 09:38:02 -04:00
misc	Minor enhancement: Allow toggling on equipment screen (#813)	2022-07-31 21:35:05 -04:00