Commit Graph

76 Commits (replace)

Author SHA1 Message Date
Scott Howard e2ef8c4022 fix -Wnewline-eof warnings 10 years ago
cc9cii 312b7cd571 Merge branch 'master' into QtOGre
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/pagedworldspacewidget.cpp
	apps/opencs/view/render/pagedworldspacewidget.hpp
	components/nif/niffile.hpp
	libs/openengine/bullet/physic.hpp
10 years ago
scrawl fc4f069d0f Remove old BSA tests 10 years ago
gus 5fd599b5de minor corrections 11 years ago
gus 2092e5fe22 compile fixes 11 years ago
greye 493f8c6050 fix opening BSA on Unicode path 11 years ago
Marek Kochanowicz 6416ae90d2 Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/view/world/subviews.cpp
11 years ago
scrawl c8c0e5de38 Fixed code issues found with unity build. Missing include guards, duplicated functions, ... 11 years ago
Marc Zinnschlag 2de862126a moved resources group creation from Engine to bsa component 11 years ago
scrawl edb5a54092 Include some more required Ogre headers explicitely. 11 years ago
Bret Curtis ab224f93c9 remove our stdint.h version that uses boost and force usage of system stdint.h 11 years ago
scrawl d0500e8124 Some unneeded includes cleanup 11 years ago
scrawl 7dc30a01cd Some changes suggested by cppcheck 12 years ago
scrawl d5c7a26041 Fix broken loose file resources when using Ogre 1.9 12 years ago
Emanuel Guevel 3adf3f5121 Revive bsatool 12 years ago
scrawl db9e49968e Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Marc Zinnschlag 9b7957cf20 fixed a missing inlcude 12 years ago
scrawl 109d0a942f Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 12 years ago
Marc Zinnschlag 85697e4628 reverted to C++03 12 years ago
scrawl 3ec703e6af Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 12 years ago
Chris Robinson e5f040a06f Improve filename pattern matching 12 years ago
scrawl e4f140841e Make OpenMW work with Ogre 1.9 12 years ago
Nathan Jeffords 44031ec3d7 fleshed out BSAArchive and DirArchive.
Implemented both lists & finds, with pattern matching.

Conflicts:
	components/bsa/bsa_archive.cpp
12 years ago
Marc Zinnschlag d1e51ebf42 silenced some warnings 12 years ago
Nathan Jeffords 67491f6c49 reworked DirArchive to improve performance
Replaced old file index with a simple map. The map works by storing the
file's relative path with path seperators normalized, and in lower case if
not in strict mode. Incoming searches are normalized in the same way then
the name is searched in the map. The value in the map is the original full
path to the file which is then used to created a ConstrainedDataStream. In
addition to changing the index, the commonly used Archive methods are
implemented so that they don't fall back on the default FileSystemArchive
implementations.
12 years ago
Nathan Jeffords 43cd88a24e include members of BSAArchives in Ogres resource indices 12 years ago
Nathan Jeffords 5c7f1bd497 moved ConstrainedDataStream into its own file
moved the ConstrainedDataStream into its own source file and changed
BSAFile to use it though the exposed factory function. This is in
preperation foreimplementing it based on feedback from profiling that
(at least on windows) the C++ iostreams library is quite slow.
12 years ago
scrawl 84a4fd56c3 consider all files in Splash directory 12 years ago
Michael Mc Donnell 7f802a22b5 Compare with stream position instead of int.
Fixes compilation of Debug build on Windows.
13 years ago
Chris Robinson 6047dc6a0c Merge remote branch 'zini/master' into nif-cleanup
Conflicts:
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/animation.hpp
	apps/openmw/mwrender/creatureanimation.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/npcanimation.hpp
	components/nifogre/ogre_nif_loader.hpp
13 years ago
guidoj a021165d9f Changed standard C lib includes to C++ format 13 years ago
Chris Robinson b4c8375f3c Merge remote branch 'zini/master' into nif-cleanup
Conflicts:
	components/bsa/bsa_archive.cpp
13 years ago
Marc Zinnschlag 871b1d1c9b silenced a warning 13 years ago
Chris Robinson bc0a6bffcf Remove outdated comment 13 years ago
Chris Robinson a8ebb39883 Avoid Mangle for BSA accesses
The way it was set up was not very efficient, and we're using Ogre for resource
management anyway, so it's best to just use that.
13 years ago
Chris Robinson 386ac56bda Remove the NIF loader and code to manually transform the vertices
This currently breaks just about everything. They should come back as it's all
reimplemented, though.
13 years ago
Jason Hooks c4c8288af8 Seven digit scales 13 years ago
scrawl c85c794c86 fixed some cppcheck issues 13 years ago
Jason Hooks 57299571d5 Preparing for clothes/armor 13 years ago
Alexander "Ace" Olofsson 54ce95cfaf Make sure it doesn't find the wrong file 13 years ago
Marc Zinnschlag 08f8701b33 workaround for tga problem 13 years ago
Alexander "Ace" Olofsson 3b0dc408ae Debug-b-gone 13 years ago
Alexander "Ace" Olofsson 06a34b9e0d Strange problems call for strange solutions. 13 years ago
Alexander "Ace" Olofsson 8e07b7e050 Better (less) debug output 13 years ago
Alexander "Ace" Olofsson 8d9100c77b Debug output 13 years ago
Alexander "Ace" Olofsson fc4e4dc336 Case sensitiviy? 13 years ago
Alexander "Ace" Olofsson 8ac9dd8e70 Always use the same type of slashes 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
Alexander "Ace" Olofsson 60b95e7992 Sorting the file lists properly 13 years ago