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

23678 commits

Author SHA1 Message Date
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
Alexei Dobrohotov
8d80747929 Merge branch 'AnyOldName3-master-patch-84976' into 'master'
Add success message to Windows prebuild script

Closes #5458

See merge request OpenMW/openmw!221
2020-06-14 18:41:04 +00:00
Bret Curtis
3f489b3774
Merge pull request #2907 from elsid/navmesh_area_cost
Use actors stats to define navmesh area cost
2020-06-13 10:43:01 +02:00
AnyOldName3
a6493ce329 Don't exit prebuild script on nonzero exit code when we already check it
We have `set -e` enabled, so normally exit the script if a command fails.
We also had explicit exit code checks in a few places with user-friendly
error messages. These were never printed as the script exited before we
could check the exit code due to a bad exit code.
2020-06-13 01:51:27 +01:00
elsid
b095ca6c86
Use actor speed to define area cost for pathfinding 2020-06-13 02:24:52 +02:00
elsid
374b85a00d
Add Class methods to get walk, run, swim speed 2020-06-13 02:24:51 +02:00
elsid
439588d10e
Remove unused mOffMeshConnectionIds 2020-06-13 02:24:51 +02:00
elsid
a35497de0c
Remove redundant runSpeed as always equal to walkSpeed 2020-06-13 02:24:45 +02:00
AnyOldName3
0d2129ca13 Add success message to Windows prebuild script 2020-06-12 22:50:06 +00:00
AnyOldName3
13c4e4b2a9 Fix ifs for ACTIVATE_MSVC 2020-06-12 22:35:38 +00:00
bzzt lost a hitlab login
26ab176389 profiling
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
daa2761c2d alphablending & billboardfix
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
4e2efb3cdb avoid sqrt
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
66c9469a80 fix
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
f12879a04c allow statesetupdater as cullcallback = faster + works in paging
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00