psi29a
|
4e93716584
|
Merge branch 'always_bigobj' into 'master'
Always use /bigobj, clean up scattered uses into one
See merge request OpenMW/openmw!1476
|
2022-01-17 08:05:19 +00:00 |
|
uramer
|
886dee57ee
|
Always use /bigobj, clean up scattered uses into one
|
2022-01-17 08:05:19 +00:00 |
|
psi29a
|
78e8fb5cf9
|
Merge branch 'movement_tweaks' into 'master'
Movement solver tweaks
See merge request OpenMW/openmw!1352
|
2022-01-17 07:32:19 +00:00 |
|
wareya
|
20cbf941fb
|
re-introduce short circuiting, but only under certain circumstances
|
2022-01-16 17:58:04 -05:00 |
|
wareya
|
784b1888a9
|
Merge branch 'upstream' into movement_tweaks
|
2022-01-16 17:19:20 -05:00 |
|
psi29a
|
fd7e0b74cc
|
Merge branch '6303-jail-stuck-attack' into 'master'
#6303 Made player stop attacking and sheathe weapon when going to jail
See merge request OpenMW/openmw!1551
|
2022-01-16 10:15:47 +00:00 |
|
Artem Nykolenko
|
a5cdc889a2
|
#6303 Made player stop attacking and sheathe weapon when going to jail
|
2022-01-16 10:15:47 +00:00 |
|
uramer
|
c07fb75bf7
|
Merge branch 'lua_settings' into 'master'
Permanent storage for Lua
See merge request OpenMW/openmw!1489
|
2022-01-15 21:52:09 +00:00 |
|
jvoisin
|
2142e4b241
|
Merge branch 'scale_your_guar' into 'master'
Make scaleObject a no-op when not changing scale
Closes #6551
See merge request OpenMW/openmw!1559
|
2022-01-15 17:17:18 +00:00 |
|
uramer
|
ae641811cf
|
Merge branch 'lua_vector' into 'master'
Use double precision for vectors serialization in Lua
See merge request OpenMW/openmw!1558
|
2022-01-15 16:14:04 +00:00 |
|
Evil Eye
|
2700fa37df
|
Merge branch 'lua_fix' into 'master'
Remove incorrect destructor that was added in !1557.
See merge request OpenMW/openmw!1560
|
2022-01-15 15:20:10 +00:00 |
|
Petr Mikheev
|
4677912997
|
Remove incorrect destructor that was added in !1557.
|
2022-01-15 13:59:22 +01:00 |
|
Evil Eye
|
5fcb2cabc8
|
Make scaleObject a no-op when not changing scale
|
2022-01-15 13:04:15 +01:00 |
|
uramer
|
c33534f468
|
Merge branch 'lua_fix' into 'master'
Lua fixes
Closes #6549
See merge request OpenMW/openmw!1557
|
2022-01-15 12:01:30 +00:00 |
|
Petr Mikheev
|
1b7e923b2c
|
Lua fixes
|
2022-01-15 12:01:30 +00:00 |
|
Petr Mikheev
|
97d56e198f
|
Use double precision for vectors serialization in Lua
|
2022-01-15 11:25:30 +01:00 |
|
psi29a
|
98d1588477
|
Merge branch 'build-fixes' into 'master'
Add missing include to unordered_map
See merge request OpenMW/openmw!1553
|
2022-01-14 09:25:48 +00:00 |
|
ζeh Matt
|
ba30b37bb4
|
Add missing include to unordered_map
|
2022-01-13 22:46:00 +02:00 |
|
Petr Mikheev
|
a182fdeea1
|
Permanent storage for Lua data
|
2022-01-11 11:21:03 +01:00 |
|
psi29a
|
781b014183
|
Merge branch 'toggable_daynightswitch' into 'master'
Toggable day night switch (#5928)
Closes #5928
See merge request OpenMW/openmw!1549
|
2022-01-11 09:34:19 +00:00 |
|
Cody Glassman
|
8ec0a52605
|
Toggable day night switch (#5928)
|
2022-01-11 09:34:19 +00:00 |
|
psi29a
|
0826de7edf
|
Merge branch 'lua_pause' into 'master'
A bit more lua bindings for game time
See merge request OpenMW/openmw!1455
|
2022-01-11 09:16:13 +00:00 |
|
Petr Mikheev
|
9fd7630ca0
|
Add calendar.lua
|
2022-01-10 21:04:07 +01:00 |
|
Petr Mikheev
|
2d1b100239
|
Change terminology of gameSecond/gameHour to simulationTime/gameTime
|
2022-01-10 21:03:35 +01:00 |
|
psi29a
|
8ee8f81619
|
Merge branch 'librecast_all_the_things' into 'master'
Add librecast-dev to deps that needed for Debian/Ubuntu
Closes #6546
See merge request OpenMW/openmw!1550
|
2022-01-10 19:38:55 +00:00 |
|
psi29a
|
877f5c445e
|
Add librecast-dev to deps that needed for Debian/Ubuntu
|
2022-01-10 19:38:55 +00:00 |
|
psi29a
|
c9d7eac883
|
Merge branch 'serialize_transforms' into 'master'
Add serialization for TransformM and TransformQ
Closes #6506
See merge request OpenMW/openmw!1543
|
2022-01-10 12:42:04 +00:00 |
|
Josquin Frei
|
d9672f7d46
|
Add serialization for TransformM and TransformQ
|
2022-01-10 12:42:03 +00:00 |
|
psi29a
|
a1f8db7600
|
Merge branch 'bright_spells' into 'master'
Replicate Morrowind spell lighting (#4949)
Closes #4949
See merge request OpenMW/openmw!1544
|
2022-01-09 11:07:14 +00:00 |
|
psi29a
|
d48f072b97
|
Merge branch 'readbuffer_save' into 'master'
Fix black save game screenshots under certain settings (#6543)
Closes #6543
See merge request OpenMW/openmw!1546
|
2022-01-09 10:57:50 +00:00 |
|
Evil Eye
|
d767ed99cf
|
Merge branch 'changelog_stuff' into 'master'
Update changelog and remove an unused setting from settings-default.cfg
See merge request OpenMW/openmw!1548
|
2022-01-09 09:13:38 +00:00 |
|
Abdu Sharif
|
cd1bea080f
|
Update changelog and remove an unused setting from settings-default.cfg
|
2022-01-09 09:13:38 +00:00 |
|
cody glassman
|
8216410e7d
|
add white ambient to spell VFX as in Morrowind
|
2022-01-08 16:19:42 -08:00 |
|
cody glassman
|
e32d3d11ce
|
ensure readbuffer is bound before using glReadPixels
|
2022-01-08 16:12:24 -08:00 |
|
psi29a
|
99e4cbf513
|
Merge branch 'coverity_artifacts' into 'master'
Keep coverity logs as artifacts instead of deploying them
See merge request OpenMW/openmw!1542
|
2022-01-08 21:12:15 +00:00 |
|
jvoisin
|
5d7db94a23
|
Keep coverity logs as artifacts instead of deploying them
|
2022-01-08 22:08:05 +01:00 |
|
psi29a
|
a50662f7db
|
Merge branch 'friendshipismagic' into 'master'
Fix multilayer parallax parameter reading in BSLightingShaderProperty
See merge request OpenMW/openmw!1541
|
2022-01-08 16:39:38 +00:00 |
|
Alexei Dobrohotov
|
b5a7ad6d62
|
Fix multilayer parallax parameter reading
|
2022-01-08 01:58:52 +03:00 |
|
psi29a
|
ceaa141cdf
|
Merge branch 'this_and_that' into 'master'
make this great again
See merge request OpenMW/openmw!1539
|
2022-01-07 15:43:04 +00:00 |
|
psi29a
|
011a26684a
|
Merge branch 'fix_wizard_dialogs' into 'master'
Fix wizard dialogs
See merge request OpenMW/openmw!1519
|
2022-01-07 14:35:12 +00:00 |
|
Josquin Frei
|
63a8bc5f9b
|
Fix wizard dialogs
|
2022-01-07 14:35:11 +00:00 |
|
psi29a
|
69319cea31
|
Merge branch 'no_more_twerking_pls' into 'master'
Heavily mitigate jittery objects far from origin
See merge request OpenMW/openmw!1540
|
2022-01-06 22:01:28 +00:00 |
|
Cody Glassman
|
cdae1c4c97
|
Heavily mitigate jittery objects far from origin
|
2022-01-06 22:01:28 +00:00 |
|
Bret Curtis
|
6672014a51
|
make this great again
|
2022-01-06 15:02:24 +01:00 |
|
psi29a
|
d8d7a3b372
|
Merge branch 'softparticles_patch' into 'master'
Shadervisitor adjustments and Mac OS fix for soft particles
See merge request OpenMW/openmw!1380
|
2022-01-06 13:13:52 +00:00 |
|
psi29a
|
6a2cf2e358
|
Merge branch 'task/#6088_ffmpeg_api_deprecation_warnings' into 'master'
#6088 ffmpeg api deprecation warnings
Closes #6088
See merge request OpenMW/openmw!1504
|
2022-01-06 13:08:45 +00:00 |
|
psi29a
|
1d4de71d35
|
Merge branch 'fix2' into 'master'
Fixes in components/lua
Closes #6535
See merge request OpenMW/openmw!1538
|
2022-01-06 08:49:17 +00:00 |
|
psi29a
|
555e0b1f53
|
Merge branch 'brainfreeze' into 'master'
Attempt to catch freezes on Windows
See merge request OpenMW/openmw!1493
|
2022-01-06 08:47:23 +00:00 |
|
Petr Mikheev
|
6a19a66ae5
|
Fix #6535
|
2022-01-05 20:08:03 +01:00 |
|
Petr Mikheev
|
5eca122f04
|
Avoid creating multiple i18n contexts with the same name.
|
2022-01-05 19:50:52 +01:00 |
|