1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-02 09:26:39 +00:00
Commit graph

23364 commits

Author SHA1 Message Date
Andrew Lanzone
fb19a0da91 Fix inventory menu getting messed up when resizing game window 2025-07-26 00:16:41 -07:00
Andrew Lanzone
5b5ed21f20 Split journal's onControllerButtonEvent into a few functions 2025-07-25 22:53:39 -07:00
Andrew Lanzone
b9ae89e032 Split onControllerButtonEvent into two; loop through ingredient slots 2025-07-25 21:46:00 -07:00
Andy Lanzone
6114a01ad4 Merge branch openmw:master into master 2025-07-19 18:10:08 -07:00
Andrew Lanzone
ef50578a62 Move controller button overlay padding into layout file 2025-07-19 18:09:00 -07:00
Andrew Lanzone
b0bdd68e7c Update a comment 2025-07-19 17:12:33 -07:00
Andrew Lanzone
29f1c7c68f Remove some hardcoded menu sizes for inventory mode 2025-07-19 17:12:09 -07:00
Andrew Lanzone
f8d9149e4f Use enum and array for cleaner management of controller button overlay 2025-07-19 16:31:25 -07:00
Evil Eye
8bf9b205b7 Merge branch 'supporteddirections' into 'master'
Cache computed supported movement directions

See merge request OpenMW/openmw!4709
2025-07-19 08:59:18 +00:00
Petr Mikheev
7f28b33cf1 Object paging in ESM4 worldspaces 2025-07-18 22:12:24 +02:00
psi29a
82b1d1b78e Merge branch 'corpsecollector' into 'master'
Ensure corpses of actors that have moved cells are cleaned up

See merge request OpenMW/openmw!4793
2025-07-18 19:57:58 +00:00
Alexei Kotov
9370b41636 Merge branch 'convertthis' into 'master'
Remove int conversions from pathfinding

See merge request OpenMW/openmw!4755
2025-07-18 16:13:20 +03:00
Andy Lanzone
bef2948062 Merge branch openmw:master into master 2025-07-18 01:23:05 -07:00
Andrew Lanzone
c53b1bf2c0 Replace more C-style casts with C++ variants 2025-07-18 01:06:25 -07:00
Andrew Lanzone
a73b803592 Fix crash when spell buying window is empty 2025-07-18 01:05:48 -07:00
Andrew Lanzone
0abbf91477 Disable double-clicking on window titles in the inventory menu 2025-07-17 23:07:54 -07:00
Skyhasacat
c90ae89381 Merge branch 'luapaths' into 'master'
Expose path grids to Lua

