1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-23 12:53:52 +00:00
Commit graph

21193 commits

Author SHA1 Message Date
Mads Buvik Sandvei
426f5952a5 Prevent movement only when *scripted* animations are playing. Otherwise idle animations of wandering NPCs will slide. 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
a9ade184d8 mLoopCount is the number of *remaining* loops. So we should be checking for >0, not >1. 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
92a5e52407 rename "persisted" animations to "scripted", because that is what they actually are. And begin teaching the animation system to distinguish between a scripted and an unscripted animation. 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
24890a729b clang'd 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
8792e76f5d explicitly prevent movement whenever playing scripted animations 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
cdb325f19a Rewrite CharacterController::updateAnimQueue() to properly maintain the animation queue and clean up finished animations. 2023-10-29 14:53:03 +01:00
Alexei Kotov
50f3b81096 Merge branch 'settings_values_terrain' into 'master'
Use settings values for Terrain settings (#6876)

See merge request OpenMW/openmw!3529
2023-10-29 13:15:54 +00:00
Alexei Kotov
e6137cff73 Merge branch 'tapdancers' into 'master'
AiWander must update wandering manually flag when resuming existing path.

Closes #7647

See merge request OpenMW/openmw!3526
2023-10-29 13:10:01 +00:00
uramer
1ec4681e40 Merge branch 'areyouthere' into 'master'
Add record presence early-outs for various script instructions (feature #7625)

Closes #7625

See merge request OpenMW/openmw!3501
2023-10-29 12:15:48 +00:00
Mads Buvik Sandvei
24bac3ebd4 AiWander must update mIsWanderingManually when resuming wander. 2023-10-29 01:07:46 +02:00
Evil Eye
6cd5734fb3 Rate weapons as useless if the actor's skill is 0 2023-10-28 10:49:18 +02:00
elsid
7e5a1cec04
Use settings values for Terrain settings 2023-10-27 22:32:20 +02:00
psi29a
f724b05c57 Merge branch 'teleport_block' into 'master'
Lua: Add isTeleportingEnabled and setTeleportingEnabled to types.Player

See merge request OpenMW/openmw!3519
2023-10-27 17:37:04 +00:00
Zackhasacat
6a671186ee Removed unused var 2023-10-26 11:50:50 -05:00
psi29a
8380da2e1d Merge branch 'missmewiththatscript' into 'master'
Remove missing scripts from actors much like is done for items

Closes #7204

See merge request OpenMW/openmw!3502
2023-10-26 16:24:35 +00:00
psi29a
664caa2fc1 Merge branch 'iseeyou' into 'master'
Prevent fleeing in inappropriate situations (bug #6932)

Closes #6932

See merge request OpenMW/openmw!3508
2023-10-26 16:24:10 +00:00
psi29a
bdd0299fe7 Merge branch 'flyyouscamps' into 'master'
Allow talking with fleeing creatures (bug #7631)

Closes #7631

See merge request OpenMW/openmw!3510
2023-10-26 16:23:57 +00:00
psi29a
035004170c Merge branch 'datadirs' into 'master'
Launcher: Improve directory appending UX and heuristics (bug #7502)

Closes #7502

See merge request OpenMW/openmw!3490
2023-10-26 16:23:28 +00:00
Zackhasacat
3e31142c0b Remove lua action 2023-10-25 17:24:18 -05:00
psi29a
6a87ba8f33 Merge branch 'mygui343_fix' into 'master'
Fix MyGUI 3.4.3 issues [#7528]

See merge request OpenMW/openmw!3319
2023-10-25 12:35:13 +00:00
psi29a
f3931c8321 Merge branch 'lua_hud_hide' into 'master'
Add functions to lua ui library to toggle HUD visibility, and check current status.

See merge request OpenMW/openmw!3450
2023-10-25 12:34:56 +00:00
Zackhasacat
ac9cfc782a Add functions to lua ui library to toggle HUD visibility, and check current status. 2023-10-25 12:34:56 +00:00
Alexei Kotov
e6c02efbb7 Add record presence early-outs for various script instructions (feature #7625)
AddItem, RemoveItem, StartScript, StopScript, AddTopic
2023-10-24 23:19:53 +03:00
Evil Eye
23bf6ed878 Remove missing scripts from actors much like is done for items 2023-10-24 20:59:45 +02:00
Zackhasacat
f4d349070c Add isTeleportingEnabled and setTeleportingEnabled 2023-10-24 13:51:12 -05:00
Petr Mikheev
f547cd5934 Merge branch 'lua_object_var' into 'master'
Add lua binding for gameObject globalVariable

See merge request OpenMW/openmw!3483
2023-10-24 13:55:51 +00:00
Zackhasacat
78e9a1753e Add lua binding for gameObject globalVariable 2023-10-24 13:55:50 +00:00
Petr Mikheev
31f5c8826b Merge branch 'lua_global_new' into 'master'
Add global variable access to world.mwscript (#7597)

See merge request OpenMW/openmw!3491
2023-10-24 09:23:25 +00:00
Zackhasacat
db42a91867 Add global variable access to world.mwscript (#7597) 2023-10-24 09:23:25 +00:00
Mads Buvik Sandvei
354b028072 isMovementAnimationControlled should be private. 2023-10-22 17:23:27 +02:00
Mads Buvik Sandvei
e893767ed0 Redundant line 2023-10-22 17:23:27 +02:00
Mads Buvik Sandvei
45a2b8042d Derive the value of MovementAnimationControlled instead of storing it. 2023-10-22 17:23:27 +02:00
Mads Buvik Sandvei
dcf6a1fc3c Refresh mMovementAnimationControlled when refreshing idle animations. 2023-10-22 17:22:50 +02:00
Alexei Kotov
f68bd3ba97 Launcher: Improve directory appending UX and heuristics (bug #7502)
- Recognize more asset directories and omwgame files
- Always let the user append the selected directory
- Automatically pick the user-selected directory if it's the only valid directory
- Add a caption to directory selection dialog, properly handle cancellation
2023-10-22 16:20:19 +03:00
Alexei Kotov
3330907d7b Combat AI: Prefer picking reachable/visible targets (bug #6932) 2023-10-22 16:20:02 +03:00
Alexei Kotov
ee5ca066fd Allow talking with fleeing creatures (bug #7631) 2023-10-22 16:18:52 +03:00
Bret Curtis
1bd4860026 no more obsolete mygui shizzle for macos 2023-10-22 11:25:39 +02:00
psi29a
a08ca11c34 Merge branch 'boundingboxing' into 'master'
BulletNifLoader: Replicate node bounds handling more closely

See merge request OpenMW/openmw!3505
2023-10-22 08:52:23 +00:00
psi29a
631a3954b1 Merge branch 'notsocharmingnow' into 'master'
Don't apply Charm to creatures (bug #7630)

Closes #7630

See merge request OpenMW/openmw!3507
2023-10-22 08:52:04 +00:00
Alexei Kotov
d0ffe6e2f9 Don't apply Charm to creatures (bug #7630) 2023-10-21 07:10:16 +03:00
Alexei Kotov
9405e5cb3c BulletNifLoader: Replicate node bounds handling more closely 2023-10-19 03:11:55 +03:00
Cody Glassman
5fc46b166a track debug window size and dimensions between sessions 2023-10-18 09:04:57 -07:00
Evil Eye
97009f1e23 Merge Assumeru/mystringvui 2023-10-17 23:53:04 +02:00
Bret Curtis
e97b07b6a4 additional cleanup 2023-10-17 23:53:04 +02:00
Bret Curtis
43a931d3c4 [#7528] Fix MyGUI 3.4.3 issues 2023-10-17 23:53:04 +02:00
psi29a
ed2e969802 Fix build 2023-10-17 20:10:19 +00:00
psi29a
798ff7062b Merge branch 'bullet' into 'master'
BulletNifLoader updates

See merge request OpenMW/openmw!3498
2023-10-17 07:40:45 +00:00
psi29a
9259f5c056 Merge branch 'merryweather' into 'master'
Replace more sized reads and change weather loading

See merge request OpenMW/openmw!3496
2023-10-16 20:06:59 +00:00
psi29a
97d9f9c4f3 Merge branch 'dont-lose-your-head' into 'master'
Add missing headers to components/CMakeLists.txt

See merge request OpenMW/openmw!3499
2023-10-16 20:06:47 +00:00
elsid
7ac402390a
Use settings values for Water settings 2023-10-15 23:24:46 +02:00