mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity
1,753 Commits 18 Branches 66 Tags
Commit Graph

1753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Zinnschlag
8da0925e70 Merge remote branch 'corristo/master' openmw-0.12.0 2012-03-02 11:18:07 +01:00
Nikolay Kasyanov
fa3fbf940c Fix for OS X 10.6 support 2012-03-02 14:10:11 +04:00
Marc Zinnschlag
a86d2877fc Merge remote branch 'ace/win64-fixes' 2012-03-02 11:00:41 +01:00
Nikolay Kasyanov
b283ad86fb revert to old launcher stylesheet location on OS X 2012-03-01 17:16:44 +04:00
Alexander "Ace" Olofsson
2c4ef5c670 64-bit install path on windows was easier to fix than expected. 2012-03-01 08:13:40 +01:00
Pieter van der Kloet
5ffa3264b2 Appended resources/ to the stylesheet path 2012-03-01 04:38:37 +01: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
Marc Zinnschlag
c796c81d00 Merge remote branch 'ace/cmake' into defeat 2012-02-28 23:32:07 +01:00
Pieter van der Kloet
11ec5cf2e2 Stylesheet location changed in CMakeLists and some minor fixes to the launcher 2012-02-28 22:45:03 +01:00
Pieter van der Kloet
b320733e45 Fixed Qt exits, this time for all occurrences 2012-02-28 21:00:02 +01:00
Marc Zinnschlag
dc1fe6fb4d adjusted readme 2012-02-28 09:56:12 +01:00
Marc Zinnschlag
7aaa7f185f same for launcher 2012-02-28 09:46:48 +01:00
Marc Zinnschlag
4c2fffdd61 temporarily disabled multi data path support in OpenMW 2012-02-28 09:27:35 +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
Alexander "Ace" Olofsson
bfb3a4a36b Changed FindOGRE a bit to make it easier to find a source build of Ogre. (At least on windows) 2012-02-27 22:22:17 +01:00
Marc Zinnschlag
2608491906 Merge remote branch 'corristo/master' 2012-02-27 16:05:04 +01:00
Nikolay Kasyanov
d58b408ae1 Deploying Qt image format plugins on OS X considered useless 2012-02-27 19:00:06 +04:00
Marc Zinnschlag
053a2996d2 fix for non-standard erase function 2012-02-26 23:31:16 +01:00
Alexander "Ace" Olofsson
be8690e333 Fix for debug crash on windows 2012-02-26 22:45:17 +01:00
Marc Zinnschlag
7505c96fbb Merge remote branch 'lgro/master' 2012-02-26 12:59:11 +01:00
Lukasz Gromanowski
cb5534c608 Updated website URL in CMakeLists file. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-02-26 12:12:00 +01:00
Nikolay Kasyanov
822f47fbac Slightly changed OIS include dir var used specially for OS X. Should not change anything on other platforms 2012-02-25 18:05:29 +04:00
Nikolay Kasyanov
1addef2cc3 added missing include for macospath.cpp 2012-02-25 17:47:57 +04:00
Nikolay Kasyanov
cb780720bb fix for string.h: use our own strnlen only on OS X < 10.7 2012-02-25 17:43:30 +04:00
Nikolay Kasyanov
3875c0f97a Merge remote-tracking branch 'upstream/master' 2012-02-25 17:23:34 +04:00
Lukasz Gromanowski
c9a1789db8 Bug fix for processing data paths in OpenMW Launcher. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-02-25 10:20:42 +01:00
Marc Zinnschlag
771d50fe69 removed a redundant assert and a left-over comment 2012-02-24 20:20:32 +01:00
Marc Zinnschlag
68da94c8f0 workaround for older boost versions 2012-02-24 20:19:32 +01:00
Nikolay Kasyanov
77368e6f05 Merge remote-tracking branch 'upstream/master' 2012-02-24 20:28:23 +04:00
Marc Zinnschlag
728e9cce5a Merge remote branch 'lgro/config_fixes' 2012-02-24 09:03:48 +01:00
Nikolay Kasyanov
4188654418 Merge remote-tracking branch 'upstream/master' 2012-02-24 11:07:55 +04:00
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>
 2012-02-23 23:21:17 +01:00
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>
 2012-02-23 23:01:42 +01:00
Alexander "Ace" Olofsson
f6a80bfc95 Small define/include fixes for compiling on windows 2012-02-23 20:06:06 +01:00
Marc Zinnschlag
5f72199419 Merge remote branch 'lgro/config_fixes' 2012-02-23 09:28:11 +01:00
Lukasz Gromanowski
d5f1d7eed7 Fix for processing tokens inside data-local config option. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-02-22 23:56:07 +01:00
Lukasz Gromanowski
e0206edc44 Fixed stupid bug in getGlobalDataPath. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-02-22 20:00:17 +01:00
Pieter van der Kloet
280babc719 Fixed stylesheet and configuration problems with the launcher and code cleanup 2012-02-22 08:34:47 +01:00
Marc Zinnschlag
b2b09320fc Merge branch 'config' 2012-02-21 13:55:58 +01:00
Marc Zinnschlag
547d6a0639 Merge remote branch 'lgro/config' into config 2012-02-21 11:50:23 +01:00
Marc Zinnschlag
971ae94fbf Revert "workaround for the configuration problems" 
This reverts commit 850501e9221daf1a55d31b72c4389da158b338e6.
 2012-02-21 11:50:04 +01:00
Marc Zinnschlag
ade6658d4d Merge remote branch 'ace/win-packaging' 2012-02-20 14:11:22 +01:00
Marc Zinnschlag
781b16a00e removed bCollision variable from World 2012-02-20 14:07:16 +01:00
Marc Zinnschlag
7eae24bb45 some fixes 2012-02-20 14:02:24 +01:00
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>
 2012-02-20 00:02:00 +01:00
Jason Hooks
7e1e746201 More changes 2012-02-19 17:59:50 -05:00
Jason Hooks
38a0d1d1c5 Merging in master 2012-02-19 15:39:12 -05:00
Jason Hooks
e330c22d68 Removing unneeded files 2012-02-19 02:04:47 -05:00
Jason Hooks
e58f2f5363 Eliminating unnecessary data from skeletons and shape saving 2012-02-19 02:01:15 -05:00
Jason Hooks
2217847c57 Fixing a crash 2012-02-18 15:29:40 -05:00