See merge request OpenMW/openmw!4792
2025-07-17 16:13:09 +00:00
Andrew Lanzone
eba063ac23 Merge branch 'master' of https://gitlab.com/OpenMW/openmw 2025-07-17 08:14:28 -07:00
Evil Eye
b61d8fb585 Use Context::initializeOnce 2025-07-17 16:42:24 +02:00
psi29a
3b42874797 Merge branch 'defendingthelight' into 'master'
Only autoequip the shield in updateEquippedLight (#8404)

Closes #8404

See merge request OpenMW/openmw!4763
2025-07-17 14:23:57 +00:00
psi29a
0006cb22e2 Merge branch 'FillJournalConsoleCommand' into 'master'
Implement FillJournal script instruction

Closes #8509

See merge request OpenMW/openmw!4676
2025-07-17 14:22:53 +00:00
psi29a
eb67d1a1fb Merge branch 'activescripts' into 'master'
Mark scripts on newly scripted, active objects as active

See merge request OpenMW/openmw!4785
2025-07-17 14:21:45 +00:00
psi29a
e1847d2670 Merge branch 'master' into 'master'
Bump libsdl to 2.0.20

See merge request OpenMW/openmw!4779
2025-07-17 14:20:13 +00:00
Andy Lanzone
f45053ad25 Bump libsdl to 2.0.20 2025-07-17 14:20:13 +00:00
Evil Eye
bd6254b6df Ensure corpses of actors that have moved cells are cleaned up 2025-07-17 08:22:26 +02:00
Evil Eye
183652e51d Expose path grids to Lua 2025-07-16 20:18:17 +02:00
Evil Eye
6dadf5de75 Merge branch 'quittingpeacefully' into 'master'
Move Quitting peacefully message to a more appropriate place

See merge request OpenMW/openmw!4769
2025-07-16 14:40:29 +00:00
psi29a
3899260eea Merge branch 'herbalismsound' into 'master'
Don't harvest if player activation is blocked (#8612)

Closes #8612

See merge request OpenMW/openmw!4773
2025-07-16 09:05:32 +00:00
psi29a
a7a47f3ea9 Merge branch 'silencekey' into 'master'
Don't play down sound while loading quick keys

See merge request OpenMW/openmw!4783
2025-07-16 09:04:49 +00:00
Andrew Lanzone
f50c275133 Ensure mouse really moved before unhiding cursor in controller menu 2025-07-16 00:25:45 -07:00
Evil Eye
931555c7ff Remove int conversions from pathfinding 2025-07-15 21:57:12 +02:00
Andrew Lanzone
4adb9bd8ac Unhide the cursor if it was hidden to show a controller tooltip 2025-07-15 02:02:49 -07:00
Andrew Lanzone
cf24063226 Replace more C-style casts with C++ style 2025-07-15 01:33:52 -07:00
Andy Lanzone
a3a1b6d11f Merge branch openmw:master into master 2025-07-14 17:48:36 -07:00
Andrew Lanzone
9e2927f734 Use the localized strings from Interface l10n module where possible 2025-07-14 17:45:03 -07:00
Andrew Lanzone
af6634ee57 Remove spurious debug log line 2025-07-14 17:27:20 -07:00
Andrew Lanzone
b8381f6e62 Replace C-style cast with C++ cast. 2025-07-14 17:25:57 -07:00
Evil Eye
6f9b813bd1 Mark scripts on newly scripted, active objects as active 2025-07-14 22:39:19 +02:00
Alexei Kotov
a12a0916ed Merge branch 'too-many-markers' into 'master'
FEAT(CS): Replace selection markers with a real one (#8139)

Closes #8139

See merge request OpenMW/openmw!4349
2025-07-14 23:18:46 +03:00
Dave Corley
9dd028b260 FEAT(CS): Replace selection markers with a real one (#8139) 2025-07-14 23:18:45 +03:00
AnyOldName3
4f60284a35 Merge branch 'first' into 'master'
Prepend new characters so they're first on the list

See merge request OpenMW/openmw!4778
2025-07-14 17:49:59 +00:00
Andrew Lanzone
1b240c7dd6 Clean up controller logic to match item transfer logic 2025-07-13 15:24:16 -07:00
Andrew Lanzone
a894481fd7 Clean up controller logic to match item transfer logic 2025-07-13 15:12:33 -07:00
Andrew Lanzone
6a02e6a4bc Merge branch 'master' of https://gitlab.com/OpenMW/openmw 2025-07-13 14:55:27 -07:00
Evil Eye
682f00bcff Don't play down sound while loading quick keys 2025-07-13 18:36:30 +02:00
Aussiemon
445cf1742d ptr.getCellRef().getRefId() 2025-07-13 10:20:58 -06:00
Alexei Kotov
4f95ca4196 Merge branch 'talk-to-me-about-something-else' into 'master'
FEAT: AddTopic in Lua, close #8334

Closes #8334

See merge request OpenMW/openmw!4529
2025-07-13 12:35:41 +03:00
Alexei Kotov
79c689784b Merge branch 'quick_item_transfer' into 'master'
Support quick item transfer (#2522)

Closes #2522

See merge request OpenMW/openmw!4659
2025-07-13 12:33:56 +03:00
Aussiemon
bb1214ed69 factionId instead of faction->mName 2025-07-13 02:48:37 -06:00
Aussiemon
11947286d9 Reuse factionId 2025-07-13 02:36:59 -06:00