be70d197e5
Merge branch 'next'
...
Conflicts:
.gitignore
cmake/FindOGRE.cmake
13 years ago
a1cbc7fb42
Altered getFver to fix a warning
13 years ago
b6915a6090
Forgot that IsWow64Process would return false on a native 64-bit application
13 years ago
9a4cd6c2b1
Fixes #200 - Paths with quotes for data-local option.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
1addef2cc3
added missing include for macospath.cpp
13 years ago
728e9cce5a
Merge remote branch 'lgro/config_fixes'
13 years ago
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
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
f6a80bfc95
Small define/include fixes for compiling on windows
13 years ago
5f72199419
Merge remote branch 'lgro/config_fixes'
13 years ago
e0206edc44
Fixed stupid bug in getGlobalDataPath.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
280babc719
Fixed stylesheet and configuration problems with the launcher and code cleanup
13 years ago
b2b09320fc
Merge branch 'config'
13 years ago
547d6a0639
Merge remote branch 'lgro/config' into config
13 years ago
971ae94fbf
Revert "workaround for the configuration problems"
...
This reverts commit 850501e922
13 years ago
e02cba58b1
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
13 years ago
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
38a0d1d1c5
Merging in master
13 years ago
e58f2f5363
Eliminating unnecessary data from skeletons and shape saving
13 years ago
2217847c57
Fixing a crash
13 years ago
850501e922
workaround for the configuration problems
13 years ago
ddb8b1e1bc
Merge remote branch 'lgro/config' into config
13 years ago
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
27caee664e
Merge remote branch 'lgro/config' into config
...
Conflicts:
components/files/path.hpp
13 years ago
1a6a49b9b8
Merge remote branch 'lgro/fix_warnings'
13 years ago
8829d46bda
Clean up compilation warnings.
...
Clan up compilation warnings like "variable ... set but not used" introduced
in some older and recent commits.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
bcc4d7a7c9
Issue #133 Handle resources across multiple data directories
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
273eac12a1
Merge remote branch 'jhooks/animation2' into animation2
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
components/nifogre/ogre_nif_loader.cpp
13 years ago
cb95c82af2
Merge remote-tracking branch 'upstream/master'
13 years ago
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
1da519a914
Some cleanup
13 years ago
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
0d7f39fcb5
Merge branch 'refdata' into next
13 years ago
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
ea241d85ef
Fixed some issues with the CMake files
13 years ago
c081160591
replaced container store in ref data with new custom data implementation
13 years ago
f4b6caac59
Revert "Issue #178 - workaround for compilation problems with ogre 1.8.0."
...
This reverts commit 37e272b3b5
13 years ago
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
6de0847b86
Slightly better performance on animation
13 years ago
ec6243dd77
fixed compilation problem with llvm clang: constant type explicitly set to float
13 years ago
841bdded76
Merge branch 'mwregistry' of https://github.com/swick/openmw into swick-mwregistry
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
406897aa64
Issue #168 - Configuration cleanup - WIP
...
Sources update.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
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
bcf3e45ff6
Proper buffer designation
13 years ago
463acb2f75
Use linuxpath for FreeBSD as well
13 years ago
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
16c214a17a
find InstalledPath in wine registry; mInstalledPath in Files::Path
13 years ago
0c2de2c00c
Merge branch 'animation2'
13 years ago
9b910dda94
clean up
13 years ago
b4174b6419
Vector instead of new/delete
13 years ago
Marc Zinnschlag
Michael Papageorgiou
Alexander "Ace" Olofsson
Lukasz Gromanowski
Nikolay Kasyanov
Pieter van der Kloet
Jason Hooks
Dmitry Marakasov
Sebastian Wick