eduard
98103e15eb
conflict resolution
2012-12-30 13:46:07 +01:00
eduard
c85400b809
Merge https://github.com/zinnschlag/openmw into comparestring
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwworld/worldimp.cpp
components/esm_store/reclists.hpp
components/misc/stringops.hpp
2012-12-30 13:09:37 +01:00
eduard
c75a5ae212
string compare and tolower
2012-12-28 18:05:52 +01:00
eduard
8545667bbd
string compare and tolower
2012-12-28 17:54:56 +01:00
Marc Zinnschlag
4c28f3211b
Merge remote-tracking branch 'lazydev/master'
2012-12-26 15:50:03 +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
Tom Mason
8ac8fdff47
implemented all text defines except a few for keybindings that don't exist yet
2012-12-21 18:09:31 +00:00
Tom Mason
f2c6907244
Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work
2012-12-20 23:16:34 +00:00
scrawl
64210e6efa
Revert "New Game button"
...
This reverts commit c5dd0e19688b388b6e4e978d5ecf07ec14f5085d.
2012-12-18 19:09:27 +01:00
scrawl
1c73a3f2fb
Revert "remove commandline switch for new game"
...
This reverts commit 86671096ec89960405726594a50e5a7fa787b075.
2012-12-18 19:09:08 +01:00
Chris Robinson
7b2c3e6cd3
Pass a proper PlayMode enum to playSound and playSound3D
2012-12-18 06:01:21 -08:00
scrawl
86671096ec
remove commandline switch for new game
2012-12-16 16:14:49 +01:00
scrawl
c5dd0e1968
New Game button
2012-12-16 16:05:31 +01:00
scrawl
faad64b254
Esc cancels the video
2012-12-12 01:13:53 +01:00
scrawl
5f676f9c6b
Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwscript/miscextensions.cpp
2012-12-11 22:28:23 +01:00
scrawl
e3dd3d565c
fix 2 leaks
2012-12-10 00:59:39 +01:00
Marc Zinnschlag
8e1a2e3a13
Issue #474 : adjust global variable pcrace
2012-12-04 10:58:43 +01:00
scrawl
c4facc233e
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-12-01 11:30:51 +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
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
scrawl
1ccad32877
GetWeaponType
2012-11-25 02:06:43 +01:00
scrawl
e8ef4dba1e
getPcRunning, getPcSneaking, getForceRun, getForceSneak
2012-11-24 02:02:49 +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
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
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
Marc Zinnschlag
9669eed083
Issue #219 : added last missing function filters
2012-11-15 20:00:27 +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
greye
235b565bb7
update main character model
2012-11-10 11:51:48 +04: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
b5a59c3a07
minor doxygen comments update
2012-11-08 19:01:42 +04:00
greye
2a86432887
store birthsign in MWWorld::Player
2012-11-08 18:50:23 +04:00
greye
83e758ee50
clean up interfaces
2012-11-08 16:37:57 +04:00
greye
2a06d72e32
remove unused custom character classes
2012-11-08 02:27:01 +04:00
greye
9dc9098fa7
update MWBase::World interface since records contains own id
2012-11-08 01:52:34 +04:00
greye
5b9621bca5
store player record data in ESMStore
2012-11-08 01:36:43 +04:00
greye
9ab2c16055
store created character classes as dynamic records
2012-11-08 01:22:44 +04:00
greye
78740306db
non-const access to Store<T> from ESMStore
2012-11-08 01:21:54 +04:00
Marc Zinnschlag
c5a6171aab
cleanup
2012-11-07 19:43:42 +01:00
Marc Zinnschlag
918316168f
Merge remote-tracking branch 'greye/store' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
apps/openmw/mwworld/worldimp.cpp
2012-11-07 19:34:28 +01:00
greye
11c0e6382f
make ESMStore setting up itself after loading
2012-11-07 15:41:59 +04:00
greye
bc218759e9
forgotten module
2012-11-07 15:38:25 +04:00
Mark Siewert
7f77bf76c7
- Add support for multiple esm contexts in cell store. This will allow to generate references from multiple esX files. Currently, only the first context is used.
...
- Add many TODOs to mark points where more work is required to fully implement this feature.
2012-11-06 22:13:19 +01:00
