mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 15:56:38 +00:00
Code Issues Releases Wiki Activity
33161 commits 115 branches 76 tags 128 MiB
Commit graph

292 commits

Author SHA1 Message Date
Alexei Dobrohotov
e4c596adf8
Fix CI builds (attempt №2) 
Gosh darn dem tabs
 2019-07-04 14:12:36 +03:00
Alexei Dobrohotov
e4e513c5dc
Fix CI builds 
Apparently the only tab characters are in this file.
 2019-07-04 13:36:27 +03:00
Nat Meo
bcc5142b32 Issue #4202: Open .omwaddon files without needing to open openmw-cs first. 2019-07-02 16:07:38 +00:00
AnyOldName3
8a6a8086da Make in-memory buffers seekable to fix fog of war 2019-07-01 00:07:44 +01:00
Ilya Zhuravlev
2e1ac51203 Clean up androidpath 2019-05-02 18:18:49 -04:00
Capostrophic
e70cc10305 Some more de-boosting 2019-02-24 03:20:20 +03:00
Andrei Kortunov
e06f0b797a Replace all NULLs to nullptr 2018-10-09 10:21:12 +04:00
Andrei Kortunov
aca6625af4 Avoid possible memory leak by using the unique_ptr 2018-09-11 11:11:27 +04:00
Andrei Kortunov
c7a5548475 Use new logging system for editor 2018-08-14 20:01:09 +04:00
Andrei Kortunov
1452684d9e Use new logging system for components 2018-08-14 19:42:41 +04:00
Alexander Stillich
70d578d050 Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all 2017-11-07 23:10:58 +01:00
Alexander Stillich
7d39c5450c Fixed escaping @ in boost program options filter 2017-11-05 22:14:16 +01:00
AnyOldName3
7329e6a9ef Load 'data=...' lines correctly when starting the wizard or launcher, and save them correctly when exiting the launcher. 2017-10-15 01:59:21 +01:00
c72aa19d6d first pass on optimization of nif parsing functions from the file stream 2017-09-20 23:53:12 -05:00
Allofich
42402976e3 Fixes for building in MSVC 2017-06-13 19:38:12 +09:00
David Carlier
8a5c62de97 needs this head for getuid 2017-06-10 14:50:43 +01:00
Bret Curtis
c781d1f8ed purge unnecessary imports 
add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back
 2017-06-09 19:08:53 +02:00
Bret Curtis
98752a9702 replace boost::bind 2017-06-09 19:08:53 +02:00
Bret Curtis
d785344fad purge all instances of <boost/shared_ptr.hpp>, clean up unused headers 2017-06-09 19:08:53 +02:00
Bret Curtis
07f75e1104 replace boost::shared_ptr in extern and components 2017-06-09 19:08:53 +02:00
Nikolay Kasyanov
db69342b5d [macOS] Move all configs & resources into app bundles 
Fixes #3566 (https://bugs.openmw.org/issues/3566).
 2016-11-23 22:32:54 +01:00
Roman Proskuryakov
416466e53e Fix uninitialized escape_hash_filter 2016-08-19 21:13:38 +03:00
scrawl
2f6075329b Clang warning fixes 2016-08-14 15:10:50 +02:00
David Carlier
83bab29e4b Mainly making compilable under OpenBSD. 
Renaming one resource file as the space led to issue for qt/moc.
 2016-08-06 19:00:27 +01:00
