1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-20 06:23:54 +00:00
Commit graph

1265 commits

Author SHA1 Message Date
psi29a
51024a8208 Merge branch 'issue-6706-save-the-size-of-the-options-window' into 'master'
Issue-6706 Save the size of the Options window

Closes #6706

See merge request OpenMW/openmw!1798
2022-04-29 09:56:09 +00:00
Eris Caffee
de291b0ec4 Issue-6706 Save the size of the Options window 2022-04-29 09:56:08 +00:00
cody glassman
276cb6f170 clamp vertex lighting in fragment shader properly 2022-04-28 20:02:13 -07:00
psi29a
66a96bfa5e Merge branch 'launcher-datadirs' into 'master'
Make launcher handle data dirs #2858 and BSA

See merge request OpenMW/openmw!192
2022-04-27 17:31:52 +00:00
fredzio
b88d32ff5b Add 3 tabs in the "Data Files" page
1 with the data directories
2 with the BSA archives
3 with the content selector

When user select a directory to be added, first we walk the directory
hierarchy to make a list of all potential data= entries. If we find
none, the selected directory is added.

If more than one data directory is found, user is presented with a
directory list to check which one(s) are to be added.

Directories containing one or more content file are marked with an icon.

data= and fallback-archive= lines are handled like content= lines:
- they are part of the profile in launcher.cfg, prefixed by the profile
name
- they are updated in openmw.cfg when profile is selected / created

Directories can be moved in the list by drag and drop or by buttons.
Insertion is possible anywhere in the list.
Global data path and data local are shown but are greyed out, as they
are always included.

No attempt is made to ensure that the user choice are valid
(dependencies, overwrite of content).

After a profile is loaded, any added content is highlighted in green.
2022-04-23 09:54:45 +02:00
elsid
e777e35414
Use system_clock for time in logs
high_resolution_clock may not give real time. MSVC implements it as
steady_clock that is basically CPU time which is usually desynchronized with
real time.
2022-04-21 23:03:40 +02:00
psi29a
c14796fc57 Merge branch 'ncc' into 'master'
#6496 Handle NCC flag in Nif files

See merge request OpenMW/openmw!1516
2022-04-17 20:29:41 +00:00
psi29a
4e723cad59 Merge branch 'issue-6667-pressing_escape_during_wait_causes_black_screen' into 'master'
issue-6667 pressing escape during wait causes black screen

See merge request OpenMW/openmw!1783
2022-04-17 20:26:23 +00:00
Eris Caffee
627656ace0 issue-6667 pressing escape during wait causes black screen 2022-04-17 20:26:23 +00:00
psi29a
58f77ab3ef Merge branch 'issue-5279-console_stops_scrolling_properly_after_selection' into 'master'
issue-5279 console stops scrolling properly after selection

See merge request OpenMW/openmw!1781
2022-04-17 20:25:10 +00:00
Eris Caffee
b2c6c49999 issue-5279 console stops scrolling properly after selection 2022-04-17 20:25:09 +00:00
fredzio
d05a2facf3 Handle NCC flag in Nif files. Objects with this flag will collide only with camera.
Expose objects with NC flag to be used by Lua mods.
2022-04-17 20:03:00 +02:00
Eris Caffee
db84d9e649 Issue 2766 Warn user of old MW version detected 2022-04-17 16:28:14 +00:00
Evil Eye
61ea678a96 Implement ignored records 2022-04-16 16:28:39 +02:00
psi29a
84458baa8b Merge branch 'VA_OpenMW-CS' into 'master'
OpenMW-CS: Issue #3245 Add configurable instance grid, angle, and scale snapping

Closes #3245

See merge request OpenMW/openmw!1737
2022-04-11 16:03:30 +00:00
VidiAquam
e2f393cbdb Update CHANGELOG.md, AUTHORS.md 2022-04-11 15:36:05 +00:00
Bret Curtis
0db5415976 refactor to use mInternal, support Flag_Reverse and updated changelog/authors.md 2022-04-07 00:09:11 +02:00
Alexei Dobrohotov
98b2ddfd4c Make console and maximized window defaults mimic Morrowind 2022-04-06 16:12:31 +03:00
Evil Eye
c1d700f770 Don't reset last hit object if the ID doesn't match 2022-03-28 11:40:46 +00:00
Nelsson Huotari
6869fa18e4 Fix unsafe memory access at object.cpp 2022-03-26 15:16:22 +00:00
psi29a
1542a0392c Merge branch 'gloss' into 'master'
Gloss-mapping

