16837 commits

Author	SHA1	Message	Date
Mads Buvik Sandvei	640420eaaa	No longer delete and recreate CopyFramebufferToTextureCallback, remove oneshot functionality. Instead just remove the callback after the traversals. Use addInitialDrawCallback instead of setInitialDrawCallback to avoid messing with existing callbacks.	2020-12-16 21:46:52 +01:00
fredzio	259d522800	When doing a ray cast to the next projectile position, ignore collisions ... that occurs with the projectile own collision object. Otherwise a magic bolt can explode "spontaneously".	2020-12-15 21:34:58 +01:00
psi29a	884b434ee0	Merge branch 'fixfriendlyfire' into 'master' ... Fix projectiles friendly fire (#5744) See merge request OpenMW/openmw!466	2020-12-15 15:45:43 +00:00
psi29a	78e85fe011	Merge branch 'this_is_nife' into 'master' ... More NIF stuff See merge request OpenMW/openmw!461	2020-12-15 15:43:12 +00:00
psi29a	bc6bcda58f	Merge branch 'wizard' into 'master' ... Wizard: fix "file is already opened" warning See merge request OpenMW/openmw!465	2020-12-15 15:35:47 +00:00
Nelsson Huotari	8b2bf12e8f	Use bip01 for root bone name	2020-12-15 13:51:49 +02:00
fredzio	b39437dfb6	Don't allow projectiles to stand still when they hit an ally. ... When an NPC fire a projectile, it should affect only its targeted actor. To this end, after a hit is detected the target is checked against the list of AI targets and reactivated if necessary. Problem occurs when the hit occurs as a result of a friendly actor going into the projectile (detected in ClosestNotMeConvexResultCallback): while the projectile is inside the friend's collision box, it is deactivated, just to be immediately reactivated. Effectively, the projectile does nothing until the actor moves out. Add a check inside the ClosestNotMeConvexResultCallback before declaring a hit. Since the necessary data is not safely accessible from the async thread, maintain a copy inside the Projectile class.	2020-12-14 22:23:01 +01:00
Alexei Dobrohotov	8fd45d85ec	Unify NiGeometry/NiGeometryData handling	2020-12-15 00:06:43 +03:00
Alexei Dobrohotov	ab789e37e1	Wizard: fix "file is already opened" warning	2020-12-14 03:45:03 +03:00
Alexei Dobrohotov	201999c4a9	Make sure adjustPosition() is safe to call for any actor	2020-12-14 03:01:26 +03:00
fredzio	a314f196eb	Unconditionally call actor->resetPosition in adjustPosition. ... Revert broken change that would force adjust all actors in cell upon loading. That break floating corpses (and probably others things).	2020-12-12 18:17:26 +01:00
Alexei Dobrohotov	15291f15d3	Make actor collision box components a struct	2020-12-11 20:07:59 +03:00
psi29a	11eff02a1d	Merge branch 'Show-more-information-about-level-on-menu' into 'master' ... Show more information about level on menu See merge request OpenMW/openmw!437	2020-12-11 12:04:15 +00:00
psi29a	9a35c5815e	Merge branch 'nofallfloor' into 'master' ... Update physics object position after spawning. See merge request OpenMW/openmw!449	2020-12-11 11:28:29 +00:00
psi29a	789d034432	Merge branch 'skirts' into 'master' ... Editor: Properly reserve body parts for skirts (bug #5731) Closes #5731 See merge request OpenMW/openmw!452	2020-12-11 11:09:32 +00:00
Frederic Chardon	460e5abb55	Update physics object position after spawning.	2020-12-11 08:57:08 +01:00
Frederic Chardon	899b8422fa	explicitely use a reference, auto can't infer it and make a copy	2020-12-11 08:56:54 +01:00
Alexei Dobrohotov	32601e0ae4	Properly reserve body parts for skirts (bug #5731)	2020-12-11 10:39:57 +03:00
Coleman Smith	3b9db41346	removing unneeded variable	2020-12-10 17:03:10 -08: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	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
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
CedricMocquillon	6bfdf0e57f	Add more information on mouse over level	2020-12-07 14:57:25 +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
Petr Mikheev	5734551ff3	Add time to logs. Redirect OSG log to OpenMW log.	2020-12-05 13:46:02 +01:00