Commit Graph

301 Commits (master)

Author SHA1 Message Date
cfcohen d00d487c3d Improved error reporting under POSIX using errno and strerror(). 9 years ago
scrawl f875597be5 Don't use tolower()
See https://forum.openmw.org/viewtopic.php?f=8&t=3231&p=35968
9 years ago
scrawl 647bed7f40 Do not read openmw.cfg from global path if one was found in the local path 9 years ago
scrawl d5a738bd39 Apply 27e669296e (locale-unaware tolower) to more code
In particular, the one in VFS::normalizeFilename was affecting cell loading performance.
9 years ago
Alexander "Ace" Olofsson 7d4125d97f Fixes for building with unity build 9 years ago
scrawl a47617c21f Fix tab indentations in apps/ and components/ 9 years ago
scrawl 67bd6cd708 Remove empty line at the beginning of files
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
10 years ago
scrawl b3f5ac5dbb Include cleanup 10 years ago
scrawl 3663511cdb Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/CMakeLists.txt
	extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
cc9cii cccf6c6bdd Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644. 10 years ago
scrawl 0cc9b1bb40 Remove dependency on OgrePlatform.h 10 years ago
scrawl 974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
scrawl 025a1a7866 Restore savegame screenshot display 10 years ago
scrawl e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp
10 years ago
k1ll a230050ec8 Boost tr1 unordered map does not work with mingw 10 years ago
k1ll 00b7712a59 Fix shlwapi include case and add the lib for linking when building for windows 10 years ago
Rohit Nirmal 997347b01e Silence -Wreorder warnings. 10 years ago
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
10 years ago
Nikolay Kasyanov af2b08214b #2460: use Application Support as user data path on OS X 10 years ago
Marc Zinnschlag c032113247 Merge remote-tracking branch 'sandstranger/release-jni-memory' 10 years ago
sylar db10c87b89 release jni memory 10 years ago
dteviot 2ef7fc4e2c Installer work for Windows (Fixes #1621)
1. Correctly reads Windows registry for vanilla MW install location.
2. Populates existing installation page with location of vanilla, when found.
3. On Windows, installer wizard now gets to Import page.
10 years ago
scrawl f91696723f Fix compile error 10 years ago
sylar 70398e2f9f change Jni name method 10 years ago
scrawl da690c91b3 Delete the old Ogre DataStream class 10 years ago
scrawl 8f0ab7d09f ESM component no longer relies on Ogre DataStreams 10 years ago
scrawl 68bce7825e Multiple definition fix 10 years ago
scrawl d4dff6ed55 Port BSAFile to istream, remove OGRE bsa resource system 10 years ago
scrawl 5a3d796578 Implement std::istream subclass for constrained file streams 10 years ago
scrawl 2abc033655 ConstrainedDataStream: print the name of the file in exceptions 10 years ago
scrawl 51e451e249 Tabs to spaces 10 years ago
scrawl ef3ba12cb6 Add silent mode to ConfigurationManager, used by essimporter 10 years ago
root 85b8fca1f0 fixes 10 years ago
root 4e756a2f4a path to game get through jni 10 years ago
sylar 4c46da79de changed android configs paths 10 years ago
Sebastian Wick 41094a8641 the global config path is not always $prefix/etc, so just define the whole path in the build system 10 years ago
Sebastian Wick 2ae8158ee9 SYSCONFDIR and LinuxPath should work with different install prefixs 10 years ago
Bret Curtis feb0ef8390 fixes building on systems with kFreeBSD kernel 11 years ago
root 32ebc90ba4 fix v9 11 years ago
root 713787d92f fix v7 11 years ago
root 8978f9bcc6 fix v6 11 years ago
root 3cd98e5259 fix code v5 10 years ago
root 174b528082 fixe v 3 11 years ago
root d8772156a7 fixe all code v 2 11 years ago
root 8a8b91dfe1 fixed all code for building on all platforms inlcudng ANDROID 10 years ago
root 7cd2d4809c android-build 11 years ago
bogglez c006393178 Fix http://bugs.openmw.org/issues/768
Changes application_name in configuration manager to OpenMW instead of
openmw, if on windows. This shouldn't break anything since Windows uses
case-insensitive filesystems. Strictly speaking the installation
directory must be OpenMW now though (not sure whether this is the case)
11 years ago
scrawl 5645c9185b Fix location of local data path 11 years ago
scrawl 3cd835e61a Fix bsa file loading not being case insensitive (Fixes #1178) 11 years ago
greye 663d5c314e be more verbose on change reasons 11 years ago
greye 417e07fbce fix irrelevant error reporting 11 years ago
greye 6cb795ef7d attempt to fix LowLevelFile, minor code reuse 11 years ago
greye 2236216344 minor simplification 11 years ago
greye a22ec223d8 open fstreams from boost::filesystem::path, vol.1 11 years ago
greye b4950509bc use converted widechars in ini importer 11 years ago
greye eafdefe999 using WindowsPath implies utf-8 for boost fs::path 11 years ago
greye 584c121f33 fix windows unicode path handling 11 years ago
Bret Curtis ab224f93c9 remove our stdint.h version that uses boost and force usage of system stdint.h 11 years ago
cc9cii 46867ec0cf Fix file handles being left open on windows builds 11 years ago
Alexander "Ace" Olofsson b50151cb38 Quick build fix for windows 11 years ago
scrawl 33389b9b63 XDG compliant paths 11 years ago
scrawl aef0fd1460 Rename some path methods 11 years ago
scrawl 530d06ab54 Remove unused code 11 years ago
scrawl 636d399c7f Refactored Ogre initialisation into a component 11 years ago
Marc Zinnschlag 25b7cd33ea added FileWidget; fixed OpenCS configuration 11 years ago
eroen 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
Emanuel Guevel 289bbc64f7 Load fallback archives listed in openmw.cfg at startup 12 years ago
vorenon 06e077c07c Removing all traces of "Open Morrowind".
pvdk said it was ok to remove the header entirely
12 years ago
Marc Zinnschlag 85697e4628 reverted to C++03 12 years ago
Michal Sciubidlo 85bdb49d1b Mix debug and release if necessary under non Windows systems. 12 years ago
eduard 2dc0064cc2 more string lowercase 12 years ago
Nikolay Kasyanov 1d3f3bcce3 clang build fix 12 years ago
Jordan Milne 3ed77ca189 Include C++ header instead 12 years ago
Jordan Milne b52904a6ea Include headers necessary for compilation under VS2010 12 years ago
Marc Zinnschlag b4d63814cc post merge fix 12 years ago
Nathan Jeffords 278337116b increased performance of ConstrainedDataStream
Reimplemented ConstrainedDataStream to use low-level IO calls and a
custom buffering scheme to avoid using C++ iostreams.
12 years ago
Nathan Jeffords 5c7f1bd497 moved ConstrainedDataStream into its own file
moved the ConstrainedDataStream into its own source file and changed
BSAFile to use it though the exposed factory function. This is in
preperation foreimplementing it based on feedback from profiling that
(at least on windows) the C++ iostreams library is quite slow.
12 years ago
Marc Zinnschlag e9ba7339f3 improved error handling 12 years ago
Alexander "Ace" Olofsson 7934d8abd9 Fixed an issue with some paths not concatenating properly. 12 years ago
Alexander "Ace" Olofsson bc6d87ba32 Oops, that would've broken getUserPath() on Linux... 12 years ago
Alexander "Ace" Olofsson cd3e780614 Removing the unnecessary local variables 12 years ago
Alexander "Ace" Olofsson 97f1be2b05 Testing a third way to solve the path issue 12 years ago
Alexander "Ace" Olofsson 6e317f00eb Fix the problem in a different way 12 years ago
Alexander "Ace" Olofsson b6fcd337df Modified the cache path to work on windows 12 years ago
scrawl c27ff546e4 shader cache 13 years ago
Michael Mc Donnell 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
Marc Zinnschlag 7cc2de3e21 boost filesystem compatibility fix 13 years ago
Marc Zinnschlag f8e54b401b fixed linkage problem 13 years ago
Nikolay Kasyanov 32d2326b4d Update components/files/ogreplugin.hpp
removed #error directive
13 years ago
Nikolay Kasyanov 03cccee0e4 bug #348: workaround for boost older than 1.44 13 years ago
Nikolay Kasyanov b05dfeae70 bug #348: cleanup
moved files to appropriate component, moved function to namespace,
added docs
13 years ago
Marc Zinnschlag 2c5d3d8df9 Merge remote branch 'scrawl/shadersystem' into shadersystem
Attention: We have submodules again. Don't forget to update!

Conflicts:
	components/files/configurationmanager.cpp
13 years ago
Lukasz Gromanowski 1dde806add Fixes #313: openmw without a ~/.config/openmw folder segfault.
Added creation of $HOME/.config/openmw directory.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
scrawl 014396e80c remove the plugins.cfg files, do not enforce CG plugin 13 years ago
guidoj 0549e949ba Mostly removal of unnecessary #include's and a little clean up 13 years ago
scrawl c85c794c86 fixed some cppcheck issues 13 years ago
scrawl 343bbaf0fd integrated video settings in the settings file, the launcher is now useless 13 years ago
Lukasz Gromanowski d9e39bd90e Changed order of plugins.cfg file paths.
Changed order of plugins.cfg file paths - before when plugins.cfg file
was found in global path then it was used as default one. Now the behavoiur
is opposite if plugins.cfg file exists in local path then it is used as
default one.
13 years ago
Alexander "Ace" Olofsson 4a9a416d46 Can find files even if no .bsa file exists now 13 years ago
Michael Papageorgiou b2c6d52db1 Another file search fix 13 years ago
Marc Zinnschlag 1c0bf162f2 boost compatibility fix 13 years ago
Michael Papageorgiou 588ac44bc7 Improved matching for the FileListLocator 13 years ago
Michael Papageorgiou f7c7ed0ac7 Fix regression with locating sound files 13 years ago
Marc Zinnschlag 69127fa8f1 boost compatibility fix; added a missing include 13 years ago
Michael Papageorgiou ad6175c78a SoundManager: Set up the priority for file look up right and take care of a corner case 13 years ago
Michael Papageorgiou 054a176c86 Added new FileLibrary class to handle music, this fixes a number of issues. 13 years ago
Michael Papageorgiou 54353794e5 SoundManager: Completely rewrote the file management 13 years ago
Alexander "Ace" Olofsson b6915a6090 Forgot that IsWow64Process would return false on a native 64-bit application 13 years ago
Lukasz Gromanowski 9a4cd6c2b1 Fixes #200 - Paths with quotes for data-local option.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Nikolay Kasyanov 1addef2cc3 added missing include for macospath.cpp 13 years ago
Marc Zinnschlag 728e9cce5a Merge remote branch 'lgro/config_fixes' 13 years ago
Lukasz Gromanowski d97854be00 Bug fixes for configuration handling.
Corrected retrieving installation path from wine registry on MacOS.
Updated doxygen comments.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Lukasz Gromanowski 3da6af6e38 Bug fixes for configuration handling.
Added erasing double quotes from paths, corrected retriveing
installation path from wine registry. Updated doxygen comments.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Alexander "Ace" Olofsson f6a80bfc95 Small define/include fixes for compiling on windows 13 years ago
Marc Zinnschlag 5f72199419 Merge remote branch 'lgro/config_fixes' 13 years ago
Lukasz Gromanowski e0206edc44 Fixed stupid bug in getGlobalDataPath.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Pieter van der Kloet 280babc719 Fixed stylesheet and configuration problems with the launcher and code cleanup 13 years ago
Lukasz Gromanowski 0c0b594090 Issue #168 - Configuration cleanup
Removed unnecessary path methods - according to forum disscusion:

http://openmw.org/forum/viewtopic.php?f=6&t=448

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Lukasz Gromanowski 80008ed09f Issue #168 - Configuration cleanup
Fixed bug with configuration tokens parsing - when something
appear after token it should be appended to replaced path.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Lukasz Gromanowski b004e2479c Issue #133 Handle resources across multiple data directories - WIP
Work In Progress - added support for multiple paths in SoundManager.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Lukasz Gromanowski 86f88bedae Issue #168 - Configuration cleanup
Removed 'data' part from token names, added token cleaning when
invalid or unknown token is passed as commandline parameter.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Lukasz Gromanowski c5dee2c4fb Issue #168 - Configuration cleanup
Corrected tokens processing. If directory exist then tokens
shall be replaced by correct path, otherwise they are silently
removed from path container.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Lukasz Gromanowski 1d96b99532 Issue #168 - Configuration cleanup
Added tokens processing, modified getInstallPath for linux
so we could use ~/.wine/dosdevices symlinks.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Lukasz Gromanowski 841bdded76 Merge branch 'mwregistry' of https://github.com/swick/openmw into swick-mwregistry
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Lukasz Gromanowski 406897aa64 Issue #168 - Configuration cleanup - WIP
Sources update.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Lukasz Gromanowski 7c24ae9ac7 Issue #168 - Configuration cleanup - WIP
This is "work in progress" commit, it shall not be merged alone,
without succeeding commits (it's not fully functional).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Dmitry Marakasov 463acb2f75 Use linuxpath for FreeBSD as well 13 years ago
Sebastian Wick 62eaaab69d move include from .hpp to .cpp; line.empty() instead of line.size() > 0; change type of startPos and pos and move to other scope 13 years ago
Sebastian Wick 16c214a17a find InstalledPath in wine registry; mInstalledPath in Files::Path 13 years ago
Alexander "Ace" Olofsson b4174b6419 Vector instead of new/delete 13 years ago
Alexander "Ace" Olofsson 8663177ad1 Oops, forgot the delete... 13 years ago
Alexander "Ace" Olofsson 96ed96d4dd Quick test at getting Morrowinds install path from the registry on windows 13 years ago
Marc Zinnschlag b63a2602c3 fixed a missing include 14 years ago
Lukasz Gromanowski d43455fd57 Issue #168: Configuration cleanup, part 2
Corrected --data and --data-local parameters handling.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Lukasz Gromanowski 48c24d4904 Issue #128: Configuration cleanup - added missing cstring header.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Lukasz Gromanowski ea7eb7a62d fixes #128 Configuration cleanup.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Marc Zinnschlag b157273cd9 Merge branch 'next'
Conflicts:
	apps/openmw/main.cpp
14 years ago
Marc Zinnschlag ba55b51627 removed a leftover debug message 14 years ago
Nikolay Kasyanov e48d265b5d Mac fix: added local config dir support, app root dir is dir where bundle located 14 years ago
Marc Zinnschlag 0f2df4e2b8 more cleanup 14 years ago
Marc Zinnschlag 5fb3dc854b Merge branch 'optimisation' 14 years ago
Marc Zinnschlag a95a0f821b Merge remote branch 'jhooks/directories' into directories
Conflicts:
	components/files/multidircollection.hpp
14 years ago
athile 231be8f381 Add BULLET_ROOT for the prebuilt binaries. Fix a minor VS2010 compile issue (missing header file). 14 years ago
Jason Hooks 51b74c2f05 starting 14 years ago
gugus b05f780675 fix a compiler error under window 14 years ago
Marc Zinnschlag a133920eb0 boost filesystem fix 14 years ago
Marc Zinnschlag d9f1b64213 some file collection bug fixing 14 years ago
Marc Zinnschlag 6e880cffb2 changed engine class to support multiple data directories for esm files 14 years ago
Marc Zinnschlag d260e5c1bd added file collection class 14 years ago
Marc Zinnschlag bdfd28f44d adjusted components/files namespace; some related cleanup 14 years ago
Marc Zinnschlag 7131c08ca4 moved path.hpp/path.cpp to a new component 14 years ago