scrawl
b77f5c06cc
added facilities for fading the screen in/out
2012-02-18 18:25:02 +01:00
scrawl
899aa5b870
fix last commit, also reacts to ToggleWireframe and not only twf
2012-02-18 16:36:54 +01:00
scrawl
40e23fe26f
added twf console command
2012-02-18 16:06:03 +01: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
ee92da3c4a
Merge remote-tracking branch 'upstream/master'
2012-02-15 11:33:53 +04: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
4a188f2820
Merge remote branch 'gus/master'
2012-02-10 14:57:51 +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
00ac2deefb
Merge remote branch 'pvdk/cmakeogre' into cmakeogre
2012-02-10 14:36:34 +01:00
Marc Zinnschlag
b878c87ba8
Merge branch 'renderingfix'
2012-02-10 14:33:27 +01:00
Pieter van der Kloet
7bf8497215
Fixed CMake problem with Ogre plugins path
2012-02-07 21:41:08 +01:00
Pieter van der Kloet
efe3a3fcbe
Merge branch 'master' of https://github.com/zinnschlag/openmw into cmakeogre
2012-02-07 21:38:16 +01:00
gugus
8affa30ff1
magic commit that fixe the crash when activating collision after changing cell.
...
To be faire, this commit should break the collision system... there must be something I don't understand with bullet ghost objects :p
2012-02-06 23:15:19 +01:00
Marc Zinnschlag
c4e028effe
fixing a faulty include
2012-02-06 10:48:58 +01:00
Marc Zinnschlag
0b0254d30e
spelling fix
2012-02-06 10:48:14 +01:00
Marc Zinnschlag
784c6fe0ff
some cleanup
2012-02-06 10:41:13 +01:00
Marc Zinnschlag
e1600d9a2a
fixed movable object cleanup for ordinary objects
2012-02-06 10:29:18 +01:00
Marc Zinnschlag
c471aa950f
re-enabled batching for statics; fixed a misplaced assert
2012-02-06 09:42:24 +01:00
Nikolay Kasyanov
df6d9c7fa4
Merge remote-tracking branch 'upstream/master'
2012-02-04 13:50:08 +04:00
Marc Zinnschlag
ee02154805
lights without a mesh were not rendered
2012-02-04 10:48:15 +01:00
Marc Zinnschlag
52a6605f10
Merge remote branch 'mirc/refactor_wm' into refactor_wm
...
- changed the way dynamics stats are passed to the character creation object
- some more clean up
Conflicts:
.gitignore
apps/openmw/mwgui/window_manager.cpp
apps/openmw/mwgui/window_manager.hpp
2012-02-03 11:24:28 +01:00
Marc Zinnschlag
c447ea073c
Merge branch 'cmakefix' into next
2012-02-03 10:31:16 +01:00
