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 850501e922
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
Marc Zinnschlag
8186445de9
fix for a very silly bug
2012-02-16 21:06:25 +01:00
Marc Zinnschlag
850501e922
workaround for the configuration problems
2012-02-16 13:14:16 +01:00
Marc Zinnschlag
8244ed5860
workaround for space in paths problem
2012-02-16 09:26:27 +01:00
Marc Zinnschlag
ddb8b1e1bc
Merge remote branch 'lgro/config' into config
2012-02-16 09:12:15 +01:00
Alexander "Ace" Olofsson
6a71cf21b0
Added OpenAL redistributable to OpenMW installer
2012-02-16 08:52:26 +01:00
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>
2012-02-15 22:34:51 +01:00
Marc Zinnschlag
d9c1ed3d5e
Merge remote branch 'corristo/osx-packaging' into config
2012-02-15 10:32:16 +01:00
Nikolay Kasyanov
2020d916ec
added missing comment
2012-02-15 11:30:35 +04:00
Nikolay Kasyanov
57a4b19880
Feature #162 - Need to create app bundle using CMake, not by hand. Almost complete
2012-02-15 11:27:51 +04:00
Marc Zinnschlag
7b457c05bc
updated readme
2012-02-14 09:39:58 +01:00
Marc Zinnschlag
8277df04b1
bumping version number
2012-02-14 09:26:06 +01:00
Marc Zinnschlag
e1defd3595
adjusted the globally installed openmw.cfg file
2012-02-14 09:25:12 +01:00
Marc Zinnschlag
9af08ff18d
store screenshots in user directory instead of local directory
2012-02-13 18:34:21 +01:00
Marc Zinnschlag
77201d05bc
post-merge fix
2012-02-13 16:42:01 +01:00
Marc Zinnschlag
27caee664e
Merge remote branch 'lgro/config' into config
...
Conflicts:
components/files/path.hpp
2012-02-13 16:36:57 +01:00
Marc Zinnschlag
10d4771550
Merge remote branch 'corristo/osx-packaging'
2012-02-13 16:35:13 +01:00
Marc Zinnschlag
1a6a49b9b8
Merge remote branch 'lgro/fix_warnings'
2012-02-13 11:06:41 +01:00
Nikolay Kasyanov
5a42c6c6f5
Feature #162 - Need to create app bundle using CMake, not by hand WIP. Removed libpng dependency from launcher
2012-02-13 10:31:43 +04:00
Lukasz Gromanowski
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>
2012-02-12 15:45:08 +01:00
Lukasz Gromanowski
bcc4d7a7c9
Issue #133 Handle resources across multiple data directories
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-12 14:21:07 +01:00
Marc Zinnschlag
273eac12a1
Merge remote branch 'jhooks/animation2' into animation2
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
components/nifogre/ogre_nif_loader.cpp
2012-02-12 13:41:06 +01:00
Marc Zinnschlag
facc36fa34
Merge remote branch 'corristo/osx-packaging' into packaging
2012-02-12 13:35:54 +01:00
Marc Zinnschlag
8ae2120e15
Merge remote branch 'ace/win-packaging' into packaging
2012-02-12 13:35:33 +01:00
Marc Zinnschlag
a0ac6e5150
cells were sometimes not fully loaded
2012-02-12 12:35:29 +01:00
Lukasz Gromanowski
4fae3bd7c6
Merge pull request #3 from pvdk/config
...
Changed the order of preference for the configuration files
2012-02-10 12:50:58 -08:00
Pieter van der Kloet
eea8773be1
Changed the order of preference for the configuration files
2012-02-10 21:45:46 +01:00
Marc Zinnschlag
bc71fb47e0
minor fix
2012-02-10 21:24:33 +01:00
Pieter van der Kloet
17b1546dc1
Changed the way screenshots are created (Bug #191 )
2012-02-10 20:23:59 +01:00
Marc Zinnschlag
4fcb721054
openengine update (physics crash workaround
2012-02-10 14:59:22 +01:00
Marc Zinnschlag
bb7730a708
Merge branch 'lightfix'
2012-02-10 14:55:52 +01:00
gugus
597e670eef
corrected the light problem
2012-02-10 14:51:49 +01:00
Marc Zinnschlag
b878c87ba8
Merge branch 'renderingfix'
2012-02-10 14:33:27 +01:00
Marc Zinnschlag
c4e028effe
fixing a faulty include
2012-02-06 10:48:58 +01:00
