1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 15:19:55 +00:00
Commit graph

25099 commits

Author SHA1 Message Date
glassmancody.info
d4e7d25d14 Make life not suck for whoever wants to edit lighting shaders 2021-04-13 11:09:49 -07:00
glassmancody.info
eecb9886a9 Shader cleanup, fix indicies 2021-04-13 11:09:49 -07:00
glassmancody.info
16f80ec6f3 Update settings when using fallback 2021-04-13 11:09:49 -07:00
glassmancody.info
4ba473b684 Finalize settings, torch fix 2021-04-13 11:09:49 -07:00
glassmancody.info
71c30a31df in-game settings, some require restart 2021-04-13 11:09:49 -07:00
glassmancody.info
3d713e8602 Fix incorrect minimum ambient 2021-04-13 11:09:49 -07:00
glassmancody.info
280fd2b162 Merge remote-tracking branch 'upstream/master' into why_are_the_christmas_lights_still_up 2021-04-13 11:09:35 -07:00
glassmancody.info
71f7f30c0b Don't break NV shaders 2021-04-13 11:09:35 -07:00
glassmancody.info
157717693a Changelog entry 2021-04-13 11:09:35 -07:00
glassmancody.info
d195602a9d Switch to shared layout, some rewording 2021-04-13 11:09:35 -07:00
glassmancody.info
cc31e1eea1 Ambient luminance threshold setting 2021-04-13 11:09:35 -07:00
glassmancody.info
690995988b More formatting, OpenCS cells are unbroken 2021-04-13 11:09:35 -07:00
glassmancody.info
142c6d2993 Enable groundcover lighting for non FFP 2021-04-13 11:09:35 -07:00
glassmancody.info
08b5681284 Missed redundant formatting changes 2021-04-13 11:09:35 -07:00
glassmancody.info
328ec85757 Code review cleanup, add setting documentation 2021-04-13 11:09:35 -07:00
glassmancody.info
24454a1698 Switch to integer, uint not reliable in GLSL 120 2021-04-13 11:09:35 -07:00
glassmancody.info
ec27e60284 Cutoff conditional in light shader 2021-04-13 11:09:35 -07:00
glassmancody.info
05a5cee132 Brighter point lights and light fade 2021-04-13 11:09:35 -07:00
glassmancody.info
7370acdf54 Merge remote-tracking branch 'upstream/master' into why_are_the_christmas_lights_still_up 2021-04-13 11:09:19 -07:00
glassmancody.info
43ac32921c Rewrite, support different lighting methods 2021-04-13 11:09:19 -07:00
glassmancody.info
9d9074c244 Add shared UBO 2021-04-13 11:07:48 -07:00
glassmancody.info
c5ea966f24 Merge remote-tracking branch 'upstream/master' into why_are_the_christmas_lights_still_up 2021-04-13 11:06:16 -07:00
glassmancody.info
dda735c54a initial commit 2021-04-13 11:06:16 -07:00
Roman Siromakha
c9acac557a
Merge pull request #3059 from akortunov/master
Revert MR672
2021-03-31 23:35:47 +02:00
Alexei Dobrohotov
323c4bda61 Merge branch 'spdx-license' into 'master'
Use the SPDX license identifier in appdata XML

See merge request OpenMW/openmw!701
2021-03-31 18:08:23 +00:00
Alexander Olofsson
44bd81e8f0
Use the SPDX license identifier in appdata XML 2021-03-31 18:15:22 +02:00
Andrei Kortunov
1ab5a9f530 Revert "Merge branch 'refractiontest' into 'master'"
This reverts commit b31459cc00, reversing
changes made to 369adf1583.
2021-03-30 15:32:01 +04:00
Andrei Kortunov
a576824bcf Merge branch 'update-maintainer' into 'master'
Update Flatpak maintainer

See merge request OpenMW/openmw!700
2021-03-30 09:56:07 +00:00
Alexander Olofsson
ad0fe2ee29
Update Flatpak maintainer 2021-03-30 11:31:36 +02:00
Andrei Kortunov
ee7198a6af Merge branch 'DarthGandalf-master-patch-33177' into 'master'
Update Gentoo maintainers (me)

