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
Mark Siewert
8ea9f00e6f
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/cellstore.hpp
apps/openmw/mwworld/containerstore.cpp
apps/openmw/mwworld/localscripts.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm_store/reclists.hpp
components/esm_store/store.cpp
extern/shiny
- Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp.
- NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.
2012-11-25 14:12:44 +01:00
Marc Zinnschlag
a6c7f16a7b
Merge remote-tracking branch 'scrawl/reputation'
2012-11-23 21:26:44 +01:00
scrawl
eb29b1593b
ModReputation, SetReputation
2012-11-23 19:56:45 +01:00
scrawl
f218ef2675
fix separator
2012-11-23 19:21:13 +01:00
scrawl
1d7e92b6b3
dialogue fixes
2012-11-23 19:05:40 +01:00
Marc Zinnschlag
d7af9fbec6
various fixes
2012-11-22 17:24:28 +01:00
Marc Zinnschlag
9201baebf9
template fix
2012-11-22 10:19:11 +01:00
scrawl
c8562d8442
toggleCollisionBoxes actually does something useful now
2012-11-20 02:20:54 +01:00
Marc Zinnschlag
5d45bcd03a
Merge remote-tracking branch 'trombonecot/master'
...
Conflicts:
apps/openmw/mwclass/light.cpp
2012-11-19 21:21:00 +01:00
eduard
4e4d15f8ac
Failed action
2012-11-19 21:04:49 +01:00
scrawl
693eeabeca
shiny: fix GLSL texture units when shaders were disabled
2012-11-19 13:55:26 +01:00
Mark Siewert
31fb715bd7
- Add support for moving existing references by plugin files. No cell changing yet.
...
- Change CellRefList::list from list<> to map<int,> so we can identify live references by their Refnumber.
- Introduce ContainerRefList, a clone of the original CellRefList. It is now used for containers, which do not track Refnumbers.
- Many small tweaks so that the new CellRefList does not conflict with existing code.
2012-11-17 21:50:25 +01:00
eduard
82ea547ce4
Failed action
2012-11-17 18:17:08 +01:00
Mark Siewert
2175f13b67
- Add tracking for dependencies between plugins.
...
- Add reference number mangling required for moving references around.
2012-11-17 00:21:51 +01:00
scrawl
8ef3edd416
Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap
2012-11-16 22:28:00 +01:00
scrawl
f5355e3e92
512x512 map, slightly faster
2012-11-16 22:26:00 +01:00
Marc Zinnschlag
a092deaee8
various fixes
2012-11-16 20:28:20 +01:00
Marc Zinnschlag
3dc013ceae
Merge remote-tracking branch 'gohan/Gohan'
2012-11-16 20:15:58 +01:00
scrawl
dc67a547b0
global map explored overlay
2012-11-16 19:34:09 +01:00
marcin
51027c541e
Feature #391 Dummy AI package classes
2012-11-16 18:38:15 +01:00
Marc Zinnschlag
9193f3b0ae
implemented getCommon/BlightDisease script instructions
2012-11-16 13:32:40 +01:00
Marc Zinnschlag
89c7936534
fixed dialogue script error reporting
2012-11-16 12:47:09 +01:00
Marc Zinnschlag
fd5671e6db
fixed argument lists for setpcfacrep and modpcfacrep
2012-11-16 12:45:07 +01:00
marcin
bed0280ba1
Feature #391 Dummy AI package classes
2012-11-15 22:33:50 +01:00
marcin
99ddc63e2c
Feature #391 Dummy AI package classes
2012-11-15 22:32:15 +01:00
marcin
515419ae0b
Feature #391 Dummy AI package classes
2012-11-15 22:22:44 +01:00
marcin
4b939c7521
Feature #391 Dummy AI package classes
2012-11-15 22:15:20 +01:00
Marc Zinnschlag
82d62eb95a
Merge branch 'script'
2012-11-15 20:00:37 +01:00
Marc Zinnschlag
9669eed083
Issue #219 : added last missing function filters
2012-11-15 20:00:27 +01:00
scrawl
aefde3f5bc
Merge branch 'master' into globalmap
2012-11-15 13:21:24 +01:00
marcin
e6c8e1f0d7
Feature #391 Dummy AI package classes
2012-11-14 18:42:04 +01:00
marcin
698afbec3e
Feature #391 Dummy AI package classes
2012-11-14 18:40:32 +01:00
scrawl
5f7d349126
several missing includes
2012-11-14 05:32:23 +01:00
Marc Zinnschlag
b046687f46
added PCFacRep script instructions
2012-11-13 16:11:03 +01:00
Marc Zinnschlag
2a1727d4c5
improved error reporting for dialogue scripts (enabled via --script-verbose)
2012-11-13 15:35:46 +01:00
Marc Zinnschlag
c621a9f7e4
added missing disposition script instructions
2012-11-13 14:29:00 +01:00
Marc Zinnschlag
8aa1fd921b
fixed some stats related script instructions
2012-11-13 14:19:43 +01:00
Marc Zinnschlag
cbb0fd5792
Merge branch 'dialogue'
2012-11-13 10:04:08 +01:00
Marc Zinnschlag
409d15576b
Merge remote-tracking branch 'greye/player-model'
2012-11-12 14:18:38 +01:00
Marc Zinnschlag
e2ccec99f0
Issue #219 : added another missing PC stats filter
2012-11-12 14:02:49 +01:00
Marc Zinnschlag
586ac3f5c6
Issue #219 : added some more stats filters; fixed two filters
2012-11-12 13:56:51 +01:00
Marc Zinnschlag
77ba8c5117
Issue #219 : implemented rank requirement filter
2012-11-12 13:23:25 +01:00
scrawl
8e847fdc6e
fix speechcraft skill increasing when persuade didn't succeed
2012-11-11 19:18:41 +01:00
Mark Siewert
42eefaf36f
- Add support for loading references from multiple esm/esp files. Full reference ID mangling coming soon (currently, moved references are simply cloned).
...
- Reference loader now (partially) supports MVRF tag.
2012-11-10 21:43:41 +01:00
scrawl
11a8d5d70a
Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap
2012-11-10 21:19:41 +01:00
scrawl
7c22690116
Merge branch 'next' into globalmap
2012-11-10 21:19:10 +01:00
greye
623e00531d
fix reentering race selection
2012-11-10 21:54:43 +04:00
greye
0d33d005a5
head/hair selection
2012-11-10 21:30:16 +04:00
