mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 17:49:55 +00:00
Code Issues Releases Wiki Activity
20486 commits 38 branches 54 tags 122 MiB
Commit graph

805 commits

Author SHA1 Message Date
Marc Zinnschlag
9c7bbd667b Merge branch 'usersettings' 2015-12-15 14:58:04 +01:00
Marc Zinnschlag
d6bd2cb1f0 changed name of openmw-cs user settings file 2015-12-15 14:51:25 +01:00
Paul Cercueil
46f45773ca CMake: Add the list of possible values for some config options 
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
 2015-12-06 15:55:23 +01:00
sandstranger
7db307e028 delete unused variables 2015-12-03 22:37:42 +03:00
sandstranger
7d374b36fd change cmake variables 2015-12-03 21:29:50 +03:00
sandstranger
d9b1b7c516 addd forgotten line 2015-12-03 19:56:38 +03:00
sandstranger
238a5824be add custom new variable fot Qt 2015-12-03 08:54:14 +03:00
sandstranger
bd5057aa3c enable opengl es1 2015-12-02 22:40:04 +03:00
scrawl
77965501d4 CMakeLists.txt: set the OPENMW_RESOURCE_FILES before configuring openmw.cfg 2015-12-02 17:33:55 +01:00
scrawl
7d6fa1b65a CMakeLists.txt: Don't use DATADIR before it's defined 2015-12-02 16:14:04 +01:00
Dmitry Marakasov
84305a1297 Reuse DATADIR in data paths 2015-12-02 04:17:54 +03:00
scrawl
dca1674133 Merge remote-tracking branch 'upstream/openmw-37' into HEAD 2015-11-24 03:30:57 +01:00
Nikolay Kasyanov
2108e96c15 OS X: use TGA, PNG & JPEG plugins instead of ImageIO 
Using ImageIO is troublesome when one needs to read an image from memory,
see for the details: https://forum.openmw.org/viewtopic.php?f=20&t=2949&start=220#p35531
 2015-11-22 19:32:13 +01:00
Marc Zinnschlag
020b3add94 Merge branch 'openmw-37' 2015-11-17 09:54:49 +01:00
scrawl
0220e82259 Remove unused SOUND_INPUT_INCLUDES cmake variable. 2015-11-14 17:17:22 +01:00
Nikolay Kasyanov
63c47a78d6 OS X: fixup Qt plugin during packaging 2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
d5aeb35449 OS X: use link path for packaging to allow CMake infer library search dirs for @rpath resolving 2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
fff6b5fde1 OS X: remove custom bundle utilities, ones from CMake versions >= 3.1.0 are good enough 2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
5c4899580f OS X: use less ambiguous variable names in packaging code 2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
3ba546628d OS X: always copy Cocoa platform plugin into OpenMW bundle 2015-11-14 13:50:01 +01:00
Bret Curtis
3ea3d07d44 really purge libav 2015-11-12 16:39:29 +01:00
Marc Zinnschlag
cdf17f415e updated version number 2015-11-09 12:03:27 +01:00
Nikolay Kasyanov
dbcce482a6 OS X: enable high resolution mode for OpenMW & OpenCS 
We don't support retina completely yet, but it's still better than
blurry mess, and Qt does pretty good job for OpenCS already.
 2015-08-15 22:37:09 +02:00
Marc Zinnschlag
7f398f8790 Merge remote-tracking branch 'corristo/osx-packaging-nextgen' 2015-08-11 11:49:20 +02:00
Nikolay Kasyanov
34d601360f OS X: setup OSG plugins packaging 2015-08-10 23:15:32 +02:00
Nikolay Kasyanov
2ded28f6aa OS X: reintroduce packaging code 
It's much simpler now thanks to bundle utilities with @rpath support.
 2015-08-10 23:15:32 +02:00
Alexander "Ace" Olofsson
46ce04a65b Don't package duplicate version for Windows 
The real version file is in the resources folder, and that's where it's read from. So the extra file is unused, and redundant.
 2015-08-05 17:10:35 +02:00
Alexandre Moine
581ea26605 Add appdata file for openmw and install it 2015-08-04 13:06:43 +02:00
Arthur Moore
2a653e45fd (Re) Wrote a tool to test NIF files in BSAs and on the filesystem. 
Just give it a set of files, one file per argument, and it will make sure openmw can read them.
 2015-07-28 06:51:47 -04:00
