Commit Graph

546 Commits (0549e949ba6cab8fb06919ebcc0ee4dee558ef59)

Author SHA1 Message Date
scrawl ff85006e71 added untested interface 13 years ago
Alexander "Ace" Olofsson 8ac9dd8e70 Always use the same type of slashes 13 years ago
Marc Zinnschlag 2d2af4b28a Merge remote branch 'scrawl/terrain18' into terrain
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
	components/esm_store/cell_store.hpp
13 years ago
Alexander "Ace" Olofsson d2f8539a42 Forgot to remove some old code that didn't do anything 13 years ago
Alexander "Ace" Olofsson 4a9a416d46 Can find files even if no .bsa file exists now 13 years ago
scrawl d5c49fa036 getWaterLevel use CellStore ; attempted fix for morrowind without tribunal 13 years ago
Nikolay Kasyanov b21a6291f7 Merge branch 'master' into pgrd-rendering
Conflicts:
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwscript/miscextensions.cpp
	apps/openmw/mwworld/world.hpp
13 years ago
Alexander "Ace" Olofsson 60b95e7992 Sorting the file lists properly 13 years ago
Alexander "Ace" Olofsson 6acd900577 Better name 13 years ago
Alexander "Ace" Olofsson c3944d3e1a Use a normal binary search 13 years ago
Alexander "Ace" Olofsson ce38876a74 Oops, that could've crashed horribly 13 years ago
scrawl 5a19d4ec45 implement water script functions and save water height in CellStore 13 years ago
Nikolay Kasyanov c3357c4396 Merge branch 'master' into pgrd-rendering
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwscript/docs/vmformat.txt
13 years ago
Alexander "Ace" Olofsson 71cb85dbc4 Performance enhancment and minor copy-paste fix. 13 years ago
scrawl 42c5d515e6 fixed interior water level 13 years ago
Alexander "Ace" Olofsson 0d163d76ab Replaced some messy code with some differently messy code, this one at least seems to work 13 years ago
scrawl 8bbb02a1bd ogre 1.8 fixes 13 years ago
scrawl 6bea08157e Merge branch 'master' into terrain18 13 years ago
Jacob Essex ec21ff21cc Removed memory leak, allocated more on the stack 13 years ago
Jacob Essex b76b62e5e4 Fixed a crash when there were cells with no data, refactored to remove non mutable data from CellStore 13 years ago
Lukasz Gromanowski f8afc22f04 Issue #225: Corrected wrong delete operator introduced by one of previous commit. 13 years ago
Lukasz Gromanowski 2b9845a5b6 Issue #225: Free memory allocated for sending into HardwareVertexBuffer.
Free memory allocated for sending into HardwareVertexBuffer in NIFLoader class.
13 years ago
Lukasz Gromanowski d3b88b9e34 Issue #225: Added cleanup of allocated memory in BulletNifLoader and BulletShapeLoader. 13 years ago
Marc Zinnschlag 4a2ade2372 Merge remote branch 'kromgart/master' into next 13 years ago
scrawl 99b2b6b648 ogre 1.8 fixes 13 years ago
scrawl f2a7acb102 Merge branch 'next' into terrain
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.cpp
13 years ago
Roman Melnik e6c55c144c Fix tabulation/formatting 13 years ago
Roman Melnik 6d33ad248d Fix memory leak in getIdentity method
Replace static pointer and new() operator with normal static variable
13 years ago
scrawl b8f962a68d Merge branch 'next' into shaders 13 years ago
scrawl 9076401892 Merge branch 'next' into terrain
Conflicts:
	CMakeLists.txt
	apps/openmw/CMakeLists.txt
13 years ago
Roman Melnik ebc49de851 Fix Bug #1: "Meshes rendered with wrong orientation"
Discard the tranformation of the root NiNode when loading nif files
(set the 'identity' transformation instead).

After applying the fix test the following types of interiors:

 - Dwemer ruins (the bug was common here before the fix)

 - Ancestral tombs (the bug was common here before the fix)

 - Daedric shrines

 - Caves/grottos

 - Dunmer strongholds

 - Telvanni, imperial, redoran houses/towers/castles