AnyOldName3
a0699ce20d Change some <> characters to double quotes, resolving compilation problems. 2016-07-27 01:19:05 +01:00
AnyOldName3
20f73f4a32 Relocate escape-related code to new files escape.hpp and escape.cpp. 2016-07-27 00:58:31 +01:00
AnyOldName3
7243583963 Change a switch to a series of if/else if/.../else, hopefully resolving compilation issues on OSX and Linux. 2016-07-21 01:36:14 +01:00
AnyOldName3
2b829f7f7b Move some stuff to a header, removing the need for a dodgy hack. 2016-07-21 01:07:25 +01:00
AnyOldName3
becc053555 Trick the software into building by using what I assume is a really dirty hack. 2016-07-21 00:16:00 +01:00
AnyOldName3
32f0ded8f6 Fix bug in unescape filter, but still manage not to fix build issue. 2016-07-20 23:15:44 +01:00
AnyOldName3
95d2c7ea5c Attempt to unescape characters when constructing file paths, introducing compilation errors. 2016-07-20 02:48:57 +01:00
AnyOldName3
f1b5ad5804 Remove unused unsafe function and properly remove inheritance from std::string, providing implementations of missing stream operators preventing boost reading and writing to escape strings. 2016-07-12 17:09:57 +01:00
AnyOldName3
e6f78ae5b7 Switch indentation to spaces to remain consistent with the rest of the project 2016-07-12 01:06:57 +01:00
AnyOldName3
08df463c94 Separate declaration and definition of some static members to hopefully calm Travis down. 2016-07-12 00:37:08 +01:00
AnyOldName3
5121e77a95 Remove the cause of a warning which upset Travis (but not the thing that made the Travis build fail, as I have no idea why it wouldn't work or how to fix it 2016-07-12 00:00:29 +01:00
AnyOldName3
195dd27780 Resolve obvious runtime error revealing more subtle one 2016-07-11 22:05:38 +01:00
AnyOldName3
fbe6dc9704 Change compilation error to runtime exception and decide that inheriting from std::string may have been a bad idea in C++ 2016-07-11 21:33:36 +01:00
AnyOldName3
c1ffc9e776 Remove a compilation error and set up framework to remove the others 2016-07-11 01:59:16 +01:00
AnyOldName3
e17e354e84 Make # only start a comment in openmw.cfg if it starts a line and introduct compilation errors 2016-07-11 01:16:32 +01:00
scrawl
fcbcc004a3 Don't use unordered_map 2016-05-11 02:35:17 +02:00
scrawl
f3e9fd49f3 Don't add the autodetected mw path in global config file 
The wizard takes care of detecting the MW installation path already. By having this path permanently in the global cfg-file, there exists no way to *not* use an autodetected installation, which is a problem.
 2016-04-17 17:17:07 +02:00
cfcohen
d00d487c3d Improved error reporting under POSIX using errno and strerror(). 2015-12-08 23:35:03 -05:00
scrawl
f875597be5 Don't use tolower() 
See https://forum.openmw.org/viewtopic.php?f=8&t=3231&p=35968
 2015-12-07 21:58:30 +01:00
scrawl
647bed7f40 Do not read openmw.cfg from global path if one was found in the local path 2015-12-02 19:21:10 +01:00
scrawl
d5a738bd39 Apply 27e669296e (locale-unaware tolower) to more code 
In particular, the one in VFS::normalizeFilename was affecting cell loading performance.
 2015-11-30 00:38:52 +01:00
Alexander "Ace" Olofsson
7d4125d97f Fixes for building with unity build 2015-09-24 15:21:42 +02:00
scrawl
a47617c21f Fix tab indentations in apps/ and components/ 2015-09-16 20:45:37 +02:00
scrawl
67bd6cd708 Remove empty line at the beginning of files 
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
 2015-08-18 23:06:12 +02:00
scrawl
b3f5ac5dbb Include cleanup 2015-07-25 02:11:49 +02:00
scrawl
3663511cdb Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
 2015-06-16 19:53:41 +02:00
cc9cii
cccf6c6bdd Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644. 2015-06-16 12:48:45 +10:00
scrawl
0cc9b1bb40 Remove dependency on OgrePlatform.h 2015-06-03 18:49:52 +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
025a1a7866 Restore savegame screenshot display 2015-05-28 02:34:38 +02:00
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
 2015-05-04 02:41:50 +02:00
k1ll
a230050ec8 Boost tr1 unordered map does not work with mingw 2015-04-29 18:31:29 +02:00
k1ll
00b7712a59 Fix shlwapi include case and add the lib for linking when building for windows 2015-04-29 18:31:28 +02:00
Rohit Nirmal
997347b01e Silence -Wreorder warnings. 2015-04-28 18:48:02 -05: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
Nikolay Kasyanov
af2b08214b #2460: use Application Support as user data path on OS X 2015-03-18 23:48:03 +02:00
Marc Zinnschlag
c032113247 Merge remote-tracking branch 'sandstranger/release-jni-memory' 2015-03-17 11:41:41 +01:00
sylar
db10c87b89 release jni memory 2015-03-16 18:21:38 +04:00
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.
 2015-03-15 08:08:55 +13:00
scrawl
f91696723f Fix compile error 2015-02-27 19:58:43 +01:00
sylar
70398e2f9f change Jni name method 2015-02-26 18:30:14 +04:00
scrawl
da690c91b3 Delete the old Ogre DataStream class 2015-02-22 14:19:00 +01:00
scrawl
8f0ab7d09f ESM component no longer relies on Ogre DataStreams 2015-02-22 14:12:05 +01:00
scrawl
68bce7825e Multiple definition fix 2015-02-20 17:57:18 +01:00
scrawl
d4dff6ed55 Port BSAFile to istream, remove OGRE bsa resource system 2015-02-17 16:19:21 +01:00
scrawl
5a3d796578 Implement std::istream subclass for constrained file streams 2015-02-17 12:26:28 +01:00
scrawl
2abc033655 ConstrainedDataStream: print the name of the file in exceptions 2015-01-31 22:40:42 +01:00
scrawl
51e451e249 Tabs to spaces 2015-01-31 22:40:42 +01:00
scrawl
ef3ba12cb6 Add silent mode to ConfigurationManager, used by essimporter 2015-01-31 22:40:39 +01:00
root
85b8fca1f0 fixes 2014-12-03 01:11:50 +04:00
root
4e756a2f4a path to game get through jni 2014-12-03 01:03:27 +04:00
sylar
4c46da79de changed android configs paths 2014-10-07 23:31:22 +04:00
Sebastian Wick
41094a8641 the global config path is not always $prefix/etc, so just define the whole path in the build system 2014-09-19 20:23:39 +02:00
Sebastian Wick
2ae8158ee9 SYSCONFDIR and LinuxPath should work with different install prefixs 2014-09-19 03:15:28 +02:00
Bret Curtis
feb0ef8390 fixes building on systems with kFreeBSD kernel 2014-08-18 17:19:54 +02:00
root
32ebc90ba4 fix v9 2014-08-06 07:52:36 +04:00
root
713787d92f fix v7 2014-08-06 07:48:16 +04:00
root
8978f9bcc6 fix v6 2014-08-06 02:10:47 +04:00
root
3cd98e5259 fix code v5 2014-09-06 02:02:39 +04:00
root
174b528082 fixe v 3 2014-08-06 00:54:53 +04:00
root
d8772156a7 fixe all code v 2 2014-08-06 00:46:21 +04:00
root
8a8b91dfe1 fixed all code for building on all platforms inlcudng ANDROID 2014-09-04 22:47:03 +04:00
root
7cd2d4809c android-build 2014-08-04 19:50:53 +04:00
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)
 2014-07-28 21:52:34 +02:00
