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

23927 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roman Siromakha
d5d5fab92e
Merge pull request #2938 from Assumeru/gtest 
Update Windows CI script to Google Test 1.10.0
 2020-06-27 21:58:04 +02:00
Evil Eye
fcc761c13c Update Windows CI script to download a version of Google Test that can actually compile the tests 2020-06-27 15:30:28 +02:00
AnyOldName3
bf69f90f80 Revert "Make build succeed so cache is kept" 
This reverts commit 53be725df2.

It was only needed for CI reasons.
 2020-06-27 03:28:42 +01:00
AnyOldName3
53be725df2 Make build succeed so cache is kept 2020-06-27 03:26:42 +01:00
AnyOldName3
d6ab2f9659 Disallow failure 2020-06-27 03:23:59 +01:00
AnyOldName3
c7cf163667 Don't keep whole build directory. 2020-06-27 03:23:12 +01:00
AnyOldName3
decf59d20e Don't try and activate MSVC when using MSBuild 2020-06-27 02:30:51 +01:00
AnyOldName3
82882beee6 Fix missing line breaks 2020-06-27 02:08:25 +01:00
AnyOldName3
edd6df1857 Try enabling Windows Shared Runners again. 
Hopefully this will work now https://gitlab.com/gitlab-org/ci-cd/custom-executor-drivers/autoscaler/-/merge_requests/99 is merged.
 2020-06-27 02:05:17 +01:00
Bret Curtis
355996c2ff supress -> suppress 2020-06-27 01:20:57 +02:00
Mads Buvik Sandvei
91de6392ca More refactoring / cleanup. Code policies. 2020-06-26 23:02:48 +02:00
psi29a
e83fb8c3fd Merge branch 'fix_turn_to_movement' into 'master' 
Bugfix for "turn to movement direction"

Fix for #5457.

Users complain that movement is not smooth enough when the character turns from "straight right" to "straight right and a bit backward" movement.

This MR fixes it.

The problem was mostly caused by the logic that at first changes animation speed to match movement speed, and then adjusts the movement speed to match the animation. IMHO it is a doubtful logic because then the real movement speed may be not consistent with the result of getSpeed.

Also I've removed the setting "turn to movement direction speed coef" because:
1) It was added as a workaround for this "non smooth movement" problem. After the fix it is not needed.
2) Users mistakenly think that it is somehow related to movement speed for diagonal movement.

See merge request OpenMW/openmw!245
 2020-06-26 20:04:02 +00:00
Petr Mikheev
63f828fea8 Bugfix for "turn to movement direction" 2020-06-26 20:04:02 +00:00
Alexei Dobrohotov
c94d6336b5
Merge pull request #2936 from akortunov/refactoring 
Use more C++11 in the physics code
 2020-06-26 19:44:16 +03:00
