mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 16:45:43 +00:00
Code Issues Releases Wiki Activity
32769 commits 108 branches 66 tags 134 MiB
Commit graph

21413 commits

Author SHA1 Message Date
Alexei Kotov
c7d5ea9fbf Improve BulletNifLoader handling of extra data 
Only handle extra data for the root node(s)
Properly handle MRK flag editor marker filtering
Fix BSXFlags test
 2023-11-14 01:30:36 +03:00
elsid
1fa5d2ca98
Use settings values for GUI tags 2023-11-12 16:33:48 +01:00
elsid
8f27178a0b
Use settings values for navigator in the launcher 2023-11-12 16:33:44 +01:00
elsid
01316f15b8
Avoid redundant conversion to string 2023-11-12 16:33:38 +01:00
Andrei Kortunov
155b07f341 Do not update WindowManager by world data when there is no game 2023-11-12 12:23:29 +04:00
kuyondo
a2de470804 minor partial equipping fix 2023-11-12 12:22:35 +08:00
uramer
fe68ff7807 Merge branch 'controller_can_tab' into 'master' 
Allow Shoulder Buttons on Controller to act as Tab and Shift Tab in menus

Closes #7554

See merge request OpenMW/openmw!3397
 2023-11-11 16:30:16 +00:00
Zackhasacat
96178a2605 Allow Shoulder Buttons on Controller to act as Tab and Shift Tab in menus 2023-11-11 16:30:16 +00:00
Cody Glassman
85fcfbafda apply same logic to render targets, remove UB 2023-11-10 21:22:11 -08:00
Cody Glassman
dec120f38c consistent average scene luminance 2023-11-10 21:00:47 -08:00
Alexei Kotov
49f13c53c0 Merge branch 'makeunlocksoundwhenlocking' into 'master' 
Play a sound when lock spell succeeds

See merge request OpenMW/openmw!3578
 2023-11-09 20:00:55 +00:00
jvoisin
9fb5fe26e6 Merge branch 'render_target_fixes' into 'master' 
[Postprocessing] Fix dirty flag and share luminance calculator between frames

See merge request OpenMW/openmw!3566
 2023-11-08 22:50:51 +00:00
