1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-17 07:16:35 +00:00
openmw/files
AnyOldName3 f8224b29d4 Resolve merge conflicts
These were caused by https://gitlab.com/OpenMW/openmw/-/merge_requests/4005

I've had to cherry-pick parts of that MR into this commit, otherwise the CI would yell at me when it noticed the location tags had gone.
2024-04-07 21:59:54 +01:00
..
data Merge branch 'ingame_text' into 'master' 2024-02-23 12:37:21 +00:00
data-mw Start the game on Friday 2023-08-21 21:31:50 +00:00
lang Resolve merge conflicts 2024-04-07 21:59:54 +01:00
launcher Rework launcher UI 2023-01-15 12:36:08 +04:00
lua_api Add a Lua function to check if actor's death is finished 2024-02-22 19:06:15 +04:00
mac
opencs Remove old, unused OpenMW-CS icons and their source files. 2023-01-16 16:08:41 +01:00
shaders Eliminate unused uniform 2024-02-20 23:10:03 +00:00
windows
wizard
CMakeLists.txt Move Morrowind-specific l10n files to a separate data dir; dehardcode a few GMST names. 2023-03-12 13:12:13 +01:00
gamecontrollerdb.txt
openmw-cs.cfg
openmw.appdata.xml Update AppData summary to be more concise 2023-03-12 20:17:40 +01:00
openmw.bmp
openmw.cfg Make builtin.omwscripts actually mandatory 2024-02-27 01:09:46 +00:00
openmw.cfg.local Make builtin.omwscripts actually mandatory 2024-02-27 01:09:46 +00:00
org.openmw.cs.desktop
org.openmw.launcher.desktop
settings-default.cfg Merge branch 'wtf-even-is-force-shaders' into 'master' 2024-02-21 10:21:54 +00:00
version.in Validate version of resources 2023-08-31 20:56:02 +02:00