24418 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Bret Curtis	d35715e5dc	add olcoal to authors and feature 5199 to changelog	2020-12-10 22:39:54 +01:00
psi29a	d77f122289	Merge branch 'gl-5199-improve-scene-colors' into 'master' ... [OpenMW-CS] Issue #5199: Improve Scene Colors See merge request OpenMW/openmw!442	2020-12-10 21:36:46 +00:00
Coleman Smith	842ea9d6ed	simplifying a bit ... - attaching gradient camera directly to the main camera - using Vec4ub	2020-12-10 21:36:46 +00:00
psi29a	c8fa8cfe74	Merge branch 'herbalmenu' into 'master' ... Add graphic herbalism to the launcher Closes #5730 See merge request OpenMW/openmw!448	2020-12-10 21:31:53 +00:00
psi29a	cfd04fcaec	Merge branch 'recast_test_fix_c17' into 'master' ... be explicit about narrowing to resolve: error: type 'btScalar *' (aka 'float... See merge request OpenMW/openmw!447	2020-12-10 21:30:05 +00:00
psi29a	7156b11dbc	be explicit about narrowing to resolve: error: type 'btScalar *' (aka 'float *') cannot be narrowed to 'bool' in initializer list [-Wc++11-narrowing]	2020-12-10 21:30:05 +00:00
Evil Eye	525292b184	Add graphic herbalism to the launcher	2020-12-10 19:02:38 +01:00
psi29a	686692519c	Merge branch 'fix-tests' into 'master' ... Use correct variable types when loading config for tests See merge request OpenMW/openmw!446	2020-12-09 21:25:30 +00:00
AnyOldName3	15f03ae375	Merge branch 'logging2' into 'master' ... Print '--version' and '--help' messages without timestamps Closes #2686 See merge request OpenMW/openmw!444	2020-12-09 16:27:54 +00:00
psi29a	0e5af74a2f	Merge branch 'masterindexloadfix' into 'master' ... [OpenMW-CS] Load master index from refId to mContentFile See merge request OpenMW/openmw!445	2020-12-09 10:12:10 +00:00
AnyOldName3	fd4a62ce35	Use correct variable types when loading config for tests	2020-12-09 00:32:01 +00:00
Petr Mikheev	49c6e50c31	Print '--version' and '--help' messages without timestamps	2020-12-08 23:14:49 +01:00
Nelsson Huotari	61a4a0807b	Load master index in refId to mContentFile, keep master index also in mIndex	2020-12-09 00:10:58 +02:00
psi29a	afaacedf67	Merge branch 'placeatmecrash' into 'master' ... Don't crash the game when placing a non-actor See merge request OpenMW/openmw!443	2020-12-08 17:37:01 +00:00
Evil Eye	39ac0cbb4a	Don't crash the game when placing a non-actor	2020-12-08 17:47:25 +01:00
Chris Djali	21de3fa7e8	Merge pull request #3033 from akortunov/main_messages ... Use a logging system instead of cout for a couple of missing messages	2020-12-08 15:49:19 +00:00
psi29a	fd64aacf7d	Merge branch 'cliherbalism' into 'master' ... Add a setting to disable graphical herbalism See merge request OpenMW/openmw!440	2020-12-08 10:02:15 +00:00
psi29a	8d8a4a890c	Merge branch 'projectiles_collisions_mk2' into 'master' ... Projectiles collisions See merge request OpenMW/openmw!369	2020-12-08 09:24:36 +00:00
fredzio	4fbe1ed12c	Ignore caster collision shape. Sometimes the magic bolt get launched ... inside too near its caster.	2020-12-08 09:06:34 +01:00
fredzio	7e85235220	Projectile to projectile collision	2020-12-08 09:06:34 +01:00
fredzio	66fe3b0d38	Modify projectile collision to work with async physics	2020-12-08 09:06:33 +01:00
Andrei Kortunov	dc7b48e92e	Generate physics collisions for projectiles (bug #3372) ... Remove redundant now mHit field	2020-12-08 09:05:38 +01:00
Andrei Kortunov	242dd8d496	Use a logging system instead of cout for a couple of missing messages	2020-12-08 11:06:30 +04:00
Evil Eye	275b9aea4d	rename setting	2020-12-07 21:56:41 +01:00
Evil Eye	e62fff5f2e	Add a setting to disable graphical herbalism	2020-12-07 19:04:32 +01:00
psi29a	c2933721c6	Merge branch 'explodespell' into 'master' ... Make AI cast self-targeted spells at the ground (bug #5695) Closes #5695 See merge request OpenMW/openmw!426	2020-12-07 12:35:58 +00:00
psi29a	a3dfdde9ef	Merge branch 'move_actors_into_scene' into 'master' ... Move actors into the scene after a teleport See merge request OpenMW/openmw!438	2020-12-07 10:19:32 +00:00
psi29a	c742c15f6d	Merge branch 'autogoesbrr' into 'master' ... Use range based for loops and auto See merge request OpenMW/openmw!400	2020-12-07 09:12:50 +00:00
psi29a	b22418d053	Merge branch 'fix_spawn' into 'master' ... Fix spawn #5724 See merge request OpenMW/openmw!439	2020-12-07 08:20:35 +00:00
fredzio	c6c02a6f16	Remove useless code. ipos is already initialized with the correct ... values.	2020-12-06 13:26:43 +01:00
fredzio	08e73a09ec	Make the code more compact by mean of std::min / max and ternary ... operator.	2020-12-06 13:24:42 +01:00
fredzio	b79f6ac808	Force reset position of actor after snapping to the ground. Otherwise ... the interpolation calculation would kick in and make the actor goes upward if the spawn point is higher than summoner or downward if lower. The actor would then either jump or fall through terrain.	2020-12-06 13:20:37 +01:00
AnyOldName3	a8ab81cfa3	Merge branch 'logging' into 'master' ... Add time to logs. Redirect OSG log to OpenMW log. See merge request OpenMW/openmw!436	2020-12-05 20:44:05 +00:00
Petr Mikheev	5734551ff3	Add time to logs. Redirect OSG log to OpenMW log.	2020-12-05 13:46:02 +01:00
fredzio	7843dad35d	Don't let the actor "nowhere" after a teleport but move them in their ... place. This solve the problem where after loading, an empty frame was rendered because the player is "nowhere".	2020-12-05 01:09:43 +01:00
Evil Eye	078de86e60	Use range based for loops and auto	2020-12-04 18:34:51 +01:00
psi29a	e2213cbdb1	Merge branch 'calibrate_teleportation_beam' into 'master' ... Solve regression when teleporting with async (#5705) See merge request OpenMW/openmw!433	2020-12-04 09:22:59 +00:00
Alexei Dobrohotov	8fb07b72d5	Merge branch 'fix-5699' into 'master' ... Guarantee glow updater regenerates shaders on completion See merge request OpenMW/openmw!435	2020-12-03 21:55:26 +00:00
Alexei Dobrohotov	84e1a29700	Make AI cast self-targeted spells at the ground (bug #5695)	2020-12-04 00:41:21 +03:00
AnyOldName3	48f397f168	Remove existing shader when no longer required	2020-12-03 21:06:02 +00:00
AnyOldName3	5ad297e6ff	Guarantee glow updater regenerates shaders on completion ... Previously, it would edit the odd numbered stateset, then regenerate shaders for the even-numbered one, then edit the even numbered one, and regenerate shaders for the odd numbered one (or vice versa if it finished during an even numbered frame). This would leave one of the shader programs still trying to use the state that had been removed.	2020-12-03 18:41:32 +00:00
fredzio	5a4872393a	Rework actor position reset. While solving the issue with invalid ... position being used under heavy load, I introduced a regression that prevented the position to be updated in case of teleport. Move the logic in its own function and decide in PhysicsSystem whether a reset is needed.	2020-12-03 12:57:57 +01:00
psi29a	a98847e670	Merge branch 'bzzt_8_shadows_in_refraction' into 'master' ... shadows enabled in refraction See merge request OpenMW/openmw!340	2020-12-02 23:03:10 +00:00
psi29a	6f0b90e606	documented that currently underwater shadows are mutually exclusive to refraction scale; to be fixed in follow up issue #5709; documentation fixes	2020-12-02 23:03:10 +00:00
psi29a	ca3cde20cd	Merge branch 'aut2020_changelog' into 'master' ... Changelog additions See merge request OpenMW/openmw!432	2020-12-02 15:06:25 +00:00
Nelsson Huotari	b416c52978	Changelog additions	2020-12-02 16:01:07 +02:00
psi29a	2c6e8eb195	Merge branch 'particles' into 'master' ... Make NIF particle node handling more generic See merge request OpenMW/openmw!425	2020-11-30 20:37:50 +00:00
psi29a	61e6b543e5	Merge branch 'qstatusbarfix' into 'master' ... Fix crash caused by QStatusBar See merge request OpenMW/openmw!431	2020-11-30 09:50:31 +00:00
Alexei Dobrohotov	db9c174ca8	Make NIF particle node handling more generic	2020-11-30 12:33:18 +03:00
Nelsson Huotari	b0e3bd6ff9	Fix crash caused by QStatusBar	2020-11-29 23:25:34 +02:00