2818 commits

Author	SHA1	Message	Date
Mads Buvik Sandvei	c9e761eb88	Merge remote-tracking branch 'remotes/origin/master' into openxr_vr	2020-07-21 13:58:52 +02:00
Mads Buvik Sandvei	b7bda3544b	MyGUI version guard.	2020-07-16 12:31:57 +02:00
Bret Curtis	a5da59e840	Merge pull request #2967 from Capostrophic/casesensitivity ... Fix search filter unicode character case sensitivity	2020-07-12 22:41:24 +02:00
Capostrophic	65ac0c86b8	Fix search filter unicode character case sensitivity	2020-07-12 19:05:47 +03:00
Andrei Kortunov	7f936e4cde	Merge pull request #2961 from akortunov/move ... Do not use outdated references when moving objects to new cells	2020-07-12 12:11:22 +04:00
Andrei Kortunov	da791590ac	Update HUD icons during mechanics update again to avoid crashes	2020-07-11 20:40:00 +04:00
Andrei Kortunov	db8f0ad6fd	Do not use outdated references when moving objects to new cells (bug #5387)	2020-07-11 17:24:20 +04:00
CedricMocquillon	096e25b29a	Make the getSkillForTraining a member method of TrainingWindow class. ... The implementation is based now on the member of the class mTrainingSkillBasedOnBaseSkill instead of local static	2020-07-07 11:13:35 +02:00
CedricMocquillon	1aa4f6bf96	The number of skills points a trainer can teach is based either on its base ... values or on its modified ones depending on the new setting 'trainers training skills based on base skill' value	2020-07-06 20:30:14 +02:00
CedricMocquillon	281cef9769	The 3 skill selected by a trainer are based on its 3 best skills. ... The skills are sorted either on their base value or on their modified one depending on the new setting 'trainers training skills based on base skill'	2020-07-06 20:28:08 +02:00
Mads Buvik Sandvei	e9ed1948f1	fix unused warning	2020-07-05 11:32:20 +02:00
Bret Curtis	0c2fea8254	Merge pull request #2932 from elsid/replace_open_threads ... Replace OpenThreads by std types	2020-07-04 13:11:23 +02:00
Andrei Kortunov	9ec61c14d2	Mark some methods as overrides to avoid warnings	2020-07-04 12:00:30 +04:00
Andrei Kortunov	d1b5f17390	Remove redundant virtual qualifier	2020-07-04 10:17:39 +04:00
Andrei Kortunov	27f1a3376c	Add a separate stats watcher for GUI	2020-07-01 15:55:44 +04:00
Mads Buvik Sandvei	461258cb4b	Reverted renaming of video player's gui layer	2020-06-28 13:01:58 +02:00
Mads Buvik Sandvei	58d73e14e6	Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr ... # Conflicts: # apps/openmw/mwbase/environment.cpp # apps/openmw/mwbase/environment.hpp # apps/openmw/mwbase/world.hpp # apps/openmw/mwgui/windowmanagerimp.cpp # apps/openmw/mwinput/inputmanagerimp.hpp # apps/openmw/mwrender/animation.cpp # apps/openmw/mwrender/camera.cpp # apps/openmw/mwrender/camera.hpp # apps/openmw/mwrender/renderingmanager.cpp # apps/openmw/mwrender/renderingmanager.hpp	2020-06-28 11:59:07 +02:00
Andrei Kortunov	d0fe15b095	Use meaningful names instead of mSkill1 and mSkill2	2020-06-26 11:47:59 +04:00
elsid	40ad87bc4d	Replace OpenThreads by std types	2020-06-25 22:16:09 +02:00
fredzio	ae27ad6bcd	Follow up to MR 126 ... Fill settings-default.cfg with default values as RGBA values are not intuitive for end users. Add a boolean setting to enable the formatting (disabled by default).	2020-06-22 04:31:12 +02:00
psi29a	981184109e	Merge branch 'formattopics' into 'master' ... Change color of keywords in the dialogue window (#2159) See merge request OpenMW/openmw!126	2020-06-21 07:58:02 +00:00
Bret Curtis	9446cece62	Issue #5468: Apparently this was always a problem but OP made "nested loading" more visible. This should resolve nested loading correctly.	2020-06-18 13:23:39 +02: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
Andrei Kortunov	d1a3cc98ff	Get rid of ECLD and dependencies	2020-06-17 13:09:16 +04:00
Andrei Kortunov	3e396a904e	Reset selected slot when close savegame dialogue to avoid accidental saving/loading	2020-06-17 11:09:17 +04:00
bzzt lost a hitlab login	0b4226f3e2	ico effieciency ... Signed-off-by: Bret Curtis <psi29a@gmail.com>	2020-06-13 00:22:28 +02:00
Mads Buvik Sandvei	7f3930c312	Override bow animations to give all races consistent aim	2020-06-08 23:54:24 +02:00
Mads Buvik Sandvei	9bd676f5be	Some bugfixes, more experimenting with timing of frame sync calls.	2020-06-07 20:02:03 +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
Andrei Kortunov	81805b7263	Introduce a separate class to control world date and time	2020-06-05 12:07:32 +04:00
Andrei Kortunov	5468fcb29f	Store attributes and skills values as floats (bug #4021)	2020-06-03 17:34:15 +04:00
Andrei Kortunov	3dce225f28	Implement vanilla-style corprus handling (bug #3714, bug #4623)	2020-06-03 12:58:17 +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	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
Capostrophic	51c0806a31	Use AppliedOnce flag in more effect duration calculations (#5425)	2020-05-24 18:37:21 +03: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
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
Andrei Kortunov	e827d9c04f	Disable physics profiler, if Bullet was compiled without profiling support	2020-05-15 12:48:41 +04:00
Mads Buvik Sandvei	6f9c405afd	Tentatively completed VR GUI	2020-05-12 22:13:01 +02: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	507adac8cd	Merge pull request #2783 from akortunov/input ... Refactor InputManager	2020-05-12 09:34:22 +02:00
Andrei Kortunov	f990150c49	Move video wrapper to the WindowsManager	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
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
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