From dcad3939ce553e635e09fdd800978c54326f788e Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Wed, 5 May 2010 23:07:43 +1200 Subject: [PATCH 1/3] update upload tool so it works. --- OpenRAUploader/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRAUploader/Program.cs b/OpenRAUploader/Program.cs index 49e7714f1b..7d213abb0f 100644 --- a/OpenRAUploader/Program.cs +++ b/OpenRAUploader/Program.cs @@ -38,7 +38,7 @@ namespace OpenRAUploader fileStream.Close(); var jsonUri = new UriBuilder(uri.Uri); - jsonUri.Path += "_version.json"; + jsonUri.Path += "version.json"; string formatString = "{{\n" + "\t\"version\":\"{0}\",\n" + From 854dfcf47044b8c194313a0e399215f4056998af Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Wed, 5 May 2010 23:37:41 +1200 Subject: [PATCH 2/3] fix stupid bug in prev [and in release] --- OpenRA.Game/Effects/Bullet.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Game/Effects/Bullet.cs b/OpenRA.Game/Effects/Bullet.cs index 7630934168..7060fd793e 100755 --- a/OpenRA.Game/Effects/Bullet.cs +++ b/OpenRA.Game/Effects/Bullet.cs @@ -75,7 +75,7 @@ namespace OpenRA.Effects { t += 40; - anim.Tick(); + if (anim != null) anim.Tick(); if (t > TotalTime()) Explode( world ); From 9297aedfcc7cffd15589a0687f2109a118b8c4fe Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Thu, 6 May 2010 01:25:48 +1200 Subject: [PATCH 3/3] don't explode on taking damage to <50% while selling --- OpenRA.Game/Graphics/Animation.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenRA.Game/Graphics/Animation.cs b/OpenRA.Game/Graphics/Animation.cs index 832a5fc905..da9bb2a120 100644 --- a/OpenRA.Game/Graphics/Animation.cs +++ b/OpenRA.Game/Graphics/Animation.cs @@ -68,6 +68,9 @@ namespace OpenRA.Graphics public void ReplaceAnim(string sequenceName) { + if (!HasSequence(sequenceName)) + return; + CurrentSequence = SequenceProvider.GetSequence(name, sequenceName); frame %= CurrentSequence.Length; }