Mark Siewert
55bd9eef66
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
2013-02-09 13:03:35 +01: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
Marc Zinnschlag
c409f1184e
cleaned up object movement and fixed a bug regarding local scripts
2013-02-05 12:19:06 +01:00
scrawl
09180666b2
Merge branch 'master' of git://github.com/zinnschlag/openmw into terrainfix
2013-02-05 00:21:42 +01:00
scrawl
58cf182db2
better place for syncing
2013-02-05 00:21:29 +01:00
scrawl
596628d339
Fix terrain derived data update (bug 534, bug 544)
2013-02-04 23:13:01 +01:00
scrawl
bf037b7d29
Removed problematic ModVertexAlpha method, now done in shader
2013-02-04 18:03:03 +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
c97553703a
fixes for static build without cg
2013-02-03 13:47:55 +01:00
Marc Zinnschlag
a4872e3217
rewrote the opencs cmake scripts (more compact and no more annoying warnings)
2013-02-03 13:30:40 +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
Emanuel Guevel
19dff822f4
Dialogue: do not filter on disposition for creatures
2013-01-24 19:43:21 +01:00
Emanuel Guevel
ed9a9904b4
Dialogue filter: search script variables case-insensitively
2013-01-24 19:39:31 +01:00
Marc Zinnschlag
90d05858ef
disabling dialogue sub-views for now
2013-01-22 11:50:08 +01:00
Marc Zinnschlag
cd662af634
Merge branch 'globals'
2013-01-22 11:47:24 +01:00
Marc Zinnschlag
2756d3ee94
Merge remote-tracking branch 'wheybags/containerscripts'
2013-01-21 23:02:45 +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
Emanuel Guevel
736e471613
Print a fallback text when no topic response is found
2013-01-20 17:44:09 +01:00
Emanuel Guevel
43e85ea0c6
Disallow redirection to info refusal for greetings
2013-01-20 17:44:09 +01:00
Emanuel Guevel
05796d85a4
NPC: take stats from NPDT12 into account
...
Some available stats (level, reputation and disposition) were not used
for NPC with auto-calculated stats.
2013-01-20 17:44:08 +01:00
Emanuel Guevel
951eb1b236
Dialogue: return a response from "Info Refusal" when disposition is not satisfied
2013-01-20 17:44:08 +01: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
abe25c5f66
removed use of c++11 auto
2013-01-20 14:24:55 +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
Nathan Jeffords
f55da17933
made some journal accessor methods constant
2013-01-19 16:21:41 -08:00
Nathan Jeffords
4c7ae3d1ff
prevent duplicate journal entries from being recorded
2013-01-19 16:21:15 -08:00
Nathan Jeffords
528c3da6da
record heard topics in journal
2013-01-19 16:20:22 -08:00
Nathan Jeffords
d6b956cdcf
fixed swapped day & month fields when created a stamped journal entry
2013-01-19 16:19:03 -08: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
Marc Zinnschlag
2d96f52864
select correct record when opening a dialogue sub view
2013-01-19 14:29:14 +01:00
Marc Zinnschlag
82b790770d
Merge remote-tracking branch 'potatoesmaster/dialogue-creatures'
2013-01-17 10:21:01 +01:00
Emanuel Guevel
4feaa66897
Do not open the dialogue window if no greeting is found
2013-01-17 01:58:44 +01:00
Marc Zinnschlag
7b568cbb15
Merge remote-tracking branch 'potatoesmaster/dialogue'
2013-01-16 22:03:40 +01:00
Marc Zinnschlag
312f68bf9c
Merge remote-tracking branch 'thoronador/fix-spelling'
2013-01-16 12:28:33 +01:00
Thoronador
3220330ce0
fix spelling in comment
2013-01-16 04:19:16 +01:00
Emanuel Guevel
9e00c6694f
Allow only ID filtered topics for dialogue with creatures
2013-01-15 21:40:44 +01:00
Chris Robinson
8a073c113e
Use const references where appropriate
2013-01-15 12:07:15 -08:00
Chris Robinson
8361192b64
Use typedefs for some maps and some cleanup
2013-01-15 11:10:41 -08:00
Marc Zinnschlag
3053440462
Issue #539 : fixed AiWander
2013-01-15 12:40:44 +01:00
Emanuel Guevel
82287445af
DialogueWindow: do not execute onFrame() when not visible
2013-01-15 00:59:48 +01:00
Emanuel Guevel
f1f9173f24
Prevent closing dialogue window when an answer is expected
2013-01-15 00:53:32 +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
Marc Zinnschlag
654cd3ab9b
Issue #479 : Use magnitude specified when adding disease
2013-01-13 14:52:55 +01:00
