885228ec02
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
11 years ago
27a05027f4
Fixes #1172 : Added basic loading/saving progress bar
...
The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system.
11 years ago
c2127845af
Added onKnockdown command
11 years ago
30666f2cce
Fixes #1297 : Store global map markers in savegame
11 years ago
f921f2e7db
Make PcRaiseRank, PcLowerRank and PcJoinFaction properly accept references instead of using the actor that the player talked to last.
...
This also solves a potential crash when no actor has been talked to yet, e.g. immediately after loading a savegame.
11 years ago
45d2a00717
Fixes #1293 : Allow interpolation type 0 in case of 0 keys
11 years ago
f6deca7c80
Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors
11 years ago
61341d4206
Removed mLocked, kept it as "Negative lock level means unlocked"
11 years ago
420163d35f
Small changes to lock command (If no valid lockLevel exists, defaults to 100)
11 years ago
6929e541dd
Fix texture name issue with Vality's Bitter Coast Mod
11 years ago
2cb9f38a45
Changed crime IDs for legacy savegames. Not an issue, but it was inconsistent.
11 years ago
262e959699
Remove unused slice_array
11 years ago
d3d0b7362f
Fix older savegame compatibility regarding new crime feature.
11 years ago
86e65944b8
Merge remote-tracking branch 'jeffreyhaines/master'
...
Conflicts:
apps/openmw/CMakeLists.txt
11 years ago
300eb6f444
make FNAM sub-record optional for all record types
11 years ago
a274b48f2f
States are saved. Crime is reacted to.
...
Issues where some crime is ignored. Needs a lot more work
11 years ago
50af9bc0d3
General perfomance optimizations.
11 years ago
2c2106205d
Merge remote-tracking branch 'scrawl/master'
11 years ago
d7df9cae21
Bug #1224 : Changed fix to potentially allow for language independent saves
11 years ago
53ba23e303
Fixes #1224 : Store class name instead of id in savegame header
11 years ago
1b6b4e3442
Merge remote-tracking branch 'slothlife/weather_save'
11 years ago
452b522bc3
Fix typos
11 years ago
00eac7d53a
Fixed header include guard to match filename
11 years ago
6eab9c5179
Move weather state save/load to a new class
11 years ago
1acd1bd913
Feature #1173 : Saved Game: include weather state
...
Removed some unused state in and changed Ogre::String to std::string in
WeatherManager.
11 years ago
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
c8c0e5de38
Fixed code issues found with unity build. Missing include guards, duplicated functions, ...
11 years ago
b0a1e1198a
Yet another terrain fix
11 years ago
a9dcc90970
Another terrain fix
11 years ago
2de862126a
moved resources group creation from Engine to bsa component
11 years ago
b8ca067730
Small fix for terrain
11 years ago
f1353dc84f
Merge branch 'scene'
11 years ago
d0f98103e4
Terrain: re-added "distant land=off" path
...
Still a hack, but the overhead of building and traversing the quad tree appears negligible.
11 years ago
1d926816b5
Terrain: background load blendmaps & layer textures. Refactor QuadTree update.
11 years ago
4328e08162
Terrain: get rid of unneeded members
11 years ago
6a002d19b3
Terrain: destroy no longer used materials
11 years ago
97c3efb3ba
Terrain: decoupled Chunk from QuadTreeNode.
11 years ago
edb5a54092
Include some more required Ogre headers explicitely.
11 years ago
195071efc7
Terrain: geometry is now loaded in background threads.
...
TODO: background load layer textures and blendmaps.
"Distant land" setting has been removed for now (i.e. always enabled).
11 years ago
b3fed853ae
Terrain: take cell world size into account for LOD selection
11 years ago
6c863486e1
Terrain: fix an embarrassing copy&paste mistake.
11 years ago
64c9932597
Terrain: remove hard dependency on shiny - can now be compiled without it (fixed function)
11 years ago
c9e349f60f
Terrain: support alternate coordinate systems. Get rid of LoadingListener for now
11 years ago
ab224f93c9
remove our stdint.h version that uses boost and force usage of system stdint.h
11 years ago
f9d2fde783
Merge branch 'openmw-29'
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
11 years ago
6e8b9c88b2
changed name of default worldspace (should reduce chance of a name conflict)
11 years ago
46867ec0cf
Fix file handles being left open on windows builds
11 years ago
2421f23c2f
cleanup the mess...
11 years ago
bfcd768078
various bits of cleanup
11 years ago
1ab5948f19
merge upstream changes
11 years ago
Thomas
scrawl
Marc Zinnschlag
Jeffrey Haines
megaton
slothlife
Marek Kochanowicz
Bret Curtis
cc9cii