Andrei Kortunov
e6690bbcc7
Use CMAKE_CURRENT_SOURCE_DIR instead of CMAKE_SOURCE_DIR
2023-12-19 19:58:52 +04:00
Evil Eye
36b61d7074
Merge branch 'copy-that' into 'master'
...
Feat(CS): Implement Instance Cloning
See merge request OpenMW/openmw!3654
2023-12-19 11:27:51 +00:00
Andrei Kortunov
2e041073fc
Move *.ui files for different applications to different folders
2023-12-19 15:21:08 +04:00
Andrei Kortunov
8d06a99507
Register language selector properly
2023-12-19 10:20:31 +04:00
Mads Buvik Sandvei
00b1cd8c08
Replace movement() with eraseMovementIf()
2023-12-18 22:50:45 +01:00
Mads Buvik Sandvei
5a6dbf8714
Comments
2023-12-18 22:43:45 +01:00
Evil Eye
94b129cc62
Stop combat when stacking a new AI package
2023-12-18 22:18:26 +01:00
Evil Eye
77cf9284b7
Allow ModPCCrimeLevel to clear crimes and cap bounties
2023-12-18 21:52:17 +01:00
Alexei Kotov
7922f0e7f8
Merge branch 'editor_modifier_settings' into 'master'
...
Use settings values to declare modifier settings (#6876 )
See merge request OpenMW/openmw!3656
2023-12-18 00:37:55 +00:00
Evil Eye
9f38ee82f4
Fix misaligned address
2023-12-17 21:30:04 +01:00
jvoisin
fc5f917b1a
Merge branch 'discolighting' into 'master'
...
Consolidate shader lighting
See merge request OpenMW/openmw!3660
2023-12-17 19:20:15 +00:00
jvoisin
2c1810c6db
Merge branch 'hoteltransylvania' into 'master'
...
Outlaw vampires and werewolves (bugs #7723 , #7724 )
Closes #7723 and #7724
See merge request OpenMW/openmw!3661
2023-12-17 19:08:32 +00:00
Evil Eye
88731f864e
Add imports
2023-12-17 15:21:12 +01:00
Evil Eye
37415b0382
Don't use getExact to read structs
2023-12-17 15:16:32 +01:00
Evil Eye
c10b9297f0
Remove Sized methods from ESMReader
2023-12-17 14:05:10 +01:00
Evil Eye
dbf9d42cc5
Remove sized reads from essimporter
2023-12-17 14:03:45 +01:00
Evil Eye
a9e6e63c4e
Remove fixed size reads
2023-12-17 13:00:14 +01:00
Alexei Kotov
82982bbc05
Outlaw vampires and werewolves (bugs #7723 , #7724 )
2023-12-15 23:46:10 +03:00
jvoisin
ec480db9ac
Merge branch 'constanteffect' into 'master'
...
For constant enchantments, allow on-self range for any effect (bug #7643 )
Closes #7643
See merge request OpenMW/openmw!3657
2023-12-15 13:35:47 +00:00
Alexei Kotov
93ea9dbc3b
Do all lighting calculations in one place, support per-vertex specularity
...
Force PPL when specular maps are used
2023-12-15 11:44:54 +03:00
Alexei Kotov
d1274fd3db
Deduplicate lambert calculations, consolidate doLighting
2023-12-15 10:36:47 +03:00
Alexei Kotov
46dc290b75
Merge branch 'more_localizable' into 'master'
...
Make hardcoded strings in Launcher and Wizard localizable
See merge request OpenMW/openmw!3630
2023-12-15 04:41:31 +00:00
Alexei Kotov
ba7932f21c
Merge branch 'fix_cs_settings_key_bindings_page' into 'master'
...
Fix CS Key Binding settings page
See merge request OpenMW/openmw!3655
2023-12-15 03:31:55 +00:00
jvoisin
c969aa42b7
Merge branch 'aifollow' into 'master'
...
Base AiFollow activation range on follow distance (bug #7685 )
Closes #7685
See merge request OpenMW/openmw!3652
2023-12-14 20:14:20 +00:00
jvoisin
3b1df3dd07
Merge branch 'tangentspace' into 'master'
...
Untangle tangent space handling and parallax
See merge request OpenMW/openmw!3648
2023-12-14 20:01:39 +00:00
Alexei Kotov
27bd70a976
For constant enchantments, allow on-self range for any effect (bug #7643 )
2023-12-14 15:55:24 +03:00
elsid
a29ae07957
Fix CS Key Binding settings page
...
This got broken by e07d8f3066
2023-12-14 00:29:18 +01:00
elsid
11db9eec1d
Use settings values to declare modifier settings
2023-12-13 23:29:35 +01:00
Dave Corley
bc662aeb63
Fix(CS): Fix minor issue in deleteSelectedInstances impl which caused it
...
to run twice
2023-12-13 16:06:46 -06:00
Dave Corley
7069a970ae
Feat(CS): Implement instance cloning
2023-12-13 16:06:46 -06:00
Dave Corley
2bb8ceef56
Fix(CS): Correct invalid refNum for cloned objects so they actually
...
appear ingame
2023-12-13 16:06:46 -06:00
Dave Corley
2a747529bb
Feat(CS): Add new shortcut for duplicating instances
2023-12-13 16:06:46 -06:00
Alexei Kotov
2628b02b4e
NpcAnimation: Assign parent animation time sources to body part controllers (bug #4822 )
2023-12-14 00:48:40 +03:00
Alexei Kotov
5b02b77a39
Base AiFollow activation range on follow distance (bug #7685 )
2023-12-13 20:18:20 +03:00
Alexei Kotov
4dfd2b0f46
Merge branch 'lessassertiveschooling' into 'master'
...
Don't assert that spells have a school
See merge request OpenMW/openmw!3651
2023-12-13 17:14:29 +00:00
Alexei Kotov
7e3270abc9
Merge branch 'unsave' into 'master'
...
Drop support for saves made prior to 0.40
See merge request OpenMW/openmw!3645
2023-12-13 00:33:20 +00:00
Evil Eye
a0694d4134
Don't assert that spells have a school
2023-12-12 22:11:32 +01:00
Evil Eye
f80cd06256
Don't count the actor we're following as siding with us if we're in combat with them but they aren't in combat with us
2023-12-12 22:06:52 +01:00
Alexei Kotov
4a96885323
Untangle normals and parallax handling
...
Move tangent space generation to the vertex shaders
Support diffuse parallax when no normal map is present
Don't use diffuse parallax if there's no diffuse map
Generalize normal-to-view conversion
Rewrite parallax
2023-12-12 22:42:53 +03:00
jvoisin
abbb620ea2
Merge branch 'nifogproperty' into 'master'
...
Handle NiFogProperty (feature #5173 )
Closes #5173
See merge request OpenMW/openmw!3642
2023-12-12 18:30:11 +00:00
Evil Eye
78da1eb41f
Merge branch 'settings_values_editor_2' into 'master'
...
Use settings values for editor (#6876 )
See merge request OpenMW/openmw!3633
2023-12-12 17:00:43 +00:00
Alexei Kotov
ad8392b7d1
Merge branch 'awholelottanothing' into 'master'
...
Don't crash on spells or enchantments without effects
Closes #7712
See merge request OpenMW/openmw!3643
2023-12-11 13:02:51 +00:00
Alexei Kotov
21ca9ba34b
Merge branch 'crashtainer' into 'master'
...
Use the right getContainerStore
Closes #7658
See merge request OpenMW/openmw!3644
2023-12-11 12:25:33 +00:00
Andrei Kortunov
ca19f7006c
Make hardcoded strings in Launcher and Wizard localizable
2023-12-11 12:02:43 +04:00
jvoisin
e3e9b39a16
Merge branch 'skinning' into 'master'
...
Streamline passing influence data to skinning
See merge request OpenMW/openmw!3641
2023-12-10 12:56:08 +00:00
jvoisin
47b87f1ff2
Merge branch 'reanimaterescaling' into 'master'
...
Restore animated collision shape rescaling (take 3)
See merge request OpenMW/openmw!3635
2023-12-10 12:55:57 +00:00
Evil Eye
623a610c5e
Merge branch 'globalmap' into 'master'
...
Remove unused global map field
See merge request OpenMW/openmw!3646
2023-12-09 21:05:25 +00:00
Mads Buvik Sandvei
76232c49df
clang format
2023-12-09 20:42:14 +01:00
Alexei Kotov
f269b25bd0
Remove unused field
2023-12-09 22:00:35 +03:00
Evil Eye
7b8c0d1d88
Remove dropped formats from tests
2023-12-09 19:00:42 +01:00
