1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 17:29:55 +00:00
Commit graph

33849 commits

Author SHA1 Message Date
AnyOldName3
61364c874f Warn future me off wasting their time again 2024-04-16 01:14:20 +01:00
AnyOldName3
a7021bf9cc Clear std stream errors when reopening
Prior errors are no longer relevant.

Shouldn't make a difference unless you've tried printing something before the streams were set up.
2024-04-16 01:10:39 +01:00
AnyOldName3
901a17ab81 Make comments stop lying 2024-04-13 19:01:34 +01:00
AnyOldName3
ea029b06ea Remove unused define 2024-04-13 18:51:45 +01:00
AnyOldName3
1930bfeabb Support coloured terminal output on Windows
First try the modern Windowsy way, where we can directly query if escape sequences will be processed.
The function is available as far back as Windows 2000, but it just won't return the right flag until the Windows version is new enough.

If that fails, fall back to the Unixy way, as not all colour-supporting terminal emulators for Windows use the Win32 API to declare that capability.
The implementation isn't identical as isatty wasn't available without adding more headers, and we already have Windows.h in this file, so I might as well use the Win32 API instead of its POSIX-compatibility layer.
2024-04-13 17:09:48 +01:00
Alexei Kotov
55c5f2112b Merge branch 'alignyorefs' into 'master'
Reorder RefData members to decrease its size

See merge request OpenMW/openmw!4020
2024-04-12 21:18:24 +00:00
psi29a
bdbbe34afc Merge branch 'pushthefatman' into 'master'
Animation regression fixes

See merge request OpenMW/openmw!4001
2024-04-12 15:02:39 +00:00
psi29a
2f9e071178 Merge branch 'launcher-wizard-localisation-fr' into 'master'
Launcher and Wizard french localisation

See merge request OpenMW/openmw!4013
2024-04-12 15:01:59 +00:00
Arnaud Dochain
b34dac1a27 Launcher and Wizard french localisation 2024-04-12 15:01:59 +00:00
psi29a
f9e957ea0e Merge branch 'esm4scvr' into 'master'
ESM4: Make script local variable loading more reliable

