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
3e43db5f76
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
2013-02-03 16:14:41 +01:00
Marc Zinnschlag
85697e4628
reverted to C++03
2013-02-02 13:24:28 +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
Tom Mason
f5f3c2e62d
enabling / disabling should not affect scripts
2013-01-21 20:06:08 +00:00
Mark Siewert
713d324eeb
- Minor code cleanup
2013-01-20 19:07:33 +01:00
Tom Mason
31c71c029d
objects with scripts attached, that are inside containers will behave correctly when the container is moved
2013-01-20 17:01:30 +00:00
Tom Mason
23dada0ee4
moved script handling on enable / disable into their own functions
2013-01-20 16:38:56 +00:00
Tom Mason
28c580d280
disabling and enabling containers causes scripts on contents to be disabled and enabled accordingly
2013-01-20 15:43:52 +00:00
Tom Mason
665a530e10
renamed realAdd to addImp
2013-01-20 14:14:34 +00:00
Tom Mason
3c6ddd7fa7
fixed isInCell method
2013-01-20 14:10:04 +00: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
Tom Mason
6fc64e8a4e
scripts run for items added to containers, and scripted items in player inv handled correctly
2013-01-13 19:49:56 +00:00
Tom Mason
7c8b3f1239
Merge remote-tracking branch 'real/master'
2013-01-13 17:07:18 +00:00
Tom Mason
c138e00aa2
objects scripts are now stopped when they are removed from a container
2013-01-13 17:05:12 +00:00
Tom Mason
d4ca954d47
scripts on items in containers added to script list on cell change
2013-01-12 18:31:57 +00:00
Nathan Jeffords
d5ebd6654d
cache loaded NIF files to eliminate reloads
...
Created a NIF file caching mechanism to prevent the system from
reloading a NIF during a startup and cell changes.
2013-01-10 21:47:02 -08:00
Marc Zinnschlag
274ff530dc
Merge remote-tracking branch 'wheybags/master'
2013-01-10 11:53:42 +01:00
Tom Mason
3517635cfd
added Drop and DropSoulGem functions
2013-01-09 21:16:45 +00:00
Marc Zinnschlag
4defb1a476
Merge remote-tracking branch 'trombonecot/lowerstring'
...
Conflicts:
apps/openmw/mwgui/loadingscreen.cpp
2013-01-09 22:13:59 +01:00
eduard
2dc0064cc2
more string lowercase
2013-01-09 20:51:52 +01:00
Tom Mason
5bfdb2449d
allowed dropObjectOnGround to be used on npcs, not just player
2013-01-09 18:53:14 +00:00
Marc Zinnschlag
6567bf38f8
Merge remote-tracking branch 'wheybags/master'
2013-01-09 17:01:47 +01:00
Tom Mason
375961fe5e
small fix
2013-01-09 13:27:12 +00:00
Tom Mason
b035a5aa4a
beast races cannot equip anything they oughtn't to be able to equip
2013-01-09 13:18:05 +00:00
Marc Zinnschlag
649ae645f3
Merge remote-tracking branch 'blunted2night/bug_495_v2'
2013-01-09 12:12:41 +01:00
Nathan Jeffords
719663d86e
added option to override the activation distance
...
The command line option '--activate-dist <int>' can be used to override
the in game activation distance.
2013-01-08 20:00:06 -08:00
Tom Mason
62a2ba1cc6
beast races cannot equip shoes/boots
2013-01-09 03:03:14 +00:00
Tom Mason
135f0870f7
in actionequip, was ignoring actor param, and always using player
2013-01-09 02:16:17 +00:00
Nathan Jeffords
b3932e3dea
added a separate activation distance for NPCs
2013-01-07 23:40:17 -08:00
Nathan Jeffords
b9fbd6ae4b
Factored faced object lookups into MWRender::World
...
* Renamed MWWorld::World::getFacedHandle to getFacedObject.
* Changed it to return an object pointer
* Updated clients to use return object directly.
2013-01-07 23:38:08 -08:00
Nathan Jeffords
05dad29005
update MWWord::World to track distances while performing occlusion queries.
...
This allows checking the activation distance against what is stored in GameSettings. Experimentation suggests that a second distance is required for NPCs.
2013-01-07 23:11:15 -08:00
Nathan Jeffords
0108be2e4f
updated MWWorld::PhysicsSystem::getFacedXXX functions
...
* changed the names and return values to be consistent
* made the distance to search a parameter
* change the distance returned to world units instead of percentage of query distance
2013-01-07 23:00:00 -08:00
Nathan Jeffords
86f691d3d5
split MWWord::World::update into multiple functions
2013-01-07 22:48:24 -08:00
scrawl
f1b138d0a8
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2013-01-07 13:25:15 +01:00
scrawl
282601d6e9
support the allowSkipping extra parameter for playBink command.
2013-01-07 13:19:52 +01:00
Emanuel Guevel
63f09462fd
to_utf8, Utf8Encoder: pass encoding as constructor parameter
...
Edit other files accordingly.
2013-01-06 01:37:58 +01:00
Mark Siewert
d6377fb2e3
- Support deleting references from a plugin
...
- Add preliminary support for loading some unique fields appearing only in savegames
- Add a few lines required for supporting respawning references. Incomplete.
2013-01-03 18:51:04 +01:00
greye
7e0713f6c4
fix string case update
2012-12-31 11:22:40 +04:00
eduard
69d9d22579
comparestring
2012-12-30 19:56:38 +01:00
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