Marc Zinnschlag
4fa2cd288d Merge branch 'openmw-36' 
Conflicts:
	apps/openmw/mwworld/store.hpp
 2015-07-18 12:47:05 +02:00
Marc Zinnschlag
b3ad983f1f Merge remote-tracking branch 'scrawl/version' 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
 2015-07-18 12:22:37 +02:00
scrawl
f09e4620b6 Move OpenMW version information to a textfile instead of compiling it in 
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
 2015-07-18 03:09:04 +02:00
slothlife
83ef1f7eea Add support for linking OpenSceneGraph statically 
Added some basic support for linking to OpenSceneGraph and its plugins
statically. Also added a library necessary to statically link MyGUI
(previously Ogre pulled it in).
 2015-07-17 00:56:15 -05:00
scrawl
cd2e6d4436 Move the __STDC_CONSTANT_MACROS define to cmakelists 2015-06-28 05:53:03 +02:00
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
 2015-06-13 21:11:24 +02:00
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.
 2015-06-12 15:13:42 +02:00
scrawl
45fcea929a Refactor cmake scripts, reducing the amount of find_package(FFmpeg) 2015-06-12 01:45:48 +02:00
scrawl
cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 2015-06-12 01:45:19 +02:00
scrawl
fc5176dc38 Refactor cmake scripts, reducing the amount of find_package(Qt4) 2015-06-11 23:38:08 +02:00
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.
 2015-06-08 15:41:39 +02:00
scrawl
d9a00288f8 Make install fix 2015-06-08 01:58:12 +02:00
scrawl
58917bcca6 Minor cleanup 2015-06-04 01:24:29 +02:00
scrawl
4bb3cbf0fb Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
scrawl
974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 2015-06-03 03:18:29 +02:00
scrawl
cdd0623009 Terrain rendering 2015-06-03 01:35:41 +02:00
scrawl
b0b55e2037 Delete niftest as it's currently broken 2015-06-01 02:48:15 +02:00
Marc Zinnschlag
d05d7f51d9 increased version number 2015-05-31 14:20:13 +02:00
scrawl
62ce2cc123 Minor cleanup 2015-05-30 20:44:19 +02:00
Marc Zinnschlag
d7cd4203ad Merge remote-tracking branch 'k1ll/mingw' 2015-05-30 11:39:53 +02:00
scrawl
22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
 2015-05-23 20:33:44 +02:00
scrawl
f2809ab63b Delete nifosgtest again 2015-05-23 06:53:26 +02:00
Rohit Nirmal
396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
scrawl
9ea416b852 Readded HW cursor manager (no image rotation yet) 2015-05-13 18:56:14 +02:00
scrawl
fe15f31f3e Remove strings.h wrapper 2015-05-10 00:36:04 +02:00
scrawl
c843cfc8e2 Physics stub in preparation for rewrite 2015-05-10 00:28:51 +02:00
Marc Zinnschlag
9f6bc1b3a9 increased version number 2015-05-04 19:06:02 +02:00
scrawl
c1edc30ad7 Dead code removal 2015-05-04 03:29:12 +02:00
scrawl
157d8bfedd Remove unused mygui files 2015-05-03 17:26:12 +02:00
k1ll
fe03727ae5 Don't force linking static boost libraries when building with mingw 2015-04-29 18:31:30 +02:00
scrawl
48a6d7c1a0 Remove mygui platform libraries from cmake 2015-04-28 16:33:30 +02:00
scrawl
8410966753 Disable mygui plugin for now 2015-04-22 18:01:55 +02:00
scrawl
92ef9b1c57 Rename to osg-ffmpeg-videoplayer 2015-04-19 20:14:06 +02:00
scrawl
42f6d9e15b Port video player 2015-04-19 20:07:18 +02:00
scrawl
1699759d12 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/view/render/cell.cpp
 2015-04-19 02:29:16 +02:00
scrawl
e6cf959134 Revert "Delete nifosgtest" 
This reverts commit ba3075dc11.
 2015-04-11 14:46:52 +02:00
