1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-01 21:26:42 +00:00
Commit graph

23442 commits

Author SHA1 Message Date
SkyHasACat
2ab87f2d22 Use namespace for servicesoffered 2025-08-04 08:35:13 -07:00
SkyHasACat
b2746a7b4b Fix autocalc, remove thing 2025-08-04 08:27:26 -07:00
SkyHasACat
afb7f1da54 Fix formatting 2025-08-03 21:39:44 -07:00
SkyHasACat
99ae52e94c Add fields to record 2025-08-03 13:42:04 -07:00
SkyHasACat
a0585949a9 Remove dead code, fix grammer 2025-08-03 12:50:57 -07:00
SkyHasACat
4a2f85cfde Merge remote-tracking branch 'origin/master' into createnewpeople 2025-08-03 12:14:10 -07:00
Evil Eye
c77a849e9e Merge branch 'cleanup_includes' into 'master'
Cleanup includes

See merge request OpenMW/openmw!4828
2025-08-03 19:11:55 +00:00
SkyHasACat
d7a411cc72 Suggested fixes 2025-08-03 11:44:45 -07:00
psi29a
b9a28dab3e Merge branch 'thread_safe_static_init' into 'master'
Do thread safe local static based initialization

See merge request OpenMW/openmw!4822
2025-08-03 10:55:50 +00:00
SkyHasACat
ae9c42e0a0 Merge remote-tracking branch 'origin/master' into spellgc 2025-08-02 15:08:25 -07:00
SkyHasACat
d40a78e8ac Player shennanigans 2025-08-02 06:32:46 -07:00
SkyHasACat
31abd366ff no const 2025-08-02 06:25:14 -07:00
SkyHasACat
7c665643ad Use overload 2025-08-02 06:08:29 -07:00
SkyHasACat
5203f300e2 Requested changes 2025-08-02 05:33:27 -07:00
elsid
e87b95f642
Use forward declaration for context and sol 2025-08-02 12:45:03 +02:00
elsid
a2bc1569e0
Remove unused includes 2025-08-02 12:45:03 +02:00
psi29a
cc68316f72 Merge branch 'lua-jail-skills' into 'master'
Bring jail time skill changes over to lua

Closes #8399

See merge request OpenMW/openmw!4593
2025-08-02 08:39:14 +00:00
Mads Buvik Sandvei
978d8668f4 Bring jail time skill changes over to lua 2025-08-02 08:39:13 +00:00
Alexei Kotov
4c4d6078d8 Training menu fixes (#8584)
Rework the layout
Use "OK" instead of "Cancel" for the OK button
Add gp to the price
Use entry spacing consistent with other service menus
2025-08-02 03:47:22 +03:00
SkyHasACat
1986891e79 different empty line? 2025-08-01 16:51:10 -07:00
SkyHasACat
c139680ce3 Add line 2025-08-01 16:49:19 -07:00
SkyHasACat
f2cfaac4b8 Fix clang 2025-08-01 16:46:25 -07:00
SkyHasACat
1fbbaefb47 Remove unrelated change, doc 2025-08-01 16:45:24 -07:00
SkyHasACat
5209685783 revert some changes 2025-08-01 16:40:30 -07:00
SkyHasACat
64a45f8aeb Change world store insert 2025-08-01 16:30:16 -07:00
SkyHasACat
abb381a163 Fix issues 2025-08-01 16:10:49 -07:00
SkyHasACat
2cd4b643d0 npc stuff 2025-08-01 15:18:55 -07:00
elsid
0801e0512d
Do thread safe local static based initialization 2025-08-01 11:48:35 +02:00
psi29a
b160cee0b7 Merge branch 'sonarview' into 'master'
Address string_view conversions flagged by SonarQube

See merge request OpenMW/openmw!4693
2025-08-01 08:06:36 +00:00
psi29a
2a8dc56619 Merge branch 'pedanticmsvc' into 'master'
Resolve unused code warnings when compiling in Debug mode using MSVC

See merge request OpenMW/openmw!4820
2025-08-01 08:06:11 +00:00
Andrei Kortunov
645eb81133 Run onUpdate when the game is paused 2025-08-01 04:18:03 +03:00
psi29a
405388b89f Merge branch 'scripteditorplz' into 'master'
Improve multiline script editing

Closes #8579

See merge request OpenMW/openmw!4728
2025-07-31 07:21:06 +00:00
Mads Buvik Sandvei
34eb3d485d [Lua] Partially dehardcode onHit 2025-07-30 20:21:15 +00:00
Evil Eye
bc05628fa8 Resolve unused code warnings when compiling in Debug mode using MSVC 2025-07-30 20:44:59 +02:00
Evil Eye
ee540039a1 Address string_view conversions flagged by SonarQube 2025-07-30 19:37:37 +02:00
Evil Eye
27ee192354 Set default hotkeys for (un)commenting script lines 2025-07-30 16:58:32 +02:00
Evil Eye
aefa0ec1c4 Add multiline (un)indent behaviour to the script editor 2025-07-30 16:58:32 +02:00
Alexei Kotov
399ec4eccc Merge branch 'qt6' into 'master'
Drop support for Qt5

Closes #8578

See merge request OpenMW/openmw!4742
2025-07-30 13:26:46 +03:00
Alexei Kotov
b0e8544d58 Merge branch 'addthoseactivespells' into 'master'
Remove minimum duration from continuous effects and add clarification to the docs

Closes #8641

See merge request OpenMW/openmw!4817
2025-07-29 23:36:39 +03:00
psi29a
b937b0271f Merge branch 'fightthechameleon' into 'master'
Prevent witnesses from ending combat because they didn't get hit

See merge request OpenMW/openmw!4814
2025-07-29 07:43:59 +00:00
Alexei Kotov
45a7040bc7 Merge branch 'fix_tests' into 'master'
Make tests more stable

See merge request OpenMW/openmw!4818
2025-07-29 08:05:58 +03:00
AnyOldName3
7c3fa3c89f Merge branch 'classheader' into 'master'
Some include cleanup

See merge request OpenMW/openmw!4815
2025-07-28 22:35:24 +00:00
elsid
70207750f2
Make tests more stable 2025-07-28 20:23:45 +02:00
Evil Eye
395f6811c9 Remove minimum duration from continuous effects and add clarification to the docs 2025-07-28 18:59:23 +02:00
psi29a
176dab5b3d Merge branch 'nomagnitudeforyou' into 'master'
Don't multiply magnitudes for effects that don't have magnitudes

Closes #8540

See merge request OpenMW/openmw!4810
2025-07-28 15:59:13 +00:00
psi29a
e304ceb449 Merge branch 'fix_init' into 'master'
Do not copy cell store to count refs

See merge request OpenMW/openmw!4813
2025-07-28 15:58:46 +00:00
psi29a
4efc8bf99d Merge branch 'fix_clang_tidy' into 'master'
Fix clang tidy warnings

See merge request OpenMW/openmw!4811
2025-07-28 15:55:53 +00:00
Alexei Kotov
0a8373987d Merge branch 'aiwander' into 'master'
Build checkpoints based path for wandering actors (#8433)

Closes #8433

See merge request OpenMW/openmw!4652
2025-07-28 00:48:17 +03:00
Alexei Kotov
272e6fabf9 Turn GreetingState into enum class and cut some mechanics manager includes 2025-07-27 23:02:06 +03:00
Evil Eye
f6a6a33c59 Prevent witnesses from ending combat because they didn't get hit 2025-07-27 21:12:52 +02:00