8c10d4badb
NIF reader compiles without Ogre
10 years ago
d4dff6ed55
Port BSAFile to istream, remove OGRE bsa resource system
10 years ago
1124343e0d
Add BUILD_OPENMW switch, build will be broken in next commit
10 years ago
a9b74671a6
Fix various MSVC warnings
10 years ago
6cc9fa2b3f
Merge remote-tracking branch 'slothlife/cmake-release-build-fix'
10 years ago
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.
10 years ago
2b619296d7
Merge remote-tracking branch 'scrawl/master'
10 years ago
003d0610f4
Merge remote-tracking branch 'ace/link-time-optimzation'
10 years ago
9da0a9f8c4
Enable link-time optimization on MSVC
10 years ago
399c24c646
CMake cleanup: remove redundant setting of Permissions to default values
10 years ago
e81d2a9dde
Merge remote-tracking branch 'upstream/openmw-35' into HEAD
...
Conflicts:
apps/openmw/mwmechanics/npcstats.cpp
10 years ago
c63ab673e1
Revert "Add freedesktop.org mimeinfo for OpenMW save game files"
...
This reverts commit 94002b0758
10 years ago
28eb766bba
Respect LIB_SUFFIX
10 years ago
5534306eb3
Few rename fixes
10 years ago
abb334bc1e
Missing change for the tool rename
10 years ago
c02537c3b1
incremented version number
10 years ago
0557d45bd1
renamed opencs into openmw-cs
10 years ago
e0d0997409
Rename omwlauncher -> openmw-launcher, mwiniimport -> openmw-iniimporter
10 years ago
8e5c8aa562
Add support for passing in Ogre plugin directory via CMake
10 years ago
f4bf2aa412
Merge remote-tracking branch 'origin/master'
10 years ago
ebe2e1491a
Fix broken windows builds due to README change
10 years ago
031eec4550
Starting ESS importer for Morrowind save files
10 years ago
595c08817f
Merge remote-tracking branch 'scrawl/master'
10 years ago
e439065897
Merge remote-tracking branch 'scrawl/master'
10 years ago
eecea4131f
Reduce MyGUI includes
10 years ago
9d07edda13
UnitTests: remove GMock which wasn't used anyway, and the gmock headers fail to compile together with gtest on ubuntu 14.04
10 years ago
f8a3ec3ee3
Merge remote-tracking branch 'scrawl/cmdline-savegame'
10 years ago
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.
10 years ago
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.
10 years ago
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.
10 years ago
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.
10 years ago
d67ad9037e
increased version number
10 years ago
a8a2b44b0f
Don't require libunshield on windows
10 years ago
d4a9cf7075
Fix wizard install location
10 years ago
4fa303d7c4
Merge branch 'master' into HEAD
...
Conflicts:
CMakeLists.txt
apps/launcher/CMakeLists.txt
10 years ago
45d41e22e2
Merge branch 'openmw-33'
10 years ago
5909fa4368
new version number and updated changelog
10 years ago
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.
10 years ago
a3c894c1e2
Merge branch 'cellmarker'
10 years ago
86f5073293
increased version number
10 years ago
313aed078e
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
...
Conflicts:
apps/opencs/CMakeLists.txt
10 years ago
772c66eedf
Changed Doxygen file extensions to .cmake for consistency. Also changed output directories for doxygen.
10 years ago
f459adf117
Revert CMake changes (didn't work for osx anyway)
10 years ago
971b0de4fa
An attempt to make osx to find the ogre overlay headers.
10 years ago
758ce0ed98
Various fixes as per feedback comments.
10 years ago
71f3f71f78
added make target for doxygen: make doc, make doc_pages
10 years ago
972c789060
Add Ogre Overlay path to cmake.
10 years ago
62ea913e69
Fix cmake warning
10 years ago
147bffa7dd
Merge remote-tracking branch 'slothlife/msvc-warning-fix'
...
Conflicts:
CMakeLists.txt
10 years ago
35ced14e45
Fix for MSVC warnings
10 years ago
0738e862cb
Make GLOBAL_CONFIG_PATH, GLOBAL_DATA_PATH configurable
10 years ago
5c8ef842b6
Merge branch 'edit'
10 years ago
b1e74e2a85
Remove support for Ogre 1.8 versions
10 years ago
f46da271d7
SYSCONFDIR should be "/etc" instead of "$PREFIX/etc" if prefix is "/usr"
10 years ago
2ae8158ee9
SYSCONFDIR and LinuxPath should work with different install prefixs
10 years ago
313bdf4e78
fix
10 years ago
76f2e5d5b8
CMake: Added multithreading, /DWIN32_LEAN_AND_MEAN and /bigobj compile flags to VS build.
10 years ago
3f671c86a8
Merge remote-tracking branch 'cc9cii/ffmpeg-swresample'
10 years ago
d92400e550
Remove libavresample restriction.
10 years ago
166ee6b483
Do not use cached FFMPEG_LIBRARIES. Make error messages clearer.
10 years ago
9b7f61b4ba
Merge remote-tracking branch 'scrawl/myguiplugin'
10 years ago
9d05718515
Move plugin to new plugins/ top level directory
10 years ago
f142d82b3a
Merge remote-tracking branch 'ace/win-package-fix'
10 years ago
2397a87330
Merge remote-tracking branch 'scrawl/bsatool'
10 years ago
dd3d7ba474
Update NSIS to use the new icon path
10 years ago
ecfc2ff5d0
Add a MyGUI plugin to register OpenMW resources, to use with MyGUI's standalone tools
10 years ago
1bb9359b4c
Fix a typo
10 years ago
fca8dc9674
Enable bsatool build by default
10 years ago
862c5fc8f6
Add libavresample support. Tested on windows x64 only.
10 years ago
785d2c7cc9
Remove incomplete implementation to support planar formats. Make libswresample a prerequisite.
10 years ago
c6cad5adc5
Make cmake more reliably detect libswresample
10 years ago
f4dd281393
Simplify the use of swr_convert and add #ifdef guards around code that require libswresample.
10 years ago
944f99b23a
Initial commit of FLTP format binkaudio support. Converts to FLT format by manually interleaving decoded samples. swresample library is included with a view to use swr_convert() in future versions, but not used in this commit.
10 years ago
b6a3541573
increased version number
10 years ago
17dc01ec44
Require MyGUI version 3.2.1 and remove legacy code ( Fixes #1528 )
10 years ago
53ce94d0e4
Disable building nif file tester by default
11 years ago
cdfa24e15d
(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.
On linux/mac you can use "xargs --arg-file=nifs.txt ./niftest" to give it a list of files to check.
11 years ago
77a4e38c49
Remove -Wno-ignored-qualifiers and fix caused warnings
11 years ago
f4ddf2a7b9
Merge remote-tracking branch 'sandstranger/android'
11 years ago
713787d92f
fix v7
11 years ago
3cd98e5259
fix code v5
10 years ago
d8772156a7
fixe all code v 2
11 years ago
8a8b91dfe1
fixed all code for building on all platforms inlcudng ANDROID
10 years ago
16aafc26bc
fixed cmake for build on all plaforms include android
11 years ago
a18cec7c8e
Use a MyGUI widget to render the screen fader ( Fixes #1741 , Fixes #1719 )
11 years ago
b56cb7e5ee
Remove defunct option for building without FFmpeg
...
- Added REQUIRED to find_package(FFmpeg)
- Removed USE_FFMPEG option from CMakeLists.txt
- Always use FFmpeg for sound input
- Removed SOUND_DEFINE from CMakeLists.txt
- Removed #else branch from videoplayer.cpp with dummy VideoState code
(FFmpeg is now guaranteed to exist and the code was incomplete)
- Remove #ifdef OPENMW_USE_FFMPEG in ffmpeg_decoder.cpp, it is guaranteed to be used
- Remove #ifdef OPENMW_USE_FFMPEG from soundmanagerimp.cpp, it is guaranteed to be used
11 years ago
192d5ca08f
Allow overriding OGRE_PLUGIN_DIR in cmake command line
11 years ago
7316f4dde4
increased version number
11 years ago
96ba4a414f
Fix MSVC size_t conversion warning.
11 years ago
9ea22324f7
Fix some MSVC warnings.
...
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
11 years ago
5960d3f1d9
These files moved, leading to package failure
11 years ago
7eee0855f7
Merge commit 'pull/origin/155'
...
Conflicts:
CMakeLists.txt
11 years ago
10758d6297
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
11 years ago
3bf599248e
CMake cleanup: Remove distribution-specific install stuff (unused)
11 years ago
e28888df39
fix for dejavu location
11 years ago
8419002393
Task #940 : Move licenses to appropriate place in docs. Additional cleanup.
11 years ago
5313862a46
Merge remote-tracking branch 'scrawl/master'
11 years ago
20dabaead9
Fix CMake scripts to link static dependencies
...
Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't
fail silently to find the libraries correctly.
Modified top-level CMakelists.txt:
- Correctly set include dirs, preprocessor definitions, and add
libraries for static Ogre plugins.
- Correctly set preprocessor definitions for static MyGUI.
Modified launcher, openmw, and opencs to link the static Ogre plugins.
Fixed FindSDL2.cmake to set a variable that contains only the SDL2
library, so that the launcher doesn't incorrectly link against
SDL2main.
Fixed FindMyGUI.cmake to correctly look for static variants.
Fixed FindOgre.cmake to set variables for DirectX plugins correctly.
11 years ago
5df9ff8e2c
Respect CMAKE_INSTALL_PREFIX in the global openmw.cfg
...
Fixes installing to /usr/local (Bug #1378 )
11 years ago
5af12d193a
Cleaned up old wizard stuff from launcher
11 years ago
38d825b004
Merge remote-tracking branch 'upstream/master' into wizard
...
Conflicts:
CMakeLists.txt
apps/launcher/maindialog.cpp
11 years ago
244eb11651
Merge remote-tracking branch 'greye/widechar'
11 years ago
8f9091550e
require boost::locale only on Windows
11 years ago
2f6d400c62
Merge branch 'master' of https://github.com/OpenMW/openmw into newgame
11 years ago
b728a919a2
write dependency on boost::locale to CMake files
11 years ago
46c32f6c47
OpenEngine MyGUI logging facility
11 years ago
510b7f8505
Task #1333 : Remove cmake git tag reading
11 years ago
7c149e98e0
Merge branch 'openmw-30'
11 years ago
a5f0fe7282
incremented version number
11 years ago
d08869a25d
Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
11 years ago
f33559fead
Fixes for MSVC warnings, less overall changes
...
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
11 years ago
c160a04ede
Revert "Fixes for warnings when building with MSVC"
...
This reverts commit 46eb20b98c
11 years ago
199f030d38
adjusted cmake file for opencs user settings file rename
11 years ago
46eb20b98c
Fixes for warnings when building with MSVC
...
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
11 years ago
21142711f0
Merge remote-tracking branch 'graffy76/master'
11 years ago
a17cb1f389
Fixed opencs.ini formatting
11 years ago
475214ab62
Implmented QSettings for loading / saving file definitions. Also
...
renamed opencs.cfg to opencs.ini to follow Ini format standards
11 years ago
688d556510
remove references to Audiere and MPG123 from top-level CMake file
11 years ago
36914b43d7
Remove install of License of no longer used font
11 years ago
78d322e6a5
Revert "Temporary added broken CMakeLists.txt - Travis IRC notification test."
...
This reverts commit 529d2436b5
11 years ago
529d2436b5
Temporary added broken CMakeLists.txt - Travis IRC notification test.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
ef38fae09d
Merge remote-tracking branch 'upstream/master' into wizard
11 years ago
0a17245633
Refactored settings window
11 years ago
7ed3effc92
Fix windows packaging issue now that the OFL license doesn't exist
...
anymore.
11 years ago
9089df3080
Add unity build option
...
Each component and each MW-subsystem will be used as a single compilation unit.
11 years ago
8fe837ae6e
Merge remote-tracking branch 'upstream/master' into wizard
11 years ago
ab224f93c9
remove our stdint.h version that uses boost and force usage of system stdint.h
11 years ago
6101916b7d
bumped version number
11 years ago
c54217d008
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
CMakeLists.txt
components/CMakeLists.txt
components/config/gamesettings.cpp
11 years ago
56d537e23d
Added some sanity checking: compare git version with manual version
11 years ago
b43325119a
Some changes to the version retrieval: ignore shallow clones
11 years ago
85b7240948
Made the git version retrieval more reliable
11 years ago
4a61868521
OS X: fixed Ogre plugin packaging
11 years ago
e4017b8bfe
It seems that OctreeSceneManager is not required anymore
11 years ago
3c281c6a62
OS X: specify path to framework binary, not to framework directory
11 years ago
c2fe0d480a
Merge remote-tracking branch 'upstream/master' into osx-ogre-19
...
Conflicts:
CMakeLists.txt
11 years ago
053b3dc371
Merge branch 'openmw-28'
...
Conflicts:
CMakeLists.txt
11 years ago
58add97676
Merge branch 'master' into osx-ogre-19
...
Conflicts:
CMakeLists.txt
11 years ago
4e6507248b
Fix travis build
11 years ago
19bef4fce8
Distinguish between release and development builds
11 years ago
43bc223e68
Added version info retrieval from git tags
11 years ago
37a59a37c6
Remove cpack (no longer used, according to BrotherBrick)
11 years ago
659d790048
uuid is not used
11 years ago
d4aeb177f9
Remove unused btKinematicCharacterController
11 years ago
7c8f735004
Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28
11 years ago
116f125f05
Windows-specific definition to deny SDL from providing it's own WinMain()
11 years ago
0d3e67dafc
Merge branch 'master' into openmw-28
11 years ago
5b0a4c9424
Get rid of unused file and some other cruft.
11 years ago
fe34c9cf1f
increased version number
11 years ago
2f082ef796
remove unneeded libraries
11 years ago
892ff93489
OS X: attempt to fix #1045
11 years ago
73c6aba4d0
OS X: Ogre plugins are now installed in OpenCS bundle too. Generalized
...
plugin install routine.
11 years ago
874ecee079
OS X: do not enforce static boost, this can be set externally
...
anyway
11 years ago
89c60b065c
OS X: looks like OGRE_Plugin_CgProgramManager_FOUND is not reliable
11 years ago
87853f4066
OS X: consider Ogre CG plugin as used only if it’s found
11 years ago
99cfb8cda2
OS X: this CMake parameters can be set in CMake invocation, no need to hardcode them in CMakeLists.txt
11 years ago
d8f20d2e66
Added the infrastructure to start working on the installation wizard
11 years ago
04b1657d98
Merge branch 'openmw-27'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
11 years ago
d4b8ac5b49
don't dpkg on windows and macos
...
No need to clutter windows and macos configuration with dpkg options, as it is
unlikely to ever be useful.
11 years ago
67284e2f9d
Introduce -DBUILD_WITH_DPKG to toggle dpkg based install
...
The current system automagically chooses between the dpkg-based install method
(for debian-derived distributions) and a "traditional" install and sets
install paths based on whether cmake can find a 'dpkg' executable.
This is not ideal, since dpkg is occasionally installed on linux distributions
unrelated to debian for purposes other than package management. In particular,
Arch and Gentoo carry it in their repositories.
11 years ago
fa13818360
OS X: OpenCS packaging
11 years ago
ef401a774b
Merge remote-tracking branch 'eroen/install-fix'
11 years ago
224aa5d38c
Merge remote-tracking branch 'eroen/install-fix-17' into openmw-27
11 years ago
5a071b0f81
necessary dpkg rules to get opencs building and packaged on dpkg systems
11 years ago
e885c502a1
Stop installing "Daedric Font License.txt"
...
It was removed in 3a827d9c12
11 years ago
6b931f566d
Stop installing "Daedric Font License.txt"
...
It was removed in 3a827d9c12
11 years ago
36efe9605f
necessary dpkg rules to get opencs building and packaged on dpkg systems
11 years ago
418ccf705d
Merge branch 'openmw-27'
...
Conflicts:
apps/launcher/graphicspage.hpp
components/CMakeLists.txt
11 years ago
f4e6f31658
Merge remote-tracking branch 'scrawl/openmw-27'
11 years ago
dec1483fa4
Merge branch 'saving' into openmw-27
11 years ago
636d399c7f
Refactored Ogre initialisation into a component
11 years ago
b20943b123
Merge remote-tracking branch 'ace/win-package' into openmw-27
11 years ago
632a53ead4
Support packing the OpenCS into windows builds
11 years ago
29fce6d11f
increased version number
11 years ago
b138533bf3
renamed defaultfilter.omwaddon.project to defaultfilters.
11 years ago
96b6787255
Getting rid of extension. Correcting tiny mistake in filters file.
11 years ago
6b293961b4
This appears to work.
11 years ago
155662860c
Added configrue file in cmake. Hopefully it will copy defaultfilters file.
11 years ago
3993c34739
Merge remote-tracking branch 'upstream/master' into osx-ogre-19
11 years ago
a18e3c9cc1
Fixed packaging when building against Ogre 1.9
11 years ago
36fb89c6cd
Cleanup
11 years ago
9637e1641b
fix for building with system tinyxml
11 years ago
6f64b1b9db
cmake option to use system tinyxml instead of embedded one
11 years ago
4dbacdc6bd
increased version number
11 years ago
0c8f85f17d
Merge remote-tracking branch 'wheybags/master'
12 years ago
13afcc9324
Don't link to OgreTerrain
12 years ago
865a7c63df
cmake for system libunshield
12 years ago
ceb3317807
Integrate unshield with launcher
12 years ago
8d925b7fd6
cleanup
...
- drop trailing slashes from paths for consistency
- sort entries that got unsorted
12 years ago
0076c558d6
Re-introduce lost functionality
...
The branch merged in 5a863589b4
12 years ago
de95926e9f
Use controllers to animate lights in ObjectLists
12 years ago
130141ecac
Merge remote-tracking branch 'corristo/master'
12 years ago
66608d5c92
Fixed compilation os OS X after moving SDL windowing code to extern/sdl4ogre
12 years ago
36fb7f3a72
Cleanup
12 years ago
71a75d2ab8
Small fixes
12 years ago
9a900908cd
Merge deb and non-deb
12 years ago
e22b7c8fc1
Add use of SYSCONFDIR path for conf files in deb
12 years ago
799c84b846
Moved deb version checking down with cpack
12 years ago
3baf44c4b5
Moved non-deb install section up for readability
12 years ago
0e02d7817e
Moved non-deb up for readability
12 years ago
b6e3b5e834
Add licenses to installed files for non-deb packages.
12 years ago
98289f051f
Set location for all non apple unixes, not just debian.
12 years ago
20e92c2cdf
increased version number
12 years ago
39a12ab9cf
CXX Flags aren't definitions
12 years ago
12cfe1fdfe
Merge remote-tracking branch 'graffy76/recordStatusDelegate'
12 years ago
7175c7cfe0
Updated OpenMW project CMakeLists.txt to include opencs.cfg file
...
installation.
12 years ago
84a8ea4ef7
static sdl2 compilation option for Unixes that are not Apple
12 years ago
4c8a04d9cb
Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
12 years ago
6abb7a18b0
SDL2 input: seems to work on OS X, has some input issues though
12 years ago
ab3634d692
Removed some remains of OIS
12 years ago
918a1655bb
Restored HW cursor rotation and resolution/fullscreen switching
12 years ago
495aeb5d3b
Merge branch 'master' into HEAD
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/mwgui/cursorreplace.cpp
apps/openmw/mwgui/cursorreplace.hpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwgui/windowmanagerimp.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
libs/openengine/ogre/renderer.cpp
12 years ago
bd08677a7f
Merge branch 'openmw24'
12 years ago
d13430e2b8
Fix for CMake > 2.8.9 on OS X
12 years ago
886bc7e2f6
libc++ fixes: don't rely on tr1
...
libc++ doesn't ship tr1, but ships unordered_map as it is part of c++11.
Since this is the only tr1 header used in openmw, add a check for c++11
unordered_map and fallback to tr1 unordered_map if it's not found.
12 years ago
3ae02547d2
increased version number
12 years ago
a54f8c7ee2
Removed an optimization that caused problems on 32 bit builds
12 years ago
8cdef343ef
take default prefix into account
12 years ago
642ac15721
moved openmw resources to /usr/share/games and added missing files
12 years ago
a5db557e22
fixed /share to be /usr/share
12 years ago
3b3a052f4f
increased version number
12 years ago
81615c1ae5
Add a custom GrowFade particle affector
12 years ago
8d706f8183
Include the ini importer in windows packages
12 years ago
00deff1758
fixed path for launcher icons
12 years ago
30f3fbac3c
Fixed paths to OpenMW icons
12 years ago
d6a5915bbd
updated version to 0.22.0
12 years ago
5e113627b7
Merge remote-tracking branch 'psi29a/master'
12 years ago
b8c42fde1f
removed chrono from deps, not needed for boost < 1.50
12 years ago
b457c7de5e
added linux opencs.desktop file
12 years ago
207f78ab77
added two additional required boost libs to build on windows, one of which is already pulled by other boost lib in Ubuntu.
12 years ago
3adf3f5121
Revive bsatool
12 years ago
f2193bb1ba
Made the mainwindow use a .ui file and removed the stylesheet
12 years ago
9810eafe23
Removing now unused oengine/imagerotate
12 years ago
372308b49a
Merge remote-tracking branch 'amdmi3/installation-fixes'
12 years ago
0e8ff22d6f
Only install binaries which are enabled to be built
12 years ago
d5aa975675
Fix some issues that seem to have appeared in the CMake configuration.
12 years ago
f994b7d227
Prepare .desktop file for more systems
...
This brings condition for .desktop file preparation in sync with
condition for its installation.
12 years ago
db9a3aeddf
Merge remote-tracking branch 'zini/master' into animation2
12 years ago
1af4e11414
apply MSVC warning settings to shiny projects
12 years ago
3c0b29de45
Merge remote-tracking branch 'zini/master' into animation2
12 years ago
56468eaecf
Add install rule for opencs
12 years ago
86f6491bc8
Remove unused pmove code
12 years ago
f9a0a19ee1
Fix a small issue in the windows installer, also added the OpenMW version to the installed package name
12 years ago
cfceb45009
adjusted gcc settings again to avoid problems with older compiler versions
12 years ago
827261e8b4
increased version number
12 years ago
85697e4628
reverted to C++03
12 years ago
4e46f403a9
added some more warning to ignore in MSVC
12 years ago
cac68c9e87
Removed an outdated section from CMakeLists
12 years ago
ed644259ce
Move SDL helpers to their own package in extern/, allow conversion from sdl to ois keycodes, (maybe) fix unicode handling
12 years ago
6449f68d61
Merge branch 'master' into sdl_input
12 years ago
884d3ea4d8
Rip out OIS, fill the holes with SDL goodness. WIP.
12 years ago
f1b138d0a8
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
12 years ago
35f4d09288
swscale handled better (cmake)
12 years ago
dcfa902525
fixed error in cmake when disabling esmtool
12 years ago
1718d735b5
Fix menu/journal/book/scroll buttons when using localised MW-installations
...
This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.
12 years ago
334588bf1c
Merge branch 'editor2'
12 years ago
3829bbfeca
Look for all available sound input libs as needed, and warn if not found
12 years ago
8cde6db665
We no longer need SDL
12 years ago
e4ac7a4df4
remove libboost1-xxx from deb depends since we can compile statically
12 years ago
c49966dd29
started over
12 years ago
5f676f9c6b
Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwscript/miscextensions.cpp
12 years ago
4114e823ac
Allow the ability to choose to compile against boost libs statically.
12 years ago
d97d4b8ef0
updated version number
12 years ago
d432420a32
fix FindFFmpeg.cmake
12 years ago
c3cd6e8a8a
new attempt at the editor
12 years ago
37a42c7dbc
increased version number; updated changelog
12 years ago
648b53ef93
removed unused launcher.cfg file
12 years ago
35d099a638
disabling gcc extensions
12 years ago
4b5706d652
Fixed packaging on OS X
12 years ago
747a4e1123
increased version number and updated readme
12 years ago
256dff0a29
Disable warning 4800 for Visual Studio
...
Visual Studio 2010 complains about constructs such as:
int myInt = 1;
bool myBool = myInt;
Which are fine with most compilers. It would instead like:
int myInt = 1;
bool myBool = (myInt != 0);
Warning 4800 is just an optimization warning and is therefore safe to
disable. This patch disables warning 4800.
12 years ago
6ac2a12296
item selection working on the preview
12 years ago
4076c19cc6
silencing a cmake warning
12 years ago
3c2efbe966
Disable "make install" for Debian based linux distributions.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
12 years ago
a61edb60fd
Fixed an issue with windows CPack failing due to trying to install linux binaries
12 years ago
99c46093dd
Merge branch 'master' of git://github.com/zinnschlag/openmw into jenkins-code-coverage-and-unittests
12 years ago
65678b95f0
Added support for make install.
...
Added support for make install based on patch from Hasufells
repository:
https://github.com/hasufell/hasufell-overlay/tree/master/games-engines/openmw/files
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
19ae30ee68
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwbase/inputmanager.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.hpp
apps/openmw/mwinput/mouselookevent.cpp
13 years ago
34513cf16b
Added support for code coverage checking and unittests.
...
Added support for code coverage checking with gcov and
unittests with Google C++ unittest and GMock frameworks.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
98219323b7
Merge remote-tracking branch 'mmd/vsdebugfixes'
13 years ago
7952d38e6c
Use debug dlls when debugging in vs2010 (try 2)
...
Using the Debug build in vs2010 is not working because the debug dlls are
not loaded when debugging. The reason they are not loaded is that
CMAKE_BUILD_TYPE is not defined when doing multiple builds. This in turns
causes OGRE_PLUGIN_DEBUG_SUFFIX not to be set. This patch makes sure that
OGRE_PLUGIN_DEBUG_SUFFIX is always set but only used when debugging.
It also defines DEBUG to make it easier turn things on and off when
debugging.
There are still other bugs that have broken Debug mode in vs2010 but those
will be addressed in other patches.
13 years ago
3112bfb54f
incremented version number
13 years ago
2a11a28e81
Revert "Use debug dlls when debugging in vs2010"
...
This reverts commit ebe131b326
13 years ago
ebe131b326
Use debug dlls when debugging in vs2010
...
Using the Debug build in vs2010 is not working because the debug dlls are
not loaded when debugging. The reason they are not loaded is that
CMAKE_BUILD_TYPE is not defined when doing multiple builds. This in turns
causes OGRE_PLUGIN_DEBUG_SUFFIX not to be set. This patch makes sure that
OGRE_PLUGIN_DEBUG_SUFFIX is always set but only used when debugging.
There are still other bugs that have broken Debug mode in vs2010 but those
will be addressed in other patches.
13 years ago
976ad7a301
key defaults specified in the code now, required in order to keep the configuration files valid across multiple versions of openmw
13 years ago
86d6f190bf
Input system rewrite
13 years ago
defab0e4b5
Merge remote-tracking branch 'upstream/master' into osx_fix
...
Conflicts:
CMakeLists.txt
13 years ago
e7a1ab9fa6
Define OGRE_PLUGIN_DEBUG_SUFFIX in all cases.
13 years ago
7161361b52
cleanup
13 years ago
23e44a86c6
another attempt to fix
13 years ago
a0a086f69d
fixed redefining macro
13 years ago
fbe9a94568
bug #348 : fixed OS X deployment
...
just enable CMake option "OPENMW_OSX_DEPLOYMENT" and it will search
plugins inside application bundle instead of Ogre prefix
13 years ago
0f40e6fc65
find boost without components so we can use Boost_VERSION
13 years ago
94ce95c679
bug #348 : works again on OS X
13 years ago
ac5bd38df9
some cmake fixes
13 years ago
b2dcf5adcd
support system install for boost wave
13 years ago
014396e80c
remove the plugins.cfg files, do not enforce CG plugin
13 years ago
4434fb640e
Merge branch 'master' into shadersystem
13 years ago
e9b95d55cd
Revert "Proper way to find and use libtbb"
...
This reverts commit d6bf2b7d29
13 years ago
d6bf2b7d29
Proper way to find and use libtbb
13 years ago
e862b6b5a5
Fix comparison in cmake
13 years ago
509e9d7034
Merge branch 'master' into shadersystem
13 years ago
2a3ce5ee6d
Remove Mangle::Stream
...
The base Stream class is left because some part of the terrain esm land factory
inherits from it, though it's largely unused (few of the methods work, and none
actually do anything).
13 years ago
9ed2f1df67
boost wave not needed anymore
13 years ago
94c3fb81d1
check if CMAKE_BUILD_TYPE is defined instead of defining it by default
13 years ago
32e14907a2
add a default value for CMAKE_BUILD_TYPE, resolves error when it is not set
13 years ago
7d5b94709d
Merge branch 'master' into shadersystem
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
13 years ago
fb109ec7e2
use debug versions of ogre plugins in debug mode
13 years ago
de9b7a51de
change glsl #version, remove CG from required libraries
13 years ago
a1e48b0feb
builds now
13 years ago
24399a45c1
add submodule with current code
13 years ago
68459441f2
adjusting version number
13 years ago
82fba53771
Removed the license screen and changed so all licenses are instead installed to the game folder.
13 years ago
3673cd2531
increased version number
13 years ago
a4d6d1baff
added a utility for creating texture atlas at runtime
13 years ago
4655ec94f0
Merge branch 'master' into physicsaedra2 & fix warnings
...
Conflicts:
apps/openmw/mwworld/scene.cpp
13 years ago
f7a03b39c4
Some improvments for windows builds and installer
13 years ago
1ce759af06
Merging in master
13 years ago
0c739825f2
another fix
13 years ago
582d7ab213
building & packaging improvements for OS X
13 years ago
b76fd249c7
updated changelog; bumped version number
13 years ago
afa859a6a6
Merge remote branch 'jhooks/clothingarmor'
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
13 years ago
8156e9e5c4
Fixed install search path for openmw.desktop. It's directly in the binary dir.
13 years ago
2d6cd16296
Now Debian Packages install the configured openmw.desktop file.
13 years ago
dc2751f4ec
Moved Build options to the top. I need this for my tar.gz packages but i think this is a good idea in general.
13 years ago
226f312163
Set the version in the openmw.desktop file via CMake
13 years ago
a4fb71a0fc
Merge remote branch 'scrawl/graphics'
13 years ago
a727bcd4a4
override nif transparency settings (part 1)
13 years ago
944654f263
image rotating function
13 years ago
74deb5588d
Post merge
13 years ago
ebab98a8a0
Restructuring things
13 years ago
bf5a009299
Some improvements to the windows installer
13 years ago
f2c4e513a4
Add support for building with a static build of the MyGui Libraries.
13 years ago
2b4b941192
Merge branch 'master' into gamesettings
13 years ago
6022d3ab13
Merge remote branch 'corristo/pgrd-rendering'
...
reduced cout spam.
Conflicts:
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/renderingmanager.cpp
components/bsa/bsa_archive.cpp
libs/openengine/bullet/physic.hpp
13 years ago
07d0203a3c
Merge remote-tracking branch 'upstream/master'
13 years ago
63e0e82049
Implement an Audiere-based decoder
13 years ago
c2a82c3d89
Merge branch 'master' into gamesettings
13 years ago
f4bbcb48a6
settings-default.cfg
13 years ago
ed58e9e553
Merge remote-tracking branch 'upstream/master'
13 years ago
0021ccf862
Merge remote-tracking branch 'upstream/master'
13 years ago
35f787c4bf
Merge remote-tracking branch 'upstream/master'
13 years ago
057c2f2e2a
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
13 years ago
fbd626baf6
mwiniimporter
13 years ago
2d2af4b28a
Merge remote branch 'scrawl/terrain18' into terrain
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
components/esm_store/cell_store.hpp
13 years ago
b21a6291f7
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwscript/miscextensions.cpp
apps/openmw/mwworld/world.hpp
13 years ago
c3357c4396
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwscript/docs/vmformat.txt
13 years ago
ef2f7e841a
Merge branch 'master' of github.com:Kromgart/openmw
13 years ago
f2075c7f4f
temporarily silence warnigns in OGRE headers
13 years ago
e6303fc3f4
Merge branch 'master' into water
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
13 years ago
scrawl
slothlife
Marc Zinnschlag
Alexander "Ace" Olofsson
Rosanne DiMesio
Nikolay Kasyanov
Arthur Moore
Marco Schulze
cc9cii
vocollapse
eroen
Sebastian Wick
Stanislav
root
bogglez
Bret Curtis
pvdk
greye
graffy76
Thoronador
Sandy
Lukasz Gromanowski
Dmitriy 'Endorph' Shkurskiy
Scott Howard
eroen
Marek Kochanowicz
Tom Mason
Chris Robinson
k1ll
vorenon
Emanuel Guevel
Dmitry Marakasov
Nathan Jeffords
hasufell
Jordan Milne
Michael Mc Donnell
Sebastian Wick
Jason Hooks
Roman Melnik