mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 17:49:55 +00:00
Code Issues Releases Wiki Activity
23592 commits 38 branches 54 tags 122 MiB
Commit graph

23592 commits

This branch
This branch
All branches
Author SHA1 Message Date
psi29a
981184109e Merge branch 'formattopics' into 'master' 
Change color of keywords in the dialogue window (#2159)

See merge request OpenMW/openmw!126
 2020-06-21 07:58:02 +00:00
psi29a
288911c2d9 Merge branch 'kill-msvc-2015' into 'master' 
Kill MSVC 2015

See merge request OpenMW/openmw!230
 2020-06-18 23:06:21 +00:00
Alexei Dobrohotov
d529cf4a81 Merge branch '5463_op_normal_maps' into 'master' 
#5463: Optimizer fix, problem was indeed related to tangents not being transformd properly.

See merge request OpenMW/openmw!229
 2020-06-18 17:23:16 +00:00
psi29a
f94ca28dbe #5463: Optimizer fix, problem was indeed related to tangents not being transformd properly. 2020-06-18 17:23:16 +00:00
Andrei Kortunov
142a9e772b Merge branch '5468_progress_caption_overlapping' into 'master' 
Issue #5468: Apparently this was always a problem but OP made "nested loading"...

See merge request OpenMW/openmw!228
 2020-06-18 16:27:06 +00:00
Andrei Kortunov
01b1b7866c
Merge pull request #2918 from akortunov/master 
Fix ordering warning
 2020-06-18 19:20:54 +04:00
Andrei Kortunov
1541c7e5eb Fix ordering warning 2020-06-18 19:19:57 +04:00
Bret Curtis
c3dc0e62e8 OP profiling regression fix; Billboards such as those from Westly's tree mod should work again. 2020-06-18 16:16:16 +02:00
AnyOldName3
36d0a55600 Add error message when vswhere doesn't find MSVC 2020-06-18 14:50:07 +01:00
AnyOldName3
a93ea93d9d Remove MSVC 2015 specific parts of CI script. 
Also add error when MSVC 2015 is requested.
 2020-06-18 14:46:08 +01:00
Bret Curtis
8d9b2eca7d
Merge pull request #2917 from akortunov/warnfix 
Fix issues, reported by CoverityScan
 2020-06-18 14:44:28 +02:00
Bret Curtis
9446cece62 Issue #5468: Apparently this was always a problem but OP made "nested loading" more visible. This should resolve nested loading correctly. 2020-06-18 13:23:39 +02:00
Andrei Kortunov
6357bc3dad Catch MyGUI exceptions in the FontLoader destructor 2020-06-18 15:13:02 +04:00
Andrei Kortunov
808c905e1f Initialize fields to avoid undefined behaviour 2020-06-18 14:50:06 +04:00
Bret Curtis
cf3a20b595
Merge pull request #2916 from akortunov/borders 
Fix cell borders color
 2020-06-18 09:01:07 +02:00
Andrei Kortunov
0e810c8d32 Fix cell borders color 2020-06-18 09:12:56 +04:00
Bret Curtis
c944acf26b
Merge pull request #2913 from akortunov/warnfix 
Get rid of ECLD and dependencies
 2020-06-17 15:00:57 +02:00
Bret Curtis
51136a75f2
Merge pull request #2915 from akortunov/guifixes 
Reset selected slot when closing savegame dialogue
 2020-06-17 14:09:31 +02:00
Bret Curtis
b18028b125
Merge pull request #2905 from elsid/ai_package_type 
Store package type id as enum except ESM
 2020-06-17 13:03:31 +02:00
psi29a
1724099d34 Merge branch 'mingw' into 'master' 
Fix mingw Windows build

See merge request OpenMW/openmw!213
 2020-06-17 09:19:02 +00:00
Andrei Kortunov
d1a3cc98ff Get rid of ECLD and dependencies 2020-06-17 13:09:16 +04:00
Bret Curtis
1db58575c8
Fixed missed AiPackageTypeId::Wander 'fix' 2020-06-17 09:58:18 +02:00
Andrei Kortunov
3e396a904e Reset selected slot when close savegame dialogue to avoid accidental saving/loading 2020-06-17 11:09:17 +04:00
Andrei Kortunov
50d692a097
Merge pull request #2914 from akortunov/master 
Fix typos in shaders
 2020-06-17 10:14:52 +04:00
Andrei Kortunov
9bc0e9b4b7 Fix typos in shaders 2020-06-17 10:13:52 +04:00
psi29a
5110b5a0bf Merge branch 'near_far_mode_in_launcher' into 'master' 
add ability to set the type of near far method to be used

See merge request OpenMW/openmw!190
 2020-06-16 23:05:43 +00:00
psi29a
66b5cf9f1d Merge branch 'master' into 'near_far_mode_in_launcher' 
# Conflicts:
#   files/settings-default.cfg
 2020-06-16 23:05:07 +00:00
Alexei Dobrohotov
2d23dad2bc
Merge branch 'master' into ai_package_type 2020-06-17 01:47:23 +03:00
psi29a
6f8eefcb16 Switching object paging active grid default option to false for now until the light limit problem is resolved. 2020-06-16 17:53:09 +00:00
Bret Curtis
b5a2e809cd
Merge pull request #2911 from unelsson/fixdaematerialseq 
Use sequenced texture units with .dae/collada
 2020-06-16 16:43:04 +02:00
Bret Curtis
66124272d7
Merge pull request #2912 from akortunov/warnfix 
Fix Clang warnings about invalid overrides
 2020-06-16 16:31:11 +02:00
psi29a
0b2c102a26 Merge branch 'AnyOldName3-master-patch-53610' into 'master' 
Fix verbose mode for Windows prebuild script

See merge request OpenMW/openmw!226
 2020-06-16 13:58:40 +00:00
AnyOldName3
7ef3a9d8ac Remove schoolboy error 2020-06-16 13:51:25 +00:00
Andrei Kortunov
805d826d5b Fix Clang warnings about invalid overrides 2020-06-16 16:59:37 +04:00
Nelsson Huotari
5bc44cf2ee Use sequenced texture units with .dae/collada 2020-06-16 14:37:06 +03:00
psi29a
9067894335 Merge branch 'set-e-kills-ret' into 'master' 
Fix Windows prebuild script error messages

Closes #5459

See merge request OpenMW/openmw!223
 2020-06-16 08:37:16 +00:00
psi29a
efd1c7c8a5 Merge branch 'cherry-picked-build-improvements' into 'master' 
Cherry picked build improvements

See merge request OpenMW/openmw!225
 2020-06-16 08:36:38 +00:00
psi29a
0dc7715c35 Merge branch 'object_paging_retry' into 'master' 
Object Paging

See merge request OpenMW/openmw!209
 2020-06-16 08:21:54 +00:00
Bret Curtis
ecc125cdba
Merge pull request #2910 from elsid/optimize_recast_mesh 
Reduce navmesh size
 2020-06-16 08:00:05 +02:00
elsid
00197e1cd9
Optimize recast mesh size by vertex deduplication 2020-06-16 00:51:36 +02:00
AnyOldName3
079be5d485 Remove annoying warning 2020-06-15 16:37:47 +01:00
Bret Curtis
bf228746c9
Merge pull request #2909 from akortunov/shaders 
Calculate viewNormal only when needed
 2020-06-15 17:36:50 +02:00
AnyOldName3
761558f612 Remove test data 
A dummy command was used to check the script would fail if a command was missing.
Not being a real command, it always made the script fail as a command was missing.
 2020-06-15 16:36:30 +01:00
AnyOldName3
5bffa7453f Merge branch 'fix-msvc-buildtools' into 'master' 
Fix the build script not detecting Visual Studio Build Tools installation

See merge request OpenMW/openmw!224
 2020-06-15 14:23:52 +00:00
Andrei Kortunov
f30cb9f8bc Calculate viewNormal only when needed 2020-06-15 12:57:37 +04:00
Bret Curtis
0d1b7fd3f0
Merge pull request #2908 from Capostrophic/uvsets 
Remove 63 UV set limit
 2020-06-15 07:54:51 +02:00
apommel
4b831f99da Allow vswhere to detect build tools installations 2020-06-15 10:13:22 +09:00
Capostrophic
6f94848dec Remove 63 UV set limit (now 65535) 2020-06-14 23:02:03 +03:00
Alexei Dobrohotov
9dff13a94c Merge branch 'AnyOldName3-master-patch-15901' into 'master' 
Fix ifs for ACTIVATE_MSVC

Closes #5460

See merge request OpenMW/openmw!220
 2020-06-14 19:50:15 +00:00
Alexei Dobrohotov
09537ed312 Merge branch 'master' into 'AnyOldName3-master-patch-15901' 
# Conflicts:
#   CI/before_script.msvc.sh
 2020-06-14 19:47:01 +00:00