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

2865 commits

Author SHA1 Message Date
psi29a
6fee37b3c3 Merge branch 'activeactiveactive' into 'master'
Move index from ActiveEffect to ActiveSpellEffect

See merge request OpenMW/openmw!4212
2024-07-11 09:03:22 +00:00
psi29a
bfcdc16ca5 Merge branch 'move360-fix-no-zoom' into 'master'
Add Camera.isZoomEnabled check to move360 zooming

Closes #8064

See merge request OpenMW/openmw!4247
2024-07-11 09:02:24 +00:00
Sam Kaufman
f258f9ec68 Set macOS app. category to role-playing game. 2024-07-10 07:34:08 +00:00
psi29a
a0e3b2ce85 Merge branch 'cleanup_logs' into 'master'
Clean up a debug log

See merge request OpenMW/openmw!4246
2024-07-09 21:33:18 +00:00
trav
0d14464fdf Merge branch openmw:master into move360-fix-no-zoom 2024-07-09 18:58:32 +00:00
psi29a
5be78f89b8 Merge branch 'master' into 'lalat-dalam-cawan'
# Conflicts:
#   files/lua_api/openmw/types.lua
2024-07-09 07:49:29 +00:00
psi29a
7d0fca1bf5 Merge branch 'noscript' into 'master'
Make mwscript return nil for records that don't have a script

See merge request OpenMW/openmw!4236
2024-07-09 07:47:24 +00:00
psi29a
82f6845b70 Merge branch 'hotpursuit' into 'master'
Require Pursue packages to target a player

See merge request OpenMW/openmw!4239
2024-07-09 07:44:21 +00:00
trav5
d4e6dd9f8c Add Camera.isZoomEnabled check to move360 zooming
Early return in the processZoom3rdPerson function at move360.lua
extended with a check for disabled zoom in the Camera interface.

This fixes #8064 - prevents from switching between 1st and 3rd person
camera by pressing zoom in/out inputs when zooming is disabled.
2024-07-08 23:30:05 +02:00
uramer
dbbcbaa4c5 Clean up a debug log 2024-07-08 21:41:31 +02:00
psi29a
3a5ed998e7 Merge branch 'timeplayed' into 'master'
Remove time played setting

See merge request OpenMW/openmw!4235
2024-07-08 07:29:29 +00:00
Evil Eye
0342a299cc Require Pursue packages to target a player 2024-07-07 15:05:19 +02:00
Kuyondo
4bacf0d55a Its sound id not sound path 2024-07-07 21:03:43 +08:00
Evil Eye
ee653eb2b8 Make mwscript return nil for records that don't have a script 2024-07-07 13:58:34 +02:00
psi29a
061f10bef7 Merge branch 'enchantmentproptorecord' into 'master'
Return nil for absent values in record properties (enchant)

See merge request OpenMW/openmw!4228
2024-07-06 21:33:55 +00:00
Kindi
bf9f5dc2ef dont return empty string for absent value 2024-07-06 00:40:06 +08:00
Kindi
045e6d8c4f move enchant charge and soul to itemdata 2024-07-05 23:33:55 +08:00
psi29a
ef0bb02def Merge branch 'master' into 'master'
An ability to specify attack type in controls.use value

