mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 12:53:53 +00:00
Code Issues Releases Wiki Activity
32878 commits 108 branches 66 tags 133 MiB
Commit graph

32878 commits

This branch
This branch
All branches
Author SHA1 Message Date
AnyOldName3
a497d40689 Merge branch 'vfs_string_view' into 'master' 
Use string_view for VFS (#6125)

See merge request OpenMW/openmw!3688
 2023-12-26 18:40:25 +00:00
AnyOldName3
4567374e1f Merge branch 'localize_tooltip' into 'master' 
Make content selector tooltip localizable

See merge request OpenMW/openmw!3687
 2023-12-26 18:38:35 +00:00
psi29a
a2c6009352 Merge branch 'editor_bool_settings' into 'master' 
Use settings values to declare bool settings (#6876)

See merge request OpenMW/openmw!3679
 2023-12-26 15:31:14 +00:00
jvoisin
c3dfc8c213 Merge branch 'detour_alloc' into 'master' 
Use RecastGlobalAllocator for Detour

See merge request OpenMW/openmw!3678
 2023-12-26 13:44:00 +00:00
psi29a
5d53eb7566 Merge branch 'russianroulette' into 'master' 
BulletNifLoader: Handle NiSkinPartition, reduce false-positive collision generation for NiSwitchNode children

See merge request OpenMW/openmw!3634
 2023-12-26 10:33:20 +00:00
psi29a
ff514df5a1 Merge branch 'distortion' into 'master' 
Distortion

See merge request OpenMW/openmw!3536
 2023-12-26 10:31:51 +00:00
psi29a
ccbc7e6c72 Merge branch 'gcc_cache_size' into 'master' 
Reduce ccache size for gcc to 3G

See merge request OpenMW/openmw!3686
 2023-12-26 10:23:16 +00:00
psi29a
f80bbd4e39 Merge branch 'these-are-the-datas-youre-looking-for' into 'master' 
Add game-independent VFS directory to CS' VFS

See merge request OpenMW/openmw!3683
 2023-12-26 10:21:58 +00:00
jvoisin
b39a6ae9cd Merge branch 'smoothbraincriminal' into 'master' 
End pursue package if the target doesn't have a bounty

See merge request OpenMW/openmw!3677
 2023-12-26 09:59:24 +00:00
elsid
851bad4262 Merge branch 'precipitationripples' into 'master' 
Use fallback weather ripple settings (bug #7292)

Closes #7292

See merge request OpenMW/openmw!3671
 2023-12-26 09:51:23 +00:00
elsid
dc8c979d1a Merge branch 'avoid_duplication' into 'master' 
Store generated UI by pointer to avoid redundant processing

See merge request OpenMW/openmw!3680
 2023-12-26 09:39:47 +00:00
elsid
0d8dc5aabc
Use string_view for VFS lookups 2023-12-25 12:21:01 +01:00
elsid
3363616f56
Remove redundant startsWith function 2023-12-25 11:43:02 +01:00
Andrei Kortunov
f2c284688b Make content selector tooltip localizable 2023-12-25 11:29:36 +04:00
elsid
26ffde0c04
Reduce ccache size for gcc to 3G 
To avoid having jobs being unable to generate the cache like
https://gitlab.com/OpenMW/openmw/-/jobs/5766643208:

Creating cache Ubuntu_GCC.ubuntu_22.04.v1-3-non_protected...
apt-cache/: found 1082 matching artifact files and directories
ccache/: found 7443 matching artifact files and directories
FATAL: write ../../../cache/OpenMW/openmw/Ubuntu_GCC.ubuntu_22.04.v1-3-non_protected/archive_991882895: no space left on device
Failed to create cache
 2023-12-24 22:22:24 +01:00
Alexei Kotov
225946b92b Merge branch 'resolution_sign' into 'master' 
Use a multiplication sign for custom resolution

See merge request OpenMW/openmw!3681
 2023-12-24 20:35:56 +00:00
AnyOldName3
01e2e56f97 Add game-independent VFS directory to CS' VFS 
This should have been like this all along - all the other applications that use the game's VFS do this.
 2023-12-24 17:55:49 +00:00
Andrei Kortunov
1ca2a0ef66 Store generated UI by pointer to avoid redundant processing 2023-12-24 20:35:19 +04:00
Andrei Kortunov
81f7149f42 Use a multiplication sign for custom resolution 2023-12-24 19:00:16 +04:00
Alexei Kotov
51b05647e2 Merge branch 'move_files' into 'master' 
Move *.ui files for different applications to different folders

See merge request OpenMW/openmw!3659
 2023-12-24 09:58:24 +00:00
elsid
edaac852d1
Use settings values to declare bool settings 2023-12-24 00:25:18 +01:00
elsid
329500b087
Remove redundant return 2023-12-24 00:24:32 +01:00
elsid
0cf55d3617
Use RecastGlobalAllocator for Detour 2023-12-24 00:24:27 +01:00
Alexei Kotov
c6a1196ec7 Merge branch 'editor_int_settings' into 'master' 
Use settings values to declare int settings (#6876)

See merge request OpenMW/openmw!3668
 2023-12-23 15:48:43 +00:00
Evil Eye
af40d7ce80 End pursue package if the target doens't have a bounty 2023-12-23 15:50:36 +01:00
elsid
9d357e0b04
Fix script to install luadocumentor 
78577b255d19a1f4f4f539662e00357936b73c33 is a part of
https://gitlab.com/ptmikheev/openmw-luadocumentor.git repo. Before doing
checkout need to change the directory.
 2023-12-23 14:23:18 +01:00
Alexei Kotov
099c39ae87 Use fallback weather ripple settings (bug #7292) 2023-12-23 11:46:08 +03:00
Alexei Kotov
dff86dc1e2 Merge branch 'update_recastnavigation' into 'master' 
Update recasnagivation to c393777d26d2ff6519ac23612abf8af42678c9dd (#6509)

Closes #6509

See merge request OpenMW/openmw!3670
 2023-12-23 06:59:49 +00:00
Alexei Kotov
44d3a40cbe Merge branch 'fix_warning' into 'master' 
Fix unused-but-set-variable warning

See merge request OpenMW/openmw!3672
 2023-12-23 06:57:17 +00:00
Alexei Kotov
4afa4e3be0 Merge branch 'gamepad_cursor_speed' into 'master' 
Use gamepad cursor speed setting (#7732)

Closes #7732

See merge request OpenMW/openmw!3673
 2023-12-23 06:56:49 +00:00
elsid
4067e10f3f
Use gamepad cursor speed setting 2023-12-22 19:24:02 +01:00
AnyOldName3
8cafcf702f Merge branch 'sdl_errors' into 'master' 
Handle and log some controller related SDL errors (#7728)

Closes #7728

See merge request OpenMW/openmw!3669
 2023-12-22 14:57:21 +00:00
elsid
995f0e4865
Fix unused-but-set-variable warning 
components/esm3/inventorystate.cpp:18:18: warning: variable 'index' set but not used [-Wunused-but-set-variable]
        uint32_t index = 0;
                 ^
 2023-12-22 14:43:38 +01:00
Alexei Kotov
f11c66794b Merge branch 'advancedalchemy' into 'master' 
Make ingredient order affect effect order

Closes #7676

See merge request OpenMW/openmw!3667
 2023-12-22 08:25:24 +00:00
jvoisin
2873f971a6 Merge branch 'downsized' into 'master' 
Remove explicitly sized reads

See merge request OpenMW/openmw!3663
 2023-12-21 22:50:10 +00:00
Cody Glassman
187f63d3d3 support postprocess distortion 2023-12-21 10:56:38 -08:00
Alexei Kotov
51cb3b08cb Merge branch 'followthecrab' into 'master' 
Stop combat when stacking a new AI package

Closes #7661

See merge request OpenMW/openmw!3665
 2023-12-21 07:08:36 +00:00
elsid
78a0e0eb3b
Handle and log some controller related SDL errors 
SDL_GameControllerNameForIndex may return nullptr indicating an error which
causes a crash when passed to log.
 2023-12-21 02:19:24 +01:00
elsid
29e8e7ba07
Update recasnagivation to c393777d26d2ff6519ac23612abf8af42678c9dd 2023-12-21 01:58:00 +01:00
elsid
491525d173
Add shebangs to bash scripts 
To specify used interpreter and set exit on error mode.
 2023-12-20 22:44:20 +01:00
Evil Eye
532a330aac mac plz 2023-12-20 13:58:43 +01:00
Evil Eye
3e101ab409 Add a variadic getHNOT 2023-12-20 12:28:34 +01:00
elsid
66b1745520
Use settings values to declare int settings 2023-12-20 12:26:36 +01:00
Evil Eye
1223d12b29 Make ingredient order affect effect order 2023-12-20 11:56:12 +01:00
Alexei Kotov
78a8f9d692 Merge branch 'skating-olympics' into 'master' 
De-jank stationary animations

Closes #3330

See merge request OpenMW/openmw!3631
 2023-12-20 12:35:41 +03:00
Alexei Kotov
d97563c830 Merge branch 'csicorruption' into 'master' 
Allow ModPCCrimeLevel to clear crimes and cap bounties

Closes #7416

See merge request OpenMW/openmw!3664
 2023-12-20 08:24:14 +00:00
Alexei Kotov
7074ea02b7 Merge branch 'qt_fix' into 'master' 
Register language selector properly

Closes #7727

See merge request OpenMW/openmw!3666
 2023-12-20 04:15:17 +00:00
Evil Eye
8a1ca870eb Stop infighting when gaining new allies 2023-12-19 21:23:10 +01:00
Andrei Kortunov
e6690bbcc7 Use CMAKE_CURRENT_SOURCE_DIR instead of CMAKE_SOURCE_DIR 2023-12-19 19:58:52 +04:00
Evil Eye
36b61d7074 Merge branch 'copy-that' into 'master' 
Feat(CS): Implement Instance Cloning

See merge request OpenMW/openmw!3654
 2023-12-19 11:27:51 +00:00