Commit Graph

134 Commits (loadfix)

Author SHA1 Message Date
scrawl 4fa303d7c4 Merge branch 'master' into HEAD
Conflicts:
	CMakeLists.txt
	apps/launcher/CMakeLists.txt
10 years ago
Arthur Moore 4583dc05db Move NIFStream functions into a cpp file where they belong 10 years ago
Arthur Moore 38bcff2622 Moved base NIF classes into a separate file.
This resolves the dependency mess, and makes things more readable.
The dependency tree for nif records now looks like this:
Record.hpp
--base.hpp
----controlled.hpp
----controller.hpp
----data.hpp
----effect.hpp
----extra.hpp
----node.hpp

Node.hpp has many extra dependencies because nifogre only includes it instead of each of these files.
That should be fixed.
10 years ago
scrawl 0bc840aadd Add NumericEditBox widget 10 years ago
scrawl 6b65502557 Add properties for new widget classes to MyGUI plugin 10 years ago
scrawl 1afcc7adb5 Add imported font colors from openmw.cfg to MyGUI plugin 10 years ago
eroen 0738e862cb Make GLOBAL_CONFIG_PATH, GLOBAL_DATA_PATH configurable 10 years ago
Sebastian Wick 41094a8641 the global config path is not always $prefix/etc, so just define the whole path in the build system 10 years ago
Sebastian Wick 2ae8158ee9 SYSCONFDIR and LinuxPath should work with different install prefixs 10 years ago
Marc Zinnschlag d1d861e1be Merge branch 'run'
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/CMakeLists.txt
10 years ago
scrawl c6bcd75058 Add various custom widgets used in OpenMW to the MyGUI plugin 10 years ago
scrawl ee3b1e800c Add FontLoader and transparent BG texture to the MyGUI plugin 10 years ago
scrawl ecfc2ff5d0 Add a MyGUI plugin to register OpenMW resources, to use with MyGUI's standalone tools 10 years ago
Arthur Moore 8be6aefd95 Moved functions from niffile.cpp to where they belong.
Also cleaned up some #includes

Removed a few asserts.  Vector already throws an out_of_range error.
11 years ago
scrawl 2b407a9995 Refactor NIF cache
- Remove broken cache locking mechanism

This was supposed to unload NIFFiles after a cell transition completes, but it was never working due to a mistake on the line if (--sLockLevel), should have been if (--sLockLevel == 0). Repairing this would increase load times (NIF files would have to be reloaded more frequently), so just removed it for now.

 - Decouple cache from NIFFile (now a new nifcache component)

 - Add API for future background loading

 - Provide a reliable way (SharedPtr) to hold on to loaded NIFFiles. This will be useful to avoid deep copies of keyframe and text key data, which is currently a performance bottleneck.
11 years ago
Marc Zinnschlag 232c6c9ad3 Merge branch 'scriptedit' into run 11 years ago
scrawl 360c7f863c Store magic effect Base values in savegame (Fixes #1489) 11 years ago
scrawl e2ee3b2497 Merge branch 'master' of https://github.com/OpenMW/openmw
Conflicts:
	apps/openmw/mwrender/terrainstorage.cpp
11 years ago
MiroslavR 4d403ed747 Rename and move functions for texture path correction 11 years ago
scrawl 8c26f802e6 Move terrain grid implementation to a component so the editor can use it (Feature #1597) 11 years ago
scrawl 982453d4f6 Move ESM terrain data handler to esmterrain component so it can be used by the editor (Feature #1597) 11 years ago
root 713787d92f fix v7 11 years ago
root d8772156a7 fixe all code v 2 11 years ago
Marc Zinnschlag 30f114873d added debug profile record 11 years ago
Marc Zinnschlag c9cd7fb6b7 Merge branch 'scripts' 11 years ago
Marc Zinnschlag aa8c0bccb4 added new argument type: z (optional, any) 11 years ago
scrawl 2a510573b8 Remove unused implementation file 11 years ago
scrawl e25fa6c157 Refactor non-distant land terrain path to a grid based implementation (Fixes #1562) 11 years ago
scrawl a54ac579a5 Savegame: Store AiSequence 11 years ago
pvdk 38d825b004 Merge remote-tracking branch 'upstream/master' into wizard
Conflicts:
	CMakeLists.txt
	apps/launcher/maindialog.cpp
11 years ago
scrawl e266aff561 Savegame: store projectiles 11 years ago
scrawl b3735981d6 Remove unused file_finder 11 years ago
scrawl a76e391ad0 Savegame: store door movement state (Closes #747) 11 years ago
scrawl 471bbd0021 Savegame: store levelled creature state and move to actorIds
(Closes #1332)
11 years ago
scrawl 9052cc4a57 Savegame: store ActiveSpells 11 years ago
scrawl 6cc691115b Savegame: store most of CreatureStats 11 years ago
scrawl a4a9794417 Savegame: store fog of war (Closes #1177) 11 years ago
scrawl 8560b43464 Move to esm component 11 years ago
scrawl 262e959699 Remove unused slice_array 11 years ago
pvdk ef38fae09d Merge remote-tracking branch 'upstream/master' into wizard 11 years ago
Marc Zinnschlag 1b6b4e3442 Merge remote-tracking branch 'slothlife/weather_save' 11 years ago
slothlife 6eab9c5179 Move weather state save/load to a new class 11 years ago
pvdk 8fe837ae6e Merge remote-tracking branch 'upstream/master' into wizard 11 years ago
Marc Zinnschlag 2de862126a moved resources group creation from Engine to bsa component 11 years ago
scrawl 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
scrawl 97c3efb3ba Terrain: decoupled Chunk from QuadTreeNode. 11 years ago
scrawl 64c9932597 Terrain: remove hard dependency on shiny - can now be compiled without it (fixed function) 11 years ago
pvdk 3792b301e9 Wizard now runs the ini-importer to import settings from Morrowind.ini 11 years ago
pvdk c54217d008 Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	CMakeLists.txt
	components/CMakeLists.txt
	components/config/gamesettings.cpp
11 years ago
Marc Zinnschlag 9788bbcab9 partially store creature state in saved game files (only attributes and dynamics for now) 11 years ago