Bret Curtis
c4453322e5
Merge pull request #2931 from Capostrophic/intimidate 
Increase disposition on marginal Intimidate wins (#5485)
 2020-06-26 13:47:35 +02:00
Bret Curtis
927f835b7f
Merge pull request #2935 from akortunov/factionfix 
Fix faction requirement calculations
 2020-06-26 13:02:57 +02:00
Andrei Kortunov
4a5fce8ca5 Use more C++11 in the physics code 2020-06-26 14:22:00 +04:00
Andrei Kortunov
d0fe15b095 Use meaningful names instead of mSkill1 and mSkill2 2020-06-26 11:47:59 +04:00
Andrei Kortunov
fde0f20a6f Fix faction requirement calculations (bug #5499) 2020-06-26 11:14:38 +04:00
Andrei Kortunov
3dc3fe06e2
Merge pull request #2934 from akortunov/master 
Fix MSVC warning about variable re-declaration
 2020-06-26 09:55:30 +04:00
Andrei Kortunov
30b63270ce Fix MSVC warning about variable re-declaration 2020-06-26 09:49:26 +04:00
Mads Buvik Sandvei
60ffaea195 Pointer mode verbiage. 
protected member variables for vranimation
 2020-06-25 23:20:38 +02:00
Mads Buvik Sandvei
d405bcc910 Obsolete struct 2020-06-25 22:55:31 +02:00
Bret Curtis
edbc1898fb
Merge pull request #2933 from elsid/update_changelog 
Add bug #5479 to changelog
 2020-06-25 22:53:20 +02:00
elsid
30c928fc09
Add bug #5479 to changelog 2020-06-25 22:43:21 +02:00
elsid
40ad87bc4d
Replace OpenThreads by std types 2020-06-25 22:16:09 +02:00
Capostrophic
b592fa826c Increase disposition on marginal Intimidate wins (#5485) 2020-06-25 20:28:55 +03:00
Bret Curtis
999325ab44
Merge pull request #2930 from Capostrophic/shieldlocation 
Redistribute hits to carried left slot when possible (#5490)
 2020-06-25 19:16:29 +02:00
Bret Curtis
585755a502
Merge branch 'master' into shieldlocation 2020-06-25 14:58:45 +02:00
Bret Curtis
e0fb9c2390
Merge pull request #2929 from Capostrophic/barterprice 
Don't offer a minimum price of 1 gold for zero value items/services (#5484)
 2020-06-25 14:55:52 +02:00
Capostrophic
2b2f9a8714 Redistribute hits to carried left slot when possible (#5490) 2020-06-25 15:44:40 +03:00
Bret Curtis
bb27fc5cb2
Merge pull request #2927 from elsid/work_queue 
Use std types for WorkQueue
 2020-06-25 14:03:09 +02:00
Capostrophic
c7aea20657 Don't offer a price of 1 gold for zero value items (#5484) 2020-06-25 14:56:20 +03:00
psi29a
227ca123a6 Merge branch 'shoulder_vertical_offset' into 'master' 
Make vertical offset of "view over shoulder" configurable

See merge request OpenMW/openmw!243
 2020-06-25 08:14:20 +00:00
Mads Buvik Sandvei
e3c460ae35 Swapchain refactoring. Use of multisampling. Msaa resolve steps for mirror textures. 2020-06-24 22:22:09 +02:00
Mads Buvik Sandvei
df45ee1690 More refactoring/cleanup 2020-06-24 21:26:11 +02:00
elsid
3251687a3d
Use std types for WorkQueue 2020-06-24 21:23:31 +02:00
Petr Mikheev
63137a3b5a Make vertical offset of "view over shoulder" configurable 2020-06-24 20:07:41 +02:00
Bret Curtis
da65a3b8d4 Thanks to https://gitlab.com/OpenMW/openmw/-/merge_requests/209, OpenMW now has Object Paging that includes distant statics. 2020-06-24 15:02:58 +02:00
psi29a
abc77075b9 Merge branch 'doc-formattopics' into 'master' 
Follow up to MR 126 - make it more obvious for end users how to set colors

See merge request OpenMW/openmw!234
 2020-06-24 11:26:22 +00:00
Andrei Kortunov
487bfed672 Use QMultiMap instead of QMap 2020-06-24 15:13:56 +04:00
psi29a
662725069e Merge branch 'qt-tidying' into 'master' 
Make Qt work on my machine

See merge request OpenMW/openmw!240
 2020-06-23 15:09:47 +00:00
AnyOldName3
35d920569c Tweak error message 
As we have `set -e`, the error message would never be printed if we
genuinely failed to create the virtualenv, just if we succeeded and the
expected directories didn't exist.
 2020-06-23 15:26:24 +01:00
AnyOldName3
657306c293 Make Qt work on my machine 
Switches `eval stuff $STRIP` to `run_cmd` as it'll log errors on failure
and eval was breaking commands that ran just fine otherwise.

Don't download aqt wheel from pip and install it in two separate steps.

Upgrade aqt from 0.8 to 0.9.2 as there are bugs with 0.8 that stop Qt
5.15.0 from working for some people.

Fall back to Qt 5.14.2 for 64-bit on MSVC 2017 as the package list is
broken and that specific combination doesn't work right now.
 2020-06-23 15:22:59 +01:00
Bret Curtis
f8e3e57755
Merge pull request #2924 from akortunov/warnfix 
Avoid more deprecated Qt stuff
 2020-06-23 13:38:39 +02:00
Bret Curtis
4b212954fb
Merge pull request #2925 from OpenMW/psi29a-debug 
change build type to debug for ci/cd
 2020-06-23 13:34:18 +02:00
Bret Curtis
ae49549f03
change build type to debug for ci/cd 
it should set -O0 which should prioritise fast compilation for gcc
 2020-06-23 12:19:38 +02:00
Andrei Kortunov
19e95afc42 Avoid reverse iteration on QHash 2020-06-23 13:33:38 +04:00
Bret Curtis
27285b9e85
Merge pull request #2923 from OpenMW/uncomplicate_things_in_travis 
removed need for split compilation for static analysis, we've gone fr…
 2020-06-23 09:10:09 +02:00
Andrei Kortunov
0bb9322a69 Use default constructor for ItemFlags 2020-06-23 10:01:36 +04:00