scrawl
ba3075dc11 Delete nifosgtest 2015-04-02 16:28:16 +02:00
Scott Howard
d646836cdd turn on -Wno-potentially-evaluated-expression on clang 2015-04-01 22:09:20 -04:00
scrawl
af67de73a5 Delete shiny 2015-04-01 17:06:31 +02:00
scrawl
4e69e7cc0f OpenMW compiles and runs w/o render window 2015-04-01 17:02:15 +02:00
scrawl
12f27123f2 Billboard scaling fix and culling bug fix 2015-03-30 17:11:27 +02:00
scrawl
236d628884 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/documentmanager.cpp
	components/CMakeLists.txt
	components/bsa/resources.cpp
	components/nif/data.hpp
	components/nif/node.cpp
	components/nifogre/mesh.hpp
	components/nifogre/ogrenifloader.cpp
	components/nifogre/particles.cpp
 2015-03-27 17:30:48 +01:00
scrawl
34d503017a OpenCS: Set up an osgQt GraphicsWindow in SceneWidget 2015-03-20 16:22:33 +01:00
Marc Zinnschlag
f0a7b202b9 Merge branch 'openmw-35-1' 2015-03-13 17:33:08 +01:00
Scott Howard
d7baf92353 tell include_directories which libraries are system libs 2015-03-09 16:49:40 -04:00
Scott Howard
88f746574d fix compiler detection and adding build flags in CMakeLists.txt 2015-03-09 14:37:43 -04:00
Marc Zinnschlag
907ac5ef7f Merge remote-tracking branch 'scrawl/master' 2015-03-06 19:24:15 +01:00
scrawl
0fda1cdd53 Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs 2015-03-06 02:36:12 +01:00
Marc Zinnschlag
cdf53c17e7 updated version number 2015-03-03 11:54:35 +01:00
scrawl
1eaa64c49c CMake: remove lines for MinGW, no one is maintaining those 2015-03-02 15:45:44 +01:00
scrawl
c6aa374934 CMake: set windows warning levels globally instead of per target 2015-03-02 15:45:29 +01:00
scrawl
c57f9ad5dc CMake: don't use CMAKE_CXX_FLAGS for gcc warning levels, it only works for CMAKE_BUILD_TYPE=None 2015-03-02 15:44:27 +01:00
scrawl
2b7287cbd2 Merge branch 'master' of https://github.com/OpenMW/openmw into joystick 
Conflicts:
	CMakeLists.txt
 2015-02-27 22:37:22 +01:00
scrawl
97cc2522c0 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	apps/openmw/mwgui/settingswindow.cpp
	extern/oics/ICSInputControlSystem_joystick.cpp
	files/mygui/openmw_settings_window.layout
 2015-02-27 22:21:02 +01:00
Digmaster
a192836582 (hopefully) correct gamecontrollerdb.txt behavior 2015-02-27 22:19:13 +01:00
Digmaster
1e4a845b6f Minor code cleanup 2015-02-27 22:19:08 +01:00
scrawl
8d64f2081e Add particle system state loading 2015-02-24 01:25:31 +01:00
scrawl
8e01d8cb19 Add OSG nifloader, currently supports geometry, materials, basic texturing, skinning, morphing, and most controllers. 2015-02-23 21:06:10 +01:00
scrawl
8c10d4badb NIF reader compiles without Ogre 2015-02-17 17:08:55 +01:00
scrawl
d4dff6ed55 Port BSAFile to istream, remove OGRE bsa resource system 2015-02-17 16:19:21 +01:00
scrawl
1124343e0d Add BUILD_OPENMW switch, build will be broken in next commit 2015-02-17 16:05:28 +01:00
slothlife
a9b74671a6 Fix various MSVC warnings 2015-02-15 20:10:21 -06:00
Marc Zinnschlag
6cc9fa2b3f Merge remote-tracking branch 'slothlife/cmake-release-build-fix' 2015-02-15 09:52:13 +01:00
slothlife
f1fd27aeaf Select CMAKE_BUILD_TYPE if not specified 
A suggestion by kcat to ensure CMake selects a reasonable default for
the build type if users don't set it themselves.
 2015-02-14 23:34:43 -06:00
Marc Zinnschlag
2b619296d7 Merge remote-tracking branch 'scrawl/master' 2015-02-11 11:30:44 +01:00
Marc Zinnschlag
003d0610f4 Merge remote-tracking branch 'ace/link-time-optimzation' 2015-02-10 10:50:45 +01:00
Alexander "Ace" Olofsson
9da0a9f8c4 Enable link-time optimization on MSVC 2015-02-10 00:55:31 +01:00
scrawl
399c24c646 CMake cleanup: remove redundant setting of Permissions to default values 2015-02-09 20:16:29 +01:00
scrawl
e81d2a9dde Merge remote-tracking branch 'upstream/openmw-35' into HEAD 
Conflicts:
	apps/openmw/mwmechanics/npcstats.cpp
 2015-02-08 21:28:29 +01:00
