Marc Zinnschlag
fa880e3274
Merge remote-tracking branch 'lazydev/master'
2013-02-24 14:07:52 +01:00
lazydev
a5ff8181b7
fix for https://bugs.openmw.org/issues/569
2013-02-24 03:35:43 +04:00
Nathan Jeffords
44b1c66c4b
fixed various warnings about converting size_t to int
2013-02-23 10:23:38 -08:00
Mark Siewert
eefbdde6de
- For pull request: remove all instances of maps used to track refnumbers.
...
- new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.
2013-02-09 13:00:57 +01:00
Mark Siewert
dca8dc4fdb
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.hpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/esmreader.hpp
- Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.
2013-01-25 18:22:01 +01:00
Mark Siewert
a8e02779b2
- Add support for multiple plugins trying to modify the same reference
...
- Fix a small signed/unsigned warning
2013-01-19 23:33:18 +01:00
Mark Siewert
8ccec17481
- Restore ability for plugins deleting records defined in parent files
...
- Don't throw a runtime_error when trying to load a reference based on a deleted record (just a warning for now, should be closer to MW)
2012-12-26 10:34:59 +01:00
Mark Siewert
049b0e66e0
- Restore ability to generate references in the same cell from multiple plugins
...
- Disable some code related to deleting entries in the store so that it builds again
2012-12-25 20:27:30 +01:00
lazydev
74ae479780
Cell names localization fix
2012-12-23 23:23:24 +04:00
scrawl
e3dd3d565c
fix 2 leaks
2012-12-10 00:59:39 +01:00
Mark Siewert
b103426cf0
- Partially reimplement deleting objects defined in a parent esX file.
...
- Try to reimplement multiple esX files dropping references in the same file.
NOTE: None of these features works. Maybe the code itself does not build. Anyway, after 12 hours of hacking, I am just tired and want to get a snapshot of the code out.
2012-11-25 19:07:16 +01:00
Mark Siewert
896ab44d1e
- Add some updated files missing from last commit.
...
- Move plugin dependency test from esmreader.cpp to esmstpre.cpp; fixes crash in omwlauncher.
2012-11-25 17:19:29 +01:00
Marc Zinnschlag
9201baebf9
template fix
2012-11-22 10:19:11 +01:00
Marc Zinnschlag
2be60041f3
Merge remote-tracking branch 'greye/player-dynamics' into next
2012-11-08 18:32:25 +01:00
greye
af5fb7916f
fix searching in store
2012-11-08 21:07:14 +04:00
greye
83e758ee50
clean up interfaces
2012-11-08 16:37:57 +04:00
greye
5b9621bca5
store player record data in ESMStore
2012-11-08 01:36:43 +04:00
Marc Zinnschlag
c5a6171aab
cleanup
2012-11-07 19:43:42 +01:00
greye
83f5b1df81
change to static --> dynamic search order
2012-11-06 17:58:49 +04:00
greye
dccc157f4c
setting up
2012-11-06 15:26:55 +04:00
greye
18bb5960e4
let's rescue linker
2012-11-06 15:10:57 +04:00
greye
b3ad872845
new interface in manualref, fix various typos
2012-11-06 13:43:48 +04:00
greye
e74b2c060d
disable createRecord(), Land constness hack, various fixes with Store<T> interface
2012-11-06 13:14:03 +04:00
greye
ff8da265ed
applying new interface vol.9, inconsistent
2012-11-06 12:36:21 +04:00
greye
11567663a7
applying new interface vol.4, inconsistent
2012-11-05 22:34:08 +04:00
greye
7cf0b8a680
just replace esmstore, inconsistent
2012-11-05 18:09:58 +04:00
