Commit Graph

10620 Commits (f70250a2969dee3089f4fa2fccbbb1c22837534f)

Author SHA1 Message Date
scrawl f70250a296 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/CMakeLists.txt
	components/CMakeLists.txt
	extern/osg-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
Marc Zinnschlag c560f8b8a2 Merge remote-tracking branch 'smbas/fix-regionmap-colors' 10 years ago
Stanislav Bas 650e37dba1 RegionMap uses proper colors 10 years ago
scrawl 89c2a7e26b Fix for possibly missing library on windows 10 years ago
scrawl e13a938896 Add support to build with Qt5 (Task #2665)
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
10 years ago
scrawl d4c45efb2b Remove useless #undef's for windows now that we have NOMINMAX flag 10 years ago
scrawl 4b5c2398a1 Remove QTextCodec::setCodecForCStrings
Not needed, we're using QString::fromUtf8/toUtf8 to handle encodings correctly.
10 years ago
scrawl cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 10 years ago
scrawl 7407bbdac9 Add a function for SDL error handling 10 years ago
scrawl 800bd511f6 Set a sensible value for SDL_GL_DEPTH_SIZE (Bug #2649) 10 years ago
scrawl fc5176dc38 Refactor cmake scripts, reducing the amount of find_package(Qt4) 10 years ago
scrawl d03880fbf0 Compile fix for old boost versions 10 years ago
scrawl 76bdf7a5b7 Add night-eye effect 10 years ago
scrawl 6051c47eef Fix for incorrect QString -> path conversion 10 years ago
scrawl 712cef36b0 Minor cleanup 10 years ago
scrawl f81c3bcd6d Fix for broken InitWorldSpaceParticles on projectile effects 10 years ago
scrawl c94c87d409 Attach effects to the insert node instead of the object root (Bug #2654) 10 years ago
scrawl c7493eb45c Fix bug with invisibility effect for meshes w/ vertex colors 10 years ago
Marc Zinnschlag 8d22d26669 Merge remote-tracking branch 'cc9cii/scrollbar-fix' 10 years ago
scrawl 15453e3d90 Use MyGUI::UString for unicode conversion 10 years ago
scrawl f511cb08ff Compatibility with bullet versions < 2.81 10 years ago
Alexander "Ace" Olofsson cd42448cd6 Windows build fixes and CMakeLists cleanup
Adds some flags necessary to build and link with OSG.
This also moves LTO and MP switches to user-accessible options, and actually
applies the generated CXXFLAGS to the project. Since the generation
happens after the subdirectories are added.
10 years ago
Marc Zinnschlag f3e040b531 Merge remote-tracking branch 'cc9cii/filter-fix' 10 years ago
cc9cii 893ad11be1 Fix missing columns in tables. Should resolve Bug #2624.
- Using Flag_Table in filterAcceptsColumn() does not work.
- Workaround by not allowing nested columns in sorting and filtering.
10 years ago
scrawl 0330d3d61e Restore the "transparent" loading screen 10 years ago
scrawl f3cbe7b9da Hide FPS widget since it currently doesn't work, use F3 instead 10 years ago
scrawl bf02c7f6e4 Sun visibility fix 10 years ago
scrawl 508c57d6e2 addEffect crash fix for objects with no model 10 years ago
scrawl 16e080e252 Fix the physics debug drawer lagging a frame behind 10 years ago
scrawl b33fe8fb62 Fix the inventory listener bug 10 years ago
scrawl e66e9916db Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/document.hpp
10 years ago
Stanislav Bas c9a8d53240 Merge remote-tracking branch 'upstream/master' 10 years ago
Marc Zinnschlag 211f6a39b8 Merge remote-tracking branch 'cc9cii/keep-comments' 10 years ago
Marc Zinnschlag d90aff4303 Merge remote-tracking branch 'smbas/feature-id-completion' 10 years ago
cc9cii d3b7cf44d3 Remove user preference setting option. 10 years ago
scrawl 0a411cbd7c Enable particle lighting 10 years ago
Stanislav Bas d63b01dde3 Checkboxes in the table view use a combobox editor 10 years ago
cc9cii 15fe5d88e2 Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535.
- controlled via a checkbox in launcher settings
10 years ago
Stanislav Bas 49512a2b57 Correct the explanation for the Console::acceptCommand() 10 years ago
Stanislav Bas d2293867ba Add the explanation to Console::acceptCommand() 10 years ago
Stanislav Bas 58e2d3711f Reset Console editbox before command execution 10 years ago
cc9cii 5c37079f0c Include only the columns that are visible for sorting. Should resolve Bug #2611. 10 years ago
scrawl 4c09ecef72 Normalize fixes 10 years ago
scrawl 1fd48e6f81 Fix not being able to move during ashstorm 10 years ago
scrawl 700000cbca Error handling fix 10 years ago
scrawl 403ce30a35 Graceful handling for failing to create SDL window 10 years ago
scrawl ddfed35d1c Object placement raycasts should use the rendering meshes 10 years ago
Stanislav Bas c40987338d Scrollbars don't save their positions between openings 10 years ago
scrawl a0b0ae9bd1 Remove an unused variable 10 years ago
scrawl 958b34771a Fix clang warnings about 'typename' outside of a template 10 years ago