mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-10 06:39:49 +00:00
Code Issues Projects Releases Wiki Activity
23,130 Commits 17 Branches 65 Tags 492 MiB
63bdc84f91
Commit Graph

23130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bret Curtis
63bdc84f91 Merge branch 'remove_evil_const_cast' into 'master' 
clean up code; purge const_cast

See merge request OpenMW/openmw!175
 2020-04-20 09:22:34 +00:00
Bret Curtis
7ade0cb2c3
Merge pull request #2784 from Capostrophic/specular 
Disable specular lighting for 4.0.0.2 and earlier files
 2020-04-19 22:21:20 +02:00
Bret Curtis
dcb3992cd3 Merge branch 'fix-partial-build' into 'master' 
Fix build of standalone OpenMW

See merge request OpenMW/openmw!176
 2020-04-19 20:19:59 +00:00
fredzio
0630cc482c Compile helpviewer in components only when USE_QT is defined 
It fixes build of OpenMW alone (wihtout launcher or OpenCS)
 2020-04-19 19:37:40 +02:00
Bret Curtis
91c2dea2a7 use OSG 3.6.5 from our PPA 2020-04-19 17:35:01 +02:00
Bret Curtis
8c2f3ff007 clean up code; purge const_cast 2020-04-19 16:31:54 +02:00
Andrei Kortunov
7aca6d72e4
Merge pull request #2785 from Capostrophic/underwaterfog 
Don't radialize underwater fog
 2020-04-19 09:06:28 +04:00
Bret Curtis
4ae0bd1fae Merge branch 'helplink' into 'master' 
Link to readthedocs documentation from OpenCS

See merge request OpenMW/openmw!171
 2020-04-18 20:54:21 +00:00
Frederic Chardon
513ac8986d Add link to opencs documentation on readthedocs, available through 
context menu.
The documentation opens in default browser.

There are 3 contexts:
- global: opens the OpenMW CS User Manual main page
- when a record is selected: opens the "Tables" page
- when the filter field is selected: opens the "Record Filters" page

There is also a link to the OpenCS tutorial in the help menu.
 2020-04-18 20:54:21 +00:00
Alexei Dobrohotov
b5ff32569b
Merge pull request #2768 from glassmancody/tabfix 
Fix tab focus for pinned windows
 2020-04-18 22:27:51 +03:00
Capostrophic
bbf6b4e517 Don't radialize underwater fog 2020-04-18 12:30:59 +03:00
Alexei Dobrohotov
392192ffc5 Merge branch 'no-empty-primitivesets' into 'master' 
Don't add empty PrimitiveSets (prevent undefined behaviour)

See merge request OpenMW/openmw!174
 2020-04-18 06:28:32 +00:00
AnyOldName3
1cf2036386 Don't add empty PrimitiveSets (prevent undefined behaviour) 2020-04-18 02:38:20 +01:00
Capostrophic
c3cc8ee1e1 Disable specular lighting for 4.0.0.2 and earlier files 2020-04-17 14:08:29 +03:00
Alexei Dobrohotov
4167bdf319
Merge pull request #2780 from elsid/fix_changelog 
Fix issue number in changelog
 2020-04-15 22:30:19 +03:00
elsid
ec7976522d
Fix issue number in changelog 2020-04-15 18:54:36 +02:00
Andrei Kortunov
ec3b8be67b
Merge pull request #2777 from Capostrophic/journal 
Make book layer have lower priority than the layer for other GUI windows
 2020-04-15 12:37:04 +04:00
Bret Curtis
bcc211cb5b
Merge pull request #2776 from Capostrophic/esmtool 
Revise esmtool cell reference output
 2020-04-14 13:47:17 +02:00
Bret Curtis
26ce8bc3f6
Merge pull request #2778 from elsid/fix_tests_build 
Specialize DetourNavigator::ObjectId ctor for pointers
 2020-04-14 13:46:19 +02:00
Andrei Kortunov
0364e0abc2
Merge pull request #2779 from Capostrophic/dialogue 
Reset dialogue history when the window can't track what closed it
 2020-04-14 12:23:57 +04:00
Capostrophic
fbcc8ef046 Reset dialogue history when the window can't track what closed it 2020-04-14 08:49:14 +03:00
elsid
208a50340d
Specialize DetourNavigator::ObjectId ctor for pointers 
To fix msvc error:
components\detournavigator\objectid.hpp(14,13): error C2440: 'reinterpret_cast': cannot convert from 'const T' to 'size_t'
          with
          [
              T=unsigned long
          ]
 2020-04-13 20:48:34 +02:00
