CedricMocquillon
86d137363e
Check if the archive is opened before adding a file to it and clear state on close
2021-05-20 21:28:52 +02:00
CedricMocquillon
b61249841e
Update lookup only after sorting files
2021-05-19 18:38:42 +02:00
psi29a
3920477618
Merge branch 'moving_lighting_method_to_graphics' into 'master'
...
Moving Lighting Method from Advanced -> Visuals to Graphics -> Lighting
See merge request OpenMW/openmw!883
2021-05-19 05:09:24 +00:00
psi29a
c4fde03542
Merge branch 'ObjectPagingMergeIssue' into 'master'
...
Share state
See merge request OpenMW/openmw!879
2021-05-19 05:08:12 +00:00
psi29a
e596f62107
Merge branch 'Terrain-Selection-Issues' into 'master'
...
Various fixes for the editor's "Terrain land editing" mode (fixes #5473 , #6022 , #6023 , #6024 , #6035 , #6036 )
Closes #6036 , #6035 , #6024 , #6023 , #6022 , and #5473
See merge request OpenMW/openmw!840
2021-05-19 05:06:43 +00:00
Thunderforge
4a15868c0e
Moving Lighting Method from Advanced -> Visuals to Graphics -> Lighting
...
The plan is to add additional options to this new tab, and since it's of similar status as the Shaders settings, it makes sense to put them next to them on the Graphics page.
2021-05-18 18:05:54 -05:00
Alexei Dobrohotov
fea5c0ac1a
Merge branch 'armour_error_fix' into 'master'
...
Fixed data subrecord name for Armour record used in error
See merge request OpenMW/openmw!882
2021-05-18 22:02:30 +00:00
CedricMocquillon
d11a6bd92c
Share state
2021-05-18 17:57:47 +02:00
Atahualpa
3a1243a5d0
Rebased branch, reduced code duplication, added comments, adjusted formatting.
2021-05-18 17:53:00 +02:00
Atahualpa
ca80aeaaea
Fix vertex calculation for cell-border drawing.
2021-05-18 15:05:26 +02:00
Atahualpa
d500507dec
Resolved merge conflicts with changelog (cont.)
2021-05-18 15:05:19 +02:00
Atahualpa
356efa15a2
Fixes #6035 (circle brush selects outside of circle) and #6036 (some corner vertices not selected).
2021-05-18 15:04:01 +02:00
Atahualpa
425f745d53
Resolved merge conflicts with changelog.
2021-05-18 15:03:56 +02:00
Atahualpa
7be891b440
Directly use Geometry instead of Geode; fix for loop; add size_t type-cast.
2021-05-18 14:56:03 +02:00
Atahualpa
73949d5bd0
Updating the CMake file isn't a bad idea either...
2021-05-18 14:56:03 +02:00
Atahualpa
6c49074765
Remove old references to Cell class.
2021-05-18 14:56:03 +02:00
Atahualpa
008bf64dd9
Second step toward fixing terrain selection issues.
2021-05-18 14:56:03 +02:00
Atahualpa
18ea4d8eb2
First step toward fixing terrain selection issues.
2021-05-18 14:56:02 +02:00
Bret Curtis
373f8636b7
Merge pull request #3092 from akortunov/master
...
Do not trigger in-game bindings via mouse buttons when controls are disabled
2021-05-18 10:47:45 +02:00
Bret Curtis
523edd0723
Merge pull request #3093 from akortunov/light_crash
...
Fix crashes on exit in LightManager
2021-05-18 10:47:36 +02:00
psi29a
ae66afb219
Merge branch 'less_verbose' into 'master'
...
Make the code less verbose.
See merge request OpenMW/openmw!874
2021-05-18 08:30:50 +00:00
psi29a
e73c0f92b8
Merge branch 'fix_present_tile_crash' into 'master'
...
Add missing synchronization for present tiles modification
See merge request OpenMW/openmw!878
2021-05-18 08:13:25 +00:00
psi29a
e9fbd76e9b
Merge branch 'windows_tests' into 'master'
...
Support running tests and benchmarks for windows
See merge request OpenMW/openmw!839
2021-05-18 08:12:22 +00:00
psi29a
4bc7012104
Merge branch 'pack-default-settings' into 'master'
...
Pack default settings
Closes #5925
See merge request OpenMW/openmw!822
2021-05-18 08:11:13 +00:00
elsid
959165bcb9
Support running unit tests on gitlab CI for windows
...
But not actually run them because gitlab fails to do this.
2021-05-18 01:34:03 +02:00
elsid
3ef1b27099
Add missing includes
2021-05-18 01:21:42 +02:00
AnyOldName3
4cedb3549b
Decode base64-packed settings files
2021-05-17 23:39:56 +01:00
Benjamin Winger
21f04f0d0f
Fixed data subrecord name for Armour record used in error
2021-05-17 18:36:59 -04:00
AnyOldName3
081650a2e5
Integrate Base64 library with build
2021-05-17 23:00:23 +01:00
AnyOldName3
2b1326cb74
Change namespace to Base64
...
The functions do Base64 encoding and decoding and do not feed me
delicious almond and meringue based confectionary.
2021-05-17 22:50:32 +01:00
AnyOldName3
d66cc3b7ae
Fix undefined behaviour
2021-05-17 22:47:08 +01:00
AnyOldName3
aba735e615
Check in external Base64 implementation
...
Taken from https://gist.github.com/tomykaira/f0fd86b6c73063283afe550bc5d77594
MIT licenced
2021-05-17 22:45:10 +01:00
elsid
a73ffc25c3
Add missing synchronization for present tiles modification
...
insert/erase can be done from multiple threads simultaneously. mMutex is
already used to synchronize reads so use it for writes too.
2021-05-17 17:44:31 +02:00
psi29a
f1f1703441
Merge branch 'fix_navmesh_wait' into 'master'
...
Fix redundant waiting until navmesh is generated
See merge request OpenMW/openmw!861
2021-05-17 10:54:23 +00:00
Andrei Kortunov
11c57978b6
Fix crashes on exit in the LightManager (bug #6044 )
2021-05-17 13:01:15 +04:00
Andrei Kortunov
c54ef55ebb
Revert "Replace raw pointer by observer_ptr to avoid dangling pointer dereferencing"
...
This reverts commit 5373cf1cd5
.
2021-05-17 12:40:55 +04:00
Andrei Kortunov
c11774f278
Do not trigger in-game bindings via mouse buttons when controls are disabled (bug #6047 )
2021-05-17 12:23:56 +04:00
psi29a
b583c2300c
Merge branch 'maybe-fix#5551' into 'master'
...
Fix #5551
Closes #5551
See merge request OpenMW/openmw!802
2021-05-17 08:16:02 +00:00
psi29a
405e634e09
Merge branch 'fix_light_manager_ub' into 'master'
...
Fix UB in light initialization
See merge request OpenMW/openmw!877
2021-05-17 07:57:42 +00:00
elsid
d520b440aa
Copy LightBuffer data into a new object when changing layout
...
Before this change LightBuffer copy constructor copied only mData pointer into
a new object. Then memcpy was applied to an overlapping source and destination
that is UB.
Replace configureLayout function by a special constructor. That copies all
mData values and a pointer to a buffer object into a newly allocated object.
2021-05-16 22:37:31 +02:00
Bret Curtis
fef9e91510
Merge pull request #3090 from akortunov/warnfix
...
Fix warning in assert - size_t can not be negative
2021-05-16 20:25:46 +02:00
Bret Curtis
46da65a568
Merge pull request #3091 from akortunov/master
...
Discard button press events during save loading
2021-05-16 20:25:08 +02:00
AnyOldName3
c2e4eda825
Merge branch '6013-fix' into 'master'
...
Retain draw callback
Closes #6013 and #5967
See merge request OpenMW/openmw!875
2021-05-16 17:30:38 +00:00
madsbuvi
f3e17e7c52
Don't redundantly call notify on every frame.
2021-05-16 18:09:48 +02:00
Andrei Kortunov
e38063dcdb
Discard button press events during save loading (bug #5619 )
2021-05-16 16:04:28 +04:00
Frederic Chardon
62c7adc87b
Merge branch 'no_at_boundaries' into 'master'
...
Don't use at() instead [] when length is checked/known
See merge request OpenMW/openmw!866
2021-05-16 11:58:14 +00:00
Frederic Chardon
38db2f8810
Merge branch 'includes_mwgui' into 'master'
...
Remove some useless includes from apps/openmw/mwgui
See merge request OpenMW/openmw!870
2021-05-16 11:46:13 +00:00
madsbuvi
5b9a2b73b0
Retain final draw callback as a member variable in ScreenshotManager, and do not call setFinalDrawCallback after init.
2021-05-16 13:04:30 +02:00
Frederic Chardon
807c7a2025
Merge branch 'useless_includes_mwmechanics' into 'master'
...
Remove some useless headers in apps/openmw/mwmechanics
See merge request OpenMW/openmw!871
2021-05-16 10:51:43 +00:00
fredzio
5b63019719
Embed actor velocity inside its class. It makes the code simpler.
2021-05-16 12:42:17 +02:00