1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-29 01:45:33 +00:00
Commit graph

15155 commits

Author SHA1 Message Date
Bret Curtis
573af17cf9
Merge pull request #2097 from akortunov/camerafix
Do not scale player's model in the 1st-person view depending on race
2019-01-07 13:57:21 +01:00
Bret Curtis
93e566a08e
Merge pull request #2117 from Capostrophic/aidata
Make Interiors of Illusion puzzle of Sotha Sil Expanded work (bug #4778)
2019-01-07 13:56:11 +01:00
Andrei Kortunov
ab0841cc3d Split physics update from world update in the profiler 2019-01-07 14:44:43 +04:00
Andrei Kortunov
02a43d0b32 Do not scale player's model in the 1st-person view depending on race (bug #4383) 2019-01-07 12:58:47 +04:00
Capostrophic
92d7f21926 Don't interrupt compilation when spell/effect functions are used for non-actors 2019-01-06 21:45:56 +03:00
Capostrophic
624db99bf2 Remove some redundant code 2019-01-05 01:25:52 +03:00
Capostrophic
27eb64c7f0 Clean up fallback record creation again 2019-01-02 13:49:04 +03:00
Capostrophic
8a266803eb Simplify some world loops 2018-12-30 15:36:42 +03:00
Bret Curtis
932691d199
Merge pull request #2091 from Capostrophic/fallheight
Avoid falling height reset if on-ground state wasn't actually updated (bug #4411)
2018-12-29 08:26:28 +01:00
Bret Curtis
d80d056140
Merge pull request #2098 from xyzz/fix-loading-screen-uaf
loadingscreen: Fix UaF in loading screen.
2018-12-28 18:58:04 +01:00
Bret Curtis
91b962c095
Merge pull request #2099 from xyzz/replace-volatile-atomic
Replace volatile bools with std::atomic<bool>
2018-12-28 16:41:07 +01:00
Capostrophic
7155e787b4 Clean up fallback record creation 2018-12-28 01:22:24 +03:00
Ilya Zhuravlev
1bdec2399f Make sure CopyFramebufferToTextureCallback is only called once and not every frame 2018-12-25 11:56:24 -05:00
Ilya Zhuravlev
07e9ce84b3 Replace volatile bools with std::atomic<bool> 2018-12-24 14:19:35 -05:00
Ilya Zhuravlev
8e7c01b561 loadingscreen: Fix UaF in loading screen.
When the CopyFramebufferToTextureCallback callback is called, in its operator() it resets setInitialDrawCallback by providing a NULL pointer.
However, this causes the callback to get deleted. In turn, the "this" pointer is invalidated.
When execution returns to DrawCallback::run, it accesses a _nestedCallback member of deleted "this" which is UB.
2018-12-24 14:18:26 -05:00
Ilya Zhuravlev
98b2c04404 android: Add a method so that we can send relative mouse movements from java. 2018-12-23 15:14:29 -05:00
Capostrophic
793c2a19d2 Cherry-pick cc9cii's editor improvements 2018-12-23 20:10:16 +03:00
Capostrophic
0bbcc0e787 Avoid falling height reset if onGround state didn't change (bug #4411) 2018-12-23 13:39:35 +03:00
Ilya Zhuravlev
09585b7208 android_main.c: Replace nullptr back to NULL since there are no nullptr in C 2018-12-22 22:21:26 -05:00
Andrei Kortunov
b4f3ce2a0a Editor: Implement faction ranks table (feature #4209) 2018-12-21 14:16:40 +04:00
Capostrophic
2681435857 Editor: handle AI settings, regional sound and levelled list "none" chances as shorts (bug #2987) 2018-12-20 19:51:55 +03:00
Bret Curtis
6d7aacab5e
Merge pull request #2053 from akortunov/animatedContainers
Native animated containers support
2018-12-17 10:00:07 +01:00
Bret Curtis
d2c88f0983
Merge pull request #2071 from Capostrophic/sneaking
Don't interrupt sneak and swim idles in attack ready state in first person view (bug #4750)
2018-12-17 09:34:27 +01:00
Andrei Kortunov
a53333c3d5 Native animated containers support (feature #4730) 2018-12-13 23:11:16 +04:00
terrabyte25
c31fa3074e
Sanity check for text input in toggleWalking 2018-12-12 14:40:15 -06:00
Capostrophic
6083e5ed4b Don't interrupt sneak and swim idles in first person view (bug #4750) 2018-12-10 00:05:06 +03:00
Marc Zinnschlag
d791dcfbf3 Merged pull request #2051 2018-12-06 13:10:48 +01:00
Bret Curtis
32624cb3ed
Merge branch 'master' into colors 2018-12-06 09:59:13 +01:00
Bret Curtis
b296c4a3bb
Merge pull request #2058 from Capostrophic/collision
Don't consider non-solid actors truly levitating (bug #4746)
2018-12-06 09:56:16 +01:00
Capostrophic
7b33838b33 Don't consider non-solid actors truly levitating (bug #4746) 2018-12-05 23:37:32 +03:00
Bret Curtis
35ea8ecb0b
Merge pull request #2056 from Capostrophic/esmtool
esmtool cleanup
2018-12-05 20:58:25 +01:00
Capostrophic
7cae0017ac Display Ambient, Sunlight and Fog field values as colors (bug #4745) 2018-12-05 17:25:26 +03:00
Capostrophic
5c8c079718 Fix incorrect event argument which messed with hidden light pointers 2018-12-04 17:07:03 +03:00
Capostrophic
832870dc79 esmtool cleanup 2018-12-02 23:10:29 +03:00
Bret Curtis
c2c86fc4a5
Merge pull request #2052 from mp3butcher/master
fix moc achieving to reach unparsable boost code
2018-12-02 19:28:35 +01:00
Bret Curtis
807cab568e
Merge pull request #2050 from Capostrophic/markers
[Regression] Revert unnecessary case changes for fallback records
2018-12-02 11:16:20 +01:00
Bret Curtis
b1ca6c6e95
Merge pull request #2045 from akortunov/animfix
[Testing needed] Fix regressions in the animation system
2018-12-02 11:14:44 +01:00
mp3butcher
9de6c630f2 fix moc achieving to reach unparsable boost code 2018-12-01 21:27:43 +01:00
Capostrophic
7b5932a49d Add Invert X Axis option (feature #3610) 2018-12-01 19:08:02 +03:00
Capostrophic
c59513c30c Revert unnecessary case changes for fallback records 2018-12-01 17:12:27 +03:00
Andrei Kortunov
880ec3ce7b Fix visible sheaths for invisible actors 2018-11-24 14:57:41 +04:00
Andrei Kortunov
671f2811d5 Fix regressions in the animation system (bug #4729) 2018-11-23 20:22:37 +04:00
Andrei Kortunov
e8b3ae8706 Improve ResetActors command (bug #4723) 2018-11-20 21:53:27 +04:00
Andrei Kortunov
7438e20ee1 Fix shield displaying on inventory avatar (bug #4720) 2018-11-17 22:42:29 +04:00
Andrei Kortunov
68c170f065 Refactor tools to do not use boost exceptions and exit() command 2018-11-15 18:10:19 +04:00
Andrei Kortunov
059a8fd32a Refactor dynamic casts in the editor 2018-11-15 17:50:23 +04:00
Bret Curtis
a21792657a
Merge pull request #2034 from akortunov/guifixes
Improve GUI cleanup
2018-11-15 07:31:57 +01:00
Andrei Kortunov
5ac81cfbff Throw exceptions with some info int the editor if dynamic_cast failed 2018-11-14 15:53:43 +04:00
Andrei Kortunov
f20d1b1b72 Catch exception in the NIFTest 2018-11-14 15:52:36 +04:00
Bret Curtis
419e7ea5a2
Merge pull request #2035 from akortunov/coverity
Fix many Coverity Scan warnings
2018-11-14 09:44:30 +01:00
Bret Curtis
8a66dec865
Merge pull request #2031 from akortunov/warnfix
Fix some Clang 7 warnings
2018-11-14 09:43:39 +01:00
Andrei Kortunov
4ee15ddcb9 Fix many Coverity Scan warnings 2018-11-14 11:21:49 +04:00
Andrei Kortunov
5e071e3eb0 Add a missing check if mPtr is empty (bug #4715) 2018-11-13 10:32:23 +04:00
Andrei Kortunov
71f1a53090 Improve tooltips cleanup (bug #4714) 2018-11-13 10:00:12 +04:00
Bret Curtis
194232abde
Merge pull request #2029 from akortunov/actorfix
[Regression] Handle case in the editor when actor's bodypart was not found
2018-11-12 11:44:28 +01:00
Bret Curtis
0f29a73fc9
Merge pull request #2025 from Capostrophic/actorloops
Use C++11 for close actor-iterating loops and avoid some redundant operations
2018-11-12 10:43:49 +01:00
Andrei Kortunov
d2613e35a2 Fix some Clang 7 warnings 2018-11-09 19:42:59 +04:00
Andrei Kortunov
0065bccf24 Handle case in the editor when actor's bodypart was not found 2018-11-09 14:51:45 +04:00
AnyOldName3
02a8c6a7ce
Merge branch 'master' into pr/fix-hidpi-resolution 2018-11-08 23:05:07 +00:00
Bret Curtis
228f6b572f
Merge branch 'master' into prisonmarker 2018-11-08 21:11:24 +01:00
Bret Curtis
f6243fae83
Merge pull request #1615 from akortunov/holstered_weapons
Weapon sheathing
2018-11-08 20:44:20 +01:00
Capostrophic
6d48d9329e Avoid making string copies instead of references 2018-11-08 17:03:29 +03:00
Bret Curtis
3751bc2c11
Merge pull request #2030 from akortunov/warnfix
Fix some compiler warnings
2018-11-08 12:19:04 +01:00
Andrei Kortunov
ad36834671 Fix some compiler warnings 2018-11-08 13:16:04 +04:00
Stanislaw Halik
8fd71fe4ad fix rain delay when exiting water
When the particle system updates its internal state noting that it's
been culled, it stops emitting any further particles. Prevent it from
having that knowledge.

v2: Fix off-by-one-frame error following review by @AnyOldName3
2018-11-07 20:55:45 +00:00
Capostrophic
4cb4f82431 Don't use bitwise AND 2018-11-07 19:44:17 +03:00
Capostrophic
39f8637e95 Simplify some actor loops and avoid some redundant calculations 2018-11-06 17:56:53 +03:00
Capostrophic
4efe1bc892 Add prison marker record fallback definition (bug #4701) 2018-11-05 19:37:46 +03:00
Stanislaw Halik
5e3e01cac0 fix resolution on HiDPI displays under Windows
The same Windows functionality as scaling user interface elements,
confuses fullscreen games unless they set a particular of metadata to
indicate that they perform the scaling by themselves.

What happened was treating 2160p as 1440p despite the former being
chosen. The same occured with other game title prior to introducing the
metadata bits.

Fortunately with CMake there's no need to invoke the mt.exe "manifest
tool" manually.

Note that the setting of "per-monitor DPI aware" still leaves openmw
confused, hence the choice of global-DPI-aware.
2018-11-05 16:16:09 +00:00
Andrei Kortunov
92e45507d8 Weapon sheathing support, including quivers and scabbards (feature #4673) 2018-11-05 11:18:20 +04:00
Bret Curtis
c114e1278e
Merge pull request #1978 from akortunov/ffmpeg3
Migrate to FFMPEG3
2018-11-05 07:52:43 +01:00
Bret Curtis
a8d944e756
Merge pull request #2023 from elsid/navmesh_cache_limit
Navmesh cache limit
2018-11-05 07:51:48 +01:00
elsid
6e78fbb538
Double key size for item cache size 2018-11-05 02:21:19 +03:00
elsid
db5638bf6d
Add global recast allocator to allocate temp buffers on stack 2018-11-04 18:11:15 +03:00
Andrei Kortunov
f88d5e808c Rewrite media decoder to use FFMpeg 3.2+ API (task #4686) 2018-11-03 22:34:25 +04:00
elsid
2ba026e2b2
Limit navmesh cache size by data size + key size 2018-11-03 16:14:07 +03:00
Andrei Kortunov
829faf7b2c Improve toggleactorspaths console command 2018-11-03 10:42:14 +04:00
AnyOldName3
3c25e7b93d
Merge pull request #2010 from AnyOldName3/windows-debug-build-fix
Include missing Windows header before calling Windows-specific functions and switch CMake compile definitions to the new style.
2018-11-02 23:57:44 +00:00
AnyOldName3
e2ddb39591 Remove incorrect comment 2018-11-02 17:30:54 +00:00
Capostrophic
1de9674c81 AI package cleanup 2018-11-02 14:58:30 +03:00
Bret Curtis
5f5773f7df
Merge pull request #2009 from elsid/pathfinder_update_tolerance
Use default tolerance to drop last point from path
2018-11-02 00:21:08 +01:00
elsid
c52db75545 Use default tolerance to drop last point from path
Fixes AiEscort. Before actor tried to reach target with 0 tolerance.
Back to logic like it was before 4fe764c3a5 and bbd82a743 commits.
2018-11-02 01:12:41 +03:00
Capostrophic
a4eff1c871 Fix isWithinMaxRange function 2018-11-02 00:22:37 +03:00
elsid
792a0585c0 Add recastnavigation as subdirectory 2018-11-01 17:01:22 +01:00
AnyOldName3
0208cb8616
Merge pull request #2001 from AnyOldName3/enable-osg-logging
Allow OSG objects to be sent to the debug log.
2018-10-31 22:14:36 +00:00
AnyOldName3
6bbc1cb308
Remove outdated include 2018-10-31 19:32:52 +00:00
AnyOldName3
93843d024c Remove another duplicate operator<< 2018-10-31 16:26:53 +00:00
Andrei Kortunov
f1eb702851 Mark virtual methods in the mechanicsmanagerimp.hpp as overrides 2018-10-31 10:09:32 +04:00
Bret Curtis
d6c674660a
Merge pull request #1633 from elsid/pathfinder_detour
Use recastnavigation for pathfinding (#2229)
2018-10-30 20:44:13 +01:00
Bret Curtis
3c53fe16e9
Merge pull request #1986 from akortunov/rootfix
[Regression] Handle RootCollisionNode exactly as in original engine
2018-10-29 22:47:04 +01:00
Bret Curtis
e65f254f7f
Merge pull request #1999 from akortunov/resurrect
[Regression] Make sure we reset current weapon animation when resurrect actor
2018-10-29 20:43:54 +01:00
Andrei Kortunov
f98fc8d7b4 Make sure we reset current weapon animation when resurrect actor (addition to bug #2626) 2018-10-29 22:47:04 +04:00
Marc Zinnschlag
a5efe0d596 Merged pull request #1998 2018-10-29 10:02:52 +01:00
Capostrophic
434b1fd0e3 Use Shift-C and Shift-V keybindings for View and Preview (feature #2845) 2018-10-29 01:53:49 +03:00
Bret Curtis
7f2baa9373
Merge pull request #1995 from Capostrophic/icons
Add icons for record context menu actions (feature #4506)
2018-10-28 22:22:42 +01:00
Bret Curtis
6f8a15afb0
Merge pull request #1996 from Capostrophic/cleanup
Clean up redundant getClass() calls in classes
2018-10-28 19:39:39 +01:00
Capostrophic
8757b3edd1 Add icons for Edit and Touch actions (kudos to akortunov) 2018-10-28 21:06:42 +03:00
Capostrophic
89b8eb029f Add icons for record context menu actions 2018-10-28 20:35:58 +03:00
Capostrophic
77b0ff7a75 Use real thrown weapon damage in tooltips and weapon rating (feature #4697) 2018-10-28 19:46:46 +03:00
elsid
49d81241db Merge branch 'master' into pathfinder_detour 2018-10-28 17:08:09 +03:00