1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-06 18:15:32 +00:00
Commit graph

23672 commits

Author SHA1 Message Date
Capostrophic
77bdd124ee Address akortunov's save loading message complaints
Add quotes to the character's name
Don't print the full path to save file
Use better terminology
2020-05-12 13:51:07 +03:00
Andrei Kortunov
f1786f14c4
Merge pull request #2834 from akortunov/master
Fix merge conflicts
2020-05-12 14:36:20 +04:00
Andrei Kortunov
d5806fd0ed Fix merge conflicts 2020-05-12 14:33:00 +04:00
Bret Curtis
42cba092b7
Merge pull request #2716 from akortunov/png
Store fog of war as a PNG image instead of TGA
2020-05-12 11:52:23 +02:00
Bret Curtis
2c743b6153
Merge pull request #2828 from Capostrophic/colormode
Improve color mode handling in shaders
2020-05-12 11:45:45 +02:00
Bret Curtis
b7c33dbe0a
Merge pull request #2831 from Capostrophic/pursue
Allow guards to pursue an invisible player (bug #4774)
2020-05-12 11:45:01 +02:00
Bret Curtis
4b30bf5699
Merge pull request #2829 from Capostrophic/logging
Log some more things
2020-05-12 11:44:05 +02:00
Bret Curtis
62290182eb
Merge pull request #2648 from Assumeru/start-scripts
Allow targeting non-unique actors with StartScript. Fixes #2311
2020-05-12 10:39:11 +02:00
Bret Curtis
507adac8cd
Merge pull request #2783 from akortunov/input
Refactor InputManager
2020-05-12 09:34:22 +02:00
Bret Curtis
e146f760d4
Merge pull request #2830 from elsid/fix_windows_install
Fix windows install target
2020-05-12 09:33:21 +02:00
Andrei Kortunov
c0dc5eb4df
Merge pull request #2833 from Capostrophic/animscale
Cap movement animation playback speed
2020-05-11 22:09:23 +04:00
Capostrophic
ece0db4f82 Cap movement animation playback speed 2020-05-11 15:11:32 +03:00
elsid
4e0c07de0f
Build install target in CI 2020-05-10 19:39:32 +02:00
unknown
3b4782959e Allow targeting non-unique actors with StartScript (bug #2311) 2020-05-10 14:57:06 +02:00
Andrei Kortunov
7a6ba8bf7a
Merge pull request #2832 from Capostrophic/warning
Fix warning
2020-05-10 15:45:20 +04:00
Capostrophic
b91d0d889f Fix warning
/home/travis/build/OpenMW/openmw/components/nifosg/nifloader.cpp:615:42: warning: using the result of an assignment as a condition without parentheses [-Wparentheses]
                    if (hasVisController |= (ctrl->recType == Nif::RC_NiVisController))
                        ~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/travis/build/OpenMW/openmw/components/nifosg/nifloader.cpp:615:42: note: place parentheses around the assignment to silence this warning
                    if (hasVisController |= (ctrl->recType == Nif::RC_NiVisController))
                                         ^
                        (                                                             )
2020-05-10 14:38:07 +03:00
Andrei Kortunov
41beca8125 Refactor actions order setup 2020-05-10 10:13:19 +04:00
Capostrophic
a5d0d13e14 Allow guards to pursue an invisible player (bug #4774) 2020-05-09 21:23:06 +03:00
elsid
e095f6b306
Remove install for not existing file 2020-05-09 19:43:48 +02:00
elsid
99cd99bc3b
Remove unused BUILD_MYGUI_PLUGIN option 2020-05-09 19:42:36 +02:00
Capostrophic
aa5161f99e Log some more things 2020-05-09 20:27:12 +03:00
Capostrophic
c0b322b264 Improve color mode handling in shaders 2020-05-09 16:15:10 +03:00
Andrei Kortunov
4a1e27ac21
Merge pull request #2824 from Capostrophic/cleanup
Cleanup
2020-05-09 14:46:17 +04:00
Andrei Kortunov
8e1f7b00d1
Merge pull request #2826 from Capostrophic/verifier
Verifier: Don't check race of non-skin body parts (bug #5400)
2020-05-09 14:19:03 +04:00
Andrei Kortunov
300b5b2620
Merge pull request #2827 from Capostrophic/dialogue
Only reset dialogue history of dialogue GUI mode is gone
2020-05-09 14:17:09 +04:00
Andrei Kortunov
a6514e7740 Add missing include 2020-05-09 11:28:30 +04:00
Andrei Kortunov
73552f1d3c Move control switch reading/writing to relevant class 2020-05-09 11:27:02 +04:00
Andrei Kortunov
b4e52a6bc8 Add missing include 2020-05-09 11:27:02 +04:00
Andrei Kortunov
0455f48d02 More formatting changes 2020-05-09 11:27:02 +04:00
Andrei Kortunov
b575712cb1 Formatting changes 2020-05-09 11:27:02 +04:00
Andrei Kortunov
85f91a7de8 Remove some redundant code 2020-05-09 11:27:02 +04:00
Andrei Kortunov
3328775eff Unify cursor enabling 2020-05-09 11:27:02 +04:00
Andrei Kortunov
b33c4c920c Move all OICS handling to the separate file 2020-05-09 11:27:02 +04:00
Andrei Kortunov
0eb24da2e7 Fix controls disabling 2020-05-09 11:27:02 +04:00
Andrei Kortunov
2f2b3173e3 Fix copy-paste error 2020-05-09 11:27:02 +04:00
Andrei Kortunov
8512133bb1 Move control switches to the separate file 2020-05-09 11:27:02 +04:00
Andrei Kortunov
f990150c49 Move video wrapper to the WindowsManager 2020-05-09 11:27:02 +04:00
Andrei Kortunov
13b7c5b519 Rework actions update 2020-05-09 11:27:02 +04:00
Andrei Kortunov
d3a9f893c8 Move keyboard-specific code to the separate file 2020-05-09 11:27:02 +04:00
Andrei Kortunov
c368250e6a Rename misleading mInputManager variable 2020-05-09 11:27:02 +04:00
Andrei Kortunov
e353647d15 Move gamepads handling to the separate file 2020-05-09 11:27:02 +04:00
Andrei Kortunov
f9d6137a29 Do not store player reference in the InputManager 2020-05-09 11:27:02 +04:00
Andrei Kortunov
ce40294124 Move input actions handling to the separate file 2020-05-09 11:27:02 +04:00
Andrei Kortunov
fcac7d3ab7 Split mouse handling to the separate file 2020-05-09 11:27:02 +04:00
Andrei Kortunov
1560e71f4e Move SDL mappigs to the separate file 2020-05-09 11:27:02 +04:00
Andrei Kortunov
3c09d05615 Split actions enum to the separate file 2020-05-09 11:27:02 +04:00
Andrei Kortunov
15dc4d241d Split sensors handling so the separate file 2020-05-09 11:27:02 +04:00
Capostrophic
45e6a03937 Only reset dialogue history of dialogue GUI mode is gone 2020-05-09 02:01:55 +03:00
psi29a
b72720f357 Merge branch 'shadow-transparency-rework' into 'master'
Only alpha-test shadows when necessary

See merge request OpenMW/openmw!170
2020-05-08 21:32:16 +00:00
Capostrophic
039c9a37eb Verifier: Don't check race of non-skin body parts (bug #5400)
Remove unnecessary flag field check
Remove magic numbers
2020-05-09 00:31:10 +03:00