Cody Glassman
cdaa44f24c [Postprocessing] Fix dirty flag and share luminance calculator between frames 2023-11-08 22:50:50 +00:00
jvoisin
32a9581394 Merge branch 'deepdepths' into 'master' 
Depth flag handling fixes (bug #7380)

See merge request OpenMW/openmw!3568
 2023-11-08 22:47:29 +00:00
AnyOldName3
9b6d82566f Merge branch 'unbound' into 'master' 
Don't use Bounding Box node bounds as the original collision shape

See merge request OpenMW/openmw!3562
 2023-11-08 16:33:16 +00:00
Kindi
a7a48aaa91 make successful lockspell play unlock sound 2023-11-09 00:27:07 +08:00
Zackhasacat
ec81bd7f1b rename specilizationIndexToLuaId 2023-11-07 12:01:54 -06:00
Zackhasacat
cb705ff02a Revert redundant changes 2023-11-07 11:52:53 -06:00
Zackhasacat
ae4eafdfd4 Move classes to types.NPC 2023-11-07 11:50:09 -06:00
Zackhasacat
81da58478d Remove test use 2023-11-07 11:41:14 -06:00
Zackhasacat
76f872aaa2 use std:;array 2023-11-07 11:40:43 -06:00
Evil Eye
76843aff19 Merge branch 'getcellnametes4' into 'master' 
Use the display name instead of the editor ID for World::getCellName

See merge request OpenMW/openmw!3564
 2023-11-07 16:45:55 +00:00
Evil Eye
5356f54526 Merge branch 'savedgamehealth' into 'master' 
Cast displayed health to int in saved game dialog (#7656)

Closes #7656

See merge request OpenMW/openmw!3563
 2023-11-07 16:45:42 +00:00
Alexei Kotov
48c1c2cf08 Merge branch 'partialequippingp2' into 'master' 
Fix partial ammo equipping

See merge request OpenMW/openmw!3434
 2023-11-07 03:55:58 +00:00
Zackhasacat
5a0de322a3 Merge branch 'fix_use_item' into 'master' 
Fix #7674

Closes #7674

See merge request OpenMW/openmw!3567
 2023-11-07 03:07:43 +00:00
Alexei Kotov
bdc019647a Merge branch 'figure-skaters' into 'master' 
Use accumulated movement when possible

Closes #5062

See merge request OpenMW/openmw!3549
 2023-11-07 03:01:56 +00:00
Alexei Kotov
d5dbbfb570 Merge branch '75_chameleon' into 'master' 
Make "isTargetMagicallyHidden" include 75% Chameleon

See merge request OpenMW/openmw!3565
 2023-11-07 02:59:37 +00:00
Abdu Sharif
0f3dba28a7 Consider 75% Chameleon magical invisibility as well 2023-11-07 02:59:37 +00:00
Alexei Kotov
116ef1c62b Depth flag handling fixes (bug #7380) 
Properly disable depth test while allowing depth writes to happen
Remove NiStencilProperty interaction
Don't set up depth flags for BSShaderPPLightingProperty
 2023-11-06 02:19:56 +03:00
Petr Mikheev
a60726ce35 Fix #7674 2023-11-05 21:32:18 +01:00
Zackhasacat
231803c6ea Merge branch 'sunvisibility' into 'master' 
Make sun specularity behavior more intuitive (bug #6190)

Closes #6190

See merge request OpenMW/openmw!3535
 2023-11-05 17:55:27 +00:00
jvoisin
e88f8e09c3 Merge branch 'fixed' into 'master' 
Replace more variable width integers in ESM code

See merge request OpenMW/openmw!3518
 2023-11-05 16:36:13 +00:00
jvoisin
e4c5c1bc43 Merge branch 'govna' into 'master' 
Expose governing attributes to Lua

See merge request OpenMW/openmw!3556
 2023-11-05 16:35:27 +00:00
jvoisin
44dc29e675 Merge branch 'forurm' into 'master' 
Add types.Actor.isDead

See merge request OpenMW/openmw!3557
 2023-11-05 16:35:09 +00:00
Mads Buvik Sandvei
acf6178ea5 movement = movementFromAnimation; also when speed is 0. 2023-11-05 16:46:11 +01:00
Evil Eye
9fe0e4c035 Merge branch 'bsshaderdepth' into 'master' 
Support BSShader/BSLightingShader depth flags

See merge request OpenMW/openmw!3560
 2023-11-05 09:03:31 +00:00
Evil Eye
776677fd70 Merge branch 'enchantmenttooltips' into 'master' 
Validate enchantment records (bug #7654)

Closes #7654

See merge request OpenMW/openmw!3531
 2023-11-05 09:02:14 +00:00
Alexei Kotov
88749b03d4 Use display name instead of editor ID for World::getCellName 
Doesn't affect Morrowind cells, but allows TES4+ cells to have legible names
 2023-11-05 05:07:04 +03:00
Mads Buvik Sandvei
e86a4ebafe Fixes based on comments by capo 2023-11-04 21:01:06 +01:00
Alexei Kotov
255d509c84 Merge branch 'fix_esmtool_output' into 'master' 
Print uint8_t as unsigned in esmtool

See merge request OpenMW/openmw!3561
 2023-11-04 18:51:06 +00:00
Mads Buvik Sandvei
9ebec27daf use const. 2023-11-04 16:18:36 +01:00
Mads Buvik Sandvei
c7c3a52e6a Clang 2023-11-04 14:41:08 +01:00
Mads Buvik Sandvei
475bb1af65 Move calculating the animation direction into its own function to help simplify update(). Eliminate a pointless epsilon. 2023-11-04 14:34:41 +01:00
Mads Buvik Sandvei
1edc82062d Account for strafing when draw state is not nothing, and "turn to movement direction" is true 2023-11-04 14:13:02 +01:00
Mads Buvik Sandvei
68fe1361f1 Attempt at clarifying the code 2023-11-04 14:00:13 +01:00
Alexei Kotov
515a90e9e0 Cast displayed health to int in saved game dialog (#7656) 2023-11-04 04:30:40 +03:00
Zackhasacat
c311caef9a Redo specialization field 2023-11-03 17:19:53 -05:00
Alexei Kotov
2c1db92d04 Don't use Bounding Box node bounds as the original collision shape 
Bounding Box node bounds are not used for non-actor collision in Morrowind and the generated box isn't actually used for actor collision in OpenMW
Preserving btBoxShape cloning code because it might get used in the future
 2023-11-04 00:56:14 +03:00
elsid
7a0d1a0868
Print uint8_t as unsigned 2023-11-03 21:23:37 +01:00
Cody Glassman
9a5fa9b8d6 fix persistent buffers and glsl_version 2023-11-03 12:59:23 -07:00
AnyOldName3
e67135a517 Merge branch 'expiredborders' into 'master' 
Fix #7621

Closes #7621

See merge request OpenMW/openmw!3533
 2023-11-03 18:13:02 +00:00
Evil Eye
eb0ddf72d8 Merge branch 'fix_my_errors' into 'master' 
Fix minor doc error, throw error when attempting to assign a value to a non-existing global variable in lua

See merge request OpenMW/openmw!3548
 2023-11-03 16:31:23 +00:00
Zackhasacat
dd87d01f06 Fix minor doc error, throw error when attempting to assign a value to a non-existing global variable in lua 2023-11-03 16:31:23 +00:00
Alexei Kotov
af08205f19 Support BSShader/BSLightingShader depth flags 2023-11-03 18:38:01 +03:00
Alexei Kotov
876f6ea2da Validate enchantment records (bug #7654) 
Clean up spell validation
Fix a flaw in spell effect tooltip code
 2023-11-03 15:08:16 +03:00
AnyOldName3
07594037ca Merge branch 'settings_values_shadows' into 'master' 
Use settings values for Shadows settings (#6876)

See merge request OpenMW/openmw!3550
 2023-11-03 11:35:58 +00:00
Alexei Kotov
410fc17159 Merge branch 'fo4_abc' into 'master' 
Use correct template flags for FO4 NPCs

See merge request OpenMW/openmw!3544
 2023-11-03 01:30:08 +00:00
Evil Eye
1e06d74f82 Fix #7621 2023-11-02 21:53:22 +01:00
Mads Buvik Sandvei
9c93d907dc Settings page entry for the "player movement ignores animation" setting. 2023-11-02 19:30:51 +01:00
Evil Eye
2d90176fe9 Add types.Actor.isDead 2023-11-02 19:29:26 +01:00
Zackhasacat
ea3eeb6bad Merge branch 'master' of gitlab.com:openmw/openmw into lua_class_data 2023-11-02 13:00:20 -05:00
Zackhasacat
859b6c823f Fix includes 2023-11-02 12:21:59 -05:00
Zackhasacat
25fe42de10 Spacing 2023-11-02 12:17:55 -05:00
Zackhasacat
3c0c699e42 Do not use const 2023-11-02 12:15:48 -05:00
Zackhasacat
685c02bd73 Re-add missing line 2023-11-02 12:10:52 -05:00
Zackhasacat
e54eba7043 Formatting fixes 2023-11-02 12:08:07 -05:00
Evil Eye
a88f0ecc95 Expose governing attributes to Lua 2023-11-02 17:43:09 +01:00
Evil Eye
3baefdf29e Merge branch 'invisibilityagain' into 'master' 
Improve invisibility breaking consistency (bug #7660)

Closes #7660

See merge request OpenMW/openmw!3539
 2023-11-02 16:00:41 +00:00
elsid
f4efbcc1c4
Use settings values for Shadows settings 2023-11-02 16:36:44 +01:00
Alexei Kotov
4445a55084 Merge branch 'font_fix' into 'master' 
Fix TrueType fonts scaling

See merge request OpenMW/openmw!3541
 2023-11-02 13:09:17 +00:00
Mads Buvik Sandvei
452f7a470e fabsf -> abs 2023-11-01 23:19:13 +01:00
Mads Buvik Sandvei
a0f8bbc621 Bad merge 2023-11-01 20:34:39 +01:00
Mads Buvik Sandvei
f41de6b02d Use accumulated movement whenever possible. Apply diagonal movement by rotating accumulated movement and sliding based on that, rather than ignoring accumulated movement. 2023-11-01 20:31:57 +01:00
Mads Buvik Sandvei
93b723a066 Apply legs yaw to accumulated movement. 2023-11-01 20:30:26 +01:00
Zackhasacat
67e74936ff Make classes Read Only 2023-11-01 13:23:32 -05:00
Zackhasacat
482d174ef2 Read only, add skill spec to docs 2023-11-01 13:21:14 -05:00
jvoisin
d3ccc246c5 Apply 1 suggestion(s) to 1 file(s) 2023-11-01 12:03:49 +00:00
Petr Mikheev
4c6e081da3 Skip zero links to ArmorAddons 2023-11-01 10:30:19 +01:00
Zackhasacat
371eeddf85 Merge branch 'master' of gitlab.com:openmw/openmw into lua_class_data 2023-10-31 22:23:45 -05:00
Petr Mikheev
6c01ce2672 Use correct template flags for FONV and FO4 NPCs 2023-10-31 23:48:29 +01:00
Cody Glassman
7e9690e531 [renderer] render scene exclusively to fbo 2023-10-31 14:45:31 -07:00
Alexei Kotov
bff4666b7b Merge branch 'dont_save_esm4' into 'master' 
Stop trying to save ESM4 objects in omwsave files

See merge request OpenMW/openmw!3537
 2023-10-31 21:33:34 +00:00
Alexei Kotov
629fe8ce81 Merge branch 'we-all-know-actors-cant-read' into 'master' 
Some cleanup of scripted animation handling.

Closes #4742, #7637, and #7636

See merge request OpenMW/openmw!3522
 2023-10-31 21:31:58 +00:00
Alexei Kotov
6e069161a4 Merge branch 'sortalphabetcalinrechargeandrepairmenu' into 'master' 
Sort repair and recharge menu list alphabetically

See merge request OpenMW/openmw!3524
 2023-10-31 21:27:43 +00:00
Kindi
733a6e01ad Sort repair and recharge menu list alphabetically (bug #7642) 2023-10-31 21:27:42 +00:00
Alexei Kotov
0b8739711e Merge branch 'settings_values_video' into 'master' 
Use settings values for Video settings (#6876)

See merge request OpenMW/openmw!3527
 2023-10-31 21:24:53 +00:00
Alexei Kotov
c49c401441 Merge branch 'settings_values_stereo' into 'master' 
Use settings values for Stereo settings (#6876)

See merge request OpenMW/openmw!3530
 2023-10-31 21:21:32 +00:00
Andrei Kortunov
377d8c905c Fix TrueType fonts scaling 2023-10-31 10:59:57 +04:00
Alexei Kotov
03c3818229 Place ESM4::ItemMod into the scene 2023-10-31 00:54:44 +03:00
Alexei Kotov
3d5b06a78e Sort inactive shader list (#7652) 2023-10-30 23:46:25 +03:00
Alexei Kotov
2d38ca4c35 Improve invisibility breaking consistency (bug #7660) 
- Break on recharge attempts
- Break on repair attempts
- Break on potion creation attempts
- Don't break on failed ingredient consuming
 2023-10-30 15:30:01 +03:00
Kindi
3761797467 reimplement partial equipping 2023-10-30 11:20:34 +08:00
Petr Mikheev
e51dfca488 Stop trying to save ESM4 objects in omwsave files because they currently can not be saved and only lead to errors in logs. 2023-10-29 22:41:53 +01:00
Petr Mikheev
62b787a214 Merge branch 'ltexmstt' into 'master' 
Add movable static and ESM4 land texture stores, don't show tooltips for unnamed ESM4Named objects

See merge request OpenMW/openmw!3528
 2023-10-29 20:02:07 +00:00
Alexei Kotov
a891965d20 Merge branch 'uimodechanged' into 'master' 
Queue Lua handler `uiModeChanged`

See merge request OpenMW/openmw!3509
 2023-10-29 19:20:59 +00:00
Mads Buvik Sandvei
58e3fdac36 Clang format 2023-10-29 16:32:35 +01:00
Mads Buvik Sandvei
85f104fefe Comments from Capo 2023-10-29 15:33:07 +01:00
Mads Buvik Sandvei
afb9fa06d7 clang format 2023-10-29 14:54:01 +01:00
Mads Buvik Sandvei
70f41b22b6 Based on the reason for closing !1845, we *should* let a scripted animation get stuck forever if the animation was already playing. 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
cf5b782c76 More persist -> script language. 2023-10-29 14:53:03 +01:00
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
Alexei Kotov
12abd30e9f Make sun specularity behavior more intuitive (bug #6190) 
Remove sun visibility influence on object specularity
Subdue sun visibility influence on water specularity
 2023-10-29 04:11:40 +03: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
bb7ac64f19
Use settings values for Stereo and Stereo View settings 2023-10-27 23:30:17 +02:00
elsid
561a6bf854
Avoid using camera settings from stereo manager 2023-10-27 23:29:07 +02:00
elsid
7e5a1cec04
Use settings values for Terrain settings 2023-10-27 22:32:20 +02:00
Alexei Kotov
84cad3de01 Don't show tooltips for unnamed ESM4Named 2023-10-27 22:53:40 +03:00
Alexei Kotov
3f4591eb3b Add movable static and ESM4 land texture stores 2023-10-27 22:53:40 +03: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
elsid
dcd81d026f
Use settings values for Video settings 
* Convert window mode, vsync mode into enums, screenshot type into a struct.
* Add missing doc for screenshot type.
 2023-10-27 14:31:23 +02: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
c2943e2fd0 Use int32_t 2023-10-25 21:47:00 -05:00
Zackhasacat
2f16a104dc Revise record store, add specialization function 2023-10-25 21:38:42 -05:00
Zackhasacat
909be9cf35 Merge branch 'master' of gitlab.com:openmw/openmw into lua_class_data 2023-10-25 21:05:35 -05:00
Zackhasacat
f0640da21e Add character to core 2023-10-25 21:05:14 -05:00
Zackhasacat
3e31142c0b Remove lua action 2023-10-25 17:24:18 -05:00
Kindi
1bff02e3b0 add docs 2023-10-26 03:32:15 +08: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
Evil Eye
dc781bad5d Use fixed size unsigned ints for inventory offsets 2023-10-24 17:51:12 +02:00
Zackhasacat
15bee21286 Fix caps 2023-10-24 09:30:00 -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
Zackhasacat
254bf7c5d8 class -> classes 2023-10-23 22:23:30 -05:00
Zackhasacat
611f96ce65 Add class bindings 2023-10-23 22:19:16 -05: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