GameCult/Aetheria
Watch
9
0
Fork
You've already forked Aetheria
 0
Code Issues Pull requests 4 Projects Releases Packages Wiki Activity Actions

Weapos Rejiggered

Browse source 
Modified weapon scripts to eliminate specialized projectile behavior - allows charged weapons to have projectiles and modify weapon stats when charged
Added machine gun weapon & VFX
Moved third party code to Plugins folder to improve compile times
This commit is contained in:
Reinier Vens 2021-01-31 03:52:32 +00:00
commit dbc522a224
2105 changed files with 7033 additions and 1141 deletions
Download patch file Download diff file Expand all files Collapse all files

67
Assets/Scripts/NIH/UniRx/Scripts/UnityEngineBridge/Triggers/ObservableCollision2DTrigger.cs
View file

@ -1,67 +0,0 @@
using System; // require keep for Windows Universal App
using UnityEngine;
namespace UniRx.Triggers
{
[DisallowMultipleComponent]
public class ObservableCollision2DTrigger : ObservableTriggerBase
{
Subject<Collision2D> onCollisionEnter2D;
/// <summary>Sent when an incoming collider makes contact with this object's collider (2D physics only).</summary>
void OnCollisionEnter2D(Collision2D coll)
{
if (onCollisionEnter2D != null) onCollisionEnter2D.OnNext(coll);
}
/// <summary>Sent when an incoming collider makes contact with this object's collider (2D physics only).</summary>
public IObservable<Collision2D> OnCollisionEnter2DAsObservable()
{
return onCollisionEnter2D ?? (onCollisionEnter2D = new Subject<Collision2D>());
}
Subject<Collision2D> onCollisionExit2D;
/// <summary>Sent when a collider on another object stops touching this object's collider (2D physics only).</summary>
void OnCollisionExit2D(Collision2D coll)
{
if (onCollisionExit2D != null) onCollisionExit2D.OnNext(coll);
}
/// <summary>Sent when a collider on another object stops touching this object's collider (2D physics only).</summary>
public IObservable<Collision2D> OnCollisionExit2DAsObservable()
{
return onCollisionExit2D ?? (onCollisionExit2D = new Subject<Collision2D>());
}
Subject<Collision2D> onCollisionStay2D;
/// <summary>Sent each frame where a collider on another object is touching this object's collider (2D physics only).</summary>
void OnCollisionStay2D(Collision2D coll)
{
if (onCollisionStay2D != null) onCollisionStay2D.OnNext(coll);
}
/// <summary>Sent each frame where a collider on another object is touching this object's collider (2D physics only).</summary>
public IObservable<Collision2D> OnCollisionStay2DAsObservable()
{
return onCollisionStay2D ?? (onCollisionStay2D = new Subject<Collision2D>());
}
protected override void RaiseOnCompletedOnDestroy()
{
if (onCollisionEnter2D != null)
{
onCollisionEnter2D.OnCompleted();
}
if (onCollisionExit2D != null)
{
onCollisionExit2D.OnCompleted();
}
if (onCollisionStay2D != null)
{
onCollisionStay2D.OnCompleted();
}
}
}
}