Capostrophic
36d82abafd Make book layer have lower priority than the layer for other GUI windows 2020-04-13 21:09:06 +03:00
Capostrophic
4e22f03ece Revise esmtool cell reference output 2020-04-13 20:17:16 +03:00
Andrei Kortunov
94c1672e73
Merge pull request #2770 from Capostrophic/autocalc 
Handle enchantment autocalc flag as a flag (bug #5363)
 2020-04-13 13:53:36 +04:00
Andrei Kortunov
8d4dde7b56
Merge branch 'master' into autocalc 2020-04-13 13:53:29 +04:00
Andrei Kortunov
5df6646b06
Merge pull request #2773 from Capostrophic/dialogue 
Only clear dialogue history if the dialogue window is closed (bug #5358)
 2020-04-13 13:51:00 +04:00
Andrei Kortunov
0bc40e1002
Merge branch 'master' into dialogue 2020-04-13 13:50:52 +04:00
Andrei Kortunov
f75417e627
Merge pull request #2772 from Capostrophic/startscript 
Make adding non-existent global script more forgiving (bug #5364)
 2020-04-13 13:49:33 +04:00
Andrei Kortunov
844b6011bc
Merge branch 'master' into startscript 2020-04-13 13:49:25 +04:00
Andrei Kortunov
a76927023d
Merge pull request #2771 from Capostrophic/soul 
Show the soulgem soul in count dialog (feature #5362)
 2020-04-13 13:47:25 +04:00
Andrei Kortunov
cb6707624d
Merge branch 'master' into soul 2020-04-13 13:47:13 +04:00
Andrei Kortunov
7d6962b6be
Merge pull request #2769 from Capostrophic/quickkeys 
Don't play equip sound for reactivated quick key items (bug #5367)
 2020-04-13 13:41:41 +04:00
Andrei Kortunov
31cc1e0f66
Merge branch 'master' into quickkeys 2020-04-13 13:41:26 +04:00
Andrei Kortunov
4c8cc0e54f
Merge pull request #2774 from Capostrophic/levelledscale 
Properly utilize creature levelled list's scale (bug #5369)
 2020-04-13 13:37:00 +04:00
Andrei Kortunov
4892172a7d
Merge pull request #2767 from Capostrophic/unlock 
Make sure it's a crime to unlock owned doors
 2020-04-13 07:46:54 +04:00
Cody
a34fe1d9b2 proper game mode detection 2020-04-12 10:18:07 -07:00
Capostrophic
07779d7fcf Properly utilize creature levelled list's scale (bug #5369) 2020-04-12 13:21:13 +03:00
Capostrophic
9dbdbbaea7 Only clear dialogue history if the dialogue window is closed (bug #5358) 2020-04-12 11:59:58 +03:00
Capostrophic
96a447ee3a Show the soulgem soul in count dialog (feature #5362) 2020-04-12 11:55:00 +03:00
Cody
8e741a0d0b fixed tab focus for pinned windows 2020-04-11 23:01:16 -07:00
Andrei Kortunov
b42d097739 Merge branch 'doc_copyright' into 'master' 
Update copyright year in the doc

See merge request OpenMW/openmw!172
 2020-04-12 03:29:16 +00:00
Andrei Kortunov
3f61022f80 Merge branch 'unused_var' into 'master' 
Remove unused field from QuadTreeBuilder

See merge request OpenMW/openmw!173
 2020-04-12 03:29:09 +00:00
fredzio
6d0022096d Bump copyright year in documentation 2020-04-12 01:14:07 +02:00
Capostrophic
f79e20379b Make sure it's a crime to unlock owned doors 2020-04-12 01:56:03 +03:00
Capostrophic
de7ecddbb8 Don't play equip sound for reactivated quick key items (bug #5367) 2020-04-11 23:29:36 +03:00
Andrei Kortunov
74c121a69d
Merge pull request #2766 from Capostrophic/collisionswitch 
Make extra sure groups with special behavior aren't optimized out
 2020-04-11 08:48:59 +04:00
Capostrophic
ad333e88fe Handle enchantment autocalc flag as a flag (bug #5363) 2020-04-11 00:03:14 +03:00
fredzio
39a55318b0 Remove unused variable 2020-04-10 22:50:28 +02:00
Capostrophic
feeab8a335 Make adding non-existent global script more forgiving (bug #5364) 2020-04-10 22:20:05 +03:00