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
2014-09-30 10:52:04 +10:00
scrawl
fc4f069d0f
Remove old BSA tests
2014-09-26 15:22:08 +02:00
gus
5fd599b5de
minor corrections
2014-08-12 13:31:20 +02:00
gus
2092e5fe22
compile fixes
2014-07-22 11:49:45 +02:00
greye
493f8c6050
fix opening BSA on Unicode path
2014-05-19 13:39:07 +04:00
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
2014-03-19 10:23:15 +01:00
scrawl
c8c0e5de38
Fixed code issues found with unity build. Missing include guards, duplicated functions, ...
2014-03-16 23:49:06 +01:00
Marc Zinnschlag
2de862126a
moved resources group creation from Engine to bsa component
2014-03-09 11:42:39 +01:00
scrawl
edb5a54092
Include some more required Ogre headers explicitely.
2014-03-05 21:46:37 +01:00
Bret Curtis
ab224f93c9
remove our stdint.h version that uses boost and force usage of system stdint.h
2014-03-05 17:08:58 +01:00
scrawl
d0500e8124
Some unneeded includes cleanup
2014-01-15 14:53:28 +01:00
scrawl
7dc30a01cd
Some changes suggested by cppcheck
2013-07-31 18:46:32 +02:00
scrawl
d5c7a26041
Fix broken loose file resources when using Ogre 1.9
2013-04-29 12:32:24 +02:00
Emanuel Guevel
3adf3f5121
Revive bsatool
2013-03-07 21:13:10 +01:00
scrawl
db9e49968e
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
2013-02-23 04:13:51 +01:00
Marc Zinnschlag
9b7957cf20
fixed a missing inlcude
2013-02-21 19:27:07 +01:00
scrawl
109d0a942f
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
2013-02-03 19:02:57 +01:00
Marc Zinnschlag
85697e4628
reverted to C++03
2013-02-02 13:24:28 +01:00
scrawl
3ec703e6af
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
2013-02-01 16:25:54 +01:00
Chris Robinson
e5f040a06f
Improve filename pattern matching
2013-01-15 14:10:52 -08:00
scrawl
e4f140841e
Make OpenMW work with Ogre 1.9
2013-01-12 08:23:15 +01:00
Nathan Jeffords
44031ec3d7
fleshed out BSAArchive and DirArchive.
...
Implemented both lists & finds, with pattern matching.
Conflicts:
components/bsa/bsa_archive.cpp
2013-01-09 08:53:27 -08:00
Marc Zinnschlag
d1e51ebf42
silenced some warnings
2013-01-09 12:25:45 +01:00
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.
2013-01-08 22:51:05 -08:00
Nathan Jeffords
43cd88a24e
include members of BSAArchives in Ogres resource indices
2013-01-08 22:51:05 -08:00
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.
2013-01-04 13:39:10 -08:00
scrawl
84a4fd56c3
consider all files in Splash directory
2012-10-17 12:39:45 +02:00
Michael Mc Donnell
7f802a22b5
Compare with stream position instead of int.
...
Fixes compilation of Debug build on Windows.
2012-08-01 17:52:20 -04:00
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
2012-07-17 10:57:15 -07:00
guidoj
a021165d9f
Changed standard C lib includes to C++ format
2012-07-17 09:44:24 +02:00
Chris Robinson
b4c8375f3c
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
components/bsa/bsa_archive.cpp
2012-07-15 12:04:43 -07:00
Marc Zinnschlag
871b1d1c9b
silenced a warning
2012-07-15 19:20:59 +02:00
Chris Robinson
bc0a6bffcf
Remove outdated comment
2012-07-15 09:03:35 -07:00
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.
2012-07-15 07:50:24 -07:00
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.
2012-07-12 20:12:18 -07:00
Jason Hooks
c4c8288af8
Seven digit scales
2012-06-13 19:34:13 -04:00
scrawl
c85c794c86
fixed some cppcheck issues
2012-06-06 20:29:30 +02:00
Jason Hooks
57299571d5
Preparing for clothes/armor
2012-04-02 22:08:46 -04:00
Alexander "Ace" Olofsson
54ce95cfaf
Make sure it doesn't find the wrong file
2012-04-01 17:25:03 +02:00
Marc Zinnschlag
08f8701b33
workaround for tga problem
2012-03-31 17:52:58 +02:00
Alexander "Ace" Olofsson
3b0dc408ae
Debug-b-gone
2012-03-31 11:29:24 +02:00
Alexander "Ace" Olofsson
06a34b9e0d
Strange problems call for strange solutions.
2012-03-31 10:35:08 +02:00
Alexander "Ace" Olofsson
8e07b7e050
Better (less) debug output
2012-03-31 00:55:47 +02:00
Alexander "Ace" Olofsson
8d9100c77b
Debug output
2012-03-30 23:29:58 +02:00
Alexander "Ace" Olofsson
fc4e4dc336
Case sensitiviy?
2012-03-30 19:05:58 +02:00
Alexander "Ace" Olofsson
8ac9dd8e70
Always use the same type of slashes
2012-03-30 16:59:19 +02:00
Alexander "Ace" Olofsson
d2f8539a42
Forgot to remove some old code that didn't do anything
2012-03-30 14:50:39 +02:00
Alexander "Ace" Olofsson
4a9a416d46
Can find files even if no .bsa file exists now
2012-03-30 14:45:32 +02:00
Alexander "Ace" Olofsson
60b95e7992
Sorting the file lists properly
2012-03-29 22:38:14 +02:00
Alexander "Ace" Olofsson
6acd900577
Better name
2012-03-29 21:36:00 +02:00
