Commit Graph

486 Commits (f7a03b39c4db9e50604520e8e552d8a97941a419)

Author SHA1 Message Date
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
Jason Hooks 39338f4be1 NPC bounded parts 13 years ago
Jason Hooks 5c48d8fc1e more stuff 13 years ago
Jason Hooks 835c3f2603 Working towards npc rendering 13 years ago
Jason Hooks 7bd911b401 Problems with handles 13 years ago
Jason Hooks e8ec9093f8 More NIFLoader code 13 years ago
Jason Hooks 828a3904a5 BSAArchive done and some change to NIFLoader 13 years ago
Jason Hooks 7319f7a8c6 Many bugs fixed related to changing cells 13 years ago
Jason Hooks c25b49d2b6 refdata change 13 years ago
Jacob Essex 9aac625000 Changes to move the mutable ESM::Position data to RefData 13 years ago
Marc Zinnschlag cb1373a4c7 rewrote cmake scripts for components 13 years ago
Marc Zinnschlag 325250f347 Merge remote branch 'gus/journal' into physicsfix
Conflicts:
	components/files/windowspath.cpp
13 years ago
gugus 241cf2555d Fixe collision shape bug. 13 years ago
Jason Hooks c52ae6825f Applying Gus's Windows fix2 13 years ago
Jason Hooks 0992f1e903 Applying Gus's Windows fix 13 years ago
gugus bf42d20f98 Fixed some compilation errors on windows.
Note that it works on my computer, but it *might* not work on older versions
of windows.
13 years ago
Marc Zinnschlag b448fc7d4c Issue #31: Do not try to load dynamical generated cells from ESM/P files 13 years ago
Marc Zinnschlag 8da15440e0 Issue #31: added function for creating cell records 13 years ago
Marc Zinnschlag cd7aaab48e Merge branch 'cells' into next
Conflicts:
	apps/openmw/engine.cpp
13 years ago
Marc Zinnschlag 02ce672fdc preload cell's reference list when accessing a reference outside of the actice cells (memory usage and speed optimisation) 13 years ago
Marc Zinnschlag 7799f7abc8 Merge remote branch 'gus/bullet_bug' into next 13 years ago
Marc Zinnschlag f0dd38b431 Issue #28: replaced the nested map structure in the CellList 13 years ago
Marc Zinnschlag e4a2f5547b Issue #28: added load-state for cells 13 years ago
Marc Zinnschlag ce7202a147 Issue #28: shifting around functionality among CellStore, Cells and CellList 13 years ago
Lukasz Gromanowski 34428f5a7c Issue #168: Configuration cleanup, part 2
Tabs vs spaces cleanup. Removed unnecessary empty function.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Marc Zinnschlag b63a2602c3 fixed a missing include 14 years ago
Lukasz Gromanowski d43455fd57 Issue #168: Configuration cleanup, part 2
Corrected --data and --data-local parameters handling.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Lukasz Gromanowski 54cb6deab9 Issue #168: Configuration cleanup, part 2 14 years ago
Lukasz Gromanowski 48c24d4904 Issue #128: Configuration cleanup - added missing cstring header.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Lukasz Gromanowski ea7eb7a62d fixes #128 Configuration cleanup.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
gugus 1bf7c4e53d Improve bullet performances 14 years ago
Marc Zinnschlag b157273cd9 Merge branch 'next'
Conflicts:
	apps/openmw/main.cpp
14 years ago
Lukasz Gromanowski ac9b1715d5 Added new command line option: "encoding"
Added new command line option: "encoding" which allow to
change font encoding used in game messages.

Currently there are three evailable encodings:

    win1250 - Central and Eastern European (languages
              that use Latin script, such as Polish,
              Czech, Slovak, Hungarian, Slovene, Bosnian,
              Croatian, Serbian (Latin script),
              Romanian and Albanian)

    win1251 - languages that use the Cyrillic alphabet
              such as Russian, Bulgarian, Serbian Cyrillic
              and others

    win1252 - Western European (Latin) - default

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Marc Zinnschlag 2b5dc0042b fix for issue 138 (record loading failed for some NPCs) 14 years ago
Marc Zinnschlag ba55b51627 removed a leftover debug message 14 years ago
Nikolay Kasyanov e48d265b5d Mac fix: added local config dir support, app root dir is dir where bundle located 14 years ago
Marc Zinnschlag 8446619ac4 Merge branch 'components_namespaces' into next
Conflicts:
	apps/openmw/mwrender/interior.cpp
	components/bsa/bsa_archive.cpp
14 years ago
Lukasz Gromanowski 57972eb042 Mantis: #18 - Move components from global namespace into their own namespace.
Added namespace around generated win_1252 table.
Added generation of header guard and ToUTF8 namespace in gen_iconv.
Small corrections in Makefile.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Lukasz Gromanowski e9ff9a446b Mantis: #18 - Move components from global namespace into their own namespace.
Moving classes from components/nifogre into NifOgre namespace.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Lukasz Gromanowski 2ddd5dba11 Mantis: #18 - Move components from global namespace into their own namespace.
Moving classes from components/nifbullet into NifBullet namespace.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Lukasz Gromanowski 514b55766f Mantis: #18 - Move components from global namespace into their own namespace.
Updated components/misc tests.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Lukasz Gromanowski 90985e849e Mantis: #18 - Move components from global namespace into their own namespace.
Moving classes from components/misc into Misc namespace.

Note: Misc namespace introduced conflict with ESM::Misc and MWClass::Misc
classes, so both of them are renamed to ESM::Miscellaneous
and MWClass::Miscellaneous.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Lukasz Gromanowski 8a84201ba2 Mantis: #18 - Move components from global namespace into their own namespace.
Moving classes from components/bsa into Bsa namespace.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Marc Zinnschlag bc92b7b1fa Merge branch 'directories' into next
Conflicts:
	components/files/multidircollection.hpp
	components/nifogre/ogre_nif_loader.hpp
14 years ago
Marc Zinnschlag 0f2df4e2b8 more cleanup 14 years ago
Jason Hooks 2132488408 merge 14 years ago
Jason Hooks 56affd018a Some cleanup 14 years ago
Marc Zinnschlag a6e83f5b9b case-handling fix for references in cells 14 years ago
Jason Hooks 9eefee7168 Say strict 14 years ago
Jason Hooks 93f41e25a4 fs-strict 14 years ago
Jason Hooks 65cc0e8317 trying strict 14 years ago
Jason Hooks 3a9007849d Windows fix 14 years ago
Jason Hooks a719a6b468 Getting rid of animation code in nif loader 14 years ago
Marc Zinnschlag d59856af5c minor performance improvement 14 years ago
Marc Zinnschlag 4f304cfff2 Merge remote branch 'jhooks/directories' into directories 14 years ago
Jason Hooks 4d31ca2c86 Leading slashes now work, efficiency changes 14 years ago
Marc Zinnschlag 5fb3dc854b Merge branch 'optimisation' 14 years ago
Marc Zinnschlag ac4af583b7 Merge remote branch 'jhooks/directories' into directories 14 years ago
Jason Hooks 45453fd7a9 Case insensitive external loader working 14 years ago
Jason Hooks f2a0fa8af2 Adding files to directory map 14 years ago
Marc Zinnschlag a95a0f821b Merge remote branch 'jhooks/directories' into directories
Conflicts:
	components/files/multidircollection.hpp
14 years ago