mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-23 09:41:33 +00:00
Code Issues Releases Wiki Activity

Merge branch 'nocolladacorruption' into 'master'

Browse source 
[OpenMW-CS] Fix corrupted rendering of collada-models

See merge request OpenMW/openmw!549
This commit is contained in:
psi29a 2021-01-18 18:36:43 +00:00
commit c727e823e8
4 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -87,6 +87,7 @@
Bug #5695: ExplodeSpell for actors doesn't target the ground Bug #5695: ExplodeSpell for actors doesn't target the ground
Bug #5703: OpenMW-CS menu system crashing on XFCE Bug #5703: OpenMW-CS menu system crashing on XFCE
Bug #5706: AI sequences stop looping after the saved game is reloaded Bug #5706: AI sequences stop looping after the saved game is reloaded
Bug #5713: OpenMW-CS: Collada models are corrupted in Qt-based scene view
Bug #5731: Editor: skirts are invisible on characters Bug #5731: Editor: skirts are invisible on characters
Bug #5739: Saving and loading the save a second or two before hitting the ground doesn't count fall damage Bug #5739: Saving and loading the save a second or two before hitting the ground doesn't count fall damage
Bug #5758: Paralyzed actors behavior is inconsistent with vanilla Bug #5758: Paralyzed actors behavior is inconsistent with vanilla

1
CHANGELOG_PR.md
View file

@ -39,6 +39,7 @@ Editor Bug Fixes:
- Verifier no longer checks for alleged 'race' entries in clothing body parts (#5400) - Verifier no longer checks for alleged 'race' entries in clothing body parts (#5400)
- Loading mods now keeps the master index (#5675) - Loading mods now keeps the master index (#5675)
- Flicker and crashing on XFCE4 fixed (#5703) - Flicker and crashing on XFCE4 fixed (#5703)
- Collada models render properly in the Editor (#5713)
Miscellaneous: Miscellaneous:
- Prevent save-game bloating by using an appropriate fog texture format (#5108) - Prevent save-game bloating by using an appropriate fog texture format (#5108)

3
apps/opencs/main.cpp
View file

@ -63,6 +63,9 @@ int runApplication(int argc, char *argv[])
application.setWindowIcon (QIcon (":./openmw-cs.png")); application.setWindowIcon (QIcon (":./openmw-cs.png"));
CS::Editor editor(argc, argv); CS::Editor editor(argc, argv);
#ifdef __linux__
setlocale(LC_NUMERIC,"C");
#endif
if(!editor.makeIPCServer()) if(!editor.makeIPCServer())
{ {

2
apps/opencs/model/world/resourcesmanager.cpp
View file

@ -17,7 +17,7 @@ void CSMWorld::ResourcesManager::addResources (const Resources& resources)
const char * const * CSMWorld::ResourcesManager::getMeshExtensions() const char * const * CSMWorld::ResourcesManager::getMeshExtensions()
{ {
// maybe we could go over the osgDB::Registry to list all supported node formats // maybe we could go over the osgDB::Registry to list all supported node formats
static const char * const sMeshTypes[] = { "nif", "osg", "osgt", "osgb", "osgx", "osg2", 0 }; static const char * const sMeshTypes[] = { "nif", "osg", "osgt", "osgb", "osgx", "osg2", "dae", 0 };
return sMeshTypes; return sMeshTypes;
} }