Marc Zinnschlag
550e5eb686
Merge remote-tracking branch 'corristo/osx-music-fix'
2014-02-18 09:12:02 +01:00
gus
d8f24ac499
bug fix
2014-02-17 15:49:49 +01:00
Marc Zinnschlag
ea16f79d77
Merge remote-tracking branch 'gus/AIFix2'
2014-02-17 10:54:07 +01:00
gus
84959eea28
woops, thanks scrawl
2014-02-17 10:50:10 +01:00
gus
6e1425321b
remove cout spam
2014-02-17 10:43:09 +01:00
gus
e5b19cf3c6
clean up
2014-02-17 10:37:11 +01:00
Marc Zinnschlag
02c6c65705
Merge remote-tracking branch 'sirherrbatka/DragDrop'
2014-02-17 09:55:50 +01:00
Marek Kochanowicz
2bb9e47507
Improvements.
2014-02-17 08:58:55 +01:00
Nikolay Kasyanov
51fb9f65ea
#1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()
2014-02-17 02:59:23 +04:00
Nikolay Kasyanov
5e8cb2e466
Another attempt to fix #1041 . This time I'm sending real data from decoder
...
once after playback started.
2014-02-17 02:35:13 +04:00
Marek Kochanowicz
e1a0f60041
allow _foo ids without qoute
2014-02-16 20:26:22 +01:00
Marek Kochanowicz
b83817e05e
May only include alphanumeric characters and underscores and may not start with a number.
2014-02-16 20:18:28 +01:00
Marek Kochanowicz
3cc23a9cb3
very basic, but safe putting down " "
2014-02-16 18:41:42 +01:00
Nikolay Kasyanov
4e28fd85a3
Fixed build on OS X
2014-02-16 20:22:46 +04:00
Marc Zinnschlag
c18c3e51ee
handle IDs that don't exist anymore after loading
2014-02-16 16:23:05 +01:00
Marc Zinnschlag
9788bbcab9
partially store creature state in saved game files (only attributes and dynamics for now)
2014-02-16 15:56:36 +01:00
Marc Zinnschlag
b0532e0c85
store NPC state in saved game files
2014-02-16 15:51:45 +01:00
Marc Zinnschlag
9f721fd144
store list of known topics in saved game files
2014-02-16 12:54:27 +01:00
Marc Zinnschlag
6ac64bbe15
Merge branch 'script'
...
Conflicts:
readme.txt
2014-02-16 12:12:56 +01:00
Marek Kochanowicz
17af865a9f
checking for the source of the drop, reject those from other files for now
2014-02-16 09:51:33 +01:00
Marc Zinnschlag
9cdfca6c26
Merge remote-tracking branch 'potatoesmaster/disable-crash'
2014-02-15 22:55:00 +01:00
Marek Kochanowicz
cbe1fe2f95
removed misplaced bracket
2014-02-15 22:38:59 +01:00
Marek Kochanowicz
45d9364195
Put the id in the quote.
2014-02-15 22:14:27 +01:00
Marek Kochanowicz
ec8c8a9d88
-journalinfo +topic
2014-02-15 22:05:42 +01:00
Marek Kochanowicz
41606a67e4
implemented whitelist of allowed types in the scripts
2014-02-15 20:49:09 +01:00
Marek Kochanowicz
930b77e60a
allow drag and drop into the script edit window.
2014-02-15 19:52:40 +01:00
Marc Zinnschlag
01a7918124
Merge remote-tracking branch 'potatoesmaster/selected-spell'
2014-02-15 18:38:10 +01:00
Marek Kochanowicz
97fe5465bf
created new files
2014-02-15 17:55:18 +01:00
Emanuel Guevel
3d8ca02479
Fix breaking of enchanted items casting
2014-02-15 17:39:57 +01:00
Marc Zinnschlag
0afa61eed5
fixed referenceable-loading in case of more than one content file
2014-02-15 15:50:17 +01:00
Marc Zinnschlag
2007a3e902
improved script check error messages
2014-02-15 13:25:38 +01:00
Marek Kochanowicz
56be62b956
small reformatting
2014-02-15 13:23:51 +01:00
Marek Kochanowicz
4ee90c24e5
more readable code.
2014-02-15 13:22:14 +01:00
Marc Zinnschlag
4e04131957
fixing case broke sorting in script context
2014-02-15 13:09:43 +01:00
Marc Zinnschlag
2130ec39d6
disable warnings by default in script verifier
2014-02-15 12:58:34 +01:00
Marek Kochanowicz
b1f63947e8
Checking if the drop comes from same document.
2014-02-15 12:40:07 +01:00
Marek Kochanowicz
d6820b977e
store const ref to the document in the table.
2014-02-15 12:22:32 +01:00
Marek Kochanowicz
f3dc45f1ec
long line split.
2014-02-14 15:29:10 +01:00
Marek Kochanowicz
37d262b147
Splited very long line.
2014-02-14 15:12:34 +01:00
Marc Zinnschlag
7b8802588e
Merge remote-tracking branch 'sirherrbatka/DragDrop'
2014-02-14 14:28:30 +01:00
Marek Kochanowicz
aafde926d3
Documentation, corrections.
2014-02-14 14:04:36 +01:00
Marc Zinnschlag
e17af4231a
added script verifier
2014-02-14 13:38:30 +01:00
Marc Zinnschlag
0ff744c2ff
fixed CSMWorld::ScriptContext::isJournalId
2014-02-14 12:56:05 +01:00
gus
a315d5cc2b
aiactivate works. Bug when you try to use it on a reference that doesn't exist. Need to clran up door.cpp
2014-02-14 12:55:14 +01:00
Marek Kochanowicz
ae418f2538
nicer formatting
2014-02-14 12:51:50 +01:00
Marc Zinnschlag
0a8ffbfb1d
added missing implementation for CSMWorld::ScriptContext::getMemberType
2014-02-14 12:46:54 +01:00
Marc Zinnschlag
910d62e4b8
added missing implementation for CSMWorld::ScriptContext::getGlobalType
2014-02-14 11:59:33 +01:00
Marc Zinnschlag
451e1f413b
instead of using pre-compiled variable lists for remote member access get the variable list from the remote script on the fly
2014-02-14 11:15:16 +01:00
Emanuel Guevel
7c981587fc
When searching object by id, search in active cells before searching in the player's inventory
2014-02-13 22:58:12 +01:00
Marc Zinnschlag
053b3dc371
Merge branch 'openmw-28'
...
Conflicts:
CMakeLists.txt
2014-02-13 20:57:28 +01:00
Emanuel Guevel
e597328b6b
Make enable/disable a no-op for items in containers
2014-02-13 20:24:27 +01:00
Marek Kochanowicz
40cc108e54
drag and drop works.
2014-02-13 20:19:51 +01:00
Marek Kochanowicz
1bcc6d6918
using new icon.
2014-02-13 19:14:17 +01:00
Marek Kochanowicz
2afe3f3e57
Introduced multitype icon.
2014-02-13 19:00:35 +01:00
Marek Kochanowicz
6662560cbc
new displays for referencable table columns
2014-02-13 15:43:19 +01:00
Marc Zinnschlag
d6e212a02b
Merge branch 'master' into script
2014-02-13 15:02:02 +01:00
Marc Zinnschlag
e9238b456d
use case-insensitive sorting in columns
2014-02-13 15:01:10 +01:00
Marek Kochanowicz
09d3c7a446
Attempt to match types. Does not work at the moment.
2014-02-13 13:54:09 +01:00
gus
7c6e27e4f9
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2
...
Conflicts:
apps/openmw/mwmechanics/aitravel.cpp
2014-02-13 12:59:04 +01:00
Marek Kochanowicz
71b2fc1c70
Introduced method to access display type.
2014-02-13 10:55:31 +01:00
Marc Zinnschlag
9c52820754
Merge remote-tracking branch 'scrawl/master'
2014-02-13 10:54:51 +01:00
Marek Kochanowicz
5f3f867a10
Implemented convertEnums function
2014-02-13 10:21:49 +01:00
scrawl
c6fb0f2d9b
Removed terrain component's dependency on ESM
2014-02-13 10:13:53 +01:00
Marc Zinnschlag
dde4fbd818
allow one more integer argument in RemoveSoulGem and up to 6 more in AiFollow and then throw them all away
2014-02-13 09:52:44 +01:00
Marc Zinnschlag
b3412b7eec
another case fix (remote member access again)
2014-02-12 15:22:17 +01:00
Marc Zinnschlag
dc433a3c09
fixed case handling problem for local variable access
2014-02-12 13:38:16 +01:00
Marc Zinnschlag
388735046f
fixed broken remote member variable access
2014-02-12 13:35:24 +01:00
Marek Kochanowicz
c142089bfe
Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop
2014-02-12 13:13:32 +01:00
Marek Kochanowicz
c00834a8de
added some iostream garbage.
2014-02-12 13:12:58 +01:00
Marek Kochanowicz
8dfdd87a07
Merge branch 'DnD' of https://github.com/gugus/openmw into DragDrop
...
Conflicts:
apps/opencs/view/world/table.cpp
2014-02-12 12:12:53 +01:00
Marek Kochanowicz
62c9c77ddf
Compiles now.
2014-02-12 11:42:19 +01:00
gus
6cf561f713
get index to where we are dropping
2014-02-12 11:32:01 +01:00
gus
2e33ab3a13
droping somewhat works
2014-02-12 11:16:12 +01:00
Marek Kochanowicz
e1a39b8388
Replaced some display_string with specific type. Damn, i wish this is correct ;-)
2014-02-12 09:24:08 +01:00
Marek Kochanowicz
fc135fbfee
Added new Display types
2014-02-12 09:04:52 +01:00
Emanuel Guevel
8824af30b4
Allow to display message box outside of dialogue window
2014-02-11 18:26:57 +01:00
Marc Zinnschlag
ffd1783690
Merge remote-tracking branch 'mrcheko/master'
2014-02-11 17:03:50 +01:00
Marc Zinnschlag
e44a7268fc
Merge remote-tracking branch 'potatoesmaster/selected-spell'
2014-02-11 17:00:41 +01:00
Emanuel Guevel
a3eea4f6b6
Do not allow spellcasting stance without spell selected
2014-02-11 16:34:51 +01:00
Emanuel Guevel
70d35da116
Unset selected spell when removed
2014-02-11 16:34:23 +01:00
Emanuel Guevel
6a4820c0f7
Show a message when the player attempts to cast a disabled spell
2014-02-11 14:52:58 +01:00
Marc Zinnschlag
9de2922d22
fixed case problem in remote member variable access
2014-02-11 13:56:56 +01:00
Marek Kochanowicz
53e2e8415d
replaced start with exec
2014-02-11 12:25:21 +01:00
gus
df46218acc
try droping
2014-02-10 16:48:04 +01:00
Marc Zinnschlag
3b990795c4
added access to remote access of local variables of global scripts
2014-02-10 14:45:55 +01:00
gus
b5006c5dbd
compile fix
2014-02-09 15:33:00 +01:00
mrcheko
a6be72673c
improves animation-controlled velocity check
2014-02-08 16:59:15 +02:00
scrawl
8f949c6ae2
Fix lockpicks
2014-02-08 07:35:34 +01:00
scrawl
6ce499f0e6
Fixes #848 : Use hardcoded animation velocity for first person movement
2014-02-06 04:05:22 +01:00
scrawl
ff11d85a62
Fix wrong assertion
2014-02-06 03:15:01 +01:00
gus
632834ce10
WIP
2014-02-05 16:12:50 +01:00
scrawl
4a26909172
Fixes #1159 : Don't allow quick keys menu in chargen
2014-02-05 12:15:49 +01:00
Marek Kochanowicz
3b8f04c0f3
Allow multi-item drag.
2014-02-05 11:44:08 +01:00
Marek Kochanowicz
f01b02c42d
Changed format.
2014-02-05 11:24:33 +01:00
Marek Kochanowicz
76b729ac9b
Removed getUniversalid interface.
2014-02-05 11:19:55 +01:00
scrawl
677fc84223
Refactor actors update
2014-02-05 09:50:21 +01:00
scrawl
0cc1cd8f7e
Fix message box formatting bug
2014-02-05 05:18:11 +01:00
scrawl
7907181c0c
Fix uninitialized member
2014-02-05 05:18:11 +01:00
scrawl
ffe19e7a52
Feature #50 : Handle attach & release of projectiles
2014-02-05 05:18:11 +01:00
scrawl
8b8fb931a0
Feature #50 : Don't allow ranged weapon attack when ammunition is empty
2014-02-05 05:18:10 +01:00
scrawl
a07eaa0c0d
Feature #50 : Allow body pitch in third person for ranged weapon aiming
2014-02-05 05:18:10 +01:00
scrawl
5ee105c812
Fix typo
2014-02-05 05:18:10 +01:00
scrawl
7cf22391a5
Feature #50 : Handle weapon controllers (i.e. bowstring animations, etc)
2014-02-05 05:18:10 +01:00
scrawl
e1e7a492e2
Fix movement speed formula for flying creatures
2014-02-05 05:18:10 +01:00
scrawl
f608ceeffc
Fixes #1158 (Armor rating label issues)
2014-02-05 05:18:10 +01:00
scrawl
8aed4fcfa4
Correction for marksman weapon inventory preview
2014-02-05 05:18:10 +01:00
scrawl
5b076aa570
Revert "Bug #1074 : Inventory paperdoll obscures armour rating"
...
This reverts commit b017a3be3e
.
2014-02-05 05:18:10 +01:00
scrawl
df78357e05
Handle knockout separately ( Closes #1151 )
2014-02-05 05:18:09 +01:00
Marek Kochanowicz
04287cb87a
Provide method to return whole data vector from tablemimedata.
2014-02-04 19:42:52 +01:00
Marek Kochanowicz
8b799683c1
Display QPixMap with dragged object.
2014-02-04 18:48:18 +01:00
Marek Kochanowicz
3439940a8e
Tablemimedata able to handle vector of objects and return icon.
2014-02-04 18:38:31 +01:00
Marek Kochanowicz
423b2906be
Yes, you can drag. But not drop.
2014-02-04 11:40:48 +01:00
Marek Kochanowicz
dc80bfff55
Attempt to get basic tablemimedata subclass.
2014-02-04 09:13:40 +01:00
mrcheko
688f359a33
discard creatures speed and negative fatique changes
2014-02-03 23:09:26 +02:00
Marc Zinnschlag
c5b92ed6c8
Merge remote-tracking branch 'pvdk/versioninfo'
2014-02-03 11:21:11 +01:00
Marc Zinnschlag
21f502df34
compatibility fix
2014-02-03 11:20:55 +01:00
pvdk
f263acdac6
Merge remote-tracking branch 'upstream/master' into versioninfo
2014-02-03 02:27:24 +01:00
Alexander "Ace" Olofsson
e50a393de4
Fix linking issues on Windows using MSVC.
2014-02-02 23:59:57 +01:00
pvdk
4e03e9cf87
Changed development version info text and the tooltip now works on all platforms
2014-02-02 20:10:47 +01:00
Marc Zinnschlag
32860a05e3
added dummy implementations for getPcInJail and getPcTraveling
2014-02-02 15:35:18 +01:00
mrcheko
761f13d3ce
activate whole-body attack animations
2014-02-02 16:29:51 +02:00
Marc Zinnschlag
914ab1b8ab
allow 'x' instead of 'getjournalindex x'
2014-02-02 15:08:27 +01:00
Marc Zinnschlag
4ee43612f6
added new switch: --script-warn
2014-02-02 14:09:59 +01:00
mrcheko
b85a4dd35e
pos accum without conformity with animation bug/creature speed
2014-02-02 15:01:49 +02:00
Alexander "Ace" Olofsson
e3d85af70a
Fix an issue with int32_t being unknown on windows.
2014-02-02 13:57:19 +01:00
Marek Kochanowicz
a36cc26434
Created new files for TableMimeData class.
2014-02-01 19:06:41 +01:00
scrawl
1deb0a7cdf
Savegame dialog: Set key focus to editbox
2014-02-01 18:42:01 +01:00
scrawl
ec46575671
Overwriting saves fixes - copy description of overwritten slot, ask for confirmation
2014-02-01 18:42:01 +01:00
scrawl
6d37cd7e86
Savegame dialog: Don't allow empty save names
2014-02-01 18:42:01 +01:00
scrawl
63284d21a0
Savegame dialog: 'Enter' while editing a name is equivalent to pressing the ok button
2014-02-01 18:42:01 +01:00
scrawl
dea9d21db6
Some additional safety checks for global map loading
2014-02-01 18:42:01 +01:00
scrawl
f89b3cac02
Feature #764 : Store the actor that gave the dialog response
2014-02-01 18:42:01 +01:00
scrawl
a988a0d6dc
Don't add duplicate topic responses to the journal
2014-02-01 18:42:00 +01:00
scrawl
37ef8ec908
Savegame dialog: support loading saves using Enter key or double-click
2014-02-01 18:42:00 +01:00
scrawl
49e26415be
Don't call loadGame() from within the MWMechanics::Actors update sequence
2014-02-01 18:42:00 +01:00
Marc Zinnschlag
1b5301eec0
Merge branch 'savedgame'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwbase/soundmanager.hpp
apps/openmw/mwgui/mapwindow.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwsound/soundmanagerimp.hpp
components/esm/loadcell.cpp
2014-02-01 18:16:32 +01:00
Marc Zinnschlag
5b04c10e1d
added creature/NPC state to saved games (only container/inventory for now)
2014-02-01 17:36:23 +01:00
Marc Zinnschlag
d2ec3ffdc8
handle equipped items when serialising inventory state
2014-02-01 17:31:05 +01:00
Marc Zinnschlag
bcc5894e2d
changed implementation functions for container serialisation from free functions to member functions (will need some polymorphism later)
2014-02-01 15:24:01 +01:00
Marc Zinnschlag
dd674566a2
store content of containers in saved game files
2014-01-31 13:25:32 +01:00
scrawl
4ec86d1c68
Bug #1147 : Fix the inventory preview pose used for ranged weapons
2014-01-31 05:06:35 +01:00
scrawl
60bbab52fe
Support keyframe controllers for bones that aren't in the skeleton base
2014-01-31 05:06:34 +01:00
scrawl
da34f8bda1
Fix LastHitObject
2014-01-31 04:43:35 +01:00
scrawl
067c2bc2ec
Disable combat movements for creatures without weapons
2014-01-31 04:43:35 +01:00
scrawl
7820ea5806
"Always best attack" should only affect the player
2014-01-31 04:43:35 +01:00
scrawl
d0c6ecd03a
Bug #1148 : Workaround for broken images in some MW versions
2014-01-31 04:43:35 +01:00
scrawl
52f89e9a17
Don't play "idle" voice entries for NPCs with Hello 0
...
Not entirely sure if this is correct, but it prevents the NPCs in the starting boat from incorrectly playing them.
2014-01-31 04:43:35 +01:00
scrawl
39d86a9468
Improvements to smooth NPC steering
2014-01-31 04:43:29 +01:00
mrcheko
80d8aa4030
bug with sequence of knockouts; giving sense to some hit state code
2014-01-30 23:54:26 +02:00
Marc Zinnschlag
900532a6ca
store additional state of lights in saved game files
2014-01-30 12:37:33 +01:00
Marc Zinnschlag
ec7cb90ca4
added support for serialisation of CustomData state
2014-01-30 11:50:13 +01:00
scrawl
2b15b8b484
Fix gold bugs ( Fixes #1145 , Fixes #1146 )
2014-01-29 15:37:27 +01:00
scrawl
305e78c981
Fix creature attack bug
2014-01-29 15:37:27 +01:00
scrawl
e717694b36
Reset Run stance in AiWander
2014-01-29 15:37:27 +01:00
scrawl
23ffb8a4dc
Fixes #1143 : Make getCurrentAiPackage return the package that was run last, not the package that will be run in the next frame.
...
This makes the Mehra Milo script work properly.
2014-01-29 15:37:27 +01:00
scrawl
434fd21584
Don't set journal index if a higher index is currently set
...
This is vanilla behaviour, and required for the Mehra Milo vivec informants quest.
2014-01-29 15:37:27 +01:00
scrawl
edff88542b
Allow double click / Enter key for accepting race/class/birthsign
2014-01-29 15:37:27 +01:00
scrawl
a8a09762ce
Don't crash when deleting or disabling a moving door
2014-01-29 15:37:26 +01:00
scrawl
190512156d
Use some more GMSTs for enchanting
2014-01-29 15:37:26 +01:00
scrawl
ea7e0abdc2
Move WhenStrikes skill success to a more appropriate place
2014-01-29 15:37:26 +01:00
scrawl
b8db151da7
Add missing skill increases for armor hits
2014-01-29 15:37:26 +01:00
scrawl
82146e7f8d
Use GMSTs for levelup
2014-01-29 15:37:26 +01:00
scrawl
cc40cec395
Move levelup to NpcStats
...
The code came from back in the days where NpcStats did not derive from CreatureStats.
2014-01-29 15:37:26 +01:00
scrawl
ba67bf45f8
Fix an issue with InventoryStore copy constructor. Don't copy the iterator directly - mContainer will be wrong and comparisons against end() will always fail.
...
This caused an exception when looting a creature that had moved cells.
2014-01-29 15:37:26 +01:00
scrawl
365ae15532
Drag&Drop: auto-hide windows that can't be drop targets on mouseover
2014-01-29 15:37:26 +01:00
mrcheko
3a5da7e6e8
merged with master
2014-01-29 00:03:00 +02:00
mrcheko
5ee1dc6be8
attacktypes error fix
2014-01-28 21:07:26 +02:00
Marc Zinnschlag
1d34f5e096
Merge remote-tracking branch 'sirherrbatka/cloning'
...
Conflicts:
apps/opencs/model/world/refiddata.cpp
2014-01-28 12:40:14 +01:00
Marc Zinnschlag
a473c3f619
some cleanup
2014-01-28 12:36:10 +01:00
Marc Zinnschlag
fd5486864a
Merge remote-tracking branch 'gus/AIFix2'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/actors.hpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
2014-01-28 12:33:31 +01:00
Marek Kochanowicz
2bd98a69ab
Corrections, according to the comments. Thanks for the review. :-)
2014-01-28 11:16:48 +01:00
mrcheko
e50e94af0b
remove CreatureStats::mAttackType, set/getAttackType()
2014-01-27 23:05:17 +02:00
mrcheko
fe0268062d
merge with master
2014-01-27 22:38:01 +02:00
Marek Kochanowicz
d3000ce099
whitespaces removed again.
2014-01-27 19:47:54 +01:00
Marek Kochanowicz
62ea0bb066
Cleared whitespaces.
2014-01-27 19:40:05 +01:00
Marek Kochanowicz
c82db915f1
Removed needless includes
2014-01-27 19:32:51 +01:00
Marek Kochanowicz
d0b07de7ef
Corrected bug mentioned by zini.
2014-01-27 16:59:18 +01:00
gus
846276f747
clean up
2014-01-27 15:14:24 +01:00
Marek Kochanowicz
ed0ba906cf
removed needless include
2014-01-27 15:05:29 +01:00
Marek Kochanowicz
9c579dbd6c
ok, that should be enough
2014-01-27 15:03:29 +01:00
Marek Kochanowicz
84e07c95b1
formatting
2014-01-27 15:02:29 +01:00
Marek Kochanowicz
51115fa5be
spaces around operators
2014-01-27 14:56:57 +01:00
Marek Kochanowicz
c91ae86084
is there something that can generate diff from two git branches? Using github for this is kinda annoying.
2014-01-27 14:53:39 +01:00
Marek Kochanowicz
52176d6435
reforfucking
2014-01-27 14:51:57 +01:00
Marek Kochanowicz
2b71568bb6
still reformating
2014-01-27 14:50:36 +01:00
Marek Kochanowicz
316debb827
reformating
2014-01-27 14:46:58 +01:00
Marek Kochanowicz
4d6fb31610
reformating
2014-01-27 14:45:07 +01:00
Marek Kochanowicz
2899f04a3f
reformatting
2014-01-27 14:43:12 +01:00
Marek Kochanowicz
6a0b5defd7
removed needless member value.
2014-01-27 13:42:08 +01:00
Marek Kochanowicz
bb62efc3d8
Removed pointless includes.
2014-01-27 13:36:01 +01:00
Marc Zinnschlag
29c3a288e3
load and save of reference in cells (without CustomData state)
2014-01-27 13:27:42 +01:00
Marek Kochanowicz
71d6364754
Chaninging variables name to follow our policy.
2014-01-27 13:13:39 +01:00
Marek Kochanowicz
aa6d1ff4c3
removed needless argument for cloning
2014-01-27 13:08:14 +01:00
Marek Kochanowicz
be8b978a89
corrected mistake in data
2014-01-27 12:23:03 +01:00
Marek Kochanowicz
62c2259c87
removing coordinates handling
2014-01-27 10:10:23 +01:00
mrcheko
45b3aa3d93
corrected things connected to determining attack type
2014-01-26 23:32:57 +02:00
gus
f5d589388c
bug fix
2014-01-26 22:06:54 +01:00
gus
764011dd1b
clean up
2014-01-26 21:53:55 +01:00
gus
7cb47aa635
new implementation of pathfinding. Works, but need clean up
2014-01-26 21:26:19 +01:00
scrawl
eba6c9a8fd
Fix massive console spam regarding the scrib's idle3 animation
2014-01-26 02:49:32 +01:00
scrawl
b1066de81d
Revert "Merge remote-tracking branch 'mrcheko/master'"
...
This reverts commit 4e360136b1
, reversing
changes made to 047bbe43b2
.
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
2014-01-26 00:31:44 +01:00
scrawl
a1fbd1fcc8
Revert "Merge remote-tracking branch 'mrcheko/master'"
...
This reverts commit df7c139e2f
, reversing
changes made to fec26342cd
.
2014-01-26 00:14:49 +01:00
scrawl
e0de76a6f7
Save/load global map
2014-01-25 19:06:14 +01:00
scrawl
e62bf8fca9
Remove some garbage
2014-01-25 16:41:26 +01:00
scrawl
79a9c4e048
Clear mShared before populating it. Fixes an issue with duplicate records (e.g. dialogue keywords) after loading a savegame.
2014-01-25 16:33:39 +01:00
scrawl
bdb03926c2
Fix crash when loading another game after dying
2014-01-25 16:13:45 +01:00
scrawl
28185e2017
Death/godmode fixes: Revive player *after* character update, since there might be fall damage.
2014-01-25 15:54:24 +01:00
scrawl
f09328ca84
Clear global map overlay when starting/loading a game
2014-01-25 13:34:56 +01:00
Marek Kochanowicz
032c542396
improving the cell cloning.
2014-01-24 20:34:33 +01:00
gus
707e579dfe
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2
...
Conflicts:
apps/openmw/mwmechanics/aifollow.cpp
2014-01-24 19:16:50 +01:00
gus
5ca5946760
WIP
2014-01-24 19:13:23 +01:00
scrawl
03cf383be7
Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
...
Conflicts:
apps/openmw/mwgui/referenceinterface.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwscript/cellextensions.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/worldimp.cpp
2014-01-24 18:28:35 +01:00
scrawl
295aed3533
Implement savegame screenshots
2014-01-24 17:49:16 +01:00
scrawl
786ed6ca5b
Include some required Ogre headers explicitely
2014-01-24 15:02:34 +01:00
scrawl
ac1859fb77
Merge branch 'savedgame' of https://github.com/zinnschlag/openmw into savedgame
2014-01-24 15:02:13 +01:00
scrawl
9b9c39af7a
Fix being able to activate magic bolts mid-flight
2014-01-24 13:22:39 +01:00
scrawl
ac4c904e62
Fix projectile bug
2014-01-24 13:22:30 +01:00
Marek Kochanowicz
01be9386d6
Id to the coordinates with the boost and explicit specialisations of template member functions.
2014-01-24 11:22:20 +01:00
mrcheko
87e83a92f8
refactoring of setting an attack type
2014-01-23 23:14:20 +02:00
Marek Kochanowicz
f390c7f4b0
Disable widgets in the cell creator.
2014-01-23 16:24:03 +01:00
Marek Kochanowicz
c87d9ff38d
Disable reference creator widget when in the clone mode.
2014-01-23 16:17:04 +01:00
Marek Kochanowicz
dda7ddb6f8
Disable not needed referencable creator widget when in cloning mode.
2014-01-23 16:00:44 +01:00
Marek Kochanowicz
1b1ecafdd8
introduced missing columns to data
2014-01-23 15:13:37 +01:00
pvdk
19bef4fce8
Distinguish between release and development builds
2014-01-23 13:18:05 +01:00
scrawl
70264eae3b
Feature #764 : Quest completetion status in quest book
2014-01-23 13:08:56 +01:00
scrawl
849ee54399
Feature #764 : Show quest names in quest book if present
2014-01-23 12:54:37 +01:00
Marc Zinnschlag
460089c0aa
ignore deleted references that did not came from a content file
2014-01-23 12:53:55 +01:00
Marc Zinnschlag
419e3a7d30
write references in cells to saved game file
2014-01-23 12:51:42 +01:00
scrawl
358cc3c62f
Closes #1060 : Fix incorrect message box size
2014-01-23 12:24:06 +01:00
Marc Zinnschlag
22cb4784b5
store cell state in saved game files (no references yet)
2014-01-23 11:29:40 +01:00
Marek Kochanowicz
4d9d31b25e
refrences cloning does not work
2014-01-23 09:41:09 +01:00
pvdk
c354cd52be
Added compile date and time to the version info in the launcher
2014-01-22 18:37:49 +01:00
pvdk
fa186f5ec1
Added version information to the launcher
2014-01-22 17:51:10 +01:00
pvdk
c95b8bcb39
Moved the generated version header stuff into components
2014-01-22 17:33:55 +01:00
scrawl
cf378ec31e
Support optional volume and pitch arguments for soundgen events (e.g. moan 0.5 1.0) as required for some actors
2014-01-22 15:25:03 +01:00
scrawl
2e6e0fd0a0
Fix GetPcCell bug
2014-01-22 14:45:36 +01:00
scrawl
ea21d8fec3
Fix CreatureTargetted function
2014-01-22 13:30:45 +01:00
scrawl
4c94289b1f
Fix PC Health Percent function
2014-01-22 13:30:07 +01:00
scrawl
f27701cbe8
Detect selling stolen items or enchanting with stolen items
2014-01-22 13:04:55 +01:00
scrawl
264226dfe3
Handle iWereWolfBounty
2014-01-22 12:33:47 +01:00
scrawl
194413c955
Feature #1119 : Implement Resistance/Weakness to normal weapons magic effect. Handle fWereWolfSilverWeaponDamageMult.
2014-01-22 12:26:53 +01:00
scrawl
f89c400305
Don't complain about greetings with no sound
2014-01-22 00:02:43 +01:00
scrawl
16f5f5862d
Feature #956 : Implement blocking melee attacks
2014-01-21 23:25:24 +01:00
Marek Kochanowicz
b3b51992ef
copying references.
2014-01-21 21:37:21 +01:00
Marc Zinnschlag
9ebe66e693
improved cleanup; failed loads will now drop back into the main menu instead of crashing
2014-01-21 14:50:58 +01:00
Marc Zinnschlag
0f60898517
adding missing cleanup for SoundManager
2014-01-21 14:13:13 +01:00
scrawl
82a07af72c
Fix typo (should be Strength, not Luck). Use GMSTs for strength damage.
2014-01-21 12:30:23 +01:00
scrawl
1617a4f7d9
Use fCombatDistance
2014-01-21 12:30:23 +01:00
scrawl
a4404054bb
Feature #1130 : Add race power spells for NPCs as well, not just the player
2014-01-21 12:30:23 +01:00
scrawl
5de8c7fe29
Feature #1130 : Add auto-calculated NPC spells
2014-01-21 12:30:23 +01:00
scrawl
851a7d5014
Feature #957 : Handle area effects for "on touch" range
2014-01-21 12:30:15 +01:00
Marek Kochanowicz
bc0130f8d8
do not double check if record is deleted
2014-01-21 10:35:08 +01:00
Marek Kochanowicz
9b56b6585b
Cloning works for referencables as well.
2014-01-21 09:43:02 +01:00
Marek Kochanowicz
7594bcf97a
Small refactoring.
2014-01-21 08:27:29 +01:00
Marek Kochanowicz
d0a52b7b24
mostly refreshing view.
2014-01-20 18:28:06 +01:00
Marek Kochanowicz
92ee252eef
Small correction.
2014-01-20 16:39:42 +01:00
Marek Kochanowicz
d82f272e05
Properly check if clone is deleted.
2014-01-20 16:17:49 +01:00
Marek Kochanowicz
5a52715701
implemented check for deletion. But it seems flawed.
2014-01-20 15:58:19 +01:00
Marek Kochanowicz
38636fab9a
added setId to adapter
2014-01-20 14:38:20 +01:00
Marek Kochanowicz
a45339bbe6
lower case in command, not in the collection
2014-01-20 14:14:59 +01:00
Marek Kochanowicz
33620a001b
Cloning works for single record type tables. Well, kinda.
2014-01-20 13:59:00 +01:00
scrawl
c8a9e9f7fa
Stop AiCombat when the target is dead
2014-01-20 13:54:10 +01:00
scrawl
42284603f7
Properly handle on target effects with mArea=0
2014-01-20 13:44:38 +01:00
scrawl
9cedd3bb2e
Fix spell area not displaying in tooltip
2014-01-20 13:11:34 +01:00
scrawl
205e8aa4e9
Feature #957 : Implement area magic
2014-01-20 13:11:29 +01:00
scrawl
ba5300b071
Update the Ptr in SoundManager for references moved to a different cell. Fixes looping sounds not stopping after a moved object was already deleted.
2014-01-20 12:05:13 +01:00
scrawl
5dd3cfa09a
Loop projectile sounds
2014-01-20 11:50:52 +01:00
scrawl
df7c139e2f
Merge remote-tracking branch 'mrcheko/master'
2014-01-19 21:23:04 +01:00
scrawl
fec26342cd
Query the number of animation groups for death/hit animations, since they can vary a lot (argonian/khajiit, creatures, first person..)
2014-01-19 21:11:48 +01:00
mrcheko
339399f8b1
bug fix/logic fix/future suggestion
2014-01-19 22:09:51 +02:00
scrawl
05e75e1214
Closes #1127 : Fix for subtitles for idle dialogue appearing outside of hearing range
2014-01-19 20:54:05 +01:00
scrawl
bea161331c
Play 'hello' voiced dialogue entries in AIWander
2014-01-19 20:53:58 +01:00
Marek Kochanowicz
0ea2bb7c4c
Working on commands
2014-01-19 16:49:39 +01:00
scrawl
0adc0f56ed
Issue #777 : Consider weapons in Creature::hit
2014-01-19 16:13:16 +01:00
scrawl
9723263730
Bug #1126 : Tweak creature attack distance a bit (still no idea where this should come from)
2014-01-19 14:47:58 +01:00
scrawl
1a00f26390
Bug #1126 : Golden saints and many other creatures only have "Bip01 Head"
2014-01-19 14:33:41 +01:00
scrawl
4e360136b1
Merge remote-tracking branch 'mrcheko/master'
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/character.cpp
apps/openmw/mwmechanics/character.hpp
2014-01-19 14:01:39 +01:00
scrawl
047bbe43b2
Don't complain about missing jump animations
2014-01-19 13:46:40 +01:00
scrawl
13646a651b
Issue #777 : Handle creatures with weapons in CharacterController. Move attack strength to CreatureStats.
2014-01-19 13:32:58 +01:00
scrawl
198bb0de60
Issue #777 : Add CreatureAnimation variant for creatures with weapons/shields
2014-01-19 13:05:26 +01:00
Marek Kochanowicz
b3e45c55bc
progressing with the cloning
2014-01-19 11:44:47 +01:00
scrawl
589fbbd871
Issue #777 : Create InventoryStore for creatures with weapons/shields
2014-01-19 11:43:23 +01:00
scrawl
69ca03c308
Issue #777 : Move DrawState to CreatureStats. All creatures can cast spells, and some creatures have weapons.
2014-01-19 09:43:41 +01:00
scrawl
947b6c9645
kOgrePi unused
2014-01-18 22:16:31 +01:00
scrawl
4c0045b418
Bug #1109 : Do not reset water level when loading a plugin with no water level record (for real this time)
2014-01-18 21:11:12 +01:00
Marc Zinnschlag
14e64c180f
on load check player record for dangling ID references
2014-01-18 15:06:58 +01:00
Marc Zinnschlag
6584a01d01
reset reference to player NPC record during cleanup
2014-01-18 14:53:25 +01:00
mrcheko
969340d61b
fixed StartCombat script
2014-01-18 12:55:17 +02:00
scrawl
525ce2f042
Some cleanup - move definitions to implementation file
2014-01-18 10:52:16 +01:00
scrawl
c04a8afc8b
Make sure onPcEquip is also set for Equip script instruction
2014-01-18 10:51:52 +01:00
scrawl
9653355cf1
Feature #701 : Spawn levelled creatures in cells
2014-01-18 07:26:27 +01:00
mrcheko
df4df5b094
fixed weapRange for creatures/startcombat script(?)
2014-01-17 23:30:28 +02:00
scrawl
5049f3b134
Fix the group for creature attack animations
2014-01-17 20:18:35 +01:00
mrcheko
a11a6b616b
Merge remote-tracking branch 'upstream/master'
2014-01-17 21:00:55 +02:00
mrcheko
435bbdd530
one more mismatch fixed
2014-01-17 20:55:21 +02:00
mrcheko
46a4790cb1
final warnings removal
2014-01-17 20:33:49 +02:00
mrcheko
7df8273d71
fix for everybody
2014-01-17 20:01:15 +02:00
scrawl
3dcb292bc1
Do not soul trap creatures without a soul (which apparently exist)
2014-01-17 18:43:45 +01:00
mrcheko
5357f569e6
fix for scrawl
2014-01-17 19:36:22 +02:00
scrawl
149d77dedf
Feature #960 : Add knockdown and hit recovery for creatures
2014-01-17 17:41:16 +01:00
scrawl
9b32b1403b
Feature #960 : Implement Creature::hit
2014-01-17 17:19:08 +01:00
scrawl
228254c890
Handle creature attack animations in character controller
2014-01-17 16:31:27 +01:00
scrawl
c76a0448a3
Closes #1123 : Implement SlowFall magic effect
2014-01-17 15:47:34 +01:00
scrawl
27d0d9c592
Fix exception when clicking on statics when in the inventory window
2014-01-17 15:27:59 +01:00
scrawl
5fc38e7ac4
Don't use blood effects for fatigue damage
2014-01-17 15:20:28 +01:00
scrawl
c548dcee13
Quick keys menu: make sure selected spell still exists
2014-01-17 15:20:22 +01:00
Marc Zinnschlag
1b7697a4b2
handle missing player specific state during load/save
2014-01-17 13:07:57 +01:00
scrawl
805843d7ff
Closes #1086 : Implement blood effects
2014-01-17 11:27:13 +01:00
scrawl
240d96a0f1
Renamed AnimationValue to AnimationTime
2014-01-17 10:55:46 +01:00
scrawl
11394d83c5
Feature #1086 : Import blood models/textures in MWIniImporter
2014-01-17 10:55:46 +01:00
scrawl
ddc432c7ef
Fix stealing bug
2014-01-17 10:55:46 +01:00
scrawl
e410eb5273
Play 'Idle' voiced dialogue entries in AIWander. Tweak voice max distance.
2014-01-17 10:55:46 +01:00
scrawl
2836c7c927
Do not set owner when adding items to a container, as opposed to NPC/creatures
2014-01-17 10:55:46 +01:00
scrawl
fe66012bcd
Closes #1115 : Fix a bug causing number of AI packages to grow exponentially when adding an AI package. Not sure if adding the same package twice should even be allowed.
2014-01-17 10:55:46 +01:00
scrawl
f070d9966d
Implement movement speed formula for creatures. Still moving a bit too slow.
2014-01-17 10:55:46 +01:00
mrcheko
f2ad1c18f2
fix merging problem/some logic fixes
2014-01-16 22:24:05 +02:00
Alexander "Ace" Olofsson
ddf72c06de
Update statswindow.cpp
...
Fixes a build issue on MSVC ('floor' : ambiguous call to overloaded function)
2014-01-16 12:09:50 +01:00
Marc Zinnschlag
c300cd9375
loading/saving of some player state (cell/coordinates and some other bits)
2014-01-16 12:03:23 +01:00
mrcheko
d5f794d4fb
update to combat ai behaviour
2014-01-15 22:56:55 +02:00
scrawl
ea8f60eddf
Implement movement speed formula for creatures. Still moving a bit too slow.
2014-01-15 16:30:16 +01:00
scrawl
d544551f61
Added getSkill to Class interface, since creatures also have skills (which are provided by generalized Combat, Magic and Stealth attributes which substitute for the specific skills, in the same way as specialization)
...
Information provided by Hrnchamd.
2014-01-15 15:50:45 +01:00
scrawl
7534fc968d
Minor acrobatics fixes
2014-01-15 14:53:30 +01:00
scrawl
28a2585106
Unsheath weapon in AiWander
2014-01-15 14:53:29 +01:00
scrawl
dff67bb0b6
StopCombat: mark as non-hostile
2014-01-15 14:53:29 +01:00
scrawl
da3295d69c
Closes #1106 : Move stance to CreatureStats, since creatures also have separate run/walk animations.
2014-01-15 14:53:29 +01:00
scrawl
03b2e99802
Remove unused Combat stance
2014-01-15 14:53:29 +01:00
scrawl
d0500e8124
Some unneeded includes cleanup
2014-01-15 14:53:28 +01:00
scrawl
0c4b6ea89f
Minor fix
2014-01-15 14:53:28 +01:00
scrawl
a432661b8a
Minor correction
2014-01-15 14:53:28 +01:00
scrawl
de64c57179
Fix some typos and accidental commit
2014-01-15 14:53:28 +01:00
Marc Zinnschlag
bf1a37dc38
Merge remote-tracking branch 'sirherrbatka/referencables_verifer'
2014-01-15 14:29:54 +01:00
Marek Kochanowicz
6224344957
Being any idiot is hard.
2014-01-15 12:52:38 +01:00
Marek Kochanowicz
3d722ba104
Corrected brackets.
2014-01-15 11:59:11 +01:00
Marek Kochanowicz
fbcb1a14fc
ooops, using search id
2014-01-15 11:12:56 +01:00
Marek Kochanowicz
89d4a90c06
Localised version of morrowind will no longer spam false positives. Don't check diff, please.
2014-01-15 10:30:43 +01:00
Marek Kochanowicz
344cae8f99
added new entry to the context menu
2014-01-14 15:44:04 +01:00
greye
61707694e8
fix memory leak in AISequence
2014-01-14 16:22:50 +04:00
Marek Kochanowicz
6397d9d40e
Added mCloneAction member
2014-01-14 13:12:15 +01:00
greye
15d946415e
minor cleanup
...
Removed case folding via std::transform, excessive lowerCase()
replaced with ciEqual().
2014-01-14 12:46:53 +04:00
Marek Kochanowicz
c981a2a6f8
Removed boost in favor of #include <components/misc/stringops.hpp>. Hopefully this will make scrawl happy. :P
2014-01-14 09:25:03 +01:00
Marek Kochanowicz
2c1ef610b9
Moving back to boost for case insensitive comparsion.
2014-01-14 09:16:59 +01:00
scrawl
52b9ebff9d
Closes #1092 : Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell.
2014-01-14 07:42:03 +01:00
scrawl
69381c49c7
Added a todo comment
2014-01-14 07:39:44 +01:00
scrawl
b8583124e0
Correction for RemoveSoulgem instruction
2014-01-14 06:13:30 +01:00
scrawl
90b92a8f41
Move levelled list code out of ContainerStore
2014-01-14 05:37:06 +01:00
scrawl
6aa56354c0
Revert "Bug #991 : Don't autoequip items with harmful permanent enchantments"
...
This is no longer needed, since merchants no longer equip items sold to them (2f35e5a04e
). Also, items with harmful enchantments that are initially in the NPCs inventory *must* be equipped (e.g. slave bracers)
This reverts commit 71d9755ef1
.
2014-01-14 05:24:58 +01:00
scrawl
9de3abcb5f
Closes #1105 : Do not reduce magicka if unable to cast
2014-01-14 03:34:30 +01:00
scrawl
396efd580b
Fix a leftover of the old coordinate system
2014-01-14 03:26:56 +01:00
scrawl
2196ce427a
Closes #556 : Link movie volume to 'master' volume slider, instead of 'music'.
2014-01-14 03:08:37 +01:00
scrawl
95651857f3
Fix code duplication
2014-01-14 02:52:34 +01:00
scrawl
0d0005c433
Fix fatigue not restoring when waiting
2014-01-14 02:20:13 +01:00
Marek Kochanowicz
e34cb9e931
changed according to the scrawl sugestion
2014-01-13 19:17:03 +01:00
Marek Kochanowicz
59de794e58
Creature check was not invoked.
2014-01-13 19:02:23 +01:00
Marek Kochanowicz
17cc6a695c
fixed bug resposnsible for exception throwed.
2014-01-13 18:34:28 +01:00
scrawl
ba27b693f8
Increase sneak skill on successful pickpocket
2014-01-13 10:18:03 +01:00
scrawl
73268a8606
Fix skill progress not working
2014-01-13 10:18:03 +01:00
scrawl
cd06b2177d
Automatically knock down when fatigue goes below zero
2014-01-13 10:18:03 +01:00
scrawl
413bf127de
Allow drain fatigue effect to reduce below zero
2014-01-13 10:18:02 +01:00
scrawl
3a1b6dd354
Handle fCombatKODamageMult and fCombatCriticalStrikeMult. Fix SelectWrapper Function_Detected.
2014-01-13 10:18:02 +01:00
scrawl
83872f6bf5
Knockdown / hit recovery improvements. Use formula and GMSTs from research wiki for knockdown determination. Hand-to-hand automatically knocks out when fatigue empty.
2014-01-13 10:18:02 +01:00
Marc Zinnschlag
3e58eb34e4
Merge remote-tracking branch 'sergeyshambir/startcombat'
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2014-01-13 10:17:10 +01:00
Marc Zinnschlag
63cd70f810
some junk removal
2014-01-13 10:03:25 +01:00
scrawl
7983b07b10
Get bk_treasuryreport script to work properly:
...
- OnPcEquip needs to be set on *using* any item, not just equipping
- Handle PcSkipEquip
- Execute item's script once immediately after setting OnPcEquip
- Do not set OnPcEquip when an item that has skipped equipping sets pcskipequip back to 0 and gets equipped
2014-01-13 06:20:18 +01:00
gus
5d4e148063
some clean up
2014-01-12 22:47:22 +01:00
gus
5d038423ec
attempt to solve Bug #1009 by not building graph every frame
2014-01-12 18:42:31 +01:00
Marc Zinnschlag
9025210965
Merge branch 'refnum' into savedgame
...
Conflicts:
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/manualref.hpp
components/esm/cellref.hpp
2014-01-12 16:58:06 +01:00
gus
0e46c40cb5
Make ACtionTeleport non player specific and teleport actors following the teleporting actor
2014-01-12 14:03:11 +01:00
gus
1ae62665d6
get all actors following a given actor
2014-01-12 14:02:40 +01:00
gus
dd870e35db
get all actors following a given actor
2014-01-12 14:02:15 +01:00
gus
2446abe076
Allow getting current active package
2014-01-12 14:01:54 +01:00
gus
7e96a391da
FollowCell duration = 0 -> infinite time
2014-01-12 11:39:42 +01:00
gus
7066844e52
Follow you until a certain cell is reached
2014-01-12 11:38:58 +01:00
scrawl
f78b846f9e
Handle CasterLinked magic effect flag
2014-01-12 10:21:49 +01:00
scrawl
767c72e619
Fix diagonal movement being faster than forward movement
2014-01-12 10:04:06 +01:00
scrawl
fb778f8ecd
Use fEncumbranceStrMult
2014-01-12 04:09:51 +01:00
scrawl
1d19d36bd6
Remove unused magic effect flags and update esmtool output
2014-01-12 01:25:00 +01:00
scrawl
921ef6cd9c
Closes #1093 : Show weapon when initializing the character controller with a weapon equipped
2014-01-12 00:42:27 +01:00
scrawl
10ddea45e9
Move crime from onHit to hit, since failed hits are apparently also a crime
2014-01-11 23:12:21 +01:00
scrawl
44b2380874
Closes #947 : Decrease fatigue when running, swimming and attacking
2014-01-11 22:28:50 +01:00
scrawl
dddc0979a2
Fix another fatigue cap issue
2014-01-11 22:28:50 +01:00
scrawl
224f288359
Don't attempt to change disposition for creatures
2014-01-11 21:30:26 +01:00
scrawl
3db299f1b2
Fix fall damage crash
2014-01-11 21:30:26 +01:00
gus
051d7141be
check position to stop AIFollow
2014-01-11 20:32:38 +01:00
Marc Zinnschlag
5ea25dc269
player state cleanup
2014-01-11 15:34:32 +01:00
Marc Zinnschlag
b1ffb64a1f
Merge remote-tracking branch 'gus/AIFix2'
2014-01-11 14:33:27 +01:00
gus
ccf07f9406
Bugfix
2014-01-11 12:07:10 +01:00
gus
2d66b2c4fa
AiFollow. Npc get stuck often (no stuck dtection yet)
2014-01-11 12:06:36 +01:00
gus
f41f08c352
Wrong logic... should improve performances
2014-01-11 12:04:32 +01:00
gus
0609b71df9
fix pathfinding
2014-01-11 11:57:07 +01:00
Marc Zinnschlag
a0872b2646
Merge remote-tracking branch 'gus/AIFix2'
2014-01-11 11:51:53 +01:00
Marc Zinnschlag
1b03eec63e
Merge remote-tracking branch 'scrawl/master'
2014-01-11 11:43:12 +01:00
gus
828e5841d8
Windows SDL fix
2014-01-11 11:00:34 +01:00
scrawl
a2ba0dde31
Implemented GoToJail
2014-01-11 06:47:58 +01:00
scrawl
3896c88403
Use VFX_DefaultCast / VFX_DefaultHit if the magic effect does not specify any
2014-01-11 05:58:05 +01:00
scrawl
9ddee8fd8c
Autocalculate NPC reputation as according to research wiki
2014-01-11 04:03:13 +01:00
scrawl
9127839cc1
Add a searchPtr method as required for getting an owner, which may already be dead and disposed of.
2014-01-11 03:33:17 +01:00
scrawl
bf6d302fba
Confiscate stolen items when caught
2014-01-11 03:29:41 +01:00
scrawl
909494ff35
Implement Assault crimes. In other words, NPCs now fight back!
2014-01-11 03:08:16 +01:00
scrawl
12944f2459
Fix an auto equipping bug that allowed twohanded weapon and shield at the same time
2014-01-11 03:07:35 +01:00
scrawl
d4a98ffc27
Increase fight rating when being the victim of a crime
2014-01-11 02:27:44 +01:00
scrawl
aba72ffefe
Fix up the merge a bit
2014-01-11 02:12:41 +01:00
scrawl
727aa30347
Dead actors are unaware of everything
2014-01-11 02:06:54 +01:00
scrawl
d01f89b153
Rewrite some awful code
2014-01-11 00:24:21 +01:00
scrawl
e9f63270d9
Speed fix for "on target" spells
2014-01-10 22:51:42 +01:00
scrawl
621e52f09d
Play "attack" voiced dialogue entries randomly based on iVoiceAttackOdds.
2014-01-10 22:48:42 +01:00
scrawl
d9d6f37619
Use iVoiceHitOdds
2014-01-10 22:44:40 +01:00
scrawl
15e48107f7
Use i1stPersonSneakDelta + some cleanup
2014-01-10 22:39:01 +01:00
scrawl
2744cde40f
Use a few additional GMSTs
2014-01-10 22:27:31 +01:00
scrawl
3bf36515d5
Implement Trespassing crime
2014-01-10 21:26:24 +01:00
scrawl
f5a70dccf0
Fix title of buttons in generate class result dialog
2014-01-10 21:13:03 +01:00
scrawl
627dcddb33
Do not allow training skills above their governing attribute
2014-01-10 20:53:53 +01:00
Marc Zinnschlag
f62497dfdc
Merge remote-tracking branch 'mrcheko/master'
2014-01-10 19:08:35 +01:00
mrcheko
ffcb7fb280
fix for bug scrawl mentioned
2014-01-10 19:04:07 +02:00
Marek Kochanowicz
cb0d3794f7
Final check is not performed with just +1! Something is not right.
2014-01-10 11:01:29 +01:00
Marek Kochanowicz
688488de62
replaced == operator for string comparsion in npc check with boost algorithm to get case insensitive check.
2014-01-10 10:43:03 +01:00
Marek Kochanowicz
31c59db71c
Splited another long line in the header.
2014-01-10 10:22:18 +01:00
Marek Kochanowicz
468b9d7340
camel case in the header
2014-01-10 09:50:56 +01:00
Marek Kochanowicz
e4d637fd64
splited long lines in the header.
2014-01-10 09:49:05 +01:00
Marek Kochanowicz
b98cdabe89
Shameful bug fixed.
2014-01-10 09:42:36 +01:00
mrcheko
d41f27451b
appropriate camera vanity<>preview mode switch + hit recoils fix
2014-01-09 23:36:40 +02:00
scrawl
546b0cee76
Closes #1077 : Replace tags before trying to get the message length
2014-01-09 22:17:51 +01:00
scrawl
aa855e9524
Include some required Ogre headers explicitely
2014-01-09 20:56:24 +01:00
Marc Zinnschlag
5e2eb8caf8
Merge remote-tracking branch 'swick/master'
2014-01-09 09:47:42 +01:00
Marc Zinnschlag
85707b5e3e
Merge remote-tracking branch 'scrawl/master'
2014-01-09 09:35:54 +01:00
scrawl
768d9f7237
Scripting: Add an optional 'required' parameter to getReference (default: true). If required=false, it will not throw an exception if there's no reference. Fixes PcExpell not working without a reference like it's supposed to, and makes the code nicer for some others (use required=false instead of catching the exception)
2014-01-09 02:21:03 +01:00
scrawl
223c1d5a38
Use GMSTs for crime bounty
2014-01-09 02:20:52 +01:00
scrawl
6f9113fe88
Add preliminary implementation of PayFine, PayFineThief and GoToJail instructions
2014-01-09 01:49:58 +01:00
scrawl
baf55df7a1
Gold fixes (when did this break?)
2014-01-09 01:34:10 +01:00
Sebastian Wick
925d28e4a7
crashcatcher uname error checking
2014-01-09 00:52:37 +01:00
scrawl
9bf7bf529c
Implement crime-related dialogue globals as they are described in MSFD
2014-01-09 00:40:25 +01:00
scrawl
d7f69205f6
Don't play "Menu Click" sound for disabled (= cannot receive input) buttons, plus some redundancy fixes
2014-01-09 00:06:24 +01:00
scrawl
0f5dc59176
Remove useless dependencies on InventoryWindow for getting player gold. Don't use string literals for gold_001 id, just to be sure.
2014-01-08 23:37:46 +01:00
scrawl
372cd437d1
Add a utility function for counting items in a container
2014-01-08 23:00:29 +01:00
scrawl
c55f9bd0aa
GetWaterLevel fix (similar to MCP): if there is no water in the cell, return -FLT_MAX to prevent mods from incorrectly thinking the player is underwater.
2014-01-08 20:19:47 +01:00
Marc Zinnschlag
7c8f735004
Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28
2014-01-08 20:16:39 +01:00
Marc Zinnschlag
a7be755db0
Merge remote-tracking branch 'mrcheko/master'
2014-01-08 20:13:31 +01:00
scrawl
bf02b77c1d
Closes #1090 : Don't throw an exception if a cell has no region in GetPCCell
2014-01-08 19:57:13 +01:00
scrawl
154fae9f25
Don't suppress exceptions thrown while running scripts
2014-01-08 19:52:57 +01:00
scrawl
9baa1bef78
Expell player from faction when committing a crime against a faction member
2014-01-08 19:26:03 +01:00
scrawl
19d63f392f
Clean up the NpcStats expelled interface. Show message box when expelled.
2014-01-08 18:59:00 +01:00
scrawl
098f9712f1
Add getPlayerPtr() utility method. Reduces dependencies a lot.
2014-01-08 18:39:44 +01:00
scrawl
7b33f6f2ac
Detect crime of sleeping in other NPC's beds. ShowRestMenu needs to support an explicit/implicit reference for this.
2014-01-08 17:19:43 +01:00
scrawl
b99ca92fee
Add missing line of sight check
2014-01-08 17:18:13 +01:00
Nikolay Kasyanov
bc90443aeb
Revert "Music playback on OS X >= 10.9 works again. Fixes bug #1041."
...
This reverts commit fc21dd1f3a
.
2014-01-08 18:07:58 +04:00
mrcheko
46519062d3
hit recoils/knockdowns feature
2014-01-08 16:05:14 +02:00
scrawl
2bb21f2f76
Don't copy NpcStats/CreatureStats unnecessarily. Fixes a bug: taunt actions would not correctly increase the target's fight rating.
2014-01-08 02:35:36 +01:00
scrawl
c85c2cff4e
Fix disposition changes from trades not applying properly
2014-01-08 01:46:42 +01:00
scrawl
728365b48d
Remove an unused hook
2014-01-07 21:07:02 +01:00
scrawl
03b6334ceb
Get rid of a hack
2014-01-07 20:43:08 +01:00
scrawl
0285d18fc2
Respect items belonging to a faction
2014-01-07 20:24:01 +01:00
scrawl
3c0080d2c1
Implement theft detection
2014-01-07 19:58:17 +01:00
scrawl
d2d76f4f47
Fix disintegration bug
2014-01-07 19:21:19 +01:00
scrawl
c4ab2f417a
Fix exception closing container window
2014-01-07 18:11:19 +01:00
scrawl
90b55c8d4b
Use Ogre's asin/acos functions which will protect against NaNs
2014-01-07 17:09:08 +01:00
Marc Zinnschlag
48a08c4c4d
Merge remote-tracking branch 'endorph/master'
2014-01-07 14:12:15 +01:00
Dmitriy 'Endorph' Shkurskiy
9afa8e952e
tabs -> spaces
2014-01-07 14:32:14 +02:00
Marc Zinnschlag
72a81a2381
Merge remote-tracking branch 'scrawl/master'
2014-01-07 10:17:33 +01:00
scrawl
780bf5a2cd
Implement pickpocket detection. Play a voiced dialogue entry when detected.
2014-01-07 03:01:33 +01:00
scrawl
ea3ee4407f
oops, didn't mean to commit this
2014-01-07 02:48:44 +01:00
Sergey Shambir
d5a0ff17fd
MWScript: updated vmformat.txt, changed opcodes to fix sequence.
...
Opcodes for StartCombat, StopCombat, GetTarget now follow the last
previous opcode.
2014-01-07 05:06:20 +04:00
Sergey Shambir
d536ff3cdc
printAIPackage: changed field name from Unknown to ShouldRepeat too.
2014-01-07 04:58:59 +04:00
Sergey Shambir
5c7e39a92f
Implemented script commands StartCombat, StopCombat, GetTarget.
...
Also renamed one field of AIWander class because it's not longer
unknown.
2014-01-07 04:43:06 +04:00
scrawl
887db76ed2
Don't consider swimming or in-air characters as sneaking
2014-01-07 01:22:04 +01:00
scrawl
29c823b9d4
Implement awareness check function. Use this for combat AI and GetDetected instruction.
2014-01-07 00:51:09 +01:00
scrawl
4a3d148a48
Fixes #1089 (skill increases)
2014-01-07 00:37:52 +01:00
Marek Kochanowicz
b85fe2becf
Changes according to the comment.
2014-01-06 23:37:18 +01:00
Marc Zinnschlag
fefaec5804
Merge remote-tracking branch 'scrawl/savedgame' into savedgame
2014-01-06 22:30:08 +01:00
scrawl
68b87714bb
Addition to 2f35e5a04e
: companions should still auto equip
2014-01-06 22:14:11 +01:00
mrcheko
2591ff2d5a
bug repairing
2014-01-06 22:00:01 +02:00
Marek Kochanowicz
06f8537087
added final check for player npc. Removed useless includes. However, this code spams exceptions and I can't figure out why.
2014-01-06 18:43:44 +01:00
Marc Zinnschlag
43dd3b8ef2
removed redundant deletion flag from CellRef
2014-01-06 13:53:20 +01:00
Marc Zinnschlag
0ad7aa1f53
Merge remote-tracking branch 'scrawl/master'
2014-01-06 10:22:07 +01:00
scrawl
62774fcc4a
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwbase/world.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/loadtes3.cpp
2014-01-06 00:23:17 +01:00
scrawl
2f35e5a04e
Stop merchants from autoequipping items sold to them
2014-01-05 22:43:09 +01:00
Marc Zinnschlag
e63b4964b2
Merge remote-tracking branch 'scrawl/master'
2014-01-05 21:27:06 +01:00
scrawl
dde2cd5d5a
Fix some code that still used setCount directly instead of using the ContainerStore interface. Also fix a related annoyance with the interface.
2014-01-05 20:53:45 +01:00
scrawl
73f8161d1e
Fix spell deletion not resetting the selected spell correctly
2014-01-05 19:40:05 +01:00
scrawl
b3764c504a
Implement GetPcJumping instruction
2014-01-05 19:08:12 +01:00
scrawl
45847c67ad
Lock NIF cache when loading an interior cell as well. Should improve load performance.
2014-01-05 18:38:21 +01:00
scrawl
c004fb778f
Get rid of underscore defines. They are reserved by the standard.
2014-01-05 18:22:29 +01:00
scrawl
b8e9343764
Extend NifOverrides to allow material overrides, useful for texture modding e.g. adding normal maps without having to edit the affected meshes
2014-01-05 18:09:50 +01:00
Marek Kochanowicz
c69814ed14
corrected one, additional name to follow policy
2014-01-05 18:00:49 +01:00
Marek Kochanowicz
4338706307
static is a keyword. renamed static to staticElement
2014-01-05 17:31:54 +01:00
Marek Kochanowicz
80d424591f
npc instead of NPC.
2014-01-05 17:28:47 +01:00
Marek Kochanowicz
693c398204
forgot to save the file before comit -_-'
2014-01-05 17:05:57 +01:00
Marek Kochanowicz
873870c7ce
Chainging names to comply our policy.
2014-01-05 17:04:57 +01:00
scrawl
ce013315ba
Nothing to see here, move along.
...
Fine... it's flying cliff racers. But did you really want to know?
2014-01-05 16:09:06 +01:00
Marek Kochanowicz
c1f4a9cb0e
Added proper id check.
2014-01-05 12:18:26 +01:00
Marek Kochanowicz
89d8ee62fa
Removing name check from listCheck. Id can't be empty to be sure.
2014-01-05 12:12:36 +01:00
Marek Kochanowicz
220d92f865
changed ID check in leveled list to name.
2014-01-05 11:30:03 +01:00
scrawl
44e96fcaaa
Implement Charm magic effect
2014-01-05 01:56:36 +01:00
scrawl
14b70a3ce6
Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead)
2014-01-05 01:34:35 +01:00
scrawl
634a53211c
Make sure materials are built before trying to determine their transparency
2014-01-04 22:56:06 +01:00
pvdk
92234cf783
Changed crashcatcher's uname system info retrieval and cleaned indentation
2014-01-04 21:46:38 +01:00
scrawl
c4e4a8fb57
Closes #1083 : Fix werewolf change handling
2014-01-04 20:50:18 +01:00
scrawl
f4517c8221
For dialogue filtering, use the Vampirism magic effect instead of the untouched NpcStats::mVampire
2014-01-04 20:50:18 +01:00
mrcheko
7002412760
resolve conflict in character.cpp
2014-01-04 17:55:09 +02:00
Marek Kochanowicz
e860717105
replaced raw values with enums.
2014-01-04 15:28:08 +01:00
Marek Kochanowicz
558690b571
implemented list of magical bolts for skipping.
2014-01-04 15:19:17 +01:00
Marek Kochanowicz
dfd1058551
Various style corrections.
2014-01-04 14:49:01 +01:00
Marek Kochanowicz
aa05ffcf60
Splited some long argument lists to the multiple lines.
2014-01-04 13:05:19 +01:00
Marc Zinnschlag
356b53bd22
Merge remote-tracking branch 'scrawl/master'
2014-01-04 11:38:31 +01:00
Dmitriy 'Endorph' Shkurskiy
7023395012
Windows-specific definition to omit inclusion of unused stuff from Windows.h
2014-01-04 07:46:29 +02:00
Dmitriy 'Endorph' Shkurskiy
18d4cdb2ac
Fix for VS2010-Debug: manual assignment operator and cctor added for MMWorld::ContainerStoreIterator
2014-01-04 07:46:29 +02:00
scrawl
16838595a3
Another console fix: discard text markup when getting the command line's text
2014-01-04 05:24:32 +01:00
scrawl
1b96c5d266
Console improvements: Show scrollbar, allow copying text from the history
2014-01-04 05:13:53 +01:00
scrawl
710a1e2f37
Smash case for manual reference IDs as well, consistent with references in data files
2014-01-04 04:39:06 +01:00
scrawl
557652112f
Show the target HP bar also when casting a heal effect (same as MCP)
2014-01-04 04:21:44 +01:00
scrawl
12691040d1
Fix incorrect disposition testing and get rid of of a related hack that is no longer needed.
2014-01-04 02:49:10 +01:00
scrawl
09d491d1ba
Move a piece of functionality to its appropriate place
2014-01-04 01:13:19 +01:00
scrawl
be2ebc5cac
Closes #1081 : Implement disease contraction
2014-01-03 23:33:14 +01:00
scrawl
2a7d610f87
Implement GetSpellReadied instruction
2014-01-03 22:55:17 +01:00
scrawl
c0fbcf413f
Use the playermagic and playerfighting control switches
2014-01-03 22:44:35 +01:00
scrawl
e9bd43e2da
Use GMSTs for bound items/creatures
2014-01-03 20:54:14 +01:00
Marek Kochanowicz
1c3296fb64
Some changes in weapons check.
2014-01-03 18:25:06 +01:00
scrawl
617a65cdd2
Print message to dialogue window after successful trade
2014-01-03 17:40:14 +01:00
scrawl
b22dd40b41
Implement Paralyze magic effect
2014-01-03 17:06:05 +01:00
Marc Zinnschlag
ee621245bb
Merge remote-tracking branch 'scrawl/master'
2014-01-03 15:59:06 +01:00
scrawl
55c5d7cee4
Implement Resurrect instruction
2014-01-03 15:54:23 +01:00
Marek Kochanowicz
7b63e1942c
style corrections
2014-01-03 11:42:49 +01:00
Marek Kochanowicz
24f090ca98
Finishing stuff.
2014-01-03 11:31:54 +01:00
Marek Kochanowicz
8201c97abf
Inventory item template.
2014-01-03 09:16:41 +01:00
scrawl
b4230f716e
Implement RemoveEffects instruction
2014-01-03 05:19:10 +01:00
scrawl
7d8ca91286
Implement RemoveSpellEffects instruction
2014-01-03 05:18:44 +01:00
scrawl
366801f3d5
Implement explodeSpell instruction (like Cast, with caster = target)
2014-01-03 04:44:50 +01:00
scrawl
93e1a2df73
Implement Cast script instruction (shrines work now)
2014-01-03 04:09:52 +01:00
scrawl
b42240be6d
Implement Damage/restore skill/attribute effects. Use dedicated classes for skill and attribute values (instead of Stat<T>) since there are some important differences.
2014-01-03 03:48:43 +01:00
scrawl
32ff3b530c
Change all instances of skill/attribute values to use an appropriate typedef.
2014-01-03 01:59:15 +01:00
scrawl
623cdef69f
Code cleanup
2014-01-02 21:49:12 +01:00
scrawl
eba60858dd
Closes #1078 : Show stat bar text even when 0
2014-01-02 21:48:33 +01:00
Marc Zinnschlag
3b75f6676c
Merge remote-tracking branch 'scrawl/openmw-0.28' into openmw-28
2014-01-02 21:27:08 +01:00
scrawl
299690631f
Implement SoulTrap magic effect
2014-01-02 21:21:28 +01:00
mrcheko
79e972bdb6
resolved accompanying minor problems
2014-01-02 21:54:41 +02:00
Lukasz Gromanowski
b017a3be3e
Bug #1074 : Inventory paperdoll obscures armour rating
...
Changed size of inventory paperdoll.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-01-02 20:20:57 +01:00
scrawl
596e0c8a49
Correct Dispel effect (use magnitude as chance)
2014-01-02 20:15:07 +01:00
scrawl
94d2ec8e4e
Add missing spells update
2014-01-02 20:02:28 +01:00
Marc Zinnschlag
5d3b696eb6
Merge remote-tracking branch 'scrawl/master' into openmw-28
2014-01-02 19:52:47 +01:00
scrawl
12de351feb
Check if levitation is enabled before levitating
2014-01-02 16:38:23 +01:00
scrawl
0990ca4b75
Closes #1072 : Fix extra light being added multiple times when showCarriedLeft(true) is called repeatedly
2014-01-02 15:58:00 +01:00
scrawl
e6c0e187bc
Closes #1073 : Check for all gold types in canSell. For containers, only gold_001 is relevant, but items in the world can be sold as well.
2014-01-02 15:44:58 +01:00
Marc Zinnschlag
0d3e67dafc
Merge branch 'master' into openmw-28
2014-01-02 13:39:36 +01:00
Marc Zinnschlag
a6e6411686
Merge remote-tracking branch 'scrawl/master'
2014-01-02 12:12:52 +01:00
scrawl
c558e12212
Don't try to move objects that are not in a cell
2014-01-02 03:06:48 +01:00
scrawl
993edf0384
Bug #1063 : Safety check in moveObject. Required when items in containers execute script commands like setAtStart etc.
2014-01-02 02:27:48 +01:00
scrawl
0f2b2fabdb
Implement water walking
2014-01-02 02:03:44 +01:00
scrawl
783c501d70
Some checks to prevent bound item abuse
2014-01-02 01:36:08 +01:00
scrawl
590c8cb4a0
Implement Disintegrate effects. When an armor/weapon breaks, unequip it and do not allow equipping it again.
2014-01-02 01:03:44 +01:00
scrawl
899214a906
Use fVanityDelay
2014-01-02 00:13:23 +01:00
scrawl
c6421276bd
Closes #841 : Correct activation distance in third person mode
2014-01-01 23:59:17 +01:00
scrawl
24aa743573
Add function for converting feet to game units
2014-01-01 23:34:18 +01:00
scrawl
f6387d5979
Implement Telekinesis magic effect. Remove some duplicate code.
2014-01-01 23:30:58 +01:00
scrawl
531bef6193
Shorter Vector3 initialisation
2014-01-01 22:46:10 +01:00
scrawl
5729672262
Show marked position on map. Implement Detect X magic effects.
2014-01-01 22:37:52 +01:00
mrcheko
16e10cc702
error fix
2014-01-01 22:46:29 +02:00
scrawl
bfc9fcf2cd
Add starting spells when building player (F_PCStart flag)
2014-01-01 21:34:00 +01:00
mrcheko
09a0a69b04
more improvements
2014-01-01 21:40:31 +02:00
Marc Zinnschlag
1f4c192bf6
Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting'
2014-01-01 19:47:11 +01:00
Marc Zinnschlag
e1355be47c
Merge remote-tracking branch 'lgro/valgrind_warnings'
2014-01-01 19:41:52 +01:00
scrawl
eab7ffd6b4
Remove redundant finding of default exterior position height
2014-01-01 18:05:28 +01:00
scrawl
8e5cae1081
Implement mark/recall magic effects
2014-01-01 17:06:21 +01:00
Lukasz Gromanowski
2d4e06cd50
Updated comments about freeing format_ctx->pb->buffer.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-01-01 17:05:49 +01:00
Lukasz Gromanowski
722469d57b
Correction to the e9844e1
commit.
...
Restored interrior check in WeatherManager::update().
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-01-01 16:45:39 +01:00
scrawl
69ba8a40bf
Fix weird formatting added during the merge
2014-01-01 16:13:20 +01:00
scrawl
b3cd10dbea
Remove redundant setTeleported calls
2014-01-01 15:18:25 +01:00
Marc Zinnschlag
b19b277f18
temporarily disable OGRE-integration in OpenCS (need to sort out path problem first)
2014-01-01 15:16:51 +01:00
Marc Zinnschlag
c3482b6f24
Merge remote-tracking branch 'scrawl/master'
...
Conflicts:
apps/openmw/mwmechanics/spellcasting.cpp
2014-01-01 15:05:42 +01:00
Marc Zinnschlag
5fa9aa5d1e
Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting'
...
Conflicts:
apps/openmw/mwworld/weather.cpp
apps/openmw/mwworld/worldimp.cpp
2014-01-01 14:57:14 +01:00
scrawl
ea3b88951a
Implement divine/almsivi intervention magic effects
2014-01-01 02:22:11 +01:00
scrawl
c86760e3cd
Remember the last known exterior position of the player in case we fail to map the interior to a world position.
2014-01-01 01:10:55 +01:00
Lukasz Gromanowski
101813fd0d
Fixes #417 : Apply weather instantly when teleporting
...
Correction to previous commit - WeatherManager->update()
will always be called.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-31 21:18:10 +01:00
Lukasz Gromanowski
e9844e1b37
Fixes #417 : Apply weather instantly when teleporting
...
Changed teleporting detection from "position tracking" to manually
setting "teleportation" flag ( player->setTeleported(true) ).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-31 20:40:23 +01:00
scrawl
b02b966c44
Closes #994 : Don't cap skills to 100 when set via console (except for modX variants)
2013-12-31 19:11:16 +01:00
Marc Zinnschlag
c34b586b65
Merge remote-tracking branch 'ace/fix'
2013-12-31 18:37:12 +01:00
scrawl
3604b9d171
Closes #566 : In interior cells, update global map position marker using the first exterior teleport door
2013-12-31 18:35:46 +01:00
scrawl
be1938ee90
Closes #805 : Don't add entities that are supposed to be invisible to static geometry
2013-12-31 18:32:46 +01:00
Lukasz Gromanowski
1ce4663065
Updated compiler opcodes for COE, and setHello.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-31 18:13:38 +01:00
mrcheko
a8fb1ae51c
improved, added knockdown after falling
2013-12-31 17:55:04 +02:00
Alexander "Ace" Olofsson
8381cad5a4
Don't try to set a cursor before one exists
2013-12-31 14:13:42 +01:00
mrcheko
d6345bce91
added npc hit reactions
2013-12-31 13:24:20 +02:00
scrawl
94cdc1efd2
Enable mipmap generator for 1.9+
2013-12-31 00:54:40 +01:00
Lukasz Gromanowski
cb04f43384
Fixes for "Conditional jump or move depends on uninitialised value(s)"
...
and memleaks reported by valgrind.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-30 23:08:53 +01:00
Lukasz Gromanowski
6107d5bad2
Updated ffmpeg decoder fix
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-30 22:16:06 +01:00
Lukasz Gromanowski
5c5f87445b
Fixes for "Conditional jump or move depends on uninitialised value(s)"
...
and memleaks reported by valgrind.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-30 21:47:06 +01:00
Marek Kochanowicz
cb723710fe
Corrected stupid typo.
2013-12-30 19:24:53 +01:00
scrawl
b8ac37347c
Code cleanup for Class::canBeEquipped
2013-12-30 19:04:35 +01:00
Marek Kochanowicz
79bc149c73
reverting refidata.hpp
2013-12-30 18:47:19 +01:00
Marek Kochanowicz
a7de04d0a4
reverting refiddata.cpp
2013-12-30 18:46:18 +01:00
Marek Kochanowicz
4a1987ddec
correcting
2013-12-30 18:41:16 +01:00
scrawl
79a440e94a
Many additions to 900bc06d2c
:
...
- Fix indentation
- Consider any kind of light, not just torch_infinite_time
- Hostile NPCs should also wear lights, if they have nothing else that could use the slot (or a twohanded weapon)
- Remove redundant code and don't add additional lights to the inventory
- World::isDark returns false for interiors which are unaffected by weather
2013-12-30 17:57:41 +01:00
Marek Kochanowicz
3758fe3834
reformatted
2013-12-30 13:23:16 +01:00
Marek Kochanowicz
c89608f390
Check for head and hair. Correct faction check.
2013-12-30 11:39:03 +01:00
Scott Howard
2f082ef796
remove unneeded libraries
2013-12-29 16:25:49 -05:00
Marek Kochanowicz
842e26b8e5
added comment
2013-12-29 21:53:33 +01:00
Marek Kochanowicz
13637e7166
Dynamic_casting, checking rank. Commented out faction check, since it will not work.
2013-12-29 21:45:09 +01:00
Marek Kochanowicz
e321d571e1
Added faction check.
2013-12-29 21:06:08 +01:00
Marek Kochanowicz
9df6d23afc
removing member size values, since this does not work properly.
2013-12-29 20:15:00 +01:00
Lukasz Gromanowski
c65f018760
Fixes #417 : Apply weather instantly when teleporting
...
Corrected constant name.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-29 15:09:49 +01:00
Marc Zinnschlag
6de39a7329
Merge remote-tracking branch 'lgro/issue845_NPCs_hold_torches_whole_day'
...
Conflicts:
apps/openmw/mwmechanics/character.cpp
2013-12-29 15:00:31 +01:00
Lukasz Gromanowski
faf8011c48
Fixes #417 : Apply weather instantly when teleporting
...
Removed changing speed of weather transition introduced in previous
commit. Instead try to detect player "teleporting" (ie. coc),
and then switch instantly to the next weather type.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-29 12:47:44 +01:00
scrawl
04f9f7af56
Closes #990 : Add option to unlock mouse cursor when in any menu
2013-12-29 00:58:48 +01:00
scrawl
17ff8165d2
Closes #1065 : Don't apply fall damage when landing in water
2013-12-29 00:36:36 +01:00
Marek Kochanowicz
bf0383fe05
Last fixes.
2013-12-28 18:07:01 +01:00
Marek Kochanowicz
147ee0ace3
small oops + added new variables to the constructor
2013-12-28 17:35:04 +01:00
scrawl
2a8ab932ef
Bug #951 : Only recalculate derived stats when attributes change
2013-12-28 17:19:35 +01:00
Marek Kochanowicz
b9d1047ad6
Small fix for lights.
2013-12-28 16:18:16 +01:00
Lukasz Gromanowski
100edda8c0
Fixes #417 : Apply weather instantly when teleporting
...
Change speed of weather transition from blight to other (twice fast as normal)
and from other to blight (four times faster than normal).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-28 16:15:34 +01:00
Marek Kochanowicz
be6e47bcb6
Corrections
2013-12-28 15:51:38 +01:00
Marek Kochanowicz
5406a70fdd
still working on npc check
2013-12-28 11:34:51 +01:00
Marek Kochanowicz
da3dda896a
Code compiles now
2013-12-27 22:57:36 +01:00
scrawl
596c9b80a9
Check if threads are joinable before joining (issue with boost 1.52)
2013-12-27 22:38:30 +01:00
Marek Kochanowicz
03235bf0a2
NPC. Still WIP.
2013-12-27 22:13:55 +01:00
scrawl
85ec80100c
Bug #1005 : Hide torches/shields during spellcasting and hand-to-hand combat
2013-12-27 22:00:16 +01:00
scrawl
7265b427fe
Bug #1013 : Rewrote fall height detection
2013-12-27 21:21:18 +01:00
scrawl
02277db685
Bug #1052 : Don't use set/getOnlyText which discards escape characters
2013-12-27 19:52:10 +01:00
scrawl
686d9efac3
Bug #1060 : Fix incorrect spell type checks
2013-12-27 18:58:35 +01:00
scrawl
27092a4494
flagAsModified should be private
2013-12-27 18:58:35 +01:00
scrawl
6400f23ab0
Use the material controller manager for effects with overridden texture
2013-12-27 14:54:36 +01:00
scrawl
d262d9e6b0
Bug #1054 : Set render queue group for effects
2013-12-27 14:51:59 +01:00
scrawl
1c60a781a5
Add header to CMakeLists
2013-12-27 14:42:22 +01:00
scrawl
561c661156
Reset starting angle / position when adding world item to a container
2013-12-27 01:57:08 +01:00
scrawl
608bd0f525
Don't copy the base node pointer when adding a world object to a container. Fixes bug #1028
2013-12-27 01:34:56 +01:00
scrawl
30b1da996b
Issue #1029 - Quick keys menu: Select compatible replacement when tool used up
2013-12-27 00:51:29 +01:00
scrawl
5a287a7e01
Remove no longer accurate flagAsModified calls. Container items are now modified via ContainerStore, not RefData.
2013-12-27 00:41:19 +01:00
scrawl
d09a86e208
Issue #1018 : Don't allow view mode switching while performing an action
2013-12-27 00:36:06 +01:00
scrawl
a3017e16d4
Don't allow changing the spell that is being cast mid-animation
2013-12-26 22:32:39 +01:00
scrawl
5054d8e6c1
Bug #1055 : Check power use and mana before starting cast animation
2013-12-26 22:06:13 +01:00
scrawl
71d9755ef1
Bug #991 : Don't autoequip items with harmful permanent enchantments
2013-12-26 21:26:59 +01:00
scrawl
5931fdcbde
Implement NiBillboardNode. Flags not handled yet.
2013-12-26 20:53:52 +01:00
scrawl
a3ff9e5be8
Change destruction order - fixes a shutdown crash discovered with mesa
2013-12-26 20:53:52 +01:00
scrawl
fb845e81a4
Rename nosound to no-sound for consistency
2013-12-26 20:53:52 +01:00
scrawl
85ed21dbd2
Remove unused command line option
2013-12-26 20:53:51 +01:00
scrawl
33389b9b63
XDG compliant paths
2013-12-26 20:53:51 +01:00
scrawl
a9e1e89bbc
Bug #1007 : Fix the console getting key focus when a reference becomes unavailable, even if the console is not visible
2013-12-26 20:53:51 +01:00
scrawl
31c1f484ed
Slight performance improvement for WindowManager::updateVisible
2013-12-26 20:53:51 +01:00
scrawl
b6bad969a0
Fix an issue with items that have no UI icon
2013-12-26 20:53:51 +01:00
scrawl
81ec8c2f55
Handle --version and --help before reading configuration - putting these options into openmw.cfg makes no sense
2013-12-26 20:53:51 +01:00
scrawl
6d27ebabb6
Integrate AddGlow with material controllers
2013-12-26 20:53:45 +01:00
Marek Kochanowicz
f04a727af6
removed set sizes, consted sizes, added itemleveledlist check
2013-12-26 18:40:47 +01:00
Marek Kochanowicz
1da56e1790
checkin leveled items lists
2013-12-26 18:28:24 +01:00
Marek Kochanowicz
c2993909cf
added creature leveled list check
2013-12-26 18:16:54 +01:00
Marek Kochanowicz
360a939aa0
Working on leveled lists now.
2013-12-26 15:35:58 +01:00
Marek Kochanowicz
6c95cea4c4
Added ingredient check
2013-12-26 15:24:52 +01:00
Marek Kochanowicz
c1715779fa
Added door check with related methods.
2013-12-26 12:59:43 +01:00
Nikolay Kasyanov
9fabae5198
OS X: force Cocoa API for Ogre windows in OpenCS
2013-12-25 00:26:15 +04:00
Marek Kochanowicz
e4e7d50623
Added creatureCheck. I don't know meaning of all data fields here.
2013-12-23 12:32:35 +01:00
Marek Kochanowicz
94fcea4d4d
added mCreaturesSize
2013-12-22 14:46:07 +01:00
Marek Kochanowicz
32046070d5
Added getCreatures
2013-12-22 14:44:22 +01:00
Marek Kochanowicz
16af9e6986
added container check
2013-12-22 14:42:17 +01:00
Marek Kochanowicz
1a7f023237
added mContainersSize.
2013-12-22 14:35:40 +01:00
Marek Kochanowicz
dc594da0de
added getContainers
2013-12-22 14:34:29 +01:00
Marek Kochanowicz
bbcaef8e42
Added armor check and related stuff.
2013-12-22 14:32:42 +01:00
Marek Kochanowicz
97fc8acbdb
Added armor check
2013-12-22 14:22:03 +01:00
Marek Kochanowicz
955fe3e8cf
Added check for non-positive quality of alchemical apparatus
2013-12-22 10:00:04 +01:00
Marek Kochanowicz
1811f0a71b
Works, but it seems that I miss something in referencables. I will write post on the forum.
2013-12-21 15:40:39 +01:00
Marek Kochanowicz
a27441720e
Added enchantmnet check for books.
2013-12-21 12:07:40 +01:00
Marek Kochanowicz
ee5dfd1cc8
Adde potionCheck method
2013-12-21 11:15:46 +01:00
Marek Kochanowicz
21ee2a6d2e
Getting size of potions.
2013-12-21 11:02:58 +01:00
Marek Kochanowicz
a6c36e2377
Small optimization.
2013-12-21 11:01:40 +01:00
Marek Kochanowicz
385824aee0
Renamed getActivator to getActivators.
2013-12-21 10:59:13 +01:00
Marek Kochanowicz
4842c56cb5
added getpotions
2013-12-21 10:58:05 +01:00
Lukasz Gromanowski
900bc06d2c
Fixes #845 : NPCs hold torches during the day
...
Moved 'equipping torches at night and unequipping at day' code from Character
to Actors class.
Removed unneeded showLights method (introduced in previous commits)
from animation/npcanimation classes.
Since this commit autoEquip() method doesn't automatically equip lights.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-20 22:38:23 +01:00
Marek Kochanowicz
f69465d7e0
Added aditional checks for books. Activator check.
2013-12-20 22:31:17 +01:00
Marek Kochanowicz
8085fcc792
Added Referencable checks class, added method to get refidcontainer, added method to get mBooks.
...
Currently only books are checked, and only if name is present.
2013-12-20 20:02:42 +01:00
Marc Zinnschlag
18e7e83585
Merge remote-tracking branch 'mrcheko/savedgame' into savedgame
2013-12-20 13:13:06 +01:00
mrcheko
8eb2696f6c
using gmst string
2013-12-20 14:04:59 +02:00
Lukasz Gromanowski
abc126e2af
Fixes #845 : NPCs hold torches during the day
...
Added check for Player character so it won't be affected by showing,
or hidding torches.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-20 01:01:30 +01:00
Lukasz Gromanowski
6eb674e4e5
Fixes #845 : NPCs hold torches during the day
...
Added equipping/unequipping torches.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-20 00:18:34 +01:00
Lukasz Gromanowski
92072d968b
Fixes #845 : NPCs hold torches during the day
...
Simplified a bit code which shows and hides light.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-19 21:11:07 +01:00
mrcheko
3816a09c6f
bug 428 ask to load recent saved game
2013-12-19 22:08:34 +02:00
Marc Zinnschlag
16b3927f17
Merge remote-tracking branch 'scrawl/master'
2013-12-19 14:26:41 +01:00
scrawl
9afdf71af3
Fix crash with player->position command
2013-12-19 00:37:57 +01:00
scrawl
a0d38dfb63
Fix highlighted topics being selectable when in a choice
2013-12-19 00:26:08 +01:00
scrawl
876fb9a899
Addition to bb4bd999ba
: adjust position for objects placed from inventory
2013-12-19 00:11:14 +01:00
Marc Zinnschlag
c22e38f825
removing 255 content file limitation
2013-12-17 21:19:05 +01:00
Marc Zinnschlag
09fadd446b
Merge remote-tracking branch 'mrcheko/savedgame' into savedgame
2013-12-17 19:33:32 +01:00
pvdk
da9b67b6d2
Fix for Bug #922 : Launcher writing merged openmw.cfg files
2013-12-16 20:40:58 +01:00
mrcheko
a854eb73db
StateRunning check returns
2013-12-16 21:02:21 +02:00
scrawl
eb5e4ecec2
Remove more unused code
2013-12-16 15:35:38 +01:00
mrcheko
f50ff0b1c4
reworked http://bugs.openmw.org/issues/428
2013-12-16 15:40:47 +02:00
scrawl
19e5978a01
Merge branch 'master' of https://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/main.cpp
2013-12-16 13:35:31 +01:00
scrawl
56893a097d
Don't stack used torches
2013-12-16 13:31:03 +01:00
scrawl
cd756a8a39
Fix incorrect value for partially used items (missing float casts). Make sure the correct value is displayed in tooltips.
2013-12-16 13:22:27 +01:00
Marc Zinnschlag
1cf1d49bc4
fix to content file reading error reporting in case of missing dependency
2013-12-16 11:39:24 +01:00
mrcheko
fd9f8c34f6
bug fix http://bugs.openmw.org/issues/428
2013-12-15 18:50:25 +02:00
Marc Zinnschlag
3590fa40bd
store global script state in saved game files
2013-12-15 16:16:50 +01:00
Nikolay Kasyanov
fc21dd1f3a
Music playback on OS X >= 10.9 works again. Fixes bug #1041 .
2013-12-14 17:26:09 +04:00
Marc Zinnschlag
0890fa66b0
Merge remote-tracking branch 'mrcheko/master'
2013-12-13 18:47:11 +01:00
mrcheko
8b3a393a6b
bug fix at http://bugs.openmw.org/issues/985
2013-12-13 19:33:01 +02:00
mrcheko
c8bf69b91a
Revert "bug fix http://bugs.openmw.org/issues/985 "
...
This reverts commit 7a9b64c6f4
.
2013-12-13 19:02:25 +02:00
scrawl
39eea24dc3
Don't try to show exceptions in a message box if SDL was not initialized
2013-12-13 03:50:01 +01:00
mrcheko
7a9b64c6f4
bug fix http://bugs.openmw.org/issues/985
2013-12-12 16:09:38 +02:00
Marc Zinnschlag
2a35c7d33a
fixed running global scripts a second time after they have been stopped
2013-12-12 13:16:32 +01:00
Marc Zinnschlag
74793c1c2f
globals script cleanup; fixed potential case folding bug
2013-12-12 13:15:38 +01:00
Marc Zinnschlag
fc37c77a91
store global variables in saved game files
2013-12-12 12:19:25 +01:00
Lukasz Gromanowski
91a4d9a2eb
Fixes #845 : NPCs hold torches during the day
...
Added method in WeatherManger and World which returns true if it is night.
This method is used later in character controller to show torches
(or other sources of light) at night and hide them at day.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-10 23:48:49 +01:00
Marc Zinnschlag
b38bfe1f21
removed a redundant function for listing global variables
2013-12-10 15:22:38 +01:00
Marc Zinnschlag
51bfa5cde3
rewrote global variable storage (using ESM variant type now)
2013-12-10 15:09:58 +01:00
Marc Zinnschlag
1fdd43bbb7
removed a redundant new
2013-12-10 12:31:18 +01:00
Emanuel Guevel
357ecd92b2
Do not display negative stat values
...
Display zero instead of negative values.
Also remove useless for loops and some unused attributes.
2013-12-10 00:41:36 +01:00
Emanuel Guevel
fc8bd1aacb
Allow fatigue stat to become negative when fatigue damages are taken
2013-12-09 21:53:04 +01:00
Marc Zinnschlag
77a2179d1e
Merge remote-tracking branch 'scrawl/master'
2013-12-09 18:39:34 +01:00
scrawl
0bc3a13c0f
Break invisibility on Use or Activate
2013-12-08 23:36:37 +01:00
scrawl
5fd2df5546
Ignore invisible targets for combat AI
2013-12-08 23:21:23 +01:00
scrawl
37a7ee8fcd
Set alpha value of character animations according to Invisibility / Chameleon effects.
2013-12-08 23:05:21 +01:00
Lukasz Gromanowski
594cc693b2
Fixes #1006 : Many NPCs have 0 skill
...
Added calculation of skill values for NPC with mNpdtType
set to NPC_WITH_AUTOCALCULATED_STATS (their NPDT is 12).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-08 21:47:43 +01:00
Lukasz Gromanowski
8d63f8eea2
Fixes #998 : Setting the max health should also set the current health
...
Added setting current value of dynamic stat in OpSetDynamic class.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-07 21:00:46 +01:00
scrawl
1624e0fd8a
Rename ObjectList to ObjectScene. Wrap it in a SharedPtr so we can automate the destruction routine.
2013-12-07 20:15:39 +01:00
Marc Zinnschlag
ef8c0fab73
Merge remote-tracking branch 'scrawl/master'
2013-12-07 16:26:52 +01:00
scrawl
742e0e014d
Remove more cruft in MessageBox. Fixes inconsistent sizing when close to a newline.
2013-12-07 14:15:51 +01:00
scrawl
bb70deabb1
Add an incomplete implementation of SayAnimationValue (lip animation)
2013-12-07 14:15:45 +01:00
Marc Zinnschlag
1c13a9037a
save and load dynamic records
2013-12-07 13:17:28 +01:00
Marc Zinnschlag
030c733e2d
Merge branch 'master' into savedgame
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
files/settings-default.cfg
2013-12-07 12:27:06 +01:00
Lukasz Gromanowski
e01085cac5
Fixes #1015 : Player status window scroll state resets on status change
...
Removed resetting scroll state position.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-07 02:57:30 +01:00
Marc Zinnschlag
48b779af80
Merge remote-tracking branch 'ace/win-fix'
2013-12-06 15:17:34 +01:00
Alexander "Ace" Olofsson
baacf91de4
Another windows build fix
2013-12-06 11:37:29 +01:00
Marc Zinnschlag
14eff87339
removed some junk from ESM store
2013-12-06 11:34:24 +01:00
Lukasz Gromanowski
bfd79bfbe6
Various fixes for CppCheck warnings.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-06 07:36:16 +01:00
Marc Zinnschlag
07f692bdd2
Merge remote-tracking branch 'scrawl/master'
2013-12-05 16:04:50 +01:00
scrawl
845bc5f7eb
Show fatal exceptions in a message box instead of cerr when running without a terminal
2013-12-05 15:51:07 +01:00
scrawl
afa71bb622
Throw an exception if a BSA is not found
2013-12-05 15:51:07 +01:00
scrawl
9ab8fe1038
Fix bsatool warning
2013-12-05 15:46:33 +01:00
scrawl
f695deb29d
Remember window positions
2013-12-05 15:46:23 +01:00
Marc Zinnschlag
ee6ddc3404
block saving while chargen is in progress
2013-12-05 14:56:30 +01:00
Marc Zinnschlag
8b7889f8e5
setup player after loading a saved game
2013-12-05 14:22:08 +01:00
Marc Zinnschlag
a7b42b867b
more cleanup
2013-12-05 14:18:43 +01:00
Marc Zinnschlag
ce624e024b
make sure player record stays in place across cleanups
2013-12-05 14:03:25 +01:00
Marc Zinnschlag
e818d43bc3
removed an outdated typedef and some dead code
2013-12-05 13:21:26 +01:00
Marc Zinnschlag
537b2efe8e
first round of cleaning up world cleanup
2013-12-05 12:49:25 +01:00
scrawl
8f4ffe4ddc
Fix new window size not being written to settings when manually resizing window
2013-12-03 15:55:31 +01:00
Marc Zinnschlag
63721682f6
GUI fix: previous character was selected when saving new character
2013-12-03 15:19:13 +01:00
Marc Zinnschlag
34cdd2bb1f
deal with dialogue/info records that don't exist anymore
2013-12-03 14:39:54 +01:00
Marc Zinnschlag
2293b92efe
storing and loading the journal
2013-12-03 14:28:46 +01:00
Marc Zinnschlag
2fe135d85f
journals subview was bound to the wrong universal ID type
2013-12-02 16:25:26 +01:00
Marc Zinnschlag
0f971163f7
use Entry instead of plain string for topic and quest entries
2013-12-01 14:50:25 +01:00
Marc Zinnschlag
b273f9e387
splitting JournalEntry into Entry and JournalEntry
2013-12-01 14:44:27 +01:00
Marc Zinnschlag
16e2d67b1f
added overloaded start/endRecord functions to ESMWriter
2013-12-01 13:32:11 +01:00
Marc Zinnschlag
c94f006307
Merge remote-tracking branch 'scrawl/master'
2013-11-30 15:06:09 +01:00
scrawl
8391891a5b
Ignore case for content file extensions
2013-11-30 14:25:29 +01:00
Marc Zinnschlag
43f5f16731
removed a todo comment
2013-11-30 12:54:44 +01:00
Marc Zinnschlag
177aab536d
storing topic name in MWDialogue::Topic (avoids a lookup in the GUI and also serves as preparation for better localisation support in OpenMW 1.1)
2013-11-30 12:41:18 +01:00
pvdk
46973e8e82
Fix for Bug #982 : unchecking addons is now saved to profile
2013-11-30 12:08:37 +01:00
Marc Zinnschlag
eed46960fe
some spelling fixes
2013-11-30 12:02:56 +01:00
Marc Zinnschlag
9d64c92d33
store text in journal entries
2013-11-30 11:57:33 +01:00
Marc Zinnschlag
8b3e852ffc
Merge remote-tracking branch 'scrawl/master'
2013-11-30 11:09:38 +01:00
Marc Zinnschlag
aebc2791a5
fixed selecting current character based on value stored in settings
2013-11-30 11:08:41 +01:00
scrawl
4b4025ed0f
Keep the player's CharacterController when changing cells. Fixes several glitches.
2013-11-30 11:01:45 +01:00
Marc Zinnschlag
016500af98
Merge remote-tracking branch 'scrawl/master'
2013-11-30 09:45:46 +01:00
Marc Zinnschlag
04b1657d98
Merge branch 'openmw-27'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
2013-11-30 09:45:41 +01:00
scrawl
e1e9de0f02
Don't hide tooltips on mouse click. Probably wasn't such a bright idea.
2013-11-30 09:04:52 +01:00
scrawl
6aa9e18915
Reset filter when starting a trade
2013-11-30 08:33:18 +01:00