mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 16:29:55 +00:00
Code Issues Releases Wiki Activity
30931 commits 107 branches 66 tags 133 MiB
Commit graph

2165 commits

Author SHA1 Message Date
Petr Mikheev
b248c3e173 Allow passing initData to the :addSript call (#7091) 2022-12-31 22:08:17 +01:00
Petr Mikheev
1879c70d1e Return back old settings description and mention that they are moved to the in-game menu 2022-12-28 22:04:19 +01:00
Petr Mikheev
1869aeae5c Move some of player controls logic from C++ to Lua 2022-12-28 22:04:19 +01:00
psi29a
ba2ececa93 Merge branch 'resolution' into 'master' 
Improve window mode change

Closes #7087

See merge request OpenMW/openmw!2530
 2022-12-28 10:45:14 +00:00
psi29a
56b493877b Merge branch 'fonts' into 'master' 
Improve Mystic cards font

See merge request OpenMW/openmw!2516
 2022-12-28 10:44:21 +00:00
Andrei Kortunov
9e77654ab4 Add a hint about disabled resolution list in the Windowed Fullscreen mode 2022-12-27 13:42:39 +04:00
AnyOldName3
66b8d4fb29 Add a setting to control coverage adjustment 
With it on, which was always the case before this setting was added,
vanilla content and poorly-made mods will look acceptable, but well-made
mods will have alpha-tested meshes appear to grow and potentially gain a
weird outline as they get further away.

With it off, which replicates the 0.46 behaviour, well-made mods will
look really good, but vanilla content and poorly-made mods will have
alpha-tested meshes shrink as they get further away.

It's been bugging me that this was forced on since 0.47 released, and
I'd hoped to figure out a solution for automatic detection at some point
before 0.48 branched off, but I didn't, so now this is what we're
getting to have Tamriel Rebuilt look right.
 2022-12-09 00:22:08 +00:00
psi29a
1d55be8214 Merge branch 'lua_profiler' into 'master' 
Lua profiler

See merge request OpenMW/openmw!2523
 2022-12-07 10:53:47 +00:00
Petr Mikheev
7c36a7eb49 Run Lua GC in every frame 2022-12-03 17:09:11 +01:00
Petr Mikheev
55db95d4cf Update Lua profiler; add ability to run OpenMW with old LuaJit that doesn't allow custom allocator (Lua profiler will be disabled in this case) 2022-12-03 16:58:03 +01:00
Petr Mikheev
02a9069a0e Lua Profiler 2022-11-30 00:06:14 +01:00
Evil Eye
a648e4cc11 Add option to restore non-MCP Calm spell behaviour 2022-11-23 20:59:37 +01:00
Joakim Berg
e3619e40fe Some Swedish translations 2022-11-21 08:45:35 +00:00
Andrei Kortunov
1851a5afe0 Improve Mystic cards font 2022-11-20 12:15:53 +04:00
Andrei Kortunov
282f4cf9c3 Add missing translations 2022-11-20 11:54:59 +04:00
Andrei Kortunov
da5b442fcf Improve postprocess HUD layout 2022-11-10 08:31:21 +04:00
uramer
1789160057 Clear storage of setting groups on reloadlua 2022-11-06 19:36:58 +01:00
Petr Mikheev
589d7e821d Fix Lua settings UI not working after a save (#7005) 2022-11-03 22:13:39 +01:00
mpeco
e10b7e5c82 types.lua baseArmor comment 2022-10-11 00:01:12 -03:00
mpeco
fd2d9d7d1a types.lua typo 2022-10-11 00:01:12 -03:00
mpeco
af3af6e091 update types.lua 2022-10-11 00:01:11 -03:00
Andrei Kortunov
7d23ad29e0 Make count input box larger to fit larger text 2022-09-25 11:54:34 +04:00
AnyOldName3
84f8a6848a Renormalise line endings 
This should replace accidental CRLF with LF
 2022-09-16 00:53:24 +01:00
psi29a
80d52e3da8 Merge branch 'cursor' into 'master' 
Support high-resolution cursor textures

Closes #6933

See merge request OpenMW/openmw!2262
 2022-09-11 18:32:18 +00:00
psi29a
435eacdaad Merge branch 'debug_draw_commands' into 'master' 
API to draw primitives

See merge request OpenMW/openmw!2345
 2022-09-11 17:17:16 +00:00
Andrei Kortunov
a2c02d2999 Support high-resolution cursor textures (feature 6933) 2022-09-11 20:54:20 +04:00
florent.teppe
43b0ae1ce7 all debug renders now use the same shader and it works 
remove debug draw shader, now that debug and debugdraw serve the same function

remove debug draw code from actors to clean

replaced int uniforms with bool for better readability

clang format

cleanup, remove unused func, and mistake whitespace

fix namespace

added more colors

fixed missing whitespace
 2022-09-11 17:54:01 +02:00
florent.teppe
21971c08ba debug draw shader uses the generic functions 
renamed files

roundabout way to change case with windows noticing

fixed type

fix filename in cmakelist.txt

ported shader and c++ code so glsl 120 can be used instead of 330

new debug shader and old one are almost unified

for some reason, even though I get no compilation issue, old debug draws don't work, only the new one implemented by this MR

remove useless const cast
 2022-09-11 17:53:59 +02:00
florent.teppe
bd1bbc0ab8 removes mutex, and uses double buffering to avoid writing on a resource that will be read by the draw thread 
changes when the buffers are reset -> at the end of the draw, because that's when we are certain the data isn't needed anymore

removed useless variable
fixed typo
include osg::vec3 instead of osg vec3f

compile linux

compile ?

applied clang format to the new files
 2022-09-11 17:53:56 +02:00
florent.teppe
2a980ecb50 cleaned some code and fixed some naming issues 
Moved debug draw to components, fixed some whitespace issues, added include guard

fixed uniform name, removed old files

Fixes some more whitespace weirdness
 2022-09-11 17:53:53 +02:00
florent.teppe
12b3424dd7 initial work to get lines in 
lines need the same synchronisation system as the other primitives

This two points are there because if I resize to 0 it crashes, si I need a pice of line at 0.,0.,0. so there is no crash.Not ideal

Lines are colored

didn't commit updated shader file
 2022-09-11 17:53:51 +02:00
florent.teppe
76008e1ff8 Multiple shapes to draw 
adds wireCube primitive

scale of the command taken into account

shading light is more vertical
 2022-09-11 17:53:47 +02:00
florent.teppe
93af569a68 can place a cube at 0,0,0 Useless for now 
Arbitrarly draw cubes at certain position with a certain color

Adds exemple of how it looks in the actor update code.

draws a green cube if alive, red else
 2022-09-11 17:53:41 +02:00
psi29a
7e8a933be9 Merge branch 'doc_fix' into 'master' 
Remove deprecated setting from docs

See merge request OpenMW/openmw!2385
 2022-09-08 09:43:23 +00:00
Andrei Kortunov
6ec9616ddd Localize the 'show effect duration' option 2022-09-08 07:46:56 +04:00
glassmancody.info
137baa4f75 remove deprecated setting 2022-09-07 19:17:47 -07:00
Andrei Kortunov
cbe923eaa7 Revert changes in the progress bars layout 2022-09-05 10:33:26 +04:00
Abdu Sharif
7344a176b5 Fix bloomlinear options 2022-09-01 06:51:26 +00:00
Andrei Kortunov
3037f190be Implement per-font resolution 2022-08-30 12:16:30 +04:00
psi29a
945448cdf1 Merge branch 'font_fixes' into 'master' 
Improve built-in default fonts

See merge request OpenMW/openmw!2302
 2022-08-30 07:54:20 +00:00
Andrei Kortunov
3178868cc3 Improve built-in default fonts 2022-08-30 07:54:20 +00:00
Andrei Kortunov
8bac073f9c Enlarge character selection menu to fit long character or class names 2022-08-28 21:35:11 +04:00
Arnaud Dochain
5d089c9e46 Bloom shader (MR2313) french localisation 2022-08-28 14:38:07 +00:00
psi29a
d9ea6e36fa Merge branch 'remove_forgotten_code' into 'master' 
Remove forgotten commented-out debugging code

See merge request OpenMW/openmw!2319
 2022-08-25 08:55:42 +00:00
wareya
e7879e52df Remove forgotten commented-out debugging code 2022-08-25 08:55:42 +00:00
elsid
ab1ddc690e
Do not check getPolyHeight status 
It may fail in some cases depending on a platform without obvious reason.
 2022-08-24 23:30:36 +02:00
psi29a
f36e13444e Merge branch 'font_loading' into 'master' 
Cleanup fonts loading

See merge request OpenMW/openmw!2309
 2022-08-21 20:11:02 +00:00
psi29a
537c6e96ab Merge branch 'bloom_shader' into 'master' 
Add wareya's linear bloom shader

See merge request OpenMW/openmw!2313
 2022-08-21 12:53:46 +00:00
jvoisin
84c72b1c0a Add dots at the end, and add the .ru translation 2022-08-21 12:43:29 +02:00
Andrei Kortunov
9e1ab590f1 Cleanup fonts loading 2022-08-21 13:19:04 +04:00
psi29a
4078f19c74 Merge branch 'SHADER_HOT_RELOAD' into 'master' 
Shaders: Hot reload, togglable by lua debug command

See merge request OpenMW/openmw!2238
 2022-08-21 09:08:27 +00:00
jvoisin
534f0377d5 Add wareya's linear bloom shader 2022-08-20 19:50:34 +02:00
psi29a
7bb1856b74 Merge branch 'font_fixes' into 'master' 
Font fixes

See merge request OpenMW/openmw!2297
 2022-08-18 12:53:37 +00:00
Andrei Kortunov
2cae8bea5d Improve layout of Interface tab 2022-08-18 14:21:39 +04:00
Andrei Kortunov
2cd2b42e33 Improve handling of larger font size 2022-08-18 13:29:12 +04:00
Andrei Kortunov
c3d3f3140b Allow to change font settings in the launcher 2022-08-18 13:29:12 +04:00
Alexei Kotov
15f4b5515d Clarify object paging merge factor docs 2022-08-18 05:55:17 +03:00
psi29a
1e4dd46688 Merge branch 'fontconfig' into 'master' 
Allow users to decide if they need to import bitmap fonts

See merge request OpenMW/openmw!2270
 2022-08-17 21:16:31 +00:00
Andrei Kortunov
43f552f48f Allow users to decide if they need to import bitmap fonts 2022-08-17 22:12:15 +04:00
Joakim Berg
b3b1628439 Update BuiltInShaders/sv.yaml 2022-08-16 09:51:53 +00:00
Arnaud Dochain
19f4e58fed French i10n translations 2022-08-09 20:04:12 +02:00
florent teppe
baadc06e98 Merge branch 'master' into 'SHADER_HOT_RELOAD' 
# Conflicts:
#   apps/openmw/mwrender/postprocessor.hpp
 2022-08-09 09:26:55 +00:00
cody glassman
ac4b29be08 cleanup default shaders and remove confusing main shader 2022-08-07 06:42:48 -07:00
florent.teppe
df69fc7659 Post processing shaders now use the same lua commands, no more launcher option to enable live reload 2022-08-07 00:19:19 +02:00
florent.teppe
15751c57a0 Lua debug api doc 2022-08-04 13:36:24 +02:00
Alexei Kotov
a50b0eccc0 Fix loading screen scene snapshot layer 2022-08-01 20:08:56 +03:00
psi29a
454684bad3 Merge branch 'custom_actor_collision_shape_type' into 'master' 
Support cylinder and rotating box collision shape types for actors (#6138)

Closes #6138

See merge request OpenMW/openmw!2043
 2022-08-01 11:00:23 +00:00
psi29a
c8e5b90ac4 Merge branch 'postpass_hotfix' into 'master' 
[Postprocessing[ Temporary fix for artifacts in transparent post-pass (#6919)

See merge request OpenMW/openmw!2222
 2022-08-01 06:23:49 +00:00
glassmancody.info
02ded8832c temporary fix for artifacts in transparent post-pass 2022-07-31 18:51:42 -07:00
Petr Mikheev
9a4df75f3c Merge branch 'luaIngredient' into 'master' 
Lua Bindings for Ingredient Records

See merge request OpenMW/openmw!2205
 2022-07-31 20:31:29 +00:00
Christian Haro
86bb3195a0 Lua Bindings for Ingredient Records 2022-07-31 20:31:29 +00:00
Andrei Kortunov
888f4d2ac1 Add a post processing API to work with fog 2022-07-30 21:44:18 +04:00
elsid
8b8e4f78b6
Support cylinder and rotating box collision shape types for actors 
Cylinder collision shape should give the best consistency between physics
simulation and pathfinding. Rotating box is already used by some actors, so
add it to have the same collision shape type for all actors.
 2022-07-30 14:28:21 +02:00
Cody Glassman
89e0de2314 Bring back empty script message 2022-07-30 08:07:24 +00:00
Ivan Beloborodov
f960e30d01 Implement Add switch for armor degradation fix. #6888 2022-07-29 13:24:16 +00:00
Matt
8ccadba799 German translation 2022-07-28 12:41:44 +00:00
psi29a
4c50073f41 Merge branch 'sv-post-proc-transl' into 'master' 
Swedish translations for built-in post processing shaders

See merge request OpenMW/openmw!2188
 2022-07-28 09:07:21 +00:00
Joakim Berg
9d79fe6310 Added strings related to language settings menu 2022-07-28 09:04:10 +00:00
Andrei Kortunov
cb64f49ba1 Allow to configure locales via settings menu 2022-07-27 13:03:34 +04:00
psi29a
26bd907b0b Merge branch 'hdr_quick' into 'master' 
Fix auto exposure

See merge request OpenMW/openmw!2174
 2022-07-26 15:13:22 +00:00
Joakim Berg
0a22919820 Update files/data/l10n/BuiltInShaders/sv.yaml, files/data/CMakeLists.txt 2022-07-26 11:29:18 +00:00
Joakim Berg
be3fb651cf Update files/data/l10n/PostProcessing/sv.yaml 2022-07-26 11:21:44 +00:00
Andrei Kortunov
e0c05a15fb Post processing shaders localization 2022-07-24 13:18:50 +00:00
glassmancody.info
fd4966f77a temporary fix for auto exposure 2022-07-22 20:41:08 -07:00
Petr Mikheev
643e33c11a Merge branch 'lua_pathfinding_bindings' into 'master' 
Add bindings for navigator utils functions (#6690)

See merge request OpenMW/openmw!2128
 2022-07-20 23:52:16 +00:00
elsid
27cc901e76
Add bindings for navigator utils functions 2022-07-21 00:04:26 +02:00
Joakim Berg
03b178c2eb Swedish i10n translations 2022-07-19 06:49:50 +00:00
Andrei Kortunov
4e9a063de2 Fix MacOS build 2022-07-18 23:37:37 +04:00
Andrei Kortunov
6f6b5ba04b Some refactoring 2022-07-17 22:01:48 +04:00
Andrei Kortunov
db686b25c2 Use fallback data from openmw.cfg to setup fonts 2022-07-17 22:01:48 +04:00
Andrei Kortunov
c47a48e25d Inject layout files to VFS 2022-07-17 22:01:48 +04:00
Andrei Kortunov
4ddba5142e Introduce font mappings 2022-07-17 22:01:48 +04:00
Andrei Kortunov
dd04bfccfb Load fonts 2022-07-17 22:01:48 +04:00
psi29a
a1e7622a30 Merge branch 'sky_blending_multiview' into 'master' 
Support sky blending in multiview mode

See merge request OpenMW/openmw!2113
 2022-07-12 13:17:57 +00:00
Andrei Kortunov
ccbb5e03fb Use YAML files to translate MyGUI's localization tags 2022-07-12 08:20:40 +04:00
Cody Glassman
24749b066c Add sky blending to launcher 2022-07-11 00:26:22 +00:00
Petr Mikheev
c1344c4765 Minor fix in move360.lua. Scrolling shouldn't toggle view mode when TAB is pressed. 2022-07-09 22:27:23 +02:00
Petr Mikheev
b3c8c8eb56 Support sky blending in multiview mode 2022-07-09 22:21:48 +02:00
psi29a
e70d2be1ee Merge branch 'settings_input' into 'master' 
More responsive renderers for input events (#6827)

Closes #6827

See merge request OpenMW/openmw!2093
 2022-07-09 17:32:36 +00:00
glassmancody.info
05fedafd37 fixed mouse event for padded box 2022-07-09 09:43:37 -07:00
glassmancody.info
89bc756732 tmp_sun_fix 2022-07-05 23:47:23 -07:00
Abdu Sharif
c09648c349 Add a missing 0 in fog.glsl 2022-07-04 17:31:03 +00:00
psi29a
9da84480f0 Merge branch 'misc_ui' into 'master' 
Improved settings window

Closes #6780

See merge request OpenMW/openmw!2087
 2022-07-04 06:55:42 +00:00
psi29a
1e56ac9878 Merge branch 'sizable' into 'master' 
Movable and resizable log window

See merge request OpenMW/openmw!2086
 2022-07-04 06:48:58 +00:00
glassmancody.info
63d9fa55c6 settings window cleanup 2022-07-03 12:49:37 -07:00
jvoisin
0f649ce544 Merge branch 'fix-appstream-images' into 'master' 
Fix the screenshot URLs in the appstream XML

See merge request OpenMW/openmw!2081
 2022-07-03 16:21:43 +00:00
glassmancody.info
fcab4fe1ab make debug window a movable and resizable window 2022-07-03 09:09:16 -07:00
Petr Mikheev
cae7bc92d8 Merge branch 'locale_ru' into 'master' 
Add a Russian localization for built-in Lua content

See merge request OpenMW/openmw!2079
 2022-07-03 12:54:14 +00:00
Cody Glassman
051832d7ae [Lua] Set simulation time scale 2022-07-03 12:51:28 +00:00
Andrei Kortunov
0989e273d4 Add a Russian localization for built-in Lua content 2022-07-03 09:59:10 +04:00
Alexander Olofsson
84259d312b
Fix the screenshot URLs in the appstream XML 2022-07-02 19:49:25 +02:00
Cody Glassman
03616ae2d3 Fix undeclared shader variable 2022-07-01 14:34:59 +00:00
glassmancody.info
7b958148d0 better fade 2022-06-30 08:23:28 -07:00
psi29a
56187ad977 Merge branch 'soften_me_up_like_one_of_your_french_meshes' into 'master' 
Allow soft particle effect on any NIF

See merge request OpenMW/openmw!2015
 2022-06-30 13:46:22 +00:00
Petr Mikheev
466fc559f4 Fix move360.lua switching to 3rd person view when it shouldn't 2022-06-30 11:25:36 +02:00
glassmancody.info
b09411d396 allow soft particles on meshes and add extra data extensions 2022-06-29 18:15:12 -07:00
Petr Mikheev
d0deb37f5c Fix several issues with sky blending 2022-06-27 21:51:41 +02:00
Petr Mikheev
377c00261a [Lua] Ability to distinguish normal interiors and quasi exteriors (like Mournhold). 2022-06-24 18:24:02 +02:00
Petr Mikheev
8123e41a75 Fix #6824 2022-06-21 21:11:15 +02:00
psi29a
1a478875f0 Merge branch 'navmesh_agent_bounds' into 'master' 
Support different agent collision shape type for pathfinding

See merge request OpenMW/openmw!2030
 2022-06-21 16:13:41 +00:00
Mads Buvik Sandvei
b0e4c7e76a [Postprocessing] Stereo integration 2022-06-21 15:55:06 +00:00
elsid
1a12c453d6
Support different agent collision shape type for pathfinding 
Actors may have different collision shapes. Currently there are axis-aligned
bounding boxes and rotating bounding boxes. With AABB it's required to use
bounding cylinder for navmesh agent to avoid providing paths where actor can't
pass. But for rotating bounding boxes cylinder with diameter equal to the front
face width should be used to not reduce of available paths. For example rats
have rotating bounding box as collision shape because of the difference between
front and side faces width.

* Add agent bounds to navmesh tile db cache key. This is required to distinguish
  tiles for agents with different bounds.
* Increase navmesh version because navmesh tile db cache key and data has changed.
* Move navmesh version to the code to avoid misconfiguration by users.
* Fix all places where wrong half extents were used for pathfinding.
 2022-06-21 12:57:32 +02:00
Petr Mikheev
3bf18c601c Better fog 2022-06-21 02:21:20 +02:00
Alexei Kotov
54896e4883 Disable all the non-vanilla Lua camera settings by default 2022-06-13 18:23:46 +03:00
Petr Mikheev
73eda27e7f Update l10n/OMWCamera/en.yaml 2022-06-12 01:00:41 +02:00
Petr Mikheev
5f0a7c2b16 Fix jumping when using move360 with a controller 2022-06-12 00:09:13 +02:00
Petr Mikheev
1ca0a3a555 Addition camera features: move360, pov_auto_switch, slow_view_change 2022-06-12 00:09:13 +02:00
Petr Mikheev
3fb470dcce Increase the size of the settings menu; reduce the size of Lua settings "number" in order to make camera settings look good with the default size of the settings menu. 2022-06-12 00:09:13 +02:00
Petr Mikheev
65efd6f1c2 Remove from settings.cfg camera settings that are controlled from Lua 2022-06-12 00:06:39 +02:00
Petr Mikheev
860d5899c4 Control camera settings in-game 2022-06-12 00:06:39 +02:00
uramer
6d2dcaea50 Lua UI: Enable autoSize for single line text edit 2022-06-11 22:24:20 +02:00
uramer
6c9c832927 Lua UI: Support autosized multiline text 2022-06-06 21:52:55 +00:00
psi29a
787f8fb627 Merge branch 'launcher' into 'master' 
Launcher consistency fixes

See merge request OpenMW/openmw!1983
 2022-06-06 16:51:19 +00:00
Kindi
aa2e724342 Lua API for Repair records 2022-06-06 16:24:54 +00:00
Alexei Kotov
6cbda10bd5 Content selector: Remove the title 2022-06-06 12:43:28 +03:00
Alexei Kotov
323b671f6d Launcher: Properly capitalize navmesh cache tab name 2022-06-06 12:42:52 +03:00
Petr Mikheev
0745ed590b Fix incorrect package name in lua docs 2022-06-04 13:28:04 +00:00
beelzebielsk
fb5eb542ff Lua api for potion records 2022-06-01 13:19:03 +00:00
glassmancody.info
4dee9acd1e fill bars to postprocess hud 2022-05-31 16:26:51 -07:00
psi29a
a875ac86c0 Merge branch 'change-inventory-usage-docs' into 'master' 
Make inventory example runnable in a script

See merge request OpenMW/openmw!1957
 2022-05-31 14:41:54 +00:00
beelzebielsk
ad3b83432c Fix docs typos 2022-05-31 13:16:19 +00:00
adam
e4b2f730c7 Make inventory example runnable in a script 2022-05-31 13:12:40 +00:00
Kindi
638ad15af8 Lua API for Miscellaneous records 2022-05-31 08:54:07 +00:00
Kindi
3d0adf259b Lua API for Apparatus records 2022-05-29 23:03:36 +00:00
psi29a
f84be8c3f9 Merge branch 'lua-api-containers' into 'master' 
Add bindings for container record

See merge request OpenMW/openmw!1932
 2022-05-28 08:03:13 +00:00
psi29a
42718f69dc Merge branch 'vfs_data' into 'master' 
Merge files/builtin_scripts and files/vfs into one dir

See merge request OpenMW/openmw!1931
 2022-05-27 18:41:54 +00:00
adam
e2528a1562 Add docs and automagical declaration 2022-05-26 07:20:50 +00:00
cody glassman
11845e7d9b improve layout of postprocessor hud 2022-05-25 19:07:01 -07:00
Petr Mikheev
6d5a0542e7 Merge files/builtin_scripts and files/vfs into one dir 2022-05-26 01:47:38 +02:00
uramer
e591f856fb Renderers 2022-05-24 19:11:13 +00:00