scrawl
5645c9185b Fix location of local data path 2014-06-18 17:18:48 +02:00
scrawl
3cd835e61a Fix bsa file loading not being case insensitive (Fixes #1178) 2014-05-26 17:34:36 +02:00
greye
663d5c314e be more verbose on change reasons 2014-05-22 16:35:57 +04:00
greye
417e07fbce fix irrelevant error reporting 2014-05-19 10:59:36 +04:00
greye
6cb795ef7d attempt to fix LowLevelFile, minor code reuse 2014-05-19 10:47:02 +04:00
greye
2236216344 minor simplification 2014-05-18 14:55:05 +04:00
greye
a22ec223d8 open fstreams from boost::filesystem::path, vol.1 2014-05-18 14:55:05 +04:00
greye
b4950509bc use converted widechars in ini importer 2014-05-18 14:55:05 +04:00
greye
eafdefe999 using WindowsPath implies utf-8 for boost fs::path 2014-05-18 14:55:05 +04:00
greye
584c121f33 fix windows unicode path handling 2014-05-18 14:55:04 +04:00
Bret Curtis
ab224f93c9 remove our stdint.h version that uses boost and force usage of system stdint.h 2014-03-05 17:08:58 +01:00
cc9cii
46867ec0cf Fix file handles being left open on windows builds 2014-03-01 07:24:20 +11:00
Alexander "Ace" Olofsson
b50151cb38 Quick build fix for windows 2013-12-28 18:16:01 +01:00
scrawl
33389b9b63 XDG compliant paths 2013-12-26 20:53:51 +01:00
scrawl
aef0fd1460 Rename some path methods 2013-12-26 20:53:51 +01:00
scrawl
530d06ab54 Remove unused code 2013-12-14 05:07:08 +01:00
scrawl
636d399c7f Refactored Ogre initialisation into a component 2013-10-30 14:04:33 +01:00
Marc Zinnschlag
25b7cd33ea added FileWidget; fixed OpenCS configuration 2013-09-08 14:31:20 +02:00
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.
 2013-05-26 12:44:30 +02:00
Emanuel Guevel
289bbc64f7 Load fallback archives listed in openmw.cfg at startup 2013-03-09 21:14:11 +01:00
vorenon
06e077c07c Removing all traces of "Open Morrowind". 
pvdk said it was ok to remove the header entirely
 2013-02-28 19:36:10 +01:00
Marc Zinnschlag
85697e4628 reverted to C++03 2013-02-02 13:24:28 +01:00
Michal Sciubidlo
85bdb49d1b Mix debug and release if necessary under non Windows systems. 2013-01-11 09:10:48 +01:00
eduard
2dc0064cc2 more string lowercase 2013-01-09 20:51:52 +01:00
Nikolay Kasyanov
1d3f3bcce3 clang build fix 2013-01-06 19:19:12 +04:00
Jordan Milne
3ed77ca189 Include C++ header instead 2013-01-05 01:17:07 -04:00
Jordan Milne
b52904a6ea Include headers necessary for compilation under VS2010 2013-01-04 19:52:27 -04:00
Marc Zinnschlag
b4d63814cc post merge fix 2013-01-04 23:12:56 +01:00
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.
 2013-01-04 13:40:00 -08:00
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.
 2013-01-04 13:39:10 -08:00
Marc Zinnschlag
e9ba7339f3 improved error handling 2012-12-26 17:15:53 +01:00
Alexander "Ace" Olofsson
7934d8abd9 Fixed an issue with some paths not concatenating properly. 2012-09-09 16:28:02 +02:00
Alexander "Ace" Olofsson
bc6d87ba32 Oops, that would've broken getUserPath() on Linux... 2012-09-08 23:04:53 +02:00
Alexander "Ace" Olofsson
cd3e780614 Removing the unnecessary local variables 2012-09-08 20:34:43 +02:00
Alexander "Ace" Olofsson
97f1be2b05 Testing a third way to solve the path issue 2012-09-08 18:47:31 +02:00
Alexander "Ace" Olofsson
6e317f00eb Fix the problem in a different way 2012-09-08 15:57:12 +02:00
Alexander "Ace" Olofsson
b6fcd337df Modified the cache path to work on windows 2012-09-08 15:08:24 +02:00
scrawl
c27ff546e4 shader cache 2012-09-02 19:40:26 +02:00
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.
 2012-08-17 10:47:20 -04:00
Marc Zinnschlag
7cc2de3e21 boost filesystem compatibility fix 2012-08-08 08:52:08 +02:00
Marc Zinnschlag
f8e54b401b fixed linkage problem 2012-08-01 09:09:00 +02:00
Nikolay Kasyanov
32d2326b4d Update components/files/ogreplugin.hpp 
removed #error directive
 2012-07-31 18:15:09 +04:00
Nikolay Kasyanov
03cccee0e4 bug #348: workaround for boost older than 1.44 2012-07-31 10:51:34 +04:00
Nikolay Kasyanov
b05dfeae70 bug #348: cleanup 
moved files to appropriate component, moved function to namespace,
added docs
 2012-07-31 01:01:00 +04:00
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
 2012-07-23 14:12:21 +02:00
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>
 2012-07-22 14:52:55 +03:00
scrawl
014396e80c remove the plugins.cfg files, do not enforce CG plugin 2012-07-20 16:44:03 +02:00
guidoj
0549e949ba Mostly removal of unnecessary #include's and a little clean up 2012-07-17 09:27:12 +02:00
scrawl
c85c794c86 fixed some cppcheck issues 2012-06-06 20:29:30 +02:00
scrawl
343bbaf0fd integrated video settings in the settings file, the launcher is now useless 2012-05-22 03:36:03 +02:00
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.
 2012-05-11 21:32:38 +02:00
Alexander "Ace" Olofsson
4a9a416d46 Can find files even if no .bsa file exists now 2012-03-30 14:45:32 +02:00
Michael Papageorgiou
b2c6d52db1 Another file search fix 2012-03-16 09:00:18 +02:00
Marc Zinnschlag
1c0bf162f2 boost compatibility fix 2012-03-15 16:56:36 +01:00
Michael Papageorgiou
588ac44bc7 Improved matching for the FileListLocator 2012-03-15 17:32:10 +02:00
Michael Papageorgiou
f7c7ed0ac7 Fix regression with locating sound files 2012-03-15 13:56:46 +02:00
Marc Zinnschlag
69127fa8f1 boost compatibility fix; added a missing include 2012-03-09 17:33:10 +01:00
Michael Papageorgiou
ad6175c78a SoundManager: Set up the priority for file look up right and take care of a corner case 2012-03-08 23:06:52 +02:00
Michael Papageorgiou
054a176c86 Added new FileLibrary class to handle music, this fixes a number of issues. 2012-03-07 17:46:51 +02:00
Michael Papageorgiou
54353794e5 SoundManager: Completely rewrote the file management 2012-03-07 02:20:15 +02:00
Alexander "Ace" Olofsson
b6915a6090 Forgot that IsWow64Process would return false on a native 64-bit application 2012-03-01 01:03:31 +01:00
Lukasz Gromanowski
9a4cd6c2b1 Fixes #200 - Paths with quotes for data-local option. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-02-27 23:56:58 +01:00