Also checked exteriors (although it is hard to do without terrain
rendering)
13 years ago
Marc Zinnschlag d9677cb33e fixed problem with parsing optional string arguments 13 years ago
Marc Zinnschlag 187b8e58d6 fixed handling of optional instruction/function arguments; removed choice workaround 13 years ago
scrawl 3e4cf64a77 Merge branch 'master' into shaders 13 years ago
Michael Papageorgiou b2c6d52db1 Another file search fix 13 years ago
Alexander "Ace" Olofsson e8eea03b4c Fixed a few more non-virtual destructor warnings 13 years ago
Nikolay Kasyanov 65fc141b62 Merge branch 'master' into pgrd-rendering
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
13 years ago
Marc Zinnschlag 1c0bf162f2 boost compatibility fix 13 years ago
Marc Zinnschlag a7211d2a90 Merge remote branch 'werdanith/searchfix' 13 years ago
Michael Papageorgiou 588ac44bc7 Improved matching for the FileListLocator 13 years ago
Marc Zinnschlag 5b378e820d warning level adjustments and some related fixes 13 years ago
Marc Zinnschlag 3c3fb8d706 Merge remote branch 'werdanith/activationsounds2' into equipment 13 years ago
Michael Papageorgiou f7c7ed0ac7 Fix regression with locating sound files 13 years ago
Marc Zinnschlag ff866269ec Merge remote branch 'corristo/pgrd'
Removed a warning

Conflicts:
	CMakeLists.txt
13 years ago
Nikolay Kasyanov a7f89b864e Merge branch 'pgrd' into pgrd-rendering 13 years ago
Nikolay Kasyanov 988c1111e9 Feature #161 (Fix) Load REC_PGRD records
fixed edge decoding, thanks Project Aedra!
13 years ago
scrawl 118250171d Merge branch 'master' of https://github.com/zinnschlag/openmw into shaders
Conflicts:
	apps/openmw/mwrender/objects.cpp
13 years ago
scrawl 4813a1ce9d Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next
Conflicts:
	CMakeLists.txt
13 years ago
Nikolay Kasyanov f292a5a7ca Feature #37 (In Progress) Render Path Grid
now using mwRoot instead of ogre's root, so no more messing with coordinates.
13 years ago
Nikolay Kasyanov 4659076129 Feature #37 (In Progress) Render Path Grid
workaround for strange ESMStore bug
13 years ago
Nikolay Kasyanov 11f957a64d Feature #37 (In Progress) Render Path Grid
cubes for path grid points
strange crash when trying to get path grids from Debugging
13 years ago
Nikolay Kasyanov de5b692f9f Feature #161 (Resolved) Load REC_PGRD records 13 years ago
Nikolay Kasyanov fda5b59eb6 Feature #161 (In Progress) Load REC_PGRD records
now using vector instead of C arrays
fixed path grid edge loading
added path grid to cell store
implemented dedicated storage class for path grids
13 years ago
Marc Zinnschlag 69127fa8f1 boost compatibility fix; added a missing include 13 years ago
Marc Zinnschlag c259b25fcf Merge remote branch 'werdanith/soundmanagerrefactor' 13 years ago
Michael Papageorgiou ad6175c78a SoundManager: Set up the priority for file look up right and take care of a corner case 13 years ago
Nikolay Kasyanov 08db70e137 disabled debug output 13 years ago
Michael Papageorgiou 054a176c86 Added new FileLibrary class to handle music, this fixes a number of issues. 13 years ago
scrawl 8be661c802 Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next
Conflicts:
	CMakeLists.txt
