Miloslav Číž
477e1437d2
Resolve conflicts
7 years ago
Andrei Kortunov
49ba00a3ec
Add NPC validation to esmstore (bug #2772 )
7 years ago
Miloslav Číž
dd00e438fe
Merge branch 'screenshot360' of https://github.com/drummyfish/openmw into screenshot360
7 years ago
Miloslav Číž
7178ee3a6e
Add FIXME comment
7 years ago
Miloslav Číž
d629c30fdb
Merge branch 'master' into screenshot360
7 years ago
Marc Zinnschlag
2b35c5efd7
Merge remote-tracking branch 'upstream/master'
7 years ago
Marc Zinnschlag
aea481eacb
Merged pull request #1753
7 years ago
Marc Zinnschlag
f62df90960
Merged pull request #1572
7 years ago
Andrei Kortunov
61c968d550
Ignore broken items when search for replacement (bug #4453 )
7 years ago
Marc Zinnschlag
7ca56ccd29
set search status bar to 'no results' message when search yields no results
7 years ago
Andrei Kortunov
81b78a82e8
AI: try to open doors every AI_REACTION_TIME seconds (bug #4454 )
7 years ago
Marc Zinnschlag
7d2394273e
added statusbar to search window ( Fixes #3276 )
7 years ago
Miloslav Číž
dcfbd554bb
Remove try catch block
7 years ago
Bret Curtis
3e4dc31e39
Merge branch 'master' into fatigue
7 years ago
Marc Zinnschlag
1ba0317905
Merged pull request #1670
7 years ago
Marc Zinnschlag
48711bbdde
Merged pull request #1592
7 years ago
Miloslav Číž
c3d7ee5a9e
Resolve merge conflicts
7 years ago
Miloslav Číž
db8aaa74d6
Start cell border debug drawing
7 years ago
Andrei Kortunov
9c45cc7e48
Use player reference instead of pointer
7 years ago
Marc Zinnschlag
a3911f52a0
Merged pull request #1750
7 years ago
Marc Zinnschlag
97773697a9
Merge remote-tracking branch 'florianjw/precise-rotations'
7 years ago
Capostrophic
1c8a20a54a
Set ok button focus in settings window by default ( fixes #4368 )
7 years ago
Andrei Kortunov
f299be8158
Play scripted animations even if SkipAnim is used
7 years ago
Andrei Kortunov
25bb7c1826
Make 'PlayGroup idle' to cancel scripted animations
7 years ago
Andrei Kortunov
0e441d48ac
Give scripted animations highest priority (bug #4286 )
7 years ago
Andrei Kortunov
0c92655250
Avoid code duplication in character manager
7 years ago
Andrei Kortunov
e3812f4075
Check creature stats only for actors
7 years ago
Andrei Kortunov
b0a140e714
Disable actor collision only after end of death animation
7 years ago
Andrei Kortunov
ebaa6fb5a2
Play death scream only once
7 years ago
Andrei Kortunov
427be928d0
Do not update animation state for dead actors
7 years ago
Andrei Kortunov
977a27ecb7
Do not clear corpses until end of death animation (bug #4307 )
7 years ago
Bret Curtis
7310e3c8c2
Merge pull request #1748 from akortunov/bookfix
...
Do not show any book text after last <BR> tag
7 years ago
Andrei Kortunov
a42c663fd7
Do not interrupt scripted animations by death animation (bug #4286 )
7 years ago
Andrei Kortunov
d0619cfb35
Play death animation for non-persisting actors with 0 health (bug #4291 )
7 years ago
Andrei Kortunov
6099735c60
Early out only when scripted animation is playing
7 years ago
Andrei Kortunov
e234dd2a36
Do not interrupt scripted animations
7 years ago
Andrei Kortunov
66a46ff03c
Do not show any book text after last <BR> tag.
7 years ago
Capostrophic
d43766d3c9
Make WakeUpPC interrupt waiting if it was supposed to be ( fixes #3629 )
7 years ago
Andrei Kortunov
acd3cba5fa
Store previous items in the savegame
7 years ago
Andrei Kortunov
9fd2d57b86
Move previous items to player
7 years ago
Andrei Kortunov
f977c6876f
Bound items: store item ID instead of pointer
7 years ago
Andrei Kortunov
4de9d9fa77
Split adjustBoundItem()
7 years ago
Andrei Kortunov
d1b1cb748d
Reequip previous item only if the expired bound item was equipped
7 years ago
Andrei Kortunov
9b72a6ac69
Use the MWWorld::Ptr() instead of string ID
7 years ago
Andrei Kortunov
0375bedab2
Equip previous item after a bound item expires (bug #2326 )
7 years ago
Andrei Kortunov
ae87e0d3fc
Do not reset mUpperBodyState for weapon->weapon switch (regression #4446 )
7 years ago
Andrei Kortunov
4ba361fea6
Unhardcode sunset and sunrise settings (bug #1990 )
7 years ago
Marc Zinnschlag
7d9de93fd3
Merged pull request #1477
7 years ago
Marc Zinnschlag
551a69f1b1
Merged pull request #1559
7 years ago
Marc Zinnschlag
efb4abbb7f
Merged pull request #1623
7 years ago
Marc Zinnschlag
76972bb2f6
Merged pull request #1709
7 years ago
Thunderforge
dfa9968565
Renaming Launcher::DataFilesPage::signalSelectedFilesChanged to signalLoadedCellsChanged
7 years ago
Thunderforge
62c4eb8d6a
Explicitly flagging loaded cells changed as queued
7 years ago
Andrei Kortunov
6ed2773299
Do not stack return packages
7 years ago
Andrei Kortunov
74a2cbe696
AI: return back after pursuit
7 years ago
Andrei Kortunov
3d0631cfcc
Store last AI package in savegame
7 years ago
Andrei Kortunov
3a0ee78d2b
AiTravel: store mHidden flag in savegame
7 years ago
Andrei Kortunov
2f5beb8853
Remove unnecessary hack
7 years ago
Andrei Kortunov
57d686131e
Remove redundant condition
7 years ago
Andrei Kortunov
5105c67642
Add mHidden field to AiTravel
7 years ago
Andrei Kortunov
81f29d8dcd
AiWander: resume moving to destination after combat
7 years ago
Andrei Kortunov
18ff097e4a
Add the parameter to AiSequence::stack() to control ability to cancel other AI packages
7 years ago
Andrei Kortunov
9d27eb197f
AiWander: return to initial position only after combat
7 years ago
Bret Curtis
61c969e970
Merge branch 'master' into hitboxfix
7 years ago
Capostrophic
b274931165
Revert erroneous changes
7 years ago
Capostrophic
dd2a11b243
Merge branch 'master' into goodbye
7 years ago
Capostrophic
24c1ee7744
Use relative stat difference for haggling
7 years ago
Capostrophic
b7026df551
Improve the offered price formula ( Fixes #2222 )
7 years ago
Andrei Kortunov
fed10e87aa
Store integer actor ID in AI packages (bug #4036 )
7 years ago
Marc Zinnschlag
9d0ce25052
Merged pull request #1738
7 years ago
Marc Zinnschlag
7899f44173
Merged pull request #1619
7 years ago
Andrei Kortunov
fea34bd73f
Added support for per-group animation files
7 years ago
Capostrophic
11103211c5
Make Goodbye and Choice choices mutually exclusive
7 years ago
Marc Zinnschlag
21ea49fe83
Merge remote-tracking branch 'capostrophic/physics'
7 years ago
Capostrophic
1a354f88ac
Make choices trigger goodbye if Goodbye is used ( fixes #3897 )
7 years ago
Andrei Kortunov
1b9edbe119
Add unequip animation during stance switching (bug #4327 )
7 years ago
Andrei Kortunov
bde1d07d4e
Use hitboxes and focused object for touch spells (bug #3374 )
7 years ago
Andrei Kortunov
4666a6a0ab
Use default hit formula as fallback
7 years ago
Andrei Kortunov
9e5d577a71
Aim from center of attacker to center of target
7 years ago
Andrei Kortunov
f5dc9f0162
Use hitbox cone only as fallback
7 years ago
Andrei Kortunov
ab433102a4
Increase hit distance for player by halfExtents
7 years ago
Marc Zinnschlag
7b4a69ff2f
Merged pull request #1728
7 years ago
Marc Zinnschlag
362aa23546
Merged pull request #1724
7 years ago
Marc Zinnschlag
2ab31b0c18
Merged pull request #1723
7 years ago
David Cernat
04a2025340
Fix crash when adding items to certain disabled creatures (bug #4441 )
7 years ago
Marc Zinnschlag
cd7268e9af
Merge remote-tracking branch 'akortunov/effectResistFix' into openmw-44
7 years ago
Thunderforge
d46590934a
Importing mutex
7 years ago
Thunderforge
e282ece3d1
Fixing bug with autocomplete not loading correctly during startup
7 years ago
Thunderforge
103a7ac628
Using a mutex lock to prevent race conditions
7 years ago
Capostrophic
c14536a399
Update faction-owned items confiscation
7 years ago
Capostrophic
3810ade67a
Don't make unnecessary faction ID searches
7 years ago
Capostrophic
191cc76378
Consider faction ownerships in item stolen checks ( fixes #4293 )
7 years ago
Thunderforge
e26c675829
Changing join to detach so that the thread will not block the UI
7 years ago
elsid
dba79f4d4d
Fix warnings: catching polymorphic type by value
...
openmw/apps/openmw/mwworld/worldimp.cpp: In member function ‘virtual bool MWWorld::World::findExteriorPosition(const string&, ESM::Position&)’:
openmw/apps/openmw/mwworld/worldimp.cpp:2650:25: warning: catching polymorphic type ‘class std::invalid_argument’ by value [-Wcatch-value=]
catch (std::invalid_argument)
^~~~~~~~~~~~~~~~
openmw/apps/openmw/mwworld/worldimp.cpp:2654:25: warning: catching polymorphic type ‘class std::out_of_range’ by value [-Wcatch-value=]
catch (std::out_of_range)
^~~~~~~~~~~~
openmw/components/widgets/numericeditbox.cpp: In member function ‘void Gui::NumericEditBox::onEditTextChange(MyGUI::EditBox*)’:
openmw/components/widgets/numericeditbox.cpp:41:21: warning: catching polymorphic type ‘class std::invalid_argument’ by value [-Wcatch-value=]
catch (std::invalid_argument)
^~~~~~~~~~~~~~~~
openmw/components/widgets/numericeditbox.cpp:45:21: warning: catching polymorphic type ‘class std::out_of_range’ by value [-Wcatch-value=]
catch (std::out_of_range)
^~~~~~~~~~~~
7 years ago
Andrei Kortunov
be394870e4
Fix regressions in spell resistance
7 years ago
Andrei Kortunov
84c8fb9df7
Add pursue package only when crime was reported (bug #4433 )
7 years ago
Andrei Kortunov
24863f620b
RotateWorld: rotate around world axis (bug #4426 )
7 years ago
Thunderforge
26dfef7970
Changing where we are loading cells to prevent Qt access issue
7 years ago
Thunderforge
78234e9468
Moving autocomplete code to thread
7 years ago
Thunderforge
c2fff61ccd
Changing so that data changes happen only after the addon is checked
7 years ago
Capostrophic
7e38bb8513
Verifier: improve handling of class name and description
7 years ago
scrawl
cfdf99f601
Revert "Merged pull request #1573"
...
This reverts commit 7324bd368f
, reversing
changes made to 810e4416f6
.
7 years ago
scrawl
99ffaafe30
Revert "Merge pull request #1701 from akortunov/standfix"
...
This reverts commit da47fc79f5
, reversing
changes made to 7324bd368f
.
7 years ago
Marc Zinnschlag
b151a89528
Merged pull request #1568
7 years ago
Marc Zinnschlag
bbc337a0af
code cleanup
7 years ago
Marc Zinnschlag
e76df5f4d3
minor tooltip fixes
7 years ago
Marc Zinnschlag
e30ade81be
Merged pull request #1680
7 years ago
Marc Zinnschlag
832b4bb778
Merged pull request #1659
7 years ago
Andrei Kortunov
1abff5365b
Capitalize enchanted items names again in spells window
7 years ago
Andrei Kortunov
afae398b5c
Use utf8 lowercase function for journal index to avoid code duplication
7 years ago
Andrei Kortunov
b5374029e5
Implement case-insensitive search in spell window
7 years ago
Andrei Kortunov
9ac752ea70
Implement filtering in the spells window
7 years ago
Bret Curtis
da47fc79f5
Merge pull request #1701 from akortunov/standfix
...
Do not apply queue movement for standing actors
7 years ago
Marc Zinnschlag
7324bd368f
Merged pull request #1573
7 years ago
Marc Zinnschlag
d92d754834
Merged pull request #1697
7 years ago
Marc Zinnschlag
1564a3f6aa
Merged pull request #1713
7 years ago
Marc Zinnschlag
2f958881b7
Merged pull request #4413
7 years ago
Thunderforge
d58cce9c72
Adding WIP code to dynamically change the autocomplete fields
7 years ago
Nelsson Huotari
825c331764
Remove texture filtering, better ltex importing, reindexing duplicates
7 years ago
declan-millar
b8df4b7c5a
Tidy in-code comment
7 years ago
declan-millar
844aef85f3
Replace spelling: soulgem -> soul gem in code comment
7 years ago
declan-millar
9ed4f33048
Replace spelling: soulgem -> soul gem
7 years ago
declan-millar
028b528c0b
Get soul magnitude before checking the rebalance setting
7 years ago
declan-millar
9346a552fa
Use Rebalance soulgem values option to set soulgem value
7 years ago
declan-millar
78e79d5775
Add advanced option to Rebalance soulgem values to the launcher
7 years ago
Nelsson Huotari
8ae46519cf
Fix missed worldspacehits, add linebreak to tooltip
7 years ago
Nelsson Huotari
21e8d08e69
Handle invalid texture id's
7 years ago
declan-millar
4b1247597e
Use soulgem value rebalance formula from morrowind code patch
7 years ago
Capostrophic
867a5938ca
Don't reset sneaking camera offset while in GUI ( fixes #4420 )
7 years ago
Marc Zinnschlag
ec900ef4ad
Merged pull request #1710 )
7 years ago
Nelsson Huotari
c2cddc91e4
Brush maximum size to a custom setting
7 years ago
tri4ng1e
f2613a74b1
Write settings before invoking openmw-iniimporter
7 years ago
tri4ng1e
7e03dd0f12
Read data paths from `data-local` section too
7 years ago
tri4ng1e
3b86f73ae7
Replace MwIniImporter::numberToString with std::to_string
7 years ago
Capostrophic
4e485dbd44
Rename Original Creature column to Parent Creature ( fixes #2897 )
7 years ago
Bret Curtis
67c381df4e
Merge pull request #1708 from akortunov/refidfix
...
fix GCC warnings
7 years ago
Andrei Kortunov
a68de93308
Initialize srate variable in openal_output
7 years ago
Andrei Kortunov
e5db5e2651
Fix 'maybe-uninitialized' warning in openal_output
7 years ago
Andrei Kortunov
df459199dd
Avoid left shift of negative value
7 years ago
Nelsson Huotari
17e01ca336
Setting "Scene Drops" rename "3D Scene Editing"
7 years ago
Nelsson Huotari
758ccac75a
Show texture id + filename
7 years ago
Bret Curtis
caf1760251
Merge pull request #1707 from akortunov/weaponreach
...
Display weapon reach on tooltips in feet
7 years ago
Andrei Kortunov
164e3d12fe
Display weapon reach on tooltips in feet.
7 years ago
Bret Curtis
e410c47660
Merge pull request #1706 from akortunov/refidfix
...
Fix compiler warning in getNestedData()
7 years ago
Andrei Kortunov
6a3ff5ed81
Fix compiler warning in getNestedData
7 years ago
Bret Curtis
c75d774356
Merge pull request #1692 from akortunov/playsound
...
Prevent PlaySound overlapping
7 years ago
Andrei Kortunov
f8655d2425
Use actor's physics position as a ray origin in tracer
7 years ago
Capostrophic
e32f38b939
Allow jumping when you're stuck on a slope ( fixes #4221 )
7 years ago
Capostrophic
409d466e42
Make 0/0 encumbrance 0% encumbrance
7 years ago
Capostrophic
ba077e7291
Fix movement fatigue loss encumbrance calculation ( fixes #4413 )
7 years ago
Capostrophic
1c9fba9a8c
Fix jumping encumbrance calculation
7 years ago
Marc Zinnschlag
0f22600a98
Merged pull request #1703
7 years ago
tri4ng1e
9126e844bf
Use data paths from config (bug #4412 )
7 years ago
Marc Zinnschlag
b7cce1a665
Merged pull request #1702
7 years ago
Nelsson Huotari
49ae5bc75c
List initialization -> initialization in constructor
7 years ago
Nelsson Huotari
1c79d5311c
Brush history menu
7 years ago
Nelsson Huotari
d2cf764a46
Tooltips, fixes
7 years ago
Nelsson Huotari
62066f01bd
clean-up
7 years ago
Nelsson Huotari
d33c98c68d
Revert unintended changes
7 years ago
Nelsson Huotari
5656745445
Select dragged texture-assets, add brush settings widget-type, fixes.
7 years ago
Nelsson Huotari
baa707b5e3
User setting for selective cell editing or new land creation
7 years ago
Nelsson Huotari
24977fcc0f
improve hit calculation accuracy for texture editing
7 years ago
Nelsson Huotari
e8a9bff85c
Drop textures to landtextures from assets (try-method)
7 years ago
Nelsson Huotari
7139889566
Brush button window opens at modebutton, slider 1-50, doxygen comments
7 years ago
Nelsson Huotari
20d1d8ac89
Fixed brush calculations, implement undostack macro when clicked.
7 years ago
Nelsson Huotari
5f3c8b2b99
c_str -> fromStdString, remove TextureBrushButton class
7 years ago
Nelsson Huotari
cf7a0f715e
Command macro for complete drag-editing operations.
7 years ago
Nelsson Huotari
9f742d5b1f
Brush affects adjancent cells
7 years ago
Nelsson Huotari
1ca2710a2a
Formatting, fixes
7 years ago
Nelsson Huotari
1c113eca9c
15 to landTextureSize-1
7 years ago
Nelsson Huotari
3327d6f7c4
Drag terrain painting, code cleanup
7 years ago
Nelsson Huotari
a54a1b9940
Command system and undo
7 years ago
Nelsson Huotari
cc415526b0
fix texture index +1, better icons
7 years ago
Nelsson Huotari
316d05bdc4
{} to ()
7 years ago
Nelsson Huotari
4649d1258c
Direct data terrain editing
7 years ago
Nelsson Huotari
4ae75d1d20
Terrain texture brush frame
7 years ago
David Cernat
32d71de2f5
Update MapWindow every frame, not just when it's open (bug #4279 )
7 years ago
Alf Henrik Sauge
feeee50a88
Dropping a separate NPDTstruct12 object and instead use NPDTstruct52
...
NPDTstruct12 is now only used when loading and saving. Turning auto calc
on and off now no longer switches between to different set of values
7 years ago
tri4ng1e
103a07b744
Less cryptic abbreviations
7 years ago
Marc Zinnschlag
3197ebd8e7
Merged pull request #1694
7 years ago
Andrei Kortunov
2f89080b36
Load default markers definitions in editor
7 years ago
Andrei Kortunov
b15bed8e22
Avoid excessive loadSound calls
7 years ago
tri4ng1e
905cde10db
Smart-sorting in iniimporter (time + dependency)
7 years ago
Marc Zinnschlag
53b6ef6f8c
minor code cleanup
7 years ago
Marc Zinnschlag
e661e3cf74
Merged pull request #1677
7 years ago
Alf Henrik Sauge
9b971caddc
CSVTools::ReportTable should now have case insensitive sorting
7 years ago
Andrei Kortunov
17222eb821
Get rid of unnecessary find
7 years ago
Bret Curtis
c44f87afd1
Merge pull request #1699 from Capostrophic/editorwarnings
...
Editor verifier updates
7 years ago
Bret Curtis
0fc198be52
Merge pull request #1698 from Capostrophic/c++11
...
A bunch of C++11-related updates
7 years ago
Capostrophic
2502d53816
Object record verifier updates
...
Removed light 0 duration warning
Spelling fixes
7 years ago
Capostrophic
91b97a27ea
Remove empty class description warning
7 years ago
Capostrophic
e22409c266
Fix sound range warning message
7 years ago
Andrei Kortunov
3636cf2015
Do not apply queue movement for standing actors
7 years ago
Capostrophic
3d3bef94cd
Use range-based for loop
7 years ago
Andrei Kortunov
1dd36329a3
Load default markers definitions (bug #4410 )
7 years ago
Bret Curtis
c219c89603
Merge pull request #1696 from Capostrophic/feature-2694
...
Rename "Model" column to "Model/Animation" (feature #2694 )
7 years ago
Capostrophic
9ac9f94638
Rename "Model" column to "Model/Animation" (feature #2694 )
7 years ago
Capostrophic
8be93b4a12
Initialize mandatoryIds vector C++11-way
7 years ago
Capostrophic
85b7aa4f09
Uncomment is_pod test in fixed string tests
7 years ago
Nelsson Huotari
e4e225f4e7
Add topic, journal and related -info icons.
7 years ago