See merge request OpenMW/openmw!699
2021-03-30 08:02:32 +00:00
Alexey Sokolov
44829046a0 Update Gentoo maintainers (me) 2021-03-30 08:00:00 +00:00
psi29a
a6123fee0e Merge branch '5904-hack' into 'master'
Fix #5904

Closes #5904

See merge request OpenMW/openmw!698
2021-03-30 06:10:25 +00:00
AnyOldName3
c6033b4de6 Fix #5904 2021-03-29 21:00:28 +00:00
AnyOldName3
e3dd1bf69e Merge branch 'setpos_again' into 'master'
Remove wrong line that slipped in yesterday.

See merge request OpenMW/openmw!697
2021-03-29 20:33:38 +00:00
fredzio
0fac172413 Remove wrong line that slipped in yesterday. 2021-03-29 21:46:08 +02:00
Bret Curtis
d835204fdf
Merge pull request #3058 from akortunov/master
Rework knockdown and knockout animations fallbacks
2021-03-29 15:37:33 +02:00
Andrei Kortunov
50352daf90 Rework knockdown and knockout animations fallbacks 2021-03-29 14:45:07 +04:00
Evil Eye
582f1503c1 Merge branch 'setpos' into 'master'
Unbreak SetPos and the mods using it (#5919)

See merge request OpenMW/openmw!696
2021-03-28 20:14:17 +00:00
fredzio
7a67492d81 Unbreak SetPos and the mods using it.
To make SetPos works with async physics, it was modified to register a
position offset that would be applied to the real position during the
simulation.

A common pattern to teleport NPC in scripts is a sequence of SetPos/Disable/Enable in the same frame.
Since Disable/Enable creates a new physics actor using last known
RefData::Position, the registered offset never get a chance to be applied.

Modify disable() to call moveObject with the offset applied, so that the newly created physics actor will have up-to-date position
2021-03-28 21:19:14 +02:00
psi29a
08afc4729f Merge branch 'physics_clean' into 'master'
Close 2 data races with async physics

See merge request OpenMW/openmw!695
2021-03-27 16:56:54 +00:00
fredzio
b58244ac26 Guard the Bullet drawing method with a read lock on the
btCollisionWorld. It closes a race on the collision shapes coordinates.
2021-03-26 23:49:31 +01:00
fredzio
dbd6e3bfee Replace pointless usage of shared_ptr by unique_ptr / non-owning raw
pointer for btCollisionWorld.
2021-03-26 23:49:31 +01:00
fredzio
ccd3cbc69a Use saved actor position instead of reading again RefData in unstuck. It
is a race condition to do so.
2021-03-26 23:49:31 +01:00
Andrei Kortunov
5fce5b12f4 Merge branch 'drop_the_bird' into 'master'
Disallow inserting containers, creatures, and npcs from the save game not present in content files

Closes #5884

See merge request OpenMW/openmw!683
2021-03-26 15:48:17 +00:00
Andrei Kortunov
b61337643e Merge branch 'issue-5680' into 'master'
change aim calculation

See merge request OpenMW/openmw!685
2021-03-26 11:43:20 +00:00
Andrei Kortunov
bb9c4d5377 Merge branch 'fix_the_swimmer' into 'master'
Fix The Swimmer (#5914)

See merge request OpenMW/openmw!686
2021-03-26 11:19:57 +00:00
Max
dc09616e59 change bugfix name to be same as ticket name 2021-03-24 14:54:47 -07:00
Max
2cd96e56d5 create constant and use constant in other parts of the code base 2021-03-24 14:54:46 -07:00
Max
e56efdd562 change aim calculation 2021-03-24 14:54:46 -07:00
AnyOldName3
52eccf1a2d Merge branch 'fix-build' into 'master'
attempt to fix build issue

See merge request OpenMW/openmw!689
2021-03-24 21:50:15 +00:00