13 years ago
Marc Zinnschlag 3d1cbcd4e7 Merge remote branch 'jhooks/animperform' 13 years ago
Michael Papageorgiou 54353794e5 SoundManager: Completely rewrote the file management 13 years ago
Nikolay Kasyanov 540e4f77a7 Feature #161 (In Progress) Load REC_PGRD records
improved debug output
13 years ago
Jason Hooks 9848b67174 Fixing errors 13 years ago
scrawl f7b706d24e use the vertex colours that morrowind supplies for a lot of meshes 13 years ago
scrawl ff8f95fcca fix batch lighting, removed the "bumping number of lights" hack 13 years ago
scrawl 332671b43d lighting fix 13 years ago
scrawl b2109a1302 make the vertex colours only affect diffuse, this caused some areas to
be darker than they should be
13 years ago
Nikolay Kasyanov e58e00ef2a Feature #161 (In Progress) Load REC_PGRD records
Point coords definitely not floats
13 years ago
scrawl 8910b0d471 use shaders for all NIF materials. this has numerous advantages:
- vertex colours are now working as they should (and they have a huge impact on the look)
 - the lighting is per pixel and looks a lot better
 - by using shaders, we can use more lights at a time (fixed function has max of 8)
13 years ago
Nikolay Kasyanov 40e07bbd2a Feature #161 (In Progress) Load REC_PGRD records
Struct sizes seems correct, but floats is broken
13 years ago
scrawl 04c141ddd5 Merge branch 'terrain' of https://github.com/Yacoby/openmw into terrain_next
Conflicts:
	apps/openmw/mwrender/terrain.cpp
13 years ago
Marc Zinnschlag be70d197e5 Merge branch 'next'
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
13 years ago
Michael Papageorgiou a1cbc7fb42 Altered getFver to fix a warning 13 years ago
Alexander "Ace" Olofsson b6915a6090 Forgot that IsWow64Process would return false on a native 64-bit application 13 years ago
Jacob Essex 6924348696 Fixed some texture splatting issues with loading empty terrain cells 13 years ago
Jacob Essex 1d0ae9c8d1 Start of a basic implementation of fake vertex colours 13 years ago
scrawl f2c3616638 Merge branch 'next' into terrain_next
Conflicts:
	CMakeLists.txt
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	cmake/FindOGRE.cmake
13 years ago
Lukasz Gromanowski 9a4cd6c2b1 Fixes #200 - Paths with quotes for data-local option.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Jason Hooks 8d7a5f469b a few changes 13 years ago
Nikolay Kasyanov 1addef2cc3 added missing include for macospath.cpp 13 years ago
Marc Zinnschlag 728e9cce5a Merge remote branch 'lgro/config_fixes' 13 years ago
Lukasz Gromanowski 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
Lukasz Gromanowski 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
Alexander "Ace" Olofsson f6a80bfc95 Small define/include fixes for compiling on windows 13 years ago
Marc Zinnschlag 5f72199419 Merge remote branch 'lgro/config_fixes' 13 years ago
Lukasz Gromanowski e0206edc44 Fixed stupid bug in getGlobalDataPath.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Pieter van der Kloet 280babc719 Fixed stylesheet and configuration problems with the launcher and code cleanup 13 years ago
Marc Zinnschlag b2b09320fc Merge branch 'config' 13 years ago
Marc Zinnschlag 547d6a0639 Merge remote branch 'lgro/config' into config 13 years ago
Marc Zinnschlag 971ae94fbf Revert "workaround for the configuration problems"
This reverts commit 850501e922.
13 years ago
Marc Zinnschlag e02cba58b1 Merge branch 'master' into next
Conflicts:
	apps/openmw/mwclass/light.cpp
13 years ago
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>
13 years ago
Jason Hooks 38a0d1d1c5 Merging in master 13 years ago
Jason Hooks e58f2f5363 Eliminating unnecessary data from skeletons and shape saving 13 years ago
Jason Hooks 2217847c57 Fixing a crash 13 years ago
Marc Zinnschlag 850501e922 workaround for the configuration problems 13 years ago
Marc Zinnschlag ddb8b1e1bc Merge remote branch 'lgro/config' into config 13 years ago
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>
13 years ago
Marc Zinnschlag 27caee664e Merge remote branch 'lgro/config' into config
Conflicts:
	components/files/path.hpp
13 years ago
Marc Zinnschlag 1a6a49b9b8 Merge remote branch 'lgro/fix_warnings' 13 years ago
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>
13 years ago
Lukasz Gromanowski bcc4d7a7c9 Issue #133 Handle resources across multiple data directories
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Marc Zinnschlag 273eac12a1 Merge remote branch 'jhooks/animation2' into animation2
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
	components/nifogre/ogre_nif_loader.cpp