See merge request OpenMW/openmw!3967
2024-04-12 15:01:46 +00:00
Evil Eye
cb92d34ddd Reorder RefData members to decrease its size 2024-04-11 17:04:55 +02:00
psi29a
c6921d5292 Merge branch 'notarget' into 'master'
Don't run target-specific spell infliction code when there's no target (#7926)

Closes #7926

See merge request OpenMW/openmw!4019
2024-04-11 09:10:23 +00:00
Alexei Kotov
8751203849 Don't run target-specific spell infliction code when there's no target (#7926) 2024-04-10 22:24:22 +03:00
psi29a
8037a6e765 Merge branch 'portable-launcher' into 'master'
Portable Launcher (plus a whole slew of bugs fixes for problems I found that I suspect aren't on the tracker)

Closes #6846

See merge request OpenMW/openmw!3925
2024-04-10 09:53:07 +00:00
psi29a
49b974763f Merge branch 'imthefactornow' into 'master'
Don't show nameless higher ranks

Closes #7923

See merge request OpenMW/openmw!4014
2024-04-10 09:52:03 +00:00
psi29a
9db56c8bc4 Merge branch 'usedontactivate' into 'master'
Disallow Lua activation of inventory objects

See merge request OpenMW/openmw!4009
2024-04-09 07:10:15 +00:00
psi29a
3942d7fb7e Merge branch 'lua_crime_bounty' into 'master'
Lua: Add setCrimeLevel to types.Player

See merge request OpenMW/openmw!4008
2024-04-09 07:10:05 +00:00
Evil Eye
1ed82662ee Don't show nameless higher ranks 2024-04-08 17:54:13 +02:00
AnyOldName3
a179e9c001 The rest of the merge conflict
I didn't notice it as GitLab didn't highlight the diff properly.
2024-04-08 13:43:42 +01:00
AnyOldName3
0d547c5438 Resolve merge conflicts from https://gitlab.com/OpenMW/openmw/-/merge_requests/3893 2024-04-08 13:37:36 +01:00
psi29a
c29816f67e Merge branch 'sv-translatation-2024-04-04' into 'master'
Update Swedish translations

See merge request OpenMW/openmw!4004
2024-04-08 09:11:41 +00:00
Joakim Berg
c485726046 Update Swedish translations 2024-04-08 09:11:40 +00:00
psi29a
d4aeeea52a Merge branch 'capitalize' into 'master'
Capitalize captions

See merge request OpenMW/openmw!3893
2024-04-08 08:09:12 +00:00
Andrei Kortunov
e8c3c8115a Capitalize captions in Launcher and Wizard 2024-04-08 09:17:43 +04:00
Andrei Kortunov
edb9da5a67 Capitalize in-game setting 2024-04-08 09:15:09 +04:00
AnyOldName3
810e2c44a6 Merge conflict resolution part II 2024-04-07 22:34:17 +01:00
AnyOldName3
48f1f08537 Hide things that depend on present-but-inactive game files
https://gitlab.com/OpenMW/openmw/-/merge_requests/3925#note_1843962919
2024-04-07 22:12:39 +01:00
AnyOldName3
f8224b29d4 Resolve merge conflicts
These were caused by https://gitlab.com/OpenMW/openmw/-/merge_requests/4005

I've had to cherry-pick parts of that MR into this commit, otherwise the CI would yell at me when it noticed the location tags had gone.
2024-04-07 21:59:54 +01:00
Zackhasacat
e549490bb1 record crime ID 2024-04-07 08:28:43 -05:00
Alexei Kotov
8027c1e662 Merge branch 'l10n-input-binding' into 'master'
Attempt to fix #7906: l10n name for inputBinding setting renderer taken from action/trigger l10n, not key

Closes #7906

See merge request OpenMW/openmw!4007
2024-04-07 12:04:34 +00:00
Evil Eye
d68d20eb1a Disallow Lua activation of inventory objects 2024-04-07 10:42:29 +02:00
Zackhasacat
b859fc10e2 Add doc note 2024-04-06 18:18:14 -05:00
Zackhasacat
4ca13a9404 Verify the player 2024-04-06 18:17:51 -05:00
Zackhasacat
5856bc8a0e Add setCrimeLevel 2024-04-06 18:13:51 -05:00
trav5
b0008d22e6 Attempt to fix openmw issue #7906
l10n name is taken not from the ActionInfo/TriggerInfo's 'key' param,
but from the 'l10n' param when making the inputBinding setting renderer
2024-04-06 23:07:11 +02:00
Alexei Kotov
239d8f49d8 Merge branch 'consistent-translations' into 'master'
Do not store 'location' tags in translation files

See merge request OpenMW/openmw!4005
2024-04-06 20:58:08 +00:00
psi29a
8e1d790919 Merge branch 'widgets_rework' into 'master'
Make widgets more vanilla-friendly

Closes #7875 and #7914

See merge request OpenMW/openmw!3941
2024-04-05 06:33:53 +00:00
psi29a
2529b8c5a9 Merge branch 'megumingreatersigngreatersigngreatersignaqua' into 'master'
Water shader cleanup

See merge request OpenMW/openmw!4000
2024-04-05 06:33:31 +00:00
Andrei Kortunov
8fecbb55ff Do not store 'location' tags in translation files 2024-04-05 10:12:31 +04:00
Alexei Kotov
f2e0129436 Convert water/ripple defines to camelCase 2024-04-04 21:12:47 +03:00
Alexei Kotov
612177be09 Improve some cryptic naming in the water shader 2024-04-04 21:01:14 +03:00
Alexei Kotov
0be7d7fa4c Reduce the amount of redundant code in the water shader 2024-04-04 21:01:14 +03:00
Alexei Kotov
fbe84f4668 Remove underwater fog radialization remnants
The fog is now view-independent so this is not something to concern ourselves as with anymore
2024-04-04 21:01:14 +03:00
Alexei Kotov
3380b806de Merge branch 'haggleraven' into 'master'
Remove superfluous Trading class

See merge request OpenMW/openmw!3996
2024-04-03 18:21:02 +00:00
Alexei Kotov
dfdd7aa684 Always queue movement even when there's none 2024-04-03 21:16:47 +03:00
Alexei Kotov
5e99545b9c Don't discard stagger/KO animation movement 2024-04-03 21:11:49 +03:00
psi29a
3a1d0a9649 Merge branch 'timeout_table_filter' into 'master'
Restore !613

See merge request OpenMW/openmw!3990
2024-04-03 07:12:53 +00:00
uramer
3b930e4471 Restore !613 2024-04-03 07:12:53 +00:00
Andrei Kortunov
02e000ab5b Add changelog entries 2024-04-02 11:56:30 +04:00
Andrei Kortunov
1b544b93d2 Do not allow to move resizable windows outside of game window 2024-04-02 11:40:21 +04:00