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
Nikolay Kasyanov
cb95c82af2
Merge remote-tracking branch 'upstream/master'
2012-01-29 23:39:36 +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
Lukasz Gromanowski
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>
2012-01-28 11:59:08 +01:00
Marc Zinnschlag
0d7f39fcb5
Merge branch 'refdata' into next
2012-01-28 11:46:34 +01:00
Lukasz Gromanowski
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>
2012-01-28 09:49:09 +01:00
Pieter van der Kloet
ea241d85ef
Fixed some issues with the CMake files
2012-01-28 01:36:17 +01:00
Marc Zinnschlag
c081160591
replaced container store in ref data with new custom data implementation
2012-01-27 14:55:58 +01:00
Lukasz Gromanowski
f4b6caac59
Revert "Issue #178 - workaround for compilation problems with ogre 1.8.0."
...
This reverts commit 37e272b3b5e18d1a93a1d69804a96845f8762ba1.
It shouldn't be commited and pushed to config branch.
2012-01-26 00:14:03 +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
Nikolay Kasyanov
ec6243dd77
fixed compilation problem with llvm clang: constant type explicitly set to float
2012-01-24 16:01:29 +04:00
Jacob Essex
cd0df082df
Textures are now blended between cells and the texture blending functions are now more abstract
2012-01-23 17:19:54 +00:00
Lukasz Gromanowski
841bdded76
Merge branch 'mwregistry' of https://github.com/swick/openmw into swick-mwregistry
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-01-22 15:52:47 +01:00
Jacob Essex
637302fc87
Added blended textures to the terrain
2012-01-21 17:59:12 +00:00
Jacob Essex
18108c02a7
Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered
2012-01-21 16:59:08 +00:00
Lukasz Gromanowski
406897aa64
Issue #168 - Configuration cleanup - WIP
...
Sources update.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-01-21 17:58:49 +01:00
Lukasz Gromanowski
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>
2012-01-21 01:31:20 +01:00
Jason Hooks
bcf3e45ff6
Proper buffer designation
2012-01-18 22:00:03 -05:00
Dmitry Marakasov
463acb2f75
Use linuxpath for FreeBSD as well
2012-01-18 15:16:45 +04:00
Sebastian Wick
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
2012-01-17 23:19:17 +01:00
Sebastian Wick
16c214a17a
find InstalledPath in wine registry; mInstalledPath in Files::Path
2012-01-17 19:18:17 +01:00
Marc Zinnschlag
0c2de2c00c
Merge branch 'animation2'
2012-01-17 15:37:51 +01:00
Marc Zinnschlag
9b910dda94
clean up
2012-01-17 15:10:53 +01:00
Alexander "Ace" Olofsson
b4174b6419
Vector instead of new/delete
2012-01-17 09:02:45 +01:00
Alexander "Ace" Olofsson
8663177ad1
Oops, forgot the delete...
2012-01-16 23:21:13 +01:00
Alexander "Ace" Olofsson
96ed96d4dd
Quick test at getting Morrowinds install path from the registry on windows
2012-01-16 23:09:25 +01:00
Lukasz Gromanowski
37e272b3b5
Issue #178 - workaround for compilation problems with ogre 1.8.0.
2012-01-13 20:41:38 +01:00
Jason Hooks
d1793bc4bd
Animation files in the correct directory
2012-01-12 20:09:55 -05:00
Jason Hooks
0712bba49b
Changing a few things around with handleshapes
2012-01-12 16:03:07 -05:00
Jason Hooks
eab69f18ac
File output switch
2012-01-10 00:34:29 -05:00
Jason Hooks
295eb27c2d
Better Text Indices; Better file output
2012-01-06 18:23:41 -05:00
Jason Hooks
859ac1153e
Basic Text Indices Working
2012-01-06 02:27:10 -05:00
Jason Hooks
0715f9b6ab
Preparing to use text indices
2012-01-06 00:55:02 -05:00
Jason Hooks
595d0b1192
Cleanup; warnings
2012-01-05 21:45:17 -05:00
Jason Hooks
45c57721ff
Turning off hardware skinning2
2012-01-04 20:30:06 -05:00
Jason Hooks
762727308e
Hardware skinning working (YESgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --all)
2012-01-02 23:06:10 -05:00
gugus
5cfac197d4
Merge branch 'journalfix' of https://github.com/zinnschlag/openmw.git into journal
2011-12-29 17:59:21 +01:00
Jason Hooks
baa3f51886
Trying to fix errors
2011-12-28 14:48:28 -05:00
Jason Hooks
cef2f5e927
Trying to get code to conform with older c++
2011-12-27 19:19:45 -05:00
Jason Hooks
d855bb4fc6
physics reenabled
2011-12-27 17:52:17 -05:00
Marc Zinnschlag
022f0fd5bd
link order fix for components
2011-12-26 22:28:53 +01:00
Jason Hooks
6d10c76b06
Unique Identifiers for Creatures and NPC Free Parts
2011-12-17 01:29:08 -05:00
Jason Hooks
d51dfebde1
NPCs fully rendered
2011-12-15 00:33:10 -05:00
Jason Hooks
47112ad7f9
Changing a lot of things
2011-12-13 23:49:03 -05:00
Jason Hooks
0902a3db89
Filled out NpcAnimation and CreatureAnimation classes
2011-12-11 22:40:00 -05:00
gugus
28bd9ce362
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into journal
2011-12-11 11:21:57 +01:00