13 years ago
Nikolay Kasyanov cb95c82af2 Merge remote-tracking branch 'upstream/master' 13 years ago
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>
13 years ago
Jason Hooks 1da519a914 Some cleanup 13 years ago
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>
13 years ago
Marc Zinnschlag 0d7f39fcb5 Merge branch 'refdata' into next 13 years ago
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>
13 years ago
Pieter van der Kloet ea241d85ef Fixed some issues with the CMake files 13 years ago
Marc Zinnschlag c081160591 replaced container store in ref data with new custom data implementation 13 years ago
Lukasz Gromanowski f4b6caac59 Revert "Issue #178 - workaround for compilation problems with ogre 1.8.0."
This reverts commit 37e272b3b5.

It shouldn't be commited and pushed to config branch.
13 years ago
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>
13 years ago
Jason Hooks 6de0847b86 Slightly better performance on animation 13 years ago
Nikolay Kasyanov ec6243dd77 fixed compilation problem with llvm clang: constant type explicitly set to float 13 years ago
Jacob Essex cd0df082df Textures are now blended between cells and the texture blending functions are now more abstract 13 years ago
Lukasz Gromanowski 841bdded76 Merge branch 'mwregistry' of https://github.com/swick/openmw into swick-mwregistry
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Jacob Essex 637302fc87 Added blended textures to the terrain 13 years ago
Jacob Essex 18108c02a7 Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered 13 years ago
Lukasz Gromanowski 406897aa64 Issue #168 - Configuration cleanup - WIP
Sources update.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
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>
13 years ago
Jason Hooks bcf3e45ff6 Proper buffer designation 13 years ago
Dmitry Marakasov 463acb2f75 Use linuxpath for FreeBSD as well 13 years ago
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 13 years ago
Sebastian Wick 16c214a17a find InstalledPath in wine registry; mInstalledPath in Files::Path 13 years ago
Marc Zinnschlag 0c2de2c00c Merge branch 'animation2' 13 years ago
Marc Zinnschlag 9b910dda94 clean up 13 years ago
Alexander "Ace" Olofsson b4174b6419 Vector instead of new/delete 13 years ago
Alexander "Ace" Olofsson 8663177ad1 Oops, forgot the delete... 13 years ago
Alexander "Ace" Olofsson 96ed96d4dd Quick test at getting Morrowinds install path from the registry on windows 13 years ago
Lukasz Gromanowski 37e272b3b5 Issue #178 - workaround for compilation problems with ogre 1.8.0. 13 years ago
Jason Hooks d1793bc4bd Animation files in the correct directory 13 years ago
Jason Hooks 0712bba49b Changing a few things around with handleshapes 13 years ago
Jason Hooks eab69f18ac File output switch 13 years ago
Jason Hooks 295eb27c2d Better Text Indices; Better file output 13 years ago
Jason Hooks 859ac1153e Basic Text Indices Working 13 years ago
Jason Hooks 0715f9b6ab Preparing to use text indices 13 years ago
Jason Hooks 595d0b1192 Cleanup; warnings 13 years ago
Jason Hooks 45c57721ff Turning off hardware skinning2 13 years ago
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) 13 years ago
gugus 5cfac197d4 Merge branch 'journalfix' of https://github.com/zinnschlag/openmw.git into journal 13 years ago
Jason Hooks baa3f51886 Trying to fix errors 13 years ago
Jason Hooks cef2f5e927 Trying to get code to conform with older c++ 13 years ago
Jason Hooks d855bb4fc6 physics reenabled 13 years ago
Marc Zinnschlag 022f0fd5bd link order fix for components 13 years ago
Jason Hooks 6d10c76b06 Unique Identifiers for Creatures and NPC Free Parts 13 years ago
Jason Hooks d51dfebde1 NPCs fully rendered 13 years ago
Jason Hooks 47112ad7f9 Changing a lot of things 13 years ago
Jason Hooks 0902a3db89 Filled out NpcAnimation and CreatureAnimation classes 13 years ago
gugus 28bd9ce362 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into journal 13 years ago