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

27684 commits

This branch
This branch
All branches
Author SHA1 Message Date
ζeh Matt
b502dc12f0
Add prng to World instance and serialize state in Save 2022-03-21 17:49:42 +02:00
Petr Mikheev
aa6cba9b17 Merge branch 'pass_events_up' into 'master' 
Pass unhandled Lua UI events to the parent

Closes #6630

See merge request OpenMW/openmw!1670
 2022-03-14 19:07:24 +00:00
uramer
36c46ada6f Pass unhandled Lua UI events to the parent 2022-03-14 19:07:23 +00:00
AnyOldName3
696be1cc39 Merge branch 'fix_6589' into 'master' 
Add default value for `user-data` in openmw.cfg

Closes #6589

See merge request OpenMW/openmw!1632
 2022-03-13 18:51:34 +00:00
psi29a
4959e44d7f Merge branch 'fourcc' into 'master' 
Switch to a constexpr for FourCC constant generation

See merge request OpenMW/openmw!1712
 2022-03-09 10:33:37 +00:00
psi29a
6110174145 Merge branch 'fix_ui_popups' into 'master' 
Rename Tooltip layer back to Popup, layer Notification layer on top of it

Closes #6663 and #6662

See merge request OpenMW/openmw!1713
 2022-03-08 21:28:55 +00:00
duncanspumpkin
e2555c1bb7 Add self to authors 2022-03-08 21:03:17 +00:00
uramer
deefdd5620 Layer Notifications over Popup 2022-03-08 21:16:28 +01:00
uramer
688ca8b7fc Revert "Rename Popup layer to Tooltip" 
This reverts commit 543ee33f7eb4bec43761f784cfa19d3b13f5b3fd.
 2022-03-08 21:12:08 +01:00
duncanspumpkin
3a117cac22 Switch to a constexpr for FourCC constant 
Add static asssert on wrong size
 2022-03-08 14:48:37 +00:00
jvoisin
8a182c130a Merge branch 'refactor/prng' into 'master' 
Refactor and rename some things around Misc::Rng

See merge request OpenMW/openmw!1710
 2022-03-07 10:19:41 +00:00
jvoisin
a59c56e3ca Merge branch 'refactor/esmvariant-string' into 'master' 
Avoid string copies for ESM::Variant::getString

See merge request OpenMW/openmw!1711
 2022-03-06 17:38:58 +00:00
Matt
54e114d83e Avoid string copies for ESM::Variant::getString 2022-03-06 17:38:58 +00:00
ζeh Matt
d83a381f79
Refactor and rename some things around Misc::Rng 2022-03-06 17:28:28 +02:00
psi29a
9396cc7592 Merge branch 'fix_layer_bugs' into 'master' 
Fix bugs introduced by layer refactor

Closes #6659

See merge request OpenMW/openmw!1709
 2022-03-04 22:08:41 +00:00
