Bug fixes
This commit is contained in:
+18
-12
@@ -4,6 +4,7 @@ using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using SynthySound;
|
||||
using Microsoft.Xna.Framework;
|
||||
|
||||
namespace EvilSatellites
|
||||
{
|
||||
@@ -12,10 +13,12 @@ namespace EvilSatellites
|
||||
public Synthy Engine;
|
||||
public Dictionary<string, AIVoiceClip> Clips;
|
||||
public Random rnd = new Random();
|
||||
public double LastSpeakTimer;
|
||||
public AI(Synthy engine)
|
||||
{
|
||||
Engine = engine;
|
||||
Clips = new Dictionary<string, AIVoiceClip>();
|
||||
LastSpeakTimer = 10000;
|
||||
SetupClips();
|
||||
}
|
||||
|
||||
@@ -39,7 +42,7 @@ namespace EvilSatellites
|
||||
{
|
||||
Name = "DamageBullet",
|
||||
NumFiles = 4,
|
||||
Probability = new int[2] { 5, 10 }
|
||||
Probability = new int[2] { 2, 4 }
|
||||
});
|
||||
|
||||
Clips.Add("DamageDebris", new AIVoiceClip
|
||||
@@ -49,18 +52,17 @@ namespace EvilSatellites
|
||||
Probability = new int[2] { 2, 4 }
|
||||
});
|
||||
|
||||
// TODO
|
||||
Clips.Add("FarMiss", new AIVoiceClip
|
||||
{
|
||||
Name = "FarMiss",
|
||||
NumFiles = 6,
|
||||
Probability = new int[2] { 5, 50 }
|
||||
Probability = new int[2] { 5, 30 }
|
||||
});
|
||||
|
||||
Clips.Add("GameOver", new AIVoiceClip
|
||||
{
|
||||
Name = "GameOver",
|
||||
NumFiles = 4,
|
||||
NumFiles = 2,
|
||||
Probability = new int[2] { 1, 1 }
|
||||
});
|
||||
|
||||
@@ -78,15 +80,13 @@ namespace EvilSatellites
|
||||
Probability = new int[2] { 1, 3 }
|
||||
});
|
||||
|
||||
// TODO
|
||||
Clips.Add("NearMiss", new AIVoiceClip
|
||||
{
|
||||
Name = "NearMiss",
|
||||
NumFiles = 4,
|
||||
Probability = new int[2] { 50, 100 }
|
||||
Probability = new int[2] { 5, 30 }
|
||||
});
|
||||
|
||||
// TODO
|
||||
Clips.Add("Spinning", new AIVoiceClip
|
||||
{
|
||||
Name = "Spinning",
|
||||
@@ -94,20 +94,18 @@ namespace EvilSatellites
|
||||
Probability = new int[2] { 2, 4 }
|
||||
});
|
||||
|
||||
// TODO
|
||||
Clips.Add("Still", new AIVoiceClip
|
||||
{
|
||||
Name = "Still",
|
||||
NumFiles = 5,
|
||||
Probability = new int[2] { 2, 4 }
|
||||
Probability = new int[2] { 1, 1 }
|
||||
});
|
||||
|
||||
// TODO
|
||||
Clips.Add("Void", new AIVoiceClip
|
||||
{
|
||||
Name = "Void",
|
||||
NumFiles = 3,
|
||||
Probability = new int[2] { 50, 200 }
|
||||
Probability = new int[2] { 5, 100 }
|
||||
});
|
||||
|
||||
Clips.Add("Wave", new AIVoiceClip
|
||||
@@ -120,17 +118,25 @@ namespace EvilSatellites
|
||||
|
||||
public void Play(string name)
|
||||
{
|
||||
if (GameSettings.EnableAI == false) return;
|
||||
if (LastSpeakTimer < 4000) return;
|
||||
if (Clips.ContainsKey(name))
|
||||
{
|
||||
var clip = Clips[name];
|
||||
var prob = rnd.Next(clip.Probability[1]);
|
||||
if (prob == clip.Probability[0] || (clip.Probability[0] == 1 && clip.Probability[1] == 1))
|
||||
{
|
||||
var file = rnd.Next(clip.NumFiles - 1) + 1;
|
||||
var file = rnd.Next(1, clip.NumFiles+1);
|
||||
Engine.PlayOneshot(@"sfx/ai/" + name + file.ToString() + ".wav");
|
||||
LastSpeakTimer = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void Update(GameTime time)
|
||||
{
|
||||
LastSpeakTimer += time.ElapsedGameTime.TotalMilliseconds;
|
||||
}
|
||||
}
|
||||
public struct AIVoiceClip
|
||||
{
|
||||
|
||||
@@ -10,5 +10,6 @@ namespace EvilSatellites
|
||||
{
|
||||
public static bool PreferSAPI = true;
|
||||
public static bool UseForceFeedback = true;
|
||||
public static bool EnableAI = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -63,6 +63,7 @@ namespace EvilSatellites.Objects
|
||||
return;
|
||||
}
|
||||
player.TakeDamage(25);
|
||||
Screen.Manager.Computer.Play("DamageDebris");
|
||||
Destroy();
|
||||
GameStats.SatelliteCollisions++;
|
||||
}
|
||||
|
||||
@@ -28,6 +28,8 @@ namespace EvilSatellites.Objects
|
||||
public float Health;
|
||||
private Random rnd = new Random();
|
||||
private bool IsDamaged;
|
||||
private double SpinTimer;
|
||||
private double IdleTimer;
|
||||
public Player(IScreen screen): base(screen)
|
||||
{
|
||||
ShouldDestroy = false;
|
||||
@@ -57,11 +59,14 @@ namespace EvilSatellites.Objects
|
||||
sfxWhine.Loop = true;
|
||||
sfxEngine.ConnectToEffect(Screen.Manager.EnvironmentEffect);
|
||||
sfxWhine.ConnectToEffect(Screen.Manager.EnvironmentEffect);
|
||||
sfxEngine.Play();
|
||||
sfxWhine.Play();
|
||||
|
||||
sfxDamage = Screen.Manager.Sound.Load(@"sfx/ui/alarmDamage.wav", false);
|
||||
sfxDamage.Loop = true;
|
||||
sfxTaps = new AudioAsset(Screen.Manager.Sound, @"sfx/ship/taps", 1, 20);
|
||||
sfxEngine.Play();
|
||||
sfxWhine.Play();
|
||||
SpinTimer = 0;
|
||||
IdleTimer = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -79,6 +84,27 @@ namespace EvilSatellites.Objects
|
||||
}
|
||||
override public void Update(GameTime gameTime)
|
||||
{
|
||||
if (Turning != 0 || Elevating != 0)
|
||||
{
|
||||
SpinTimer += gameTime.ElapsedGameTime.TotalMilliseconds;
|
||||
if (SpinTimer > 4000)
|
||||
{
|
||||
Screen.Manager.Computer.Play("Spinning");
|
||||
SpinTimer = 0;
|
||||
}
|
||||
}
|
||||
if (Movement.Length() < 0.01 && Elevating == 0 && Turning == 0 && CurrentWeapon.State == WeaponState.Stopped)
|
||||
{
|
||||
IdleTimer += gameTime.ElapsedGameTime.TotalMilliseconds;
|
||||
if (IdleTimer > 30000)
|
||||
{
|
||||
Screen.Manager.Computer.Play("Still");
|
||||
IdleTimer = 0;
|
||||
}
|
||||
} else
|
||||
{
|
||||
IdleTimer = 0;
|
||||
}
|
||||
CurrentWeapon.Update(gameTime);
|
||||
Move(Movement);
|
||||
if (Turning == -1)
|
||||
@@ -154,6 +180,7 @@ namespace EvilSatellites.Objects
|
||||
{
|
||||
Turning = 0;
|
||||
sfxTurn.Stop();
|
||||
if (Elevating == 0) SpinTimer = 0;
|
||||
}
|
||||
|
||||
public void StartElevating(int dir, GameTime time)
|
||||
@@ -167,6 +194,7 @@ namespace EvilSatellites.Objects
|
||||
{
|
||||
Elevating = 0;
|
||||
sfxElevator.Stop();
|
||||
if (Turning == 0) SpinTimer = 0;
|
||||
}
|
||||
|
||||
public void StartVacuuming(GameTime time)
|
||||
@@ -232,10 +260,7 @@ namespace EvilSatellites.Objects
|
||||
|
||||
override public void OnCollision(IGameObject obj)
|
||||
{
|
||||
if (obj.Type == ObjectType.Debris)
|
||||
{
|
||||
Screen.Manager.Computer.Play("DamageDebris");
|
||||
}
|
||||
|
||||
if (obj.Type == ObjectType.Projectile)
|
||||
{
|
||||
var proj = (Projectile)obj;
|
||||
|
||||
@@ -53,6 +53,11 @@ namespace EvilSatellites.Objects
|
||||
Move(Direction);
|
||||
if (Vector3.Distance(StartPos, Position) > Range)
|
||||
{
|
||||
var scr = (GameScreen)Screen;
|
||||
if (Owner == scr.GetPlayer())
|
||||
{
|
||||
Screen.Manager.Computer.Play("Void");
|
||||
}
|
||||
Destroy();
|
||||
}
|
||||
Sound.Position = new System.Numerics.Vector3(Position.X + Dimensions.X / 2, Position.Y + Dimensions.Y / 2, Position.Z + Dimensions.Z / 2);
|
||||
|
||||
@@ -50,9 +50,17 @@ namespace EvilSatellites.Objects
|
||||
{
|
||||
Move(new Vector3(0, 0, -0.05f));
|
||||
Sound.Position = new System.Numerics.Vector3(Position.X+Dimensions.X/2, Position.Y+Dimensions.Y/2, Position.Z+Dimensions.Z/2);
|
||||
var scr = (GameScreen)Screen;
|
||||
if (Vector3.Distance(scr.GetPlayer().Position, Position) > 1000)
|
||||
{
|
||||
var player = scr.GetPlayer();
|
||||
var x = player.Position.X - 250f + (float)rnd.NextDouble() * 500;
|
||||
var y = player.Position.Y - 250f + (float)rnd.NextDouble() * 500;
|
||||
var z = player.Position.Z - 250f + (float)rnd.NextDouble() * 500;
|
||||
Position = new Vector3(x, y, z);
|
||||
}
|
||||
if (rnd.Next(1024) == 512)
|
||||
{
|
||||
var scr = (GameScreen)Screen;
|
||||
var player = scr.GetPlayer();
|
||||
var orient = Matrix.Invert(Matrix.CreateTranslation(Position) * Matrix.CreateLookAt(Position, scr.GetPlayer().Position, Rotation.Up));
|
||||
var dir = Position - player.Position;
|
||||
|
||||
@@ -23,7 +23,7 @@ namespace EvilSatellites
|
||||
public bool IsPlaying;
|
||||
public Vector3 RadarTarget;
|
||||
public Matrix RadarOrientation;
|
||||
|
||||
public float RadarPitch;
|
||||
public Radar(IGameObject owner, IScreen screen)
|
||||
{
|
||||
Owner = owner;
|
||||
@@ -71,11 +71,13 @@ namespace EvilSatellites
|
||||
if (Target == null)
|
||||
{
|
||||
RadarNoise.Pitch = 0.1;
|
||||
RadarPitch = 0.1f;
|
||||
return;
|
||||
}
|
||||
Vector3 radarTarget = (Target.Position - Owner.Position);
|
||||
radarTarget.Normalize();
|
||||
RadarNoise.Pitch = MathHelper.Clamp(0.1f / Vector3.Distance(Owner.Rotation.Forward, radarTarget) * 3f, 0, 1);
|
||||
RadarPitch = MathHelper.Clamp(0.1f / Vector3.Distance(Owner.Rotation.Forward, radarTarget) * 3f, 0, 1);
|
||||
}
|
||||
|
||||
|
||||
@@ -86,6 +88,7 @@ namespace EvilSatellites
|
||||
RadarPosition += RadarDirection;
|
||||
RadarNoise.Position = new System.Numerics.Vector3(RadarPosition.X, RadarPosition.Y, RadarPosition.Z);
|
||||
RadarNoise.Pitch = MathHelper.Clamp(0.1f / Vector3.Distance(Owner.Rotation.Forward, RadarTarget) * 3f, 0, 2);
|
||||
RadarPitch = MathHelper.Clamp(0.1f / Vector3.Distance(Owner.Rotation.Forward, RadarTarget) * 3f, 0, 2);
|
||||
if (Vector3.Distance(RadarPosition, Owner.Position) > 20)
|
||||
{
|
||||
IsPlaying = false;
|
||||
|
||||
@@ -70,6 +70,7 @@ namespace EvilSatellites
|
||||
public void Update(GameTime gameTime)
|
||||
{
|
||||
Vibrations.Update((float)gameTime.ElapsedGameTime.TotalMilliseconds);
|
||||
Computer.Update(gameTime);
|
||||
if (_ToAdd.Count > 0)
|
||||
{
|
||||
foreach (var screen in _ToAdd)
|
||||
|
||||
@@ -22,7 +22,7 @@ namespace EvilSatellites.Screens
|
||||
private Quadtree<IGameObject> objtree = new Quadtree<IGameObject>(new Vector3(50000, 50000, 50000), 10, 20);
|
||||
private float Theta = 0;
|
||||
private Player _player;
|
||||
private Radar ObjectRadar;
|
||||
public Radar ObjectRadar;
|
||||
private SatelliteSpawner Spawner;
|
||||
private bool GameOver = false;
|
||||
public void Activate()
|
||||
|
||||
@@ -16,6 +16,7 @@ namespace EvilSatellites.Screens
|
||||
MenuOptions.Add(new MenuEntry("Music Volume", "Toggle between music volumes"))
|
||||
.Add(new MenuEntry("Use screen reader", "Use screen reader speech instead of SAPI"))
|
||||
.Add(new MenuEntry("Use Force Feedback", "Vibrate on certain game actions such as weapon fire, getting hit, etc."))
|
||||
.Add(new MenuEntry("AI", "Your AI will sometimes comment on the things you're doing in game"))
|
||||
.Add(new MenuEntry("Back", "Go Back to previous screen"));
|
||||
base.Activate();
|
||||
}
|
||||
@@ -36,6 +37,10 @@ namespace EvilSatellites.Screens
|
||||
ChangeForceFeedback();
|
||||
}
|
||||
if (CursorPosition == 3)
|
||||
{
|
||||
ChangeAI();
|
||||
}
|
||||
if (CursorPosition == 4)
|
||||
{
|
||||
Manager.RemoveScreen(this);
|
||||
Manager.AddScreen(new MainMenuScreen());
|
||||
@@ -44,16 +49,18 @@ namespace EvilSatellites.Screens
|
||||
|
||||
public void ChangeSpeech()
|
||||
{
|
||||
if (GameSettings.PreferSAPI)
|
||||
if (GameSettings.PreferSAPI == true)
|
||||
{
|
||||
Tolk.PreferSAPI(false);
|
||||
Tolk.TrySAPI(false);
|
||||
Tolk.Output("Prefering screen reader");
|
||||
GameSettings.PreferSAPI = false;
|
||||
} else
|
||||
{
|
||||
Tolk.PreferSAPI(true);
|
||||
Tolk.TrySAPI(true);
|
||||
Tolk.Output("Prefering SAPI");
|
||||
GameSettings.PreferSAPI = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,5 +100,19 @@ namespace EvilSatellites.Screens
|
||||
Manager.Vibrations.AddVibration(1, 1, 500);
|
||||
}
|
||||
}
|
||||
|
||||
public void ChangeAI()
|
||||
{
|
||||
if (GameSettings.EnableAI)
|
||||
{
|
||||
GameSettings.EnableAI = false;
|
||||
Tolk.Output("AI is now muted");
|
||||
}
|
||||
else
|
||||
{
|
||||
GameSettings.EnableAI = true;
|
||||
Tolk.Output("AI is now unmuted");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -96,6 +96,14 @@ namespace EvilSatellites.Weapons
|
||||
Projectile proj = new Projectile(Screen, _wielder.Position, _wielder.Rotation, _wielder);
|
||||
Screen.AddObject(proj);
|
||||
GameStats.ShotsFired++;
|
||||
var scr = (EvilSatellites.Screens.GameScreen)Screen;
|
||||
if (scr.ObjectRadar.RadarPitch < 0.8)
|
||||
{
|
||||
scr.Manager.Computer.Play("FarMiss");
|
||||
} else if (scr.ObjectRadar.RadarPitch < 1)
|
||||
{
|
||||
scr.Manager.Computer.Play("NearMiss");
|
||||
}
|
||||
} else
|
||||
{
|
||||
sfxEmpty.Reset();
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:77eb482695b5cf8c9e789d71803674cce3129cbfbac414d7ebddd70a4c5a7283
|
||||
size 483536
|
||||
oid sha256:1bff3793b269c1e8a3e729cd3555fa840e39d36fd4b5d7a3fd7683bddaeb48c7
|
||||
size 592104
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9f6bbe50fd655dffaf22d54a2445c78316aa082b7dee9962485886f1751606af
|
||||
size 808340
|
||||
oid sha256:c8626ae99e2cebe5166c246a4cf6c078e940808ea5b6c5ba6cdd1dc16074e71f
|
||||
size 993860
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c764adc2ab1b5136f0711f4479e62349a3e7fa64b98d90e5594a15cce4203b75
|
||||
size 405724
|
||||
oid sha256:bb83b357e45019a7f1c7407413abe38c43676aee273aef7c0daa9deaafd1d953
|
||||
size 492948
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3183dc91f6fbeb1c08d98e63aad448f4bb8c66733e9a8fa27b5c264b8b25027b
|
||||
size 359068
|
||||
oid sha256:dde87d4151e9a449a1ae6c8e77373ade770e1cd480fa8ee02529771373e726a0
|
||||
size 444436
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1cd245dcd062f28a8f0ed354cfad841ee7e88fc9e095ec2484dee4ddeb86ae6e
|
||||
size 609444
|
||||
oid sha256:9987067d99e6c761932ecf93dff415518f27bcaef456df146d39894d48dc5330
|
||||
size 738892
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e39967556c8e14d4e72cb63044abdc3c558644d7607259476476b612b58ff9e0
|
||||
size 927016
|
||||
oid sha256:47db81ad6ebff7a32661abd7da6fc9cda654fb6e71c5e387763349c5f6f43165
|
||||
size 1147860
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6a319192cf7daea0ab86a43e07ba389506478de6878702d138cdbd1f53f918cd
|
||||
size 404932
|
||||
oid sha256:7653592969129ce1930009a2aa3c497e1894bd657e0f862be4e1bd126f31ec4e
|
||||
size 479696
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2ef2c5c2e3a6c0fd773849c30366ce992000aae2964e8ffe23a98136d2e56bb2
|
||||
size 608744
|
||||
oid sha256:b4d66b25726c4fef1a5d71471997e6455e0809b1d350113ce8ebeb9a5b11dda6
|
||||
size 779476
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:911515a1f627f6228a52aab2bbf318f76839ca2f697ade6cea1cb2a7d973111d
|
||||
size 477960
|
||||
oid sha256:05bdd0a1acaf4947fda4f11de0e911eeb007ddbfd3ba9657fe6133920ee2d4d5
|
||||
size 586320
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:272ffabb10e43f7d289fbca245a9f93657b5b5eb62d526ea283b02dbdd2b4b06
|
||||
size 765736
|
||||
oid sha256:abf534fdcb17891ec9b9bc0f49afaae9c799291663bc1c0c3d73340bf663e45d
|
||||
size 919996
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b30db094078f09dfff5c3bf339382fa3eb5d528ed6b2baf5bcf8a5ca23d59743
|
||||
size 375296
|
||||
oid sha256:2daab5b0355a1a2c012dd95912e3607124239e271e0db95af3c3c76a40e05d5c
|
||||
size 422152
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2107ccf20048a00b15745eb3c3b871a22ac0fd22e14feb1a038eb0bcca64fe17
|
||||
size 384392
|
||||
oid sha256:6909cdd03bb307c14e1195dd391c45b870a7b4c8ec656f933b98941707f4cf20
|
||||
size 468980
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d9eec00bb47cc9f0920dce6aa20d04868a54349275495752c65378ef604bc68d
|
||||
size 668260
|
||||
oid sha256:468e70ea1a32bde81766e0e902edef403c764abe3f2036e411b0e771699a7eca
|
||||
size 832280
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:67e126254130792957dc67ce07afe1472b64c2e7f77cdb8eb4dcca8139f8c81b
|
||||
size 697868
|
||||
oid sha256:3a3275e9639e889a5c5be28f9d1cb0bff6d2edf3b6c3db478eedff62052da0a1
|
||||
size 858456
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:07a289845c81e14b9ffef572a89c463ca3adffa9c340735843b8cecbca5f923d
|
||||
size 355564
|
||||
oid sha256:de0923ee0103fbd703873163a7a73c1b1ccb3c65ed5343ff3ea07d8e4b6a9f85
|
||||
size 438524
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:750fad38c4bdd0c9c00ae6cac3e09cfb6c32f8df198e610d1cb16accc5cccf38
|
||||
size 351968
|
||||
oid sha256:b6a7abd7dbfb695450f480dab0be78b9d291a5180af552799dd9b8f203d87c3b
|
||||
size 423476
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:36283c5f0e4ea244c6a5b9804e1e9a157cd975659863c9bf37b39eefb0d72185
|
||||
size 675012
|
||||
oid sha256:79bc39a3cf8a9f99fd614aaa371643ff97a4a9cec59c70547c704602dbb1a73d
|
||||
size 435772
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1f5a01e5bba0d53e1285a594c49a8d27469718f2f039a01fb941f0afacf25e2c
|
||||
size 669636
|
||||
oid sha256:4f68fa0bc1d0c2e099120a18f4ca548634132805aa249677f7767d110d49a154
|
||||
size 338020
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:27dda846510fc0f801909d7fb945491932620bed2b7de8e7610d5f4251adf5b7
|
||||
size 642328
|
||||
oid sha256:8c99eb9367581c26b4ebae7ae261d185a40523bef9c48550b05bb22921f86519
|
||||
size 809100
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:733efe3ddf0d49a37c2bc1ce42ef3d4618b6633255dbecc1e24ce74555d1055c
|
||||
size 590372
|
||||
oid sha256:50e33972ff499696652326bb2cbbd7f2cfa94aae487d2917f8d4090ea73982de
|
||||
size 745268
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4d6e4603930a7486fd7355a6fb65dcc1fef840a1255a7809f97a649e391b4e23
|
||||
size 1461824
|
||||
oid sha256:3f3210f5023af20abe7d6a826712c4f34f2fcfdbd17352e26a20ef1aa567fc2c
|
||||
size 1769200
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5a73fb942580fa483103e7c81f9c89f5fe5ad109b51cdcdcf8eb2a3aa64aac54
|
||||
size 301440
|
||||
oid sha256:b90aff4e24370abaed3ce7721cbf080032000d38928c78e8649f06dcfae0386d
|
||||
size 348012
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:94c8bcd86b2cd868989bd1b591d3ec8f3a192e5f7f26589ada1b217e2e1dafe7
|
||||
size 371700
|
||||
oid sha256:4c202c020ae3a8885caa96e531bedb41fe7443a2eb9ba2fb8bf941e2223fdfee
|
||||
size 410264
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9215902c1c6f8824929223e4aa4ff00e50f84d86cf9195ad20c79956507f4502
|
||||
size 204132
|
||||
oid sha256:761569c6a2cc1b6bd3030fd3357d9846a2045a9e5a3c5245d740bb8985a8fa02
|
||||
size 243776
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d1c191b306c41a804b951d314081cb32013019c55704ed417df057f7844f9694
|
||||
size 432016
|
||||
oid sha256:2fddbd97295f938c26b0440d676bfb7f6c3d1d32b26922597ee72cf329d5497e
|
||||
size 511416
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e33434cf384d8bb9694b680c4b8225d32894e77e231a10bd03e6aba9efb50a7d
|
||||
size 284984
|
||||
oid sha256:56aba24d530ae919be096e50f094126f4bd54f207fd44604117c990d4cf325cd
|
||||
size 333296
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:748628fa6340d8b55f1e6a0f72e62048c43cb885eaee3a74abf5a33bbc54a532
|
||||
size 341704
|
||||
oid sha256:a9c6d40d7ee02b8716f4ab841c89890d7a843c7e4cc469c7c2d6320a0dd68b1c
|
||||
size 403620
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f4ebcf02906d308d8bf7c1dc688285ac2be6326e0ed72ffb4626ab187a8a4128
|
||||
size 432456
|
||||
oid sha256:4c15e325dce86113b45add955acf6e03479b05224cb7030e6f097db8b317c7d1
|
||||
size 558848
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b94931ffa4ade783f8a3c7ad3b549aa79eb84f2b535dd903d907f43703d8f1cc
|
||||
size 1039724
|
||||
oid sha256:964fb281d68c55aa75ad49368fbc014086c1ad1b7e5a5e6ee8ffdb0df1b09d35
|
||||
size 1285468
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b46c2a42a03383793c64d6d37aebedbeccc30993f34b3e5afb2e8b1c17ed71f5
|
||||
size 375676
|
||||
oid sha256:57a4baf653392b6116eeb9773c4d7d5d8bf243b4148ec7f142ac3770cd84d32b
|
||||
size 456104
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f10d2246e0cfacb2627c4db5cabc56b9faf241cacda3f724e27b034e1f47e70c
|
||||
size 842648
|
||||
oid sha256:adfecab0a99fb4371958d07788c8a1c20cc3dc6c45520186ad04c490df82f01d
|
||||
size 1028856
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b98a750f1d6f814b481d72eaf54f7addec7ff518d7fe6840960ddc7e0c1ba0a5
|
||||
size 595892
|
||||
oid sha256:9706f0c8433a0e81dec093e8e1182fa9daa12930d766d06c62d69761e2b12092
|
||||
size 712640
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d29b631d847ddd89b3d73010c5b5e1298b7987942e6f1ae0747208902e07ba6d
|
||||
size 628008
|
||||
oid sha256:79225ddc8811905c417a4373716400ce9931b2a0eb7f2439a6eeddb4a2fd0409
|
||||
size 798576
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:51e74099611d8bcac9034d28cefe3319b37713bc52ccc1171eb9f4c0b5788ec4
|
||||
size 534340
|
||||
oid sha256:fc16fe3efb236469e9e821e078f9e59f945ac54e099ebbb2be9fb8cc6f2eee40
|
||||
size 664064
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d21721bae0d82544d6c79126ae96ff3e29638ae6561acef51731d0514d8ae9d8
|
||||
size 819124
|
||||
oid sha256:0758ee93fbe3a2a7088feaf0f715a8a9132cab95a9c99881a87db4498a8d8a4e
|
||||
size 1013888
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:de5d208b70d523960a96a8382efb81ca384cdecfe42658f35d9037833cb18ebf
|
||||
size 417140
|
||||
oid sha256:83233d364afaa620cef5463b4ca30c65cc9aab03e8b00bfc4f4ea37a833e6964
|
||||
size 511712
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c1102f75c2d703d970e411cd531dc22fcdf20acf1b7288d99121b5de4d6383da
|
||||
size 1007340
|
||||
oid sha256:52ce81404cc47b1a29078fe8acad0a31f5c283646fffb5ae32073cd4905eba87
|
||||
size 1213972
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:85a13b1703703cc4218629cd2818984cb1a220b89bd0aea9e13f207dfc36a0d7
|
||||
size 424076
|
||||
oid sha256:701743e27e5b8c21bb07cd90e0ab03c914b65780c182750669faaa1b81245f16
|
||||
size 1058036
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a89f27becc14b62bf64f933533e61e8fce4fc943e02b0b13778baad2e1674d29
|
||||
size 527172
|
||||
oid sha256:9724bc12d1b9882589fdc869bbc3b46d97b2e46e45432148f37566817df079c8
|
||||
size 814488
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:be5ea0eb93698bad566bf110ea3f91560b70e5b594a5ce33dd8c11281406944e
|
||||
size 680244
|
||||
oid sha256:6dbf0e7520d7ef06a6a6520ae4006c535d2c9483aef07e2a02d044d969cf5e54
|
||||
size 1206064
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c81b07d6cad4dec76f0a9a486401e61b92d12db74041443a6c3a04c859dcd110
|
||||
size 235288
|
||||
oid sha256:39fccb6a4e675dffcca4f2c914ff7267a2949bf77adaf60ed99c191695be5efd
|
||||
size 295740
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:958a9c1db6fa175db97b6ae6723eda92158ed1d8927f68dee68b7f216fe9f19a
|
||||
size 1011912
|
||||
oid sha256:ca5d1b770a7eb2f7251bcaa4da4d552343ce7dc5b0445bedd334a2a816d02e49
|
||||
size 1186672
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7daaeafb61038c9f5f9d4aa8a23276420901d02c8870997f9e4044c0301cb88e
|
||||
size 445592
|
||||
oid sha256:11b827f3eb6d2cb0e2c255f4ade9e2dc5b4febc35eb50716b44150377ea1be32
|
||||
size 536668
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b3e228fcfb713869e15b324bb5d01596e4225349392bae6213ea4c5254f4a3b3
|
||||
size 682604
|
||||
oid sha256:e6e47b3a2d7c0cd787eaa90cff7a93ac041c986cd9d1b73dbdbbca6ac6f4e8f4
|
||||
size 825844
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:82221125c5e3630e8a6965bc067265f7c35c24a8cb5446d1460a9d9ff25a3d40
|
||||
size 443356
|
||||
oid sha256:6c87e238d68a8cc1af6d788595ecfff64aa3d96305062f33208de05a2a065741
|
||||
size 556204
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b872cd1948f237c35c5d835b47c4e4e5515e38b512ff4a8210367882802a323b
|
||||
size 584284
|
||||
oid sha256:e1c64c6f1234fb280c205d31a3c2a78d7bc3196bcb91c2240cdb9a761044bc4e
|
||||
size 724248
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c298f638df67a8e6fb50ec840a28ce2a19a78cc88c4c6e53d3278656415537d7
|
||||
size 929972
|
||||
oid sha256:350a2c104e2c408964a35c2f1e0e88b21cf1b9743be0404d4ea5e7fa93a9f824
|
||||
size 1161928
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:84f6b45ab70259296d69bd3ad6b1188f36a031a961b5fedff35cec192a280eee
|
||||
size 492684
|
||||
oid sha256:077fd287b94fcef26bedbf970820f2e9d361daa60bfe39183124e3edc93a0c22
|
||||
size 600288
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8fdf73e186004b8e9a96640a7f61ab085b8a5010bec150bab76a9a50cf458002
|
||||
size 372752
|
||||
oid sha256:6c1a391edbc30f36080b96227630a9867b8549e95a235d263b741a788a614e79
|
||||
size 459248
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:77eb482695b5cf8c9e789d71803674cce3129cbfbac414d7ebddd70a4c5a7283
|
||||
size 483536
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9f6bbe50fd655dffaf22d54a2445c78316aa082b7dee9962485886f1751606af
|
||||
size 808340
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c764adc2ab1b5136f0711f4479e62349a3e7fa64b98d90e5594a15cce4203b75
|
||||
size 405724
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3183dc91f6fbeb1c08d98e63aad448f4bb8c66733e9a8fa27b5c264b8b25027b
|
||||
size 359068
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1cd245dcd062f28a8f0ed354cfad841ee7e88fc9e095ec2484dee4ddeb86ae6e
|
||||
size 609444
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e39967556c8e14d4e72cb63044abdc3c558644d7607259476476b612b58ff9e0
|
||||
size 927016
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6a319192cf7daea0ab86a43e07ba389506478de6878702d138cdbd1f53f918cd
|
||||
size 404932
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2ef2c5c2e3a6c0fd773849c30366ce992000aae2964e8ffe23a98136d2e56bb2
|
||||
size 608744
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:911515a1f627f6228a52aab2bbf318f76839ca2f697ade6cea1cb2a7d973111d
|
||||
size 477960
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:272ffabb10e43f7d289fbca245a9f93657b5b5eb62d526ea283b02dbdd2b4b06
|
||||
size 765736
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b30db094078f09dfff5c3bf339382fa3eb5d528ed6b2baf5bcf8a5ca23d59743
|
||||
size 375296
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2107ccf20048a00b15745eb3c3b871a22ac0fd22e14feb1a038eb0bcca64fe17
|
||||
size 384392
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d9eec00bb47cc9f0920dce6aa20d04868a54349275495752c65378ef604bc68d
|
||||
size 668260
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:67e126254130792957dc67ce07afe1472b64c2e7f77cdb8eb4dcca8139f8c81b
|
||||
size 697868
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:07a289845c81e14b9ffef572a89c463ca3adffa9c340735843b8cecbca5f923d
|
||||
size 355564
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:750fad38c4bdd0c9c00ae6cac3e09cfb6c32f8df198e610d1cb16accc5cccf38
|
||||
size 351968
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:36283c5f0e4ea244c6a5b9804e1e9a157cd975659863c9bf37b39eefb0d72185
|
||||
size 675012
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1f5a01e5bba0d53e1285a594c49a8d27469718f2f039a01fb941f0afacf25e2c
|
||||
size 669636
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:27dda846510fc0f801909d7fb945491932620bed2b7de8e7610d5f4251adf5b7
|
||||
size 642328
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:733efe3ddf0d49a37c2bc1ce42ef3d4618b6633255dbecc1e24ce74555d1055c
|
||||
size 590372
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4d6e4603930a7486fd7355a6fb65dcc1fef840a1255a7809f97a649e391b4e23
|
||||
size 1461824
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5a73fb942580fa483103e7c81f9c89f5fe5ad109b51cdcdcf8eb2a3aa64aac54
|
||||
size 301440
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:94c8bcd86b2cd868989bd1b591d3ec8f3a192e5f7f26589ada1b217e2e1dafe7
|
||||
size 371700
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9215902c1c6f8824929223e4aa4ff00e50f84d86cf9195ad20c79956507f4502
|
||||
size 204132
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d1c191b306c41a804b951d314081cb32013019c55704ed417df057f7844f9694
|
||||
size 432016
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e33434cf384d8bb9694b680c4b8225d32894e77e231a10bd03e6aba9efb50a7d
|
||||
size 284984
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:748628fa6340d8b55f1e6a0f72e62048c43cb885eaee3a74abf5a33bbc54a532
|
||||
size 341704
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f4ebcf02906d308d8bf7c1dc688285ac2be6326e0ed72ffb4626ab187a8a4128
|
||||
size 432456
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b94931ffa4ade783f8a3c7ad3b549aa79eb84f2b535dd903d907f43703d8f1cc
|
||||
size 1039724
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b46c2a42a03383793c64d6d37aebedbeccc30993f34b3e5afb2e8b1c17ed71f5
|
||||
size 375676
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f10d2246e0cfacb2627c4db5cabc56b9faf241cacda3f724e27b034e1f47e70c
|
||||
size 842648
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b98a750f1d6f814b481d72eaf54f7addec7ff518d7fe6840960ddc7e0c1ba0a5
|
||||
size 595892
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d29b631d847ddd89b3d73010c5b5e1298b7987942e6f1ae0747208902e07ba6d
|
||||
size 628008
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:51e74099611d8bcac9034d28cefe3319b37713bc52ccc1171eb9f4c0b5788ec4
|
||||
size 534340
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d21721bae0d82544d6c79126ae96ff3e29638ae6561acef51731d0514d8ae9d8
|
||||
size 819124
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:de5d208b70d523960a96a8382efb81ca384cdecfe42658f35d9037833cb18ebf
|
||||
size 417140
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c1102f75c2d703d970e411cd531dc22fcdf20acf1b7288d99121b5de4d6383da
|
||||
size 1007340
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:85a13b1703703cc4218629cd2818984cb1a220b89bd0aea9e13f207dfc36a0d7
|
||||
size 424076
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user