6 Commits

Author	SHA1	Message	Date
Dydzio	319d05b94f	Missing merge conflict stuff	2023-02-12 12:05:12 +01:00
Dydzio	5a08ec04fe	Initial split of BattleOptionsWindow	2023-02-02 17:17:16 +01:00
Dydzio	d04c53e7e0	Merge branch 'develop' into settings-rework	2023-02-02 11:55:13 +01:00
Dydzio	88744633de	Move buttons from mainOptions to SystemOptionsWindow	2023-01-30 23:26:33 +01:00
Dydzio	cc9d65a341	Make battle settings callable without battle, save last settings tab	2023-01-30 22:15:37 +01:00
Dydzio	9dd692cea4	Initial draft of tabbed settings window	2023-01-30 20:18:59 +01:00