See merge request OpenMW/openmw!4187
2024-07-05 08:12:17 +00:00
Alexei Kotov
888abc0097 Remove time played setting 2024-07-05 07:13:45 +03:00
Cody Glassman
45cb3eb081 lua - use loaded node when possible when calculating bounding box 2024-07-03 13:29:01 -07:00
Dave Corley
8130410200 FIX(animation.lua): Use lowercase instead of camelcase as the function
expects lower
2024-06-29 22:14:19 -05:00
psi29a
4da35c7e7f Merge branch 'free_range_containers' into 'master'
FEAT: Add organic/respawning flags to containers (Close #8038)

Closes #8038

See merge request OpenMW/openmw!4205
2024-06-29 09:21:12 +00:00
Evil Eye
8a022651f7 Move index from ActiveEffect to ActiveSpellEffect 2024-06-28 17:23:51 +02:00
Dave Corley
77fa41b8c6 CLEANUP(container): Make organic/respawning field names more consistent 2024-06-28 09:26:35 -05:00
Dave Corley
fccf75377d FEAT: Add organic/respawning flags to containers 2024-06-28 09:21:44 -05:00
Evil Eye
91bcd0a556 Add a showInDialogue parameter to ui.showMessage and use it for level up messages 2024-06-27 17:16:49 +02:00
Max Yari
13918e3b70 AttackType -> ATTACK_TYPE 2024-06-24 01:15:43 +02:00
Max Yari
88e4ec198d Changed value type in the docs 2024-06-22 00:15:19 +02:00
Max Yari
b01b76b81e Introduced attacktype enum, fixed lua docs 2024-06-21 23:18:48 +02:00
Max Yari
2ef0568dda Changed lua enum name, tweaked docs 2024-06-21 23:18:48 +02:00
Max Yari
70c822d036 Updated lua docs description 2024-06-21 23:18:48 +02:00
Alexei Kotov
348ef6ff2f Update settings-default.cfg light bounds multiplier comment 2024-06-21 20:22:26 +03:00
psi29a
3a686dd8af Merge branch 'lua_travel_dest_2' into 'master'
Expose cell ID, Add actor travel destinations to types.Actor.record.servicesOffered

See merge request OpenMW/openmw!3592
2024-06-19 21:38:27 +00:00
Zackhasacat
533ce499e0 Expose cell ID, Add actor travel destinations to types.Actor.record.servicesOffered 2024-06-19 21:38:27 +00:00
Kindi
ecb07c9bc7 add mwscript.isRunning 2024-06-17 08:05:52 +08:00
psi29a
9523aab18e Merge branch 'objectisinstance(lockable)' into 'master'
Doc: Add objectisinstance to lockable

See merge request OpenMW/openmw!4175
2024-06-15 08:42:24 +00:00
Kindi
cdc77a1d2c add missing objectisinstance to lockable 2024-06-14 12:19:25 +08:00
Alexei Kotov
6ad914919b Remove launcher lighting settings that support runtime changes
Also update lighting method descriptions
2024-06-12 22:44:12 +03:00
Alexei Kotov
ccd36e9413 Support light fade settings in legacy lighting method
This doesn't change launcher descriptions because the launcher settings are going to be omitted
2024-06-12 22:44:12 +03:00
psi29a
cbf0471d8a Merge branch 'launch_button' into 'master'
Set minimum width for Launch OpenMW button

See merge request OpenMW/openmw!4162
2024-06-10 13:51:13 +00:00
psi29a
56183ba982 Merge branch 'ingameppl' into 'master'
Move force per-pixel lighting setting to the in-game settings

See merge request OpenMW/openmw!4137
2024-06-10 13:49:14 +00:00
Andrei Kortunov
fb3687e62a Set minimum width for Launch OpenMW button 2024-06-08 17:20:54 +04:00
psi29a
176e6490c5 Merge branch 'stufftheminasack' into 'master'
Drop 360-degree screenshot support (#7720)

Closes #7720

See merge request OpenMW/openmw!4158
2024-06-07 20:50:43 +00:00
psi29a
24d8accee7 Merge branch 'lua_base_disposition_fns' into 'master'
lua - Add [get,set,mod]BaseDisposition functions to npc type

See merge request OpenMW/openmw!4142
2024-06-06 21:44:55 +00:00
Alexei Kotov
93d1c6d7e0 Drop 360-degree screenshot support (#7720) 2024-06-06 14:46:01 +03:00
Alexei Kotov
593d4ff714 Move per-pixel lighting to the in-game settings 2024-06-06 05:19:33 +03:00
Sebastian Fieber
ed26708e4d more dry + restrict mutation of disposition to global and on self 2024-06-05 18:09:54 +02:00
psi29a
32dd4a4a68 Merge branch 'windows11_qss' into 'master'
Improve dark mode stylesheets

See merge request OpenMW/openmw!4148
2024-06-04 20:38:46 +00:00
Andrei Kortunov
937101d580 Add a dark style sheet tweaked for Windows 11 2024-06-02 16:58:02 +04:00
Andrei Kortunov
98c0b712f5 Update some lines in Russian translations 2024-06-02 13:55:17 +04:00
Sebastian Fieber
da4531faa0 rename modBaseDisposition to modifyBaseDisposition 2024-05-31 19:39:02 +02:00
Sebastian Fieber
f683adeb14 Add [get,set,mod]BaseDisposition functions to npc type 2024-05-30 00:08:11 +02:00
Joakim Berg
fcc29eeefe duh, found more post processing mistranslations 2024-05-25 18:14:01 +00:00
Joakim Berg
60e8275bb9 Fixed some small translation errors 2024-05-25 18:09:31 +00:00
Alexei Kotov
950d65a382 Merge branch 'rollback_music_interface' into 'master'
Rollback a Muisc interface

See merge request OpenMW/openmw!4129
2024-05-25 15:31:16 +00:00
psi29a
6e0606b55b Merge branch 'paralysisagainagain' into 'master'
Make paralysis cancel camera mode changes (#7997)

Closes #7997

See merge request OpenMW/openmw!4122
2024-05-24 23:06:35 +00:00
psi29a
16572109fc Merge branch 'restoringthelightfacingthedark' into 'master'
Lighting fixes, non-exciting part

See merge request OpenMW/openmw!4126
2024-05-24 23:05:07 +00:00
psi29a
157a5a4489 Merge branch 'l10n' into 'master'
Many localization fixes

See merge request OpenMW/openmw!4108
2024-05-24 17:46:47 +00:00
Andrei Kortunov
aa07dc0312 Rollback a Muisc interface 2024-05-24 10:16:28 +04:00
Alexei Kotov
f87aa02390 Don't clamp individual light contribution in shaders as FFP doesn't do this 2024-05-23 18:06:10 +03:00
psi29a
d15be7a685 Merge branch 'fix-nearest-gui-options' into 'master'
Fix incorrect texture filtering GUI for nearest, allow to disable nearest from GUI

See merge request OpenMW/openmw!4114
2024-05-23 10:07:42 +00:00
psi29a
db27543ea1 Merge branch 'uniform_choice' into 'master'
Add choice widget type to postprocessing uniforms

See merge request OpenMW/openmw!3969
2024-05-23 10:06:22 +00:00
Alexei Kotov
462818c304 Make paralysis cancel camera mode changes (#7997) 2024-05-23 12:29:10 +03:00
Sam Hellawell
a7991f9988 Update german translation 2024-05-23 04:11:29 +01:00
Sam Hellawell
d3c1aa6653 Fix incorrect texture filtering GUI for nearest, allow to disable nearest from GUI 2024-05-23 04:11:29 +01:00
psi29a
cd116ebe5f Merge branch 'dark_mode' into 'master'
Support dark mode on Windows

Closes #7985

See merge request OpenMW/openmw!4101
2024-05-20 14:51:20 +00:00
Andrei Kortunov
9f470b45fa Improve size grip appearance 2024-05-20 16:50:25 +04:00
Andrei Kortunov
d1d3a6e631 Make some buttons more noticable in dark mode 2024-05-20 16:50:25 +04:00
Andrei Kortunov
bf682d51a6 Support dark mode on Windows (feature 7985) 2024-05-20 16:50:24 +04:00
Andrei Kortunov
5a1ec8ce87 Implement Lua-based music 2024-05-19 22:10:54 +04:00
Alexei Kotov
45035413e9 Shorten Swedish am/pm lines to make them less confusing 2024-05-18 08:38:00 +03:00
Alexei Kotov
2aa5c78424 Add Swedish translations for the newly exposed lines 2024-05-18 07:38:05 +03:00
Alexei Kotov
1528522c4d Add French translations for the newly exposed lines
Bump the max width for Prefs page checkbox captions to allow butchering the lines less
2024-05-17 18:31:26 +03:00
Alexei Kotov
f2f9ce343e Add German translations for the newly exposed lines 2024-05-17 13:58:16 +03:00
Alexei Kotov
86ecf3fa0c Make saved game dialog Health and Level lines localizable
Currently providing English, Russian and GMST-based localization.
2024-05-17 05:01:06 +03:00
Alexei Kotov
71dc14cbb2 Use standard quote marks for German OMWControls and OMWCamera
Mystic Cards doesn't provide glyphs for the quote marks Atahualpa used
2024-05-17 04:25:48 +03:00
Alexei Kotov
381ab8e0d2 Unbreak Swedish OMWEngine localization 2024-05-17 03:24:03 +03:00
Alexei Kotov
04989953ad Make rest autosave, crosshair and best attack lines localizable
This includes English, Russian and GMST-based localization for these lines
2024-05-17 02:57:16 +03:00
Alexei Kotov
309201934a Fix Calendar localizations in German, Swedish and Russian
The proper translations for some lines can't come from data/l10n/Calendar variants of the files as these are overridden and aren't included to begin with
Capitalize Dag in Swedish localization
Add all missing lines in Russian localization
Properly supply all localization files
2024-05-17 02:55:56 +03:00
Zackhasacat
c63c1e69cf Lua: Add missing light flags, allow creating light record via world.createRecord 2024-05-13 14:14:44 +00:00
psi29a
f595015ffc Merge branch 'fix-ci-language' into 'master'
Fix CI - missing english launcher translations

See merge request OpenMW/openmw!4092
2024-05-12 08:39:08 +00:00
psi29a
7f54486e80 Merge branch 'doc_has_more_probls' into 'master'
Very minor doc changes

See merge request OpenMW/openmw!4072
2024-05-12 08:38:00 +00:00
Sam Hellawell
4281ea28f6 Fix missing english launcher translations 2024-05-12 05:37:37 +01:00
Zackhasacat
3659890b28 Fix link 2024-05-11 22:21:41 -05:00
psi29a
85ee730b97 Merge branch 'capitalizeonthetimeofdaysystem' into 'master'
Adjust default spellings for English l10n am/pm/day lines

Closes #7969

See merge request OpenMW/openmw!4089
2024-05-11 12:38:27 +00:00
psi29a
ea7555c012 Merge branch 'feature/pplLauncherSetting' into 'master'
added force PPL checkbox

See merge request OpenMW/openmw!3857
2024-05-11 07:45:04 +00:00
psi29a
919d1e366e Merge branch 'staticcollections' into 'master'
Place static collections to the scene and fix item modification record loading

See merge request OpenMW/openmw!4085
2024-05-11 07:43:28 +00:00
Alexei Kotov
37e11df59b Adjust default spellings for English l10n am/pm/day lines 2024-05-10 15:38:34 +03:00
Benjamin Y
553ae5249e fixed ru translation 2024-05-10 06:47:23 -05:00
psi29a
ef93c01a44 Merge branch 'overlapremnants' into 'master'
Remove some more remnants of 'allow shadow map overlap'

See merge request OpenMW/openmw!4083
2024-05-10 11:30:00 +00:00
Zackhasacat
0e1678b3b8 Merge branch 'mwdialogue-bindings' into 'master'
Add Lua bindings for ESM::Dialogue record stores to openmw.core

Closes #7964

See merge request OpenMW/openmw!4034
2024-05-09 23:22:03 +00:00
Alexei Kotov
7d979a2dfc Place ESM4 static collections to the scene 2024-05-09 17:26:27 +03:00
Alexei Kotov
5aa67abe47 Remove some more remnants of 'allow shadow map overlap' 2024-05-09 00:31:11 +03:00
Zackhasacat
8cd488b91f Add hidden to faction docs 2024-05-07 16:01:05 -05:00
Zackhasacat
921ee8ffe6 Merge branch 'master' of gitlab.com:openmw/openmw into doc_has_more_probls 2024-05-07 15:57:30 -05:00
Alexei Kotov
b9069835b2 Merge branch 'scriptedit' into 'master'
Improve appearance of script editor in the OpenMW-CS

See merge request OpenMW/openmw!4076
2024-05-07 13:22:58 +00:00
trav
fc6695a918 Merge branch openmw:master into mwdialogue-bindings 2024-05-06 18:27:19 +00:00
Andrei Kortunov
b56c255be2 Improve appearance of script editor in the OpenMW-CS 2024-05-06 12:22:30 +04:00
psi29a
2e971ec2e3 Merge branch 'appropriateammunition' into 'master'
Adjust Russian appropriate ammunition setting label/description

See merge request OpenMW/openmw!4062
2024-05-05 20:19:45 +00:00
trav
512b7e46e5 Merge branch openmw:master into mwdialogue-bindings 2024-05-04 14:35:31 +00:00