Closes #6541

See merge request OpenMW/openmw!1552
2022-03-24 11:22:58 +00:00
Evil Eye
12f6530ab3 Relocate changelog entries 2022-03-16 19:24:36 +01:00
Evil Eye
484a7c7b7e Base dialogue order solely on mPrev 2022-03-16 18:09:21 +01:00
Evil Eye
25feea9b16 Prevent write to empty vector element 2022-02-28 16:42:22 +01:00
psi29a
7e4e78b1a7 Merge branch 'engarde' into 'master'
Always reduce weapon condition by the raw damage (bug #6559)

Closes #6559

See merge request OpenMW/openmw!1694
2022-02-23 21:49:57 +00:00
Alexei Dobrohotov
fdd9e6a793 Always reduce weapon condition by the raw damage (bug #6559) 2022-02-23 16:37:56 +03:00
Alexei Dobrohotov
1a15ad216d Increase the base angular velocity to 900°/sec (#5192) 2022-02-23 02:13:31 +03:00
Alexei Dobrohotov
dd473d06df Implement gloss-mapping (feature #6541) 2022-02-18 06:24:06 +03:00
psi29a
b011809056 Merge branch 'master' into 'sort_me_baby_one_more_time'
# Conflicts:
#   components/nif/niffile.cpp
2022-02-17 09:24:50 +00:00
psi29a
bd8c75daee Merge branch 'quest_redo' into 'master'
Restart all quests with the same name when a quest is restarted

Closes #6606

See merge request OpenMW/openmw!1651
2022-02-13 15:31:18 +00:00
Alexei Kotov
14a9af15ab Merge branch 'dagoth_wave' into 'master'
Remove weaponless, non-biped distinction

Closes #5054

See merge request OpenMW/openmw!1517
2022-02-12 15:07:32 +00:00
Evil Eye
c382910c1f Restart all quests with the same name when a quest is restarted 2022-02-12 13:25:27 +01:00
glassmancody.info
712107de2d nisortadjust support 2022-02-10 11:59:49 -08:00
psi29a
9183fa897e Merge branch 'particle_vertex_palooza' into 'master'
Support vertex emitters (#6592)

Closes #6592

See merge request OpenMW/openmw!1638
2022-02-09 08:35:09 +00:00
glassmancody.info
88f02913d5 use vertex emitters on array particle controllers when appropriate 2022-02-07 19:46:42 -08:00
glassmancody.info
bbc9c53423 support morrowind stenciling 2022-02-07 11:51:59 -08:00
Petr Mikheev
1bcc4a8bcc Read settings.cfg from all active config dirs 2022-02-02 23:47:11 +01:00
Alexei Dobrohotov
aaea2bc0f6 Implement transformBoundingSphere for both sphere types (bug #6579) 2022-02-02 16:51:35 +03:00
Evil Eye
8752f78fa4 Remove weaponless, non-biped distinction 2022-02-01 21:58:55 +01:00
elsid
ae821738c9
Revert "Add #5858 to the changelog"
This reverts commit 670cc97947.
2022-01-30 22:09:37 +01:00
Petr Mikheev
88a83bab1f Remove predefined data paths data="?global?data", data=./data (#6564) 2022-01-27 22:48:27 +01:00
psi29a
84e209308d Merge branch 'refactor/interpreter' into 'master'
Cleanup interpreter code a bit

Closes #6553

See merge request OpenMW/openmw!1556
2022-01-27 19:18:57 +00:00
Matt
34723c8ea8 Cleanup interpreter code a bit 2022-01-27 19:18:57 +00:00
Evil Eye
670cc97947 Add #5858 to the changelog 2022-01-25 15:24:49 +01:00
Artem Nykolenko
a5cdc889a2 #6303 Made player stop attacking and sheathe weapon when going to jail 2022-01-16 10:15:47 +00:00
Cody Glassman
8ec0a52605 Toggable day night switch (#5928) 2022-01-11 09:34:19 +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
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
psi29a
0766e1310b Merge branch 'lunacy' into 'master'
Don't touch base stats when turning into a werewolf

Closes #6333

See merge request OpenMW/openmw!1511
2022-01-04 10:27:48 +00:00
Evil Eye
6f870a464b Replace magic numbers with enums 2021-12-29 12:34:12 +00:00
Evil Eye
debdcf2953 Don't touch base stats when turning into a werewolf 2021-12-27 00:47:33 +01:00
Evil Eye
c166341ec0 Merge branch 'gh_sync' into 'master'
Resovles #6519 Do not display effects duration for ingredient

See merge request OpenMW/openmw!1506
2021-12-26 19:50:20 +00:00
psi29a
81c9ef947f Resovles #6519 Do not display effects duration for ingredient 2021-12-26 19:50:19 +00:00
psi29a
01ac96e900 Merge branch 'stats_gave_me_a_headache' into 'master'
Make Set- and ModStat behave as they should

Closes #2036

See merge request OpenMW/openmw!1410
2021-12-26 19:47:09 +00:00
Alexei Dobrohotov
26dfce1114 Rehash key group and morph loading (bug #6517) 2021-12-24 07:21:30 +03:00
psi29a
dc4d73e76c Merge branch 'msgboxvanillastyle' into 'master'
Vanilla style encumbrance messagebox

Closes #6191

See merge request OpenMW/openmw!1437
2021-12-16 07:59:43 +00:00
kuyondo
651b79d34e Update changelog.md 2021-12-16 12:53:28 +08:00
Evil Eye
a204b4da96 Change the legalities of opening unlocked objects 2021-12-14 21:06:40 +01:00
elsid
24ec06f0d2
Add changelog record for navmesh disk cache 2021-12-11 01:14:53 +01:00
psi29a
59ab947f3b Merge branch 't800' into 'master'
Keep only one '\0' in NIF strings (bug #6473)

Closes #6473

See merge request OpenMW/openmw!1458
2021-12-06 14:45:57 +00:00
psi29a
c844e5d045 Merge branch 'racer_recursion_limited' into 'master'
Check if a leveled creature is in an unloaded cell before deciding it doesn't exist

Closes #4376

See merge request OpenMW/openmw!1420

(cherry picked from commit 782371cb2e7f6653d72305090033557b53bbcf3a)

6d945da7 Check if a leveled creature is in an unloaded cell before deciding it doesn't exist
2021-12-06 13:58:35 +00:00
Alexei Dobrohotov
dd15b30a27 Keep only one '\0' in NIF strings (bug #6473) 2021-12-05 15:56:58 +03:00
Kindi
47ff6a87a3 Raise a warning when entering non-existent region 2021-12-03 16:05:18 +00:00
Evil Eye
b35cb038d0 Merge branch 'drowningbar' into 'master'
Bug #5434: Pinned windows shouldn't cover breath progress bar

Closes #5434

See merge request OpenMW/openmw!1448
2021-12-02 17:01:40 +00:00
andrew-app
13400b2c5f Bug #5434: Pinned windows shouldn't cover breath progress bar 2021-12-02 17:01:40 +00:00
Ivan Beloborodov
ead0cb5ce0 #6419 Topic shouldn't be greyed out if they can produce another topic reference. 2021-12-02 08:04:29 +00:00
Evil Eye
f1ec8db393 Make Set- and ModStat behave as they should 2021-11-30 19:39:15 +01:00
psi29a
7f2c0df3fd Merge branch 'follow_the_path_of_peace' into 'master'
Remove allies from combat when stopping combat

Closes #1930

See merge request OpenMW/openmw!1441
2021-11-30 15:59:06 +00:00
Kindi
5927924ebc Update CHANGELOG.md 2021-11-29 17:29:35 +00:00
Evil Eye
d6f06fbf9a Remove allies from combat when stopping combat 2021-11-25 22:00:52 +01:00
Evil Eye
a231037449 Merge branch 'accumroot' into 'master'
Use the anim source to find mAccumRoot (bug #6417)

Closes #6417

See merge request OpenMW/openmw!1431
2021-11-25 19:13:21 +00:00
kuyondo
5ffd077f9e Update changelog.md 2021-11-24 01:51:03 +08:00
Alexei Dobrohotov
fd58e5ba77 Use the anim source to find mAccumRoot (bug #6417) 2021-11-23 04:53:03 +03:00
psi29a
53e14eb238 Merge branch 'reset' into 'master'
AI reset argument

Closes #6177 and #1465

See merge request OpenMW/openmw!1405
2021-11-21 09:39:55 +00:00
psi29a
adc3bab51e Merge branch 'Embedded-error-marker' into 'master'
Embed marker error

See merge request OpenMW/openmw!1383
2021-11-20 18:07:13 +00:00
Cédric Mocquillon
8a7b4649f0 Update changelog 2021-11-20 11:12:08 +01:00
Evil Eye
3c57ffd81f Save repeat and duration 2021-11-20 11:03:07 +01:00
Evil Eye
c5de69f9c6 Merge branch 'faceyourfears' into 'master'
Make AiExtensions less toxic (bug #6429)

Closes #6429

See merge request OpenMW/openmw!1411
2021-11-20 09:59:49 +00:00
Alexei Dobrohotov
fcef92e3ea Make AiExtensions less toxic (bug #6429) 2021-11-20 03:15:15 +03:00
Evil Eye
42020bc2c3 Ignore the axis argument when rotating the player 2021-11-20 00:02:48 +00:00
psi29a
d4e8a58351 Merge branch 'headsup' into 'master'
Force assign head animation timer (bug #4389)

Closes #4389

See merge request OpenMW/openmw!1361
2021-11-14 19:59:31 +00:00
Alexei Kotov
ec63546a37 Merge branch 'save_me_utf8' into 'master'
Handle non-ASCII characters without triggering an assertion

Closes #6396

See merge request OpenMW/openmw!1375
2021-11-14 12:38:36 +00:00
Evil Eye
8f48a1f030 Handle non-ASCII characters while saving without triggering an assertion 2021-11-14 11:26:06 +01:00
Andrei Kortunov
cca6029088 Add missing changelog entry 2021-11-14 13:23:13 +04:00
Andrei Kortunov
dce4cceb39 Support deleted CellRefs in groundcover (bug 6276) 2021-11-14 13:23:10 +04:00
psi29a
914993d6ae Merge branch 'itsmagic' into 'master'
Factor race weight into magic projectile speed (bug #6343)

Closes #6343

See merge request OpenMW/openmw!1385
2021-11-13 21:09:44 +00:00
psi29a
ba0aae06ca Merge branch 'morphyslaw' into 'master'
Morph geometry more like NifSkope (bug #6416)

Closes #6416

See merge request OpenMW/openmw!1389
2021-11-13 18:42:17 +00:00
Alexei Dobrohotov
b918135b4b Factor race weight into magic projectile speed (bug #6343) 2021-11-13 17:33:32 +03:00
Evil Eye
bee94e2afc Treat commas in scripts as whitespace 2021-11-13 14:06:21 +01:00
Alexei Dobrohotov
c7edca559b Morph geometry more like NifSkope (bug #6416) 2021-11-13 15:58:59 +03:00
psi29a
bea8df7dd4 Merge branch 'astoecke-fix-6386-water-reflection' into 'master'
Use `gl_FragCoord`  in `water_fragment.glsl` (fixes #6386)

Closes #6386

See merge request OpenMW/openmw!1347
2021-11-12 22:05:05 +00:00
Alexei Kotov
f210559a80 Merge branch 'bound_rating' into 'master'
Improve AI rating of bound effects

Closes #3855

See merge request OpenMW/openmw!1366
2021-11-11 14:30:41 +00:00
Alexei Dobrohotov
0d13b8cd3f Allow movement during blocking (bug #6327) 2021-11-10 15:48:03 +03:00
Andreas Stöckel
81f2fa992f Update changelog 2021-11-09 23:27:32 -05:00
psi29a
295ebbebbd Merge branch 'astoecke-fix-6354-sfx-distance-attenuation' into 'master'
Fade sounds when performing distance-based culling (Fixes #6354)

Closes #6354

See merge request OpenMW/openmw!1341
2021-11-09 14:33:52 +00:00
psi29a
5836d0225f Merge branch 'leave_butter_to_soften' into 'master'
Soft Particles (#6128)

See merge request OpenMW/openmw!980
2021-11-09 14:16:47 +00:00
psi29a
9b7dfcac6b Merge branch 'windows_aero_snap' into 'master'
Fix windows aero snap with borderless window (#5394)

See merge request OpenMW/openmw!1370
2021-11-08 07:13:08 +00:00
glassmancody.info
c489b77385 fix windows aero snap 2021-11-07 20:01:07 -08:00
Evil Eye
11ed594910 Improve AI rating of bound effects 2021-11-07 22:13:27 +01:00
Evil Eye
9394cdde22 Only restore focus to widgets with visible parents 2021-11-07 21:12:15 +01:00
Alexei Dobrohotov
e125308dd8 Force assign head animation timer (bug #4389) 2021-11-07 14:10:51 +03:00
Evil Eye
013043ee6e Update changelog 2021-11-06 17:45:29 +01:00
Andreas Stöckel
e637d36071 Add changelog entry 2021-11-04 16:05:31 -04:00
psi29a
ea7e83499d Merge branch 'enlightened_skeletons' into 'master'
Allow creatures to use torches

Closes #6376

See merge request OpenMW/openmw!1335
2021-11-02 20:25:26 +00:00
Evil Eye
a9106f4d7c Rotate torches by 90 degrees 2021-11-02 18:01:22 +01:00
glassmancody.info
4461366761 settings update and launcher option 2021-11-01 09:26:50 -07:00
Evil Eye
92bdd44e58 Allow creatures to use torches 2021-10-31 20:25:37 +01:00
psi29a
4c81518abb Merge branch 'puddle' into 'master'
Give each reflect and spell absorption effect a chance to apply

Closes #6255 and #6253

See merge request OpenMW/openmw!1279
2021-10-30 19:26:32 +00:00
glassmancody.info
f0eb068e4b remove dead code and fix changelog entry 2021-10-29 18:50:04 -07:00
psi29a
b3f84df43c Merge branch 'sky_shaders' into 'master'
Sky shaders

See merge request OpenMW/openmw!1057
2021-10-27 20:25:40 +00:00
Andrei Kortunov
3ee6657768 Early out from LOS check when source and target is the same (bug 5913) 2021-10-27 10:01:06 +04:00
Evil Eye
4ec927829f Give each reflect and spell absorption effect a chance to apply 2021-10-26 16:50:40 +02:00
psi29a
3006c496fc Merge branch 'morrowland_scripting' into 'master'
Morrowland scripting

Closes #6363

See merge request OpenMW/openmw!1318
2021-10-26 10:07:45 +00:00
Evil Eye
289e1544d2 Don't wait a frame to recalculate magicka 2021-10-25 16:54:50 +02:00
Evil Eye
fef902617a Parse integer format arguments as variable names 2021-10-24 17:23:15 +02:00
glassmancody.info
1e40d27318 introduce sky shaders 2021-10-23 17:53:38 -07:00
Evil Eye
f70a154195 Merge branch 'place' of github.com:akortunov/openmw into master 2021-10-23 11:34:42 +02:00
Evil Eye
63fa6d3b7c Apply on self effects on projectiles to the target instead 2021-10-21 17:28:36 +02:00
Andrei Kortunov
362c124e8f Allow to place levelled creatures to the game world (bug 6347) 2021-10-17 17:58:54 +04:00
psi29a
2f0484f4fc Merge branch 'clear_me_not' into 'master'
Do not clear depth buffer in first person (#6078)

Closes #6078

See merge request OpenMW/openmw!1119
2021-10-17 09:30:30 +00:00
glassmancody.info
cc009d246f do not clear depth buffer in first person 2021-10-16 18:37:34 -07:00
unelsson
e65a7f10e7 Add changelog 2021-10-15 21:55:09 +03:00
Evil Eye
6b482d0b52 Merge branch 'openmw-tradeglitch' into master 2021-10-12 18:19:19 +02:00
Evil Eye
f6eeee3ad5 Detect keys and enchanted items in containers without custom data 2021-10-08 16:51:30 +02:00
psi29a
1332e57195 Merge branch 'outside_means_outside' into 'master'
Make StayOutside only block teleportation from exteriors to interiors

Closes #6323

See merge request OpenMW/openmw!1268
2021-10-08 06:46:42 +00:00
psi29a
88d5b4a90b Merge branch 'variable_function' into 'master'
Parse local variables sharing a name with a function as variables

Closes #6291

See merge request OpenMW/openmw!1269
2021-10-08 06:45:02 +00:00
psi29a
555224a0fb Merge branch 'fixes' into 'master'
Make compilers happy and fix the changelog

See merge request OpenMW/openmw!1260
2021-10-07 10:17:27 +00:00
Evil Eye
5037def3b3 Parse local variables sharing a name with a function as variables 2021-10-06 21:27:08 +02:00
Evil Eye
dfc72e9b7e Make StayOutside only block teleportation from exteriors to interiors 2021-10-06 18:25:28 +02:00
Kindi
2a1cb939ba Update CHANGELOG.md 2021-10-04 20:50:40 +00:00
Andrei Kortunov
61168c3583
Add missing changelog entries for 0.47 (#3145) 2021-10-04 11:12:54 +02:00
Evil Eye
686268b2f9 Remove incorrect changelog entries 2021-10-03 21:39:43 +02:00
psi29a
2c8c36fe5d Merge branch 'master' into 'effective_magic'
# Conflicts:
#   CHANGELOG.md
2021-10-01 21:20:08 +00:00
psi29a
bd866cf210 Merge branch 'fix_infidelities' into 'master'
Fix Infidelities quest from Tribunal (#6307)

Closes #6307

See merge request OpenMW/openmw!1248
2021-10-01 21:12:15 +00:00
Evil Eye
f6c39b9f19 Fix issue numbers 2021-09-30 22:24:25 +02:00
Evil Eye
2de7b8e2fb Allow non-biped creatures using weapons to open doors 2021-09-29 21:21:52 +02:00
Evil Eye
e4994054ec Add #5207 to the changelog 2021-09-29 19:25:12 +02:00
Evil Eye
46ce2ff10c Add #4414 to the changelog 2021-09-29 19:25:12 +02:00
Evil Eye
b8e4f18751 Clear temporary effects before unloading actors to prevent absorb effects becoming permanent 2021-09-29 19:25:11 +02:00
Evil Eye
dc1fe62dde Overhaul magic effects to work with onApply and onEnd events 2021-09-29 19:25:10 +02:00
elsid
c0ef4417c3
Check AiTravel destination for other actors presence
Use faster aabbTest but without destance filter. To avoid dependency on a
specific constant and correctly handle situations when there is a big
difference between actors sizes.
2021-09-29 01:05:23 +02:00
Evil Eye
77a23dab09 Only add enabled objects to the scene 2021-09-27 22:23:00 +02:00
psi29a
782e0710af Merge branch 'OpenCS-preserve-blocked' into 'master'
OpenCS - Preserve "blocked" record flags when saving. #6288

Closes #6288

See merge request OpenMW/openmw!1052
2021-09-27 19:21:20 +00:00
psi29a
908d196fee Merge branch 'master' into 'undead_intelligence'
# Conflicts:
#   CHANGELOG.md
2021-09-27 19:12:13 +00:00
psi29a
47eda85b9f Merge branch 'master' into 'the_goal_is_elevation'
# Conflicts:
#   CHANGELOG.md
2021-09-27 19:10:33 +00:00
psi29a
449539c0ed Update CHANGELOG.md 2021-09-27 19:04:38 +00:00
Evil Eye
34cf66139a Make GetCurrentAIPackage return -1 for non-actors and dead actors 2021-09-26 22:15:43 +02:00
Evil Eye
c679565893 Make names starting with digits use normal name parsing code 2021-09-26 22:13:53 +02:00
Evil Eye
2f4df12b2e Merge branch 'Fix_ASCII' into 'master'
Fixed an issue where keyword search expected the text to be all ASCII characters

See merge request OpenMW/openmw!1227
2021-09-26 20:08:55 +00:00