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
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
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
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
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
facc36fa34
Merge remote branch 'corristo/osx-packaging' into packaging
2012-02-12 13:35:54 +01:00
Marc Zinnschlag
a0ac6e5150
cells were sometimes not fully loaded
2012-02-12 12:35:29 +01: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
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
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
Marc Zinnschlag
ee02154805
lights without a mesh were not rendered
2012-02-04 10:48:15 +01:00
Nikolay Kasyanov
472d88e2c5
Feature #162 - Need to create app bundle using CMake, not by hand WIP
2012-02-01 20:48:13 +04:00
Jason Hooks
2d0e83a2cf
Reversing changes
2012-01-30 00:06:29 -05:00
Jason Hooks
d2b3c1dbac
Collision may be working correctly
2012-01-29 18:13:43 -05:00
Jason Hooks
9c73fa6b6d
Physics sort of fixed
2012-01-29 17:50:51 -05:00
Nikolay Kasyanov
a301fc355e
Feature #162 - Need to create app bundle using CMake, not by hand In progress. Still need to handle dynamically loaded libs (Ogre & Qt plugins)
2012-01-29 23:41:27 +04:00
Lukasz Gromanowski
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>
2012-01-29 20:27:03 +01:00
Jason Hooks
1da519a914
Some cleanup
2012-01-29 00:42:55 -05:00
Pieter van der Kloet
ea241d85ef
Fixed some issues with the CMake files
2012-01-28 01:36:17 +01:00
Lukasz Gromanowski
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>
2012-01-25 23:55:43 +01:00
Jason Hooks
6de0847b86
Slightly better performance on animation
2012-01-25 01:21:30 -05:00
Marc Zinnschlag
4b6cd582a7
removed some redundant (and misplaced) functions
2012-01-24 10:45:40 +01:00
Marc Zinnschlag
26c328e73f
added some more comments to avoid further confusion
2012-01-23 14:55:00 +01:00
Marc Zinnschlag
16bc374921
animation updates were hooked up to the wrong update function
2012-01-23 14:33:06 +01:00