uramer
3bcbd4c170 Fix quickkeys assign UI layer 2022-03-04 21:58:39 +01:00
uramer
db5770b44c Fix bugs introduced by layer refactor 2022-03-04 17:31:52 +01:00
Petr Mikheev
696c2135ef Merge branch 'FixSettingsLoaderForEditor' into 'master' 
Make settings loader differentiate between engine and editor (fixes #6658).

Closes #6658

See merge request OpenMW/openmw!1706
 2022-03-04 09:44:52 +00:00
Martin Otto
96e48e5492 Make settings loader differentiate between engine and editor (fixes #6658). 2022-03-04 09:44:52 +00:00
Petr Mikheev
df41b4080d Merge branch 'refactor/headtracking' into 'master' 
Small improvement for headtracking

See merge request OpenMW/openmw!1683
 2022-03-03 20:39:53 +00:00
Matt
0b528d3bfb Small improvement for headtracking 2022-03-03 20:39:53 +00:00
psi29a
c99db4a66f Merge branch 'fix-6660' into 'master' 
Fix #6660: Crash during intro video when closing the game

Closes #6660

See merge request OpenMW/openmw!1707
 2022-03-03 20:23:48 +00:00
ζeh Matt
129d68e299
Fix #6660: Crash during intro video when closing the game 2022-03-03 20:25:35 +02:00
psi29a
4b312c7c34 Merge branch 'ccache_for_windows' into 'master' 
ccache for Windows

See merge request OpenMW/openmw!1220
 2022-03-02 09:06:58 +00:00
psi29a
f6757ce124 ccache for Windows 2022-03-02 09:06:58 +00:00
psi29a
3afa46b25e Merge branch 'CPP20_support' into 'master' 
Support C++20

See merge request OpenMW/openmw!1705
 2022-03-01 11:11:37 +00:00
Bret Curtis
32fd6f297a static_cast bitwise operation between different enumeration types 2022-03-01 10:53:01 +01:00
Bret Curtis
6601274992 constify weakcache overloaded operators 2022-03-01 10:53:01 +01:00
Bret Curtis
1927b1c6d9 use static cast to handle: deprecated between enumerations of different types 2022-03-01 10:53:01 +01:00
Bret Curtis
ad11cc8d8a reinstall fontconfig as needed; const an imbigious == operator 2022-03-01 10:53:01 +01:00
Bret Curtis
4b742dd461 explicit capture for lamda 2022-03-01 09:43:08 +01:00
psi29a
3558196098 Merge branch 'Newer-Bsa-formats-no-longer-load' into 'master' 
#6651 Newer bsa formats no longer load

Closes #6651

See merge request OpenMW/openmw!1703
 2022-03-01 07:22:04 +00:00
psi29a
a59ee1ec50 Merge branch 'absorb_self' into 'master' 
Prevent write to empty vector element

Closes #6655

See merge request OpenMW/openmw!1704
 2022-03-01 07:17:30 +00:00
Evil Eye
25feea9b16 Prevent write to empty vector element 2022-02-28 16:42:22 +01:00
psi29a
ceae2d664d Merge branch 'refactor/stdlist' into 'master' 
Use std::vector instead of std::list for some functions

See merge request OpenMW/openmw!1699
 2022-02-28 07:40:21 +00:00
Cédric Mocquillon
ff7ad93bac Avoid missusing of CompressedBSAFile with private inheritance 2022-02-27 20:40:35 +01:00
Petr Mikheev
c2da4a5d49 Merge branch 'fix_messagebox_layer' into 'master' 
Update hardcoded layers (hotfix for https://gitlab.com/OpenMW/openmw/-/merge_requests/1681)

See merge request OpenMW/openmw!1701
 2022-02-27 11:59:55 +00:00
uramer
6845d681f2 Update hardcoded layers (hotfix for https://gitlab.com/OpenMW/openmw/-/merge_requests/1681) 2022-02-27 11:59:55 +00:00
psi29a
2d4e9b38ae Merge branch 'lua_ui_image' into 'master' 
Document the Lua Image widget, add UI texture resources

See merge request OpenMW/openmw!1637
 2022-02-26 17:48:50 +00:00
uramer
67879bac55 MR feedack 2022-02-26 17:01:46 +01:00
Petr Mikheev
6afafbbe30 Merge branch 'refactor_layers' into 'master' 
Refactor UI layers

See merge request OpenMW/openmw!1681
 2022-02-26 13:54:42 +00:00
uramer
21a363d96f Refactor UI layers 2022-02-26 13:54:42 +00:00
Cédric Mocquillon
fe13fa850e Fix bug on memorystream 2022-02-26 14:38:33 +01:00
jvoisin
f8c57770c5 Merge branch 'strv_esmtool' into 'master' 
Use toStringView in esmtool instead of toString

See merge request OpenMW/openmw!1700
 2022-02-25 17:46:02 +00:00
uramer
a7bb87d8a1 Use StringUtils::format 2022-02-25 18:18:27 +01:00
uramer
e7474490a1 Document using ui.texture to create atlases 2022-02-25 18:18:27 +01:00
uramer
94cc090f73 PR feedack for documentation 2022-02-25 18:18:27 +01:00
uramer
e7ed709e5e Fix Lua TextEdit skin 2022-02-25 18:18:26 +01:00
uramer
fc50724f5c Render text and images correctly in templates with slots 2022-02-25 18:18:26 +01:00
uramer
e092ee2624 Document the Lua Image widget, add UI texture resources 2022-02-25 18:18:26 +01:00