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

12367 commits

Author SHA1 Message Date
elsid
5b34ef224b
Replace AiPackage virtual methods by options 2020-06-06 12:00:17 +02:00
Bret Curtis
3b1c717ab9
Merge pull request #2888 from elsid/ai_packages_const 
Mark not changing AiPackages fields as const
 2020-06-05 23:11:10 +02:00
Bret Curtis
204d2acf25
Merge pull request #2092 from akortunov/float_stats 
Store attributes and skills values as floats
 2020-06-05 22:38:12 +02:00
Bret Curtis
5d019c27ae
Merge pull request #2887 from akortunov/worldmanager 
Introduce a separate class to control world date and time
 2020-06-05 13:15:44 +02:00
Andrei Kortunov
81805b7263 Introduce a separate class to control world date and time 2020-06-05 12:07:32 +04:00
elsid
da8ea9d8c7
Mark not changing AiPackages fields as const 2020-06-04 23:12:23 +02:00
elsid
d35ccc39c6
Fix build tests with double precision bullet 2020-06-03 21:34:05 +02:00
Mads Buvik Sandvei
f25c3af9cb More refactoring of VRSession. Moved call of BeginFrame and WaitFrame to the start of cull to keep shadow technique within openxr specs. There is still some jitter unless i change to single-threaded, and now i have no idea why. 2020-06-03 19:46:20 +02:00
Andrei Kortunov
5468fcb29f Store attributes and skills values as floats (bug #4021) 2020-06-03 17:34:15 +04:00
Bret Curtis
2eb9d4ad4e
Merge pull request #2878 from Assumeru/mutate-ai 
Mutate base records when editing AI settings (#2798)
 2020-06-03 15:09:40 +02:00
Bret Curtis
dd7f5fcde7
Merge pull request #2884 from Capostrophic/deathmagic 
Update spell effects during death animation (#5403)
 2020-06-03 15:07:08 +02:00
Bret Curtis
109057e53f
Merge pull request #2544 from akortunov/corprus 
Rework corprus implementation
 2020-06-03 13:41:57 +02:00
Andrei Kortunov
3dce225f28 Implement vanilla-style corprus handling (bug #3714, bug #4623) 2020-06-03 12:58:17 +04:00
Andrei Kortunov
c0e62e9529 Refactor list of variables in the WorldManager 2020-06-03 11:21:34 +04:00
Mads Buvik Sandvei
31336aba79 Some refactoring of openxrswapchain 2020-06-02 22:16:42 +02:00
Evil Eye
4d7947d27c Mutate base records when editing AI settings (#2798) 2020-06-02 21:59:37 +02:00
Mads Buvik Sandvei
8f38f0536c Separate GLRC for OpenXR to ensure uncontested access. 
Safety check on predictions to police that they are made only once per frame.
 2020-06-02 21:46:22 +02:00
Mads Buvik Sandvei
9ad910a8e7 Comparison operator for Pose, View, and co. 2020-06-02 21:45:18 +02:00
elsid
b67e18329e
Store AI packages as unique_ptr 2020-06-01 17:07:08 +02:00
elsid
ce7c47ee12
Return cloned AiPackage as unique_ptr 2020-06-01 17:07:08 +02:00
Bret Curtis
18bb6dd223
Merge pull request #2859 from elsid/aipackage_single_clone 
Single clone function definition for all AI packages
 2020-06-01 01:21:57 +02:00
Mads Buvik Sandvei
4361f4191d Predictions were off due to count of frames in flight off by 1. 2020-05-31 13:19:26 +02:00
Mads Buvik Sandvei
b65c1f582a Recenter action 2020-05-31 12:15:31 +02:00
Mads Buvik Sandvei
930ee48da6 Player rotation no longer FPS dependent 2020-05-31 12:10:52 +02:00
Mads Buvik Sandvei
64d586929c Fixed false staticness of VRGUILayer by editing camera ortography rather than texture coordinates. 2020-05-31 11:57:08 +02:00
Capostrophic
d72152183f Update spell effects during death animation (#5403) 2020-05-30 23:24:06 +03:00
Bret Curtis
d3b3b74945
Merge pull request #2871 from Capostrophic/tcl 
Don't "disable" player's collision shape in TCL (#5435)
 2020-05-30 17:57:27 +02:00
Capostrophic
577786f110 Don't disable player's collision shape in TCL (#5435) 2020-05-30 00:55:17 +03:00
Capostrophic
b0b4550f05 Pass Actor by reference, simplify GetTarget for greetings 2020-05-30 00:51:58 +03:00
Capostrophic
efd5f13b2b Make greeting-related actor data temporary (bug #5397) 2020-05-30 00:51:58 +03:00
Bret Curtis
9d0855baa5
Merge pull request #2866 from elsid/extend_osg_stats 
Extend OSG stats
 2020-05-29 23:23:38 +02:00
Alexei Dobrohotov
6f2b0252fa
Merge pull request #2881 from akortunov/statemanager 
Use C++11-style loops in the StateManager
 2020-05-29 23:53:59 +03:00
Bret Curtis
6f2fdb990b
Merge pull request #2876 from Capostrophic/blending 
Reenable weapon animation lower body anim blending in first person view (#5441)
 2020-05-29 11:05:33 +02:00
Andrei Kortunov
48b3fe5733 Use C++11-style loops in the StateManager 2020-05-29 12:26:02 +04:00
Andrei Kortunov
396afe79f1 Move font loading to the FontLoader 2020-05-28 23:18:31 +04:00
Bret Curtis
f36288569c
Merge pull request #2874 from akortunov/windowmanager 
Cleanup WindowManager
 2020-05-28 13:22:23 +02:00
Andrei Kortunov
1759276ac5
Merge pull request #2869 from Capostrophic/appliedonce 
Use AppliedOnce flag in more effect duration calculations (#5425)
 2020-05-27 17:00:14 +04:00
Alexei Dobrohotov
afc537384d
Merge pull request #2875 from akortunov/input 
Move cursor update to the MouseManager
 2020-05-26 20:34:31 +03:00
Evil Eye
a8231ae297 fix explicit startscript calls 2020-05-26 19:01:33 +02:00
Andrei Kortunov
2ff04b4e73 Move TextColours initialization to the TextColours itself 2020-05-26 18:35:16 +04:00
Andrei Kortunov
dcfc4cc5dd Rename onFrame() to update() to make WindowManager consistent with other managers 2020-05-26 18:35:16 +04:00
Andrei Kortunov
000e44a18e Move data from WindowManager to CharacterCreation to simplify API 2020-05-26 18:35:13 +04:00
Andrei Kortunov
b00d72b9e4 Move cursor update to the MouseManager 2020-05-26 18:03:29 +04:00
Capostrophic
95cd473352 Reenable weapon animation lower body animation blending in FPV (#5441) 
Disabling it is a non-vanilla behavior that breaks things that aren't broken in vanilla
 2020-05-26 17:01:45 +03:00
Roman Siromakha
b3b8480d49
Merge pull request #2868 from Capostrophic/opcodes 
Give new opcodes to old functions made custom
 2020-05-26 14:08:27 +02:00
Andrei Kortunov
e3df170a53 Fix mControlsDisabled flag usage 2020-05-26 10:58:24 +04:00
Mads Buvik Sandvei
ee25d7be38 Prediction fix 2020-05-24 18:20:57 +02:00
Mads Buvik Sandvei
480ce82217 Fixed performance issues related to xr synchronization as well as osg pipelining. Some code refactoring / cleanup. 2020-05-24 18:00:42 +02:00
Capostrophic
51c0806a31 Use AppliedOnce flag in more effect duration calculations (#5425) 2020-05-24 18:37:21 +03:00
Capostrophic
e0ecbc08df Give new opcodes to old functions made custom 2020-05-23 11:57:15 +03:00
elsid
69df6098e5
Report frame number, number of actors and objects to stats 2020-05-22 17:39:18 +02:00
Capostrophic
c9c9599ec5 Improve GetDistance and object search warnings (bug #5427) 
Allow GetDistance to work with a non-existent object argument or with inventory items that belong to a container store that doesn't exist
 2020-05-22 15:50:04 +03:00
Capostrophic
904b245d30 Re-enable non-biped creature headtracking (bug #5424) 2020-05-22 14:45:28 +03:00
Alexei Dobrohotov
a68a4338a0
Merge pull request #2841 from Assumeru/consistent-refs 
Script reference consistency
 2020-05-22 12:48:50 +03:00
Bret Curtis
357a845d00
Merge pull request #2862 from elsid/optimize_has_animation 
Optimize MWRender::Animation::hasAnimation
 2020-05-22 10:33:37 +02:00
Mads Buvik Sandvei
3e3ed7ecee STATIC data variance and asynchronous xrwaitframe. 2020-05-21 19:52:21 +02:00
elsid
9326111f4c
Use vector for Animation::mActiveControllers 
Container is only used to add elements, iterate over all of them and
clear. Multimap adds overhead for all of these operations without any
benefits. Reduce Animation::resetActiveGroups CPU time usage by 50%.
 2020-05-21 17:32:25 +02:00
elsid
a59e25e093
Optimize MWRender::Animation::hasAnimation 
Use a set to check for group start existence.
Reduce time taken from 2.6% to 0.08% and
MWMechanics::MechanicsManager::update from 7% to 5%
in relative CPU time usage for a scene with ~100 actors.
 2020-05-21 16:21:11 +02:00
Mads Buvik Sandvei
288530510d Some cleanup. Fixed problems arising from latest merge (refactoring). 2020-05-21 01:01:15 +02:00
elsid
8e0934cbd8
Single AI package clone definition 2020-05-20 20:15:29 +02:00
elsid
103188b61d
Derive all AI package classes from template to support CRTP features 2020-05-20 20:15:29 +02:00
elsid
d7a920a04b
Env variable to write OSG stats into file 2020-05-18 23:44:21 +02:00
Bret Curtis
88a7ecc18d
Merge pull request #2528 from akortunov/effectstime 
Use real time to update spell effects
 2020-05-18 11:07:48 +02:00
Bret Curtis
730d0493db
Merge pull request #2856 from elsid/aisequence_cleanup 
AiSequence cleanup
 2020-05-18 09:47:36 +02:00
Bret Curtis
72507e57c6
Merge pull request #2857 from elsid/aipackage_cleanup 
Remove redundant explicit dtor definition for AiPackage
 2020-05-18 00:13:30 +02:00
Mads Buvik Sandvei
cbbc82f053 Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/engine.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwinput/inputmanagerimp.hpp
#	apps/openmw/mwphysics/physicssystem.cpp
#	apps/openmw/mwrender/water.cpp
#	apps/openmw/mwrender/water.hpp
#	apps/openmw/mwworld/worldimp.cpp
 2020-05-17 23:47:28 +02:00
Mads Buvik Sandvei
5fba3b17e7 Changed logic for updating GUI tracking 2020-05-17 23:17:30 +02:00
elsid
a4fbcb8a10
Remember package iterator to erase it from list without find call 2020-05-17 22:37:44 +02:00
Evil Eye
3875b837bc make MenuMode, Random, GetSecondsPassed regular functions 2020-05-17 22:34:54 +02:00
elsid
d48eead038
Check type id of current package 
If package is changed the following usage of it is not consistent.
 2020-05-17 22:34:15 +02:00
elsid
f566ab03ab
Mark overriden AiPackage methods as final 2020-05-17 22:19:50 +02:00
elsid
3b5ce71d71
Remove redundant explicit dtor definition for AiPackage 2020-05-17 22:18:26 +02:00
elsid
ca93f8ee39
Compare initialized iterator 
Comparsion of untilialized iterator is UB. Initialize with packages end.
 2020-05-17 21:42:38 +02:00
elsid
e3cce0949e
Replace condition that may lead to UB by assert 
If mPackages is empty it means package is a pointer to a deleted object
at line . We can assume it couldn't happen because execute is always called
next for this object at line 289.
 2020-05-17 21:42:38 +02:00
Mads Buvik Sandvei
6474d703ae GUI fixes. Animation fixes, i now understand movement accumulation better and was able to clean up some of the hacks with a better result. Lockpicks and probes now work. Haptics. Ready to be playtested. 2020-05-17 16:25:51 +02:00
Alexei Dobrohotov
b168544445
Merge pull request #2852 from elsid/aiwander_cleanup 
AiWander cleanup
 2020-05-17 00:37:22 +03:00
Bret Curtis
59bda361f0
Merge pull request #2848 from akortunov/bullet 
Fix Bullet flags usage
 2020-05-16 23:22:34 +02:00
elsid
d86669843e
Remove unseud pointTolerance argument 2020-05-16 18:44:12 +02:00
elsid
256c9917a4
Make AiWander::isPackageCompleted const 2020-05-16 18:44:12 +02:00
elsid
131f2557b1
Split functions to remove redundant clearPath argument 2020-05-16 18:44:12 +02:00
elsid
b8513e0318
Remove unused arguments 2020-05-16 18:44:12 +02:00
elsid
489a92de95
Check for hidden path only for actors wandering manually 
Actors who doesn't wander over pathgrid.
 2020-05-16 16:26:42 +02:00
elsid
e616188265
Do not allow wandering actor to have empty path 2020-05-16 16:11:30 +02:00
elsid
71350c6dff
Remove redundant variable 2020-05-16 16:11:30 +02:00
Andrei Kortunov
b5833f3c59 Use real time to update spell effects instead of game timestamps (bug #5165) 2020-05-16 11:00:28 +04:00
Andrei Kortunov
3ebbe14a62 Avoid zero division 2020-05-16 10:56:51 +04:00
Capostrophic
8265ebc484 Fix spell school calculation 2020-05-15 22:24:48 +03:00
Andrei Kortunov
add42830d9 Add a flag to use double-precision functions from Bullet 2020-05-15 12:48:47 +04:00
Andrei Kortunov
e827d9c04f Disable physics profiler, if Bullet was compiled without profiling support 2020-05-15 12:48:41 +04:00
Mads Buvik Sandvei
cad6468518 Rewrote action system to be more flexible. Makes writing rebindable actions easier, and lets me disambiguate press vs long-press actions on the same key. 2020-05-15 00:53:49 +02:00
Evil Eye
f0e2ee45fa reuse ImplicitRef and ExplicitRef for enable, disable, getdisabled, startscript; move scriptrunning and stopscript 2020-05-13 21:17:08 +02:00
elsid
2d7c3bae61
Support bullet with double precision 2020-05-13 19:24:28 +02:00
Capostrophic
110e3761bf Disable small feature culling for orthographic cameras 2020-05-12 23:25:07 +03:00
Mads Buvik Sandvei
6f9c405afd Tentatively completed VR GUI 2020-05-12 22:13:01 +02:00
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
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
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
Capostrophic
ece0db4f82 Cap movement animation playback speed 2020-05-11 15:11:32 +03:00
unknown
3b4782959e Allow targeting non-unique actors with StartScript (bug #2311) 2020-05-10 14:57:06 +02: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
Capostrophic
aa5161f99e Log some more things 2020-05-09 20:27:12 +03: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
Alexei Dobrohotov
12833d66af
Merge pull request #2822 from Assumeru/magic-ai-numbers 
Remove magic numbers and casts
 2020-05-07 13:05:33 +03:00
Evil Eye
19f12cb3fe remove magic numbers and casts 2020-05-05 19:37:15 +02:00
Evil Eye
f9881b699c remove redundant templating 2020-05-05 19:18:23 +02:00
Bret Curtis
b4aeb2711c
Merge pull request #2809 from Capostrophic/spellcasting 
Refactor spellcasting header and implementation (task #5339)
 2020-05-05 17:17:13 +02:00
Bret Curtis
b8c467e2e0
Merge pull request #2787 from p4r4digm/screenshot-path 
Added setting to change the directory screenshots are stored in
 2020-05-04 17:11:49 +02:00
fredzio
947f3cf13c Optionally change color of keywords in the dialogue window based on the 
next answer:
- if the answer was already heard, apply "color topic exhaused" setting
- if the answer was never heard, and the current actor is specified in
the dialog, apply "color topic specific"
- otherwise, do nothing special
 2020-05-02 01:42:05 +02:00
Mads Buvik Sandvei
57e48cfc03 Separate rendering of window menus. It's still awkward. Needs polishing. 2020-05-01 21:37:01 +02:00
Alexei Dobrohotov
7ba8176862
Merge pull request #2819 from elsid/fix_ub 
Fix UB in NpcAnimation::mNpcType initialization
 2020-05-01 21:49:04 +03:00
elsid
6d8debe009
Initialize variable without reading itself 2020-05-01 17:23:10 +02:00
Capostrophic
87ba0bb0e0 Fix usage of uninitialized weapon type in equipmentChanged() 2020-05-01 16:37:40 +03:00
Bret Curtis
7345c89b54
Merge pull request #2813 from Capostrophic/collisionswitch 
Fix collision switch node mask (again)
 2020-04-30 13:50:09 +02:00
Capostrophic
844838c46a Revert an invalid attempt to autoequip shields instead of torches 2020-04-30 00:12:52 +03:00
Capostrophic
89282d14aa Fix collision switch node mask (again) 2020-04-29 17:18:39 +03:00
AnyOldName3
a3b032bf2b Fix chameleon shadows 2020-04-27 23:49:48 +01:00
Capostrophic
69cd53ef8a Fix reflect 2020-04-27 14:06:50 +03:00
Capostrophic
e7f91ff341 Simplify some inflict() logic 2020-04-27 12:50:09 +03:00
Capostrophic
4c1c30db33 Address akortunov's concerns regarding spell refactoring 
Separate linked effect handling into linked effects header
Separate spell absorption handling into spell absorption header
Make armor disintegration loop a range-based for loop
 2020-04-27 12:05:17 +03:00
bzzt
dc33eeadf1 tightscenebound is uncessary after water bbfix 2020-04-27 08:42:46 +02:00
Capostrophic
b1d857818d Clean up CastSpell 2020-04-26 22:17:38 +03:00
Capostrophic
8d22e075e6 Separate functions that don't belong to CastSpell class 2020-04-26 22:17:38 +03:00