1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 02:49:55 +00:00
Commit graph

16145 commits

Author SHA1 Message Date
Capostrophic
d44dcc3242 Revert infinite fall failsafe addition 2020-02-25 16:46:53 +03:00
Alexei Dobrohotov
22b4629fc6
Merge pull request #2678 from unelsson/deleteinstanceshotkey
Editor: Delete instances via hotkey
2020-02-24 22:52:16 +03:00
Capostrophic
21c49ca1b0 Make Wizard less shy (bug #4493) 2020-02-24 22:35:43 +03:00
Alexei Dobrohotov
3f64d98305 Merge branch 'inventorysearch' into 'master'
Item search in inventory redux

See merge request OpenMW/openmw!158
2020-02-24 18:14:40 +00:00
Frederic Chardon
78d58a344d Item search in inventory (feature #4831) 2020-02-24 18:14:40 +00:00
Capostrophic
1da4b31047 Switch torches to shields for hostile NPCs (bug #5300) 2020-02-24 02:20:08 +03:00
Andrei Kortunov
a01c44bbdd
Merge pull request #2707 from Capostrophic/pcskipequip
Make PCSkipEquip and OnPCEquip behavior vanilla-like (bug #4141)
2020-02-23 14:08:44 +04:00
Capostrophic
cfa877b109 Make PCSkipEquip and OnPCEquip behavior vanilla-like (bug #4141) 2020-02-21 21:18:54 +03:00
Alexander Olofsson
776c0857fa
Always use ref_ptr for query geometry 2020-02-21 07:51:50 +01:00
Capostrophic
f9f0299c27 Make ModCurrentFatigue KO the actor when necessary (bug #4523) 2020-02-21 00:05:13 +03:00
Capostrophic
3787625e61 Fix water ripple cleanup (bug #5246) 2020-02-19 23:27:45 +03:00
Nelsson Huotari
198a75b8e6 Delete selected instances with a hotkey 2020-02-19 11:44:55 +02:00
elsid
650f429ff5
Add final modifier to fix warnings 2020-02-18 10:36:08 -08:00
Bret Curtis
a0902bb98e
Merge pull request #2700 from akortunov/masks
Move VisMask to components
2020-02-17 11:58:53 +01:00
Andrei Kortunov
84979fa8b7 Move VisMask to components 2020-02-16 16:03:35 +04:00
Alexander Olofsson
5de1e0fb0c
Use queryGeom for all query geometry accesses 2020-02-15 03:12:52 +01:00
Capostrophic
9db0bbf255 Make infinite failsafe logic more forgiving 2020-02-14 15:32:50 +03:00
Roman Siromakha
3ae1a208df
Merge pull request #2684 from Capostrophic/damagefatigue
Make uncapped Damage Fatigue optional (bug #5264)
2020-02-13 20:37:50 +01:00
Alexander Olofsson
7db58a893a
Ensure osg/Version is included 2020-02-13 19:32:17 +01:00
Alexander Olofsson
807f550386
Fix building mwrender/sky with OSG 3.6.5
OSG commit aff574b completely replaces the method of doing user-defined
query geometry, removing support for modifying the default geometry.
2020-02-13 19:15:33 +01:00
Bret Curtis
3bbd32fe98
Merge pull request #2667 from Capostrophic/infinitefall
Add an infinite fall failsafe (feature 1415)
2020-02-13 09:23:05 +01:00
Andrei Kortunov
7d53c6274d
Merge pull request #2697 from Capostrophic/shield
Don't try to attach absent (empty path) shield models to NPCs
2020-02-12 21:53:29 +04:00
elsid
1e4565a15c
Avoid using temporary vector to get items owned by 2020-02-11 22:24:18 +01:00
Capostrophic
61b60c8a94 Add an infinite fall failsafe (feature 1415) 2020-02-11 18:26:58 +03:00
Capostrophic
013953ec7f Support Wander movement deceleration 2020-02-11 13:50:53 +03:00
Capostrophic
fcbd3b4324 Don't try to attach absent shield models to NPCs 2020-02-11 11:58:02 +03:00
elsid
9404b1dd72
Stop wandering when destination is hidden or occupied by other actor 2020-02-10 22:29:54 +01:00
elsid
4a0c056489
Do not wander to occupied area by other actor 2020-02-10 22:29:54 +01:00
elsid
85414e2353
Check for line of sight for wander destination 2020-02-10 22:29:54 +01:00
elsid
0c92a567af
Use distance to position since last normal state in obstacle checker 2020-02-10 22:29:54 +01:00
elsid
52945921a7
Print ptr by betacomment 2020-02-10 22:29:37 +01:00
Capostrophic
9b4be677f6 Make Show output format closer to vanilla 2020-02-09 20:10:24 +03:00
Capostrophic
aadf13b123 Make Show fallback to global variables when sensible (bug #5278) 2020-02-09 15:08:44 +03:00
Capostrophic
122dffe4c1 Make uncapped Damage Fatigue optional (bug #5264)
Cap Absorb Fatigue
2020-02-09 14:41:38 +03:00
AnyOldName3
3ce3f364ea Merge branch 'AnyOldName3-master-patch-00511' into 'master'
Add default font releaseGLObjects workaround for OSG <3.65

Closes #4704

See merge request OpenMW/openmw!160
2020-02-05 22:46:16 +00:00
Andrei Kortunov
b8548b8f56
Merge pull request #2691 from elsid/navigator_status
Use status codes to handle navigator errors instead of exceptions
2020-02-05 13:24:29 +04:00
Andrei Kortunov
7371650f8e
Merge pull request #2688 from Capostrophic/shield
Make sure not to pick the ground shield model incorrectly for NPCs
2020-02-05 12:11:24 +04:00
Bret Curtis
7d77d44b34
Merge branch 'master' into interiorlighting 2020-02-05 08:59:28 +01:00
elsid
349040ffb2
Use status codes to handle navigator errors instead of exceptions
For find path use case.
2020-02-04 22:33:56 +01:00
Capostrophic
216a5d27c6 Avoid working with AMBI subrecord in tools unnecessarily (bug #5269) 2020-02-04 20:57:04 +03:00
Capostrophic
4a78674583 Make sure not to pick the ground shield model incorrectly 2020-02-02 15:39:29 +03:00
Andrei Kortunov
1db51a9e08 Re-work wandering outside of initial cell (bug #5261, bug #5262) 2020-02-02 11:02:19 +04:00
AnyOldName3
73722eedf3 Add default font releaseGLObjects workaround for OSG <3.65
This resolves https://gitlab.com/OpenMW/openmw/issues/4704

I've not compiled this or anything and I'm going off my memory from
around ten or eleven months ago, so if this fails CI or causes more
problems, that's why. The most likely issue is that we'll need to make
the context current before releasing the program.
2020-01-30 23:12:54 +00:00
Alexei Dobrohotov
2652b10b9c
Merge pull request #2681 from akortunov/hello
Do not interrupt greeting update when Hello = 0 or actor starts to swim
2020-01-30 00:48:13 +03:00
Andrei Kortunov
1522883fdd Do not interrupt greeting update when Hello = 0 or actor starts to swim (bug #5248) 2020-01-29 16:31:09 +04:00
elsid
f7caeefddb
Fallback to straight path when navmesh and pathgrind are not available 2020-01-29 11:14:07 +01:00
elsid
8e0b638145
Fix start position for AiWander random point selection 2020-01-28 20:29:52 +01:00
Bret Curtis
7dfbeff049
Merge pull request #2677 from unelsson/fixcsrotation
Editor: Convert radians to degrees when rotating objects
2020-01-28 11:55:56 +01:00
Bret Curtis
44a85795cf
Merge pull request #2669 from Capostrophic/wnam
Generate WNAM subrecord upon saving terrain instead of upon editing it
2020-01-28 11:43:47 +01:00
Nelsson Huotari
032513ae18 Convert radians to degrees 2020-01-28 11:33:44 +02:00
elsid
1e106013a0
Use navmesh to find wander destination outside pathgrid for ground based actors
Use dtNavMeshQuery::findRandomPointAroundCircle from recastnavigation
2020-01-21 00:01:06 +01:00
elsid
e323e6e7e6
Consider moved distance in direction to destination for obstacle check
Assume actor is stuck when it's not able to move in the destination
direction with maximum speed. Approach to check moved distance from the
previous point doesn't work good for slow and big actors. When they face
obstacle they're trying to move along with oscillation so check is
passing but they don't get any closer to the destination.
2020-01-20 23:46:58 +01:00
Capostrophic
a2c674bb2e Make GetTarget return 1 during actor greeting (bug #5255) 2020-01-19 15:38:50 +03:00
Andrei Kortunov
8bfca9830f
Merge pull request #2666 from Capostrophic/keybindings
Editor: Add a reset to defaults button to keybindings (feature #4068)
2020-01-13 10:28:38 +04:00
Capostrophic
7659370992 Editor: Add a reset to defaults button to keybindings (feature #4068) 2020-01-13 02:26:01 +03:00
Andrei Kortunov
a384104f73 Rework greeting timeouts (bug #5249) 2020-01-11 21:47:08 +04:00
capostrophic
89055f1c6c Generate WNAM upon saving terrain 2020-01-11 02:42:04 +03:00
Bret Curtis
95f9e4f4c9
Merge pull request #2649 from Capostrophic/nifstreamline
Yet more NIF adjustments
2020-01-10 22:07:25 +01:00
Alexei Dobrohotov
2615913494
Merge pull request #2661 from akortunov/guifixes
Settings menu tweaks
2020-01-10 14:24:36 +03:00
capostrophic
bbe5adb860 Use shield body part model for creatures (bug #5250) 2020-01-10 14:18:40 +03:00
Andrei Kortunov
4d4663e0ad Make 'Toggle HUD' hotkey configurable 2020-01-10 14:31:25 +04:00
Andrei Kortunov
2bed25a5e8
Merge pull request #2659 from Capostrophic/aitravel
Handle out-of-range actors' travel packages (bug #5212)
2020-01-10 13:32:51 +04:00
capostrophic
fc0f813dcb Add and use 'always active' AI package flag
Update documentation
2020-01-10 12:07:57 +03:00
capostrophic
1251b32f0f Slightly reduce code duplication 2020-01-09 22:17:01 +03:00
capostrophic
af2ea477d5 Don't use loops to detect absorb effects 2020-01-09 22:17:01 +03:00
capostrophic
42cc27194b Fix reported spellcasting discrepancies
Make ExplodeSpell behavior closer to Cast behavior (#5242)
Nullify on-self absorb spells in a different way (#5241)
Allow casting permanent spells through Cast/ExplodeSpell
2020-01-09 22:17:01 +03:00
Alexei Dobrohotov
7a4caaf5bf
Merge pull request #2660 from akortunov/boost
Additional de-boosting
2020-01-09 22:14:32 +03:00
Alexei Dobrohotov
ff2739b8a3
Merge pull request #2651 from akortunov/encoding
Unify streams usage to support non-ASCII paths
2020-01-09 22:12:55 +03:00
Andrei Kortunov
1cdd33b434 Implement additional stringops to avoid Boost functions 2020-01-09 19:40:22 +04:00
capostrophic
2d87d287ba Handle out-of-range actors' travel packages (#5212) 2020-01-09 14:17:54 +03:00
Andrei Kortunov
22a0549e73
Merge pull request #2656 from Capostrophic/sneak
Don't combine sneak idle with scripted/wander idles (bug #4284)
2020-01-07 11:26:59 +04:00
Alexei Dobrohotov
87f9b85e21
Merge pull request #2653 from akortunov/log
Improve BetaComment handling
2020-01-06 17:34:09 +03:00
Andrei Kortunov
a42396254b Use ISO format to print datetime 2020-01-06 11:27:11 +04:00
capostrophic
9b28420875 [Regression] Make creatures autoequip shields properly again 2020-01-05 23:49:19 +03:00
capostrophic
29c6a8975a Don't combine sneak idle with scripted/wander idles (bug #4284) 2020-01-05 15:09:02 +03:00
Andrei Kortunov
af36b652aa Simplify datetime formatting 2020-01-04 10:45:11 +04:00
Andrei Kortunov
b6899a821b Improve BetaComment handling (feature #4129) 2020-01-03 08:45:53 +04:00
Andrei Kortunov
3704acf857 Unify streams usage to support non-ASCII paths (bug #5239) 2020-01-03 07:10:17 +04:00
capostrophic
c61f64ae86 Fix tests 2020-01-02 13:07:27 +03:00
Andrei Kortunov
71e1d576cd Allow to enchant multiple projectiles at once (feature #3517) 2019-12-31 21:31:49 +04:00
Alexei Dobrohotov
119382ed13
Merge pull request #2647 from akortunov/warnfix2
Do not use the QStringList::fromSet, which is deprecated since Qt 5.14
2019-12-31 12:33:40 +03:00
Alexei Dobrohotov
133b99bf18
Merge pull request #2622 from akortunov/testcells
Implement TestCells and TestInteriorCells console commands
2019-12-29 14:27:48 +03:00
Andrei Kortunov
d57253c5e2 Do not use the QStringList::fromSet, which is deprecated since Qt 5.14 2019-12-28 21:38:49 +04:00
Alexei Dobrohotov
2693598d82
Merge pull request #2642 from akortunov/warnfix2
Add safety checks for door state
2019-12-23 21:22:56 +03:00
Andrei Kortunov
88a695f251 Add safety checks for door state 2019-12-23 19:29:12 +04:00
Andrei Kortunov
24ce242941 Implement TestCells (feature #5219) 2019-12-22 11:13:42 +04:00
Andrei Kortunov
cd81f81fb6 Initialize variables to avoid GCC warnings 2019-12-22 10:44:14 +04:00
Andrei Kortunov
089548cdc4 Fix build on Qt4 2019-12-22 10:31:32 +04:00
Andrei Kortunov
30a18c2a66
Merge pull request #2625 from Capostrophic/sneaking
[Regression] Attempt to fix idle state reset again
2019-12-20 14:32:22 +04:00
Andrei Kortunov
78450312bf Fix the last warning about deprecated Qt functions 2019-12-20 13:36:32 +04:00
Andrei Kortunov
47a13f1ed2 Do not use deprecated Qt API in the launcher 2019-12-20 12:59:56 +04:00
Andrei Kortunov
e44021b369 Fix most of deprecated API usage in the editor 2019-12-20 12:59:56 +04:00
Andrei Kortunov
5220177ebc Fix ESMTool build 2019-12-19 15:21:49 +04:00
Assumeru
737aa1e4e8 Remove FactionID editing from OpenCS (#2636)
* Remove FactionID editing

* remove useless comments

* rename FactionID to Unknown
2019-12-18 20:42:54 +03:00
Assumeru
dfbe0021a5 Change rescaling to be more inline with vanilla (fixes #5214) (#2635)
* move rescaling to loadData

* clamp on save
2019-12-18 19:37:45 +03:00
Andrei Kortunov
97ee4bc349 Improve equipment logic (bug #5223) 2019-12-14 22:30:27 +04:00
Capostrophic
483b37bb3f Disallow resting if the fall height hasn't been reset (bug #4802) 2019-12-12 15:26:02 +03:00
Andrei Kortunov
3d9c42e8ee Cap reputation values (bug #5226) 2019-12-11 08:47:46 +04:00
Capostrophic
0a96f065d7 Launcher: improve first run and missing game data dialogues (bug #4009) 2019-12-08 17:03:27 +03:00
Capostrophic
0bc13b47fa Fix essimporter script header and inventory item conversion 2019-12-05 23:50:55 +03:00