scrawl
c63ab673e1 Revert "Add freedesktop.org mimeinfo for OpenMW save game files" 
This reverts commit 94002b0758.

Conflicts:
	CMakeLists.txt
 2015-02-07 23:24:27 +01:00
Rosanne DiMesio
28eb766bba Respect LIB_SUFFIX 2015-02-06 14:27:12 -06:00
Nikolay Kasyanov
5534306eb3 Few rename fixes 2015-02-06 08:59:00 +02:00
Alexander "Ace" Olofsson
abb334bc1e Missing change for the tool rename 2015-02-03 22:43:15 +01:00
Marc Zinnschlag
c02537c3b1 incremented version number 2015-02-03 13:42:47 +01:00
Marc Zinnschlag
0557d45bd1 renamed opencs into openmw-cs 2015-02-03 13:18:03 +01:00
scrawl
e0d0997409 Rename omwlauncher -> openmw-launcher, mwiniimport -> openmw-iniimporter 2015-01-31 22:40:38 +01:00
scrawl
8e5c8aa562 Add support for passing in Ogre plugin directory via CMake 2015-01-23 23:57:00 +01:00
Marc Zinnschlag
f4bf2aa412 Merge remote-tracking branch 'origin/master' 2015-01-20 16:07:17 +01:00
Alexander "Ace" Olofsson
ebe2e1491a Fix broken windows builds due to README change 2015-01-20 15:24:33 +01:00
scrawl
031eec4550 Starting ESS importer for Morrowind save files 2015-01-17 00:16:49 +01:00
Marc Zinnschlag
595c08817f Merge remote-tracking branch 'scrawl/master' 2015-01-10 17:02:46 +01:00
Marc Zinnschlag
e439065897 Merge remote-tracking branch 'scrawl/master' 2015-01-10 11:33:04 +01:00
scrawl
eecea4131f Reduce MyGUI includes 2015-01-10 02:50:43 +01:00
scrawl
9d07edda13 UnitTests: remove GMock which wasn't used anyway, and the gmock headers fail to compile together with gtest on ubuntu 14.04 2015-01-09 20:53:43 +01:00
Marc Zinnschlag
f8a3ec3ee3 Merge remote-tracking branch 'scrawl/cmdline-savegame' 2015-01-08 20:57:49 +01:00
scrawl
94002b0758 Add freedesktop.org mimeinfo for OpenMW save game files 
This allows us to launch OpenMW when the user opens a save game file through the file manager.
 2015-01-07 15:08:57 +01:00
Arthur Moore
c1315ed90c Build the nif file tester by default 
It's extremely useful in determining if a nif file is bad without having to load up openmw or opencs.
Also updated the nif testing script to run at a low priority.
 2015-01-01 22:49:33 -05:00
Marco Schulze
3024c67995 Regenerate components/version/version.hpp as HEAD moves on a git checkout 
Pull request #416 introduced a common bug where version.hpp wouldn't be
regenerated every build, poteantially leading to stale version data. This
commit adds a custom build target, git-version, which updates version.hpp
before the components library is built.
 2014-12-30 18:37:33 -03:00
Marco Schulze
d92cd2ffad Remove GetGitRevisionDescription.cmake 
GetGitRevisionDescription.cmake uses a somewhat contrived method to obtain the
hash of the commit pointed by the repository's HEAD. This method fails on
unusual, but still valid repository layouts.

This commit removes cmake/GetGitRevisionDescription.cmake{,.in}, replacing its
functionality with direct use of Git's plumbing.
 2014-12-27 00:26:35 -03:00
Marc Zinnschlag
d67ad9037e increased version number 2014-12-03 20:55:33 +01:00
scrawl
a8a2b44b0f Don't require libunshield on windows 2014-11-23 00:51:57 +01:00
scrawl
d4a9cf7075 Fix wizard install location 2014-11-18 17:54:37 +01:00
scrawl
4fa303d7c4 Merge branch 'master' into HEAD 
Conflicts:
	CMakeLists.txt
	apps/launcher/CMakeLists.txt
 2014-11-18 17:43:51 +01:00
Marc Zinnschlag
45d41e22e2 Merge branch 'openmw-33' 2014-11-05 21:22:18 +01:00
Marc Zinnschlag
5909fa4368 new version number and updated changelog 2014-11-05 21:18:43 +01:00
scrawl
eb1c24ffe6 Refactor video player engine to get rid of MWSound dependencies 
- Split video player to separate source files.
 - Move video player engine sources to extern/ (repository will be set up on github soon).
 - Audio is handled in a MovieAudioFactory, implemented by the user (here in MWSound subsystem).
 - Handle conversion of unsupported channel layouts via ffmpeg's swresample.
 2014-10-22 22:33:32 +02:00
Marc Zinnschlag
a3c894c1e2 Merge branch 'cellmarker' 2014-10-17 14:26:16 +02:00
Marc Zinnschlag
86f5073293 increased version number 2014-10-15 09:12:34 +02:00
cc9cii
313aed078e Merge remote-tracking branch 'remotes/upstream/master' into QtOgre 
Conflicts:
	apps/opencs/CMakeLists.txt
 2014-10-13 20:45:30 +11:00
vocollapse
772c66eedf Changed Doxygen file extensions to .cmake for consistency. Also changed output directories for doxygen. 2014-10-12 18:30:39 +02:00
cc9cii
f459adf117 Revert CMake changes (didn't work for osx anyway) 2014-10-12 22:30:08 +11:00
cc9cii
971b0de4fa An attempt to make osx to find the ogre overlay headers. 2014-10-12 21:48:49 +11:00
cc9cii
758ce0ed98 Various fixes as per feedback comments. 2014-10-12 21:15:50 +11:00
vocollapse
71f3f71f78 added make target for doxygen: make doc, make doc_pages 2014-10-12 11:28:56 +02:00
cc9cii
972c789060 Add Ogre Overlay path to cmake. 2014-10-06 20:25:09 +11:00
scrawl
62ea913e69 Fix cmake warning 2014-09-24 20:09:48 +02:00
Marc Zinnschlag
147bffa7dd Merge remote-tracking branch 'slothlife/msvc-warning-fix' 
Conflicts:
	CMakeLists.txt
 2014-09-23 08:57:49 +02:00
slothlife
35ced14e45 Fix for MSVC warnings 2014-09-22 21:33:09 -05:00
eroen
0738e862cb Make GLOBAL_CONFIG_PATH, GLOBAL_DATA_PATH configurable 2014-09-22 15:36:42 +02:00
Marc Zinnschlag
5c8ef842b6 Merge branch 'edit' 2014-09-22 09:54:44 +02:00
scrawl
b1e74e2a85 Remove support for Ogre 1.8 versions 2014-09-21 10:41:13 +02:00
Sebastian Wick
f46da271d7 SYSCONFDIR should be "/etc" instead of "$PREFIX/etc" if prefix is "/usr" 2014-09-19 07:13:06 +02:00
Sebastian Wick
2ae8158ee9 SYSCONFDIR and LinuxPath should work with different install prefixs 2014-09-19 03:15:28 +02:00
Stanislav
313bdf4e78 fix 2014-09-18 10:25:33 +06:00
Stanislav
76f2e5d5b8 CMake: Added multithreading, /DWIN32_LEAN_AND_MEAN and /bigobj compile flags to VS build. 2014-09-17 09:05:47 +06:00
Marc Zinnschlag
3f671c86a8 Merge remote-tracking branch 'cc9cii/ffmpeg-swresample' 2014-09-15 12:44:38 +02:00
cc9cii
d92400e550 Remove libavresample restriction. 2014-09-15 19:46:11 +10:00
cc9cii
166ee6b483 Do not use cached FFMPEG_LIBRARIES. Make error messages clearer. 2014-09-15 18:49:07 +10:00
Marc Zinnschlag
9b7f61b4ba Merge remote-tracking branch 'scrawl/myguiplugin' 2014-09-14 10:45:26 +02:00
scrawl
9d05718515 Move plugin to new plugins/ top level directory 2014-09-12 19:27:49 +02:00
Marc Zinnschlag
f142d82b3a Merge remote-tracking branch 'ace/win-package-fix' 2014-09-12 14:28:46 +02:00