diff --git a/Main.cs b/Main.cs index 9983d04..2f901ed 100644 --- a/Main.cs +++ b/Main.cs @@ -12,13 +12,14 @@ public partial class Main : Node public override void _Ready() { - NewGame(); + //NewGame(); } public void GameOver() { GetNode("MobTimer").Stop(); GetNode("ScoreTimer").Stop(); + GetNode("HUD").ShowGameOver(); } public void NewGame() @@ -30,12 +31,19 @@ public partial class Main : Node player.Start(startPosition.Position); GetNode("StartTimer").Start(); + + var hud = GetNode("HUD"); + hud.UpdateScore(_score); + hud.ShowMessage("Get Ready!"); + + GetTree().CallGroup("mobs", Node.MethodName.QueueFree); } // We also specified this function name in PascalCase in the editor's connection window. private void OnScoreTimerTimeout() { _score++; + GetNode("HUD").UpdateScore(_score); } // We also specified this function name in PascalCase in the editor's connection window. diff --git a/Mob.cs b/Mob.cs deleted file mode 100644 index 6441205..0000000 --- a/Mob.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Godot; -using System; - -public partial class Mob : RigidBody2D -{ - public override void _Ready() - { - var animatedSprite2D = GetNode("AnimatedSprite2D"); - string[] mobTypes = animatedSprite2D.SpriteFrames.GetAnimationNames(); - animatedSprite2D.Play(mobTypes[GD.Randi() % mobTypes.Length]); - } - - // We also specified this function name in PascalCase in the editor's connection window. - private void OnVisibleOnScreenNotifier2DScreenExited() - { - QueueFree(); - } -} diff --git a/Mob.cs.uid b/Mob.cs.uid deleted file mode 100644 index 6550bd9..0000000 --- a/Mob.cs.uid +++ /dev/null @@ -1 +0,0 @@ -uid://bmqxvh0q486kb diff --git a/art/House In a Forest Loop.ogg b/art/House In a Forest Loop.ogg new file mode 100644 index 0000000..ece3640 Binary files /dev/null and b/art/House In a Forest Loop.ogg differ diff --git a/art/House In a Forest Loop.ogg.import b/art/House In a Forest Loop.ogg.import new file mode 100644 index 0000000..66a402f --- /dev/null +++ b/art/House In a Forest Loop.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://ctf7osjgudmv3" +path="res://.godot/imported/House In a Forest Loop.ogg-1a6a72ae843ad792b7039931227e8d50.oggvorbisstr" + +[deps] + +source_file="res://art/House In a Forest Loop.ogg" +dest_files=["res://.godot/imported/House In a Forest Loop.ogg-1a6a72ae843ad792b7039931227e8d50.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/enemyFlyingAlt_1.png b/art/enemyFlyingAlt_1.png similarity index 100% rename from enemyFlyingAlt_1.png rename to art/enemyFlyingAlt_1.png diff --git a/enemyFlyingAlt_1.png.import b/art/enemyFlyingAlt_1.png.import similarity index 67% rename from enemyFlyingAlt_1.png.import rename to art/enemyFlyingAlt_1.png.import index 1708f8e..6064496 100644 --- a/enemyFlyingAlt_1.png.import +++ b/art/enemyFlyingAlt_1.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c1xpmsur8h7bt" -path="res://.godot/imported/enemyFlyingAlt_1.png-122fb22640a174075ff6bc1c8de9ef4b.ctex" +uid="uid://20l58n0ih2w8" +path="res://.godot/imported/enemyFlyingAlt_1.png-559f599b16c69b112c1b53f6332e9489.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://enemyFlyingAlt_1.png" -dest_files=["res://.godot/imported/enemyFlyingAlt_1.png-122fb22640a174075ff6bc1c8de9ef4b.ctex"] +source_file="res://art/enemyFlyingAlt_1.png" +dest_files=["res://.godot/imported/enemyFlyingAlt_1.png-559f599b16c69b112c1b53f6332e9489.ctex"] [params] diff --git a/enemyFlyingAlt_2.png b/art/enemyFlyingAlt_2.png similarity index 100% rename from enemyFlyingAlt_2.png rename to art/enemyFlyingAlt_2.png diff --git a/enemyFlyingAlt_2.png.import b/art/enemyFlyingAlt_2.png.import similarity index 67% rename from enemyFlyingAlt_2.png.import rename to art/enemyFlyingAlt_2.png.import index 1238b9b..f9952e4 100644 --- a/enemyFlyingAlt_2.png.import +++ b/art/enemyFlyingAlt_2.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://duyxe6bvilcac" -path="res://.godot/imported/enemyFlyingAlt_2.png-36b0a0d446f525b984c4e8bd335e811c.ctex" +uid="uid://j3he7mqxqv3u" +path="res://.godot/imported/enemyFlyingAlt_2.png-31dc7310eda6e1b721224f3cd932c076.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://enemyFlyingAlt_2.png" -dest_files=["res://.godot/imported/enemyFlyingAlt_2.png-36b0a0d446f525b984c4e8bd335e811c.ctex"] +source_file="res://art/enemyFlyingAlt_2.png" +dest_files=["res://.godot/imported/enemyFlyingAlt_2.png-31dc7310eda6e1b721224f3cd932c076.ctex"] [params] diff --git a/enemySwimming_1.png b/art/enemySwimming_1.png similarity index 100% rename from enemySwimming_1.png rename to art/enemySwimming_1.png diff --git a/enemySwimming_1.png.import b/art/enemySwimming_1.png.import similarity index 67% rename from enemySwimming_1.png.import rename to art/enemySwimming_1.png.import index 46b59ec..abbb533 100644 --- a/enemySwimming_1.png.import +++ b/art/enemySwimming_1.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://d1cq0yledu7sl" -path="res://.godot/imported/enemySwimming_1.png-7968befc57e9c94b5179ed7bf6a69e9f.ctex" +uid="uid://oagj5757wwts" +path="res://.godot/imported/enemySwimming_1.png-dd0e11759dc3d624c8a704f6e98a3d80.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://enemySwimming_1.png" -dest_files=["res://.godot/imported/enemySwimming_1.png-7968befc57e9c94b5179ed7bf6a69e9f.ctex"] +source_file="res://art/enemySwimming_1.png" +dest_files=["res://.godot/imported/enemySwimming_1.png-dd0e11759dc3d624c8a704f6e98a3d80.ctex"] [params] diff --git a/enemySwimming_2.png b/art/enemySwimming_2.png similarity index 100% rename from enemySwimming_2.png rename to art/enemySwimming_2.png diff --git a/enemySwimming_2.png.import b/art/enemySwimming_2.png.import similarity index 67% rename from enemySwimming_2.png.import rename to art/enemySwimming_2.png.import index 1e08cb2..12224ef 100644 --- a/enemySwimming_2.png.import +++ b/art/enemySwimming_2.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dr6tqvwcfdwpv" -path="res://.godot/imported/enemySwimming_2.png-bf5cf15c885fdd416bd5ca8e6aae9642.ctex" +uid="uid://b0ricy0343hpo" +path="res://.godot/imported/enemySwimming_2.png-4c0cbc0732264c4ea3290340bd4a0a62.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://enemySwimming_2.png" -dest_files=["res://.godot/imported/enemySwimming_2.png-bf5cf15c885fdd416bd5ca8e6aae9642.ctex"] +source_file="res://art/enemySwimming_2.png" +dest_files=["res://.godot/imported/enemySwimming_2.png-4c0cbc0732264c4ea3290340bd4a0a62.ctex"] [params] diff --git a/enemyWalking_1.png b/art/enemyWalking_1.png similarity index 100% rename from enemyWalking_1.png rename to art/enemyWalking_1.png diff --git a/enemyWalking_1.png.import b/art/enemyWalking_1.png.import similarity index 68% rename from enemyWalking_1.png.import rename to art/enemyWalking_1.png.import index 4bc8167..2f98f4a 100644 --- a/enemyWalking_1.png.import +++ b/art/enemyWalking_1.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dxudw2rt0l078" -path="res://.godot/imported/enemyWalking_1.png-cb9fd27cc5ab93dedf6a051d16055638.ctex" +uid="uid://cfuwipiglerup" +path="res://.godot/imported/enemyWalking_1.png-5af6eedbe61b701677d490ffdc1e6471.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://enemyWalking_1.png" -dest_files=["res://.godot/imported/enemyWalking_1.png-cb9fd27cc5ab93dedf6a051d16055638.ctex"] +source_file="res://art/enemyWalking_1.png" +dest_files=["res://.godot/imported/enemyWalking_1.png-5af6eedbe61b701677d490ffdc1e6471.ctex"] [params] diff --git a/enemyWalking_2.png b/art/enemyWalking_2.png similarity index 100% rename from enemyWalking_2.png rename to art/enemyWalking_2.png diff --git a/enemyWalking_2.png.import b/art/enemyWalking_2.png.import similarity index 68% rename from enemyWalking_2.png.import rename to art/enemyWalking_2.png.import index c7bf43b..a8743d3 100644 --- a/enemyWalking_2.png.import +++ b/art/enemyWalking_2.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c2usp1a4mowsj" -path="res://.godot/imported/enemyWalking_2.png-921b64c7dfb8652228a4ffd707d9669c.ctex" +uid="uid://doayjemlvuit1" +path="res://.godot/imported/enemyWalking_2.png-67c480ed60c35e95f5acb0436246b935.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://enemyWalking_2.png" -dest_files=["res://.godot/imported/enemyWalking_2.png-921b64c7dfb8652228a4ffd707d9669c.ctex"] +source_file="res://art/enemyWalking_2.png" +dest_files=["res://.godot/imported/enemyWalking_2.png-67c480ed60c35e95f5acb0436246b935.ctex"] [params] diff --git a/art/gameover.wav b/art/gameover.wav new file mode 100644 index 0000000..77f865a Binary files /dev/null and b/art/gameover.wav differ diff --git a/art/gameover.wav.import b/art/gameover.wav.import new file mode 100644 index 0000000..d424ca3 --- /dev/null +++ b/art/gameover.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://wjdayh7jstm3" +path="res://.godot/imported/gameover.wav-98c95c744b35280048c2bd093cf8a356.sample" + +[deps] + +source_file="res://art/gameover.wav" +dest_files=["res://.godot/imported/gameover.wav-98c95c744b35280048c2bd093cf8a356.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/playerGrey_up1.png b/art/playerGrey_up1.png similarity index 100% rename from playerGrey_up1.png rename to art/playerGrey_up1.png diff --git a/playerGrey_up1.png.import b/art/playerGrey_up1.png.import similarity index 68% rename from playerGrey_up1.png.import rename to art/playerGrey_up1.png.import index deab4a7..68afd4f 100644 --- a/playerGrey_up1.png.import +++ b/art/playerGrey_up1.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bfx7o0vsjshp2" -path="res://.godot/imported/playerGrey_up1.png-3aa61131c0882580ef256c2e63b2c4f5.ctex" +uid="uid://bigvacjklr7in" +path="res://.godot/imported/playerGrey_up1.png-6bd114d0a6beac91f48e3a7314d44564.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://playerGrey_up1.png" -dest_files=["res://.godot/imported/playerGrey_up1.png-3aa61131c0882580ef256c2e63b2c4f5.ctex"] +source_file="res://art/playerGrey_up1.png" +dest_files=["res://.godot/imported/playerGrey_up1.png-6bd114d0a6beac91f48e3a7314d44564.ctex"] [params] diff --git a/playerGrey_up2.png b/art/playerGrey_up2.png similarity index 100% rename from playerGrey_up2.png rename to art/playerGrey_up2.png diff --git a/playerGrey_up2.png.import b/art/playerGrey_up2.png.import similarity index 68% rename from playerGrey_up2.png.import rename to art/playerGrey_up2.png.import index 097f98a..856215a 100644 --- a/playerGrey_up2.png.import +++ b/art/playerGrey_up2.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bqkvfdd2htfry" -path="res://.godot/imported/playerGrey_up2.png-1a4d6b79dc0f594823072cc61cec8a24.ctex" +uid="uid://bskloxogmm7ox" +path="res://.godot/imported/playerGrey_up2.png-d6aba85f5f2675ebc7045efa7552ee79.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://playerGrey_up2.png" -dest_files=["res://.godot/imported/playerGrey_up2.png-1a4d6b79dc0f594823072cc61cec8a24.ctex"] +source_file="res://art/playerGrey_up2.png" +dest_files=["res://.godot/imported/playerGrey_up2.png-d6aba85f5f2675ebc7045efa7552ee79.ctex"] [params] diff --git a/playerGrey_walk1.png b/art/playerGrey_walk1.png similarity index 100% rename from playerGrey_walk1.png rename to art/playerGrey_walk1.png diff --git a/playerGrey_walk1.png.import b/art/playerGrey_walk1.png.import similarity index 67% rename from playerGrey_walk1.png.import rename to art/playerGrey_walk1.png.import index f3d04f5..de8dcc2 100644 --- a/playerGrey_walk1.png.import +++ b/art/playerGrey_walk1.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://emguskfoeupl" -path="res://.godot/imported/playerGrey_walk1.png-cc737e5947095223c3494468704ca885.ctex" +uid="uid://cww2tug20ksn3" +path="res://.godot/imported/playerGrey_walk1.png-c4773fe7a7bf85d7ab732eb4458c2742.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://playerGrey_walk1.png" -dest_files=["res://.godot/imported/playerGrey_walk1.png-cc737e5947095223c3494468704ca885.ctex"] +source_file="res://art/playerGrey_walk1.png" +dest_files=["res://.godot/imported/playerGrey_walk1.png-c4773fe7a7bf85d7ab732eb4458c2742.ctex"] [params] diff --git a/playerGrey_walk2.png b/art/playerGrey_walk2.png similarity index 100% rename from playerGrey_walk2.png rename to art/playerGrey_walk2.png diff --git a/playerGrey_walk2.png.import b/art/playerGrey_walk2.png.import similarity index 67% rename from playerGrey_walk2.png.import rename to art/playerGrey_walk2.png.import index fb65861..d982eb1 100644 --- a/playerGrey_walk2.png.import +++ b/art/playerGrey_walk2.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dimv2j24hgb1w" -path="res://.godot/imported/playerGrey_walk2.png-f5cfaf08bfb66680dc47cac4becdc491.ctex" +uid="uid://csm4ru8wkc2cb" +path="res://.godot/imported/playerGrey_walk2.png-34d2d916366100182d08037c51884043.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://playerGrey_walk2.png" -dest_files=["res://.godot/imported/playerGrey_walk2.png-f5cfaf08bfb66680dc47cac4becdc491.ctex"] +source_file="res://art/playerGrey_walk2.png" +dest_files=["res://.godot/imported/playerGrey_walk2.png-34d2d916366100182d08037c51884043.ctex"] [params] diff --git a/fonts/FONTLOG.txt b/fonts/FONTLOG.txt new file mode 100644 index 0000000..826c7d8 --- /dev/null +++ b/fonts/FONTLOG.txt @@ -0,0 +1,253 @@ +Please distribute this file along with the Xolonium fonts when possible. + + +Source + + Find the sourcefiles of Xolonium at + + + +Credits + + Xolonium is created with FontForge , + Inkscape , Python , and + FontTools . + + It originated as a custom font for the open-source + game Xonotic . With many thanks to the + Xonotic community for your support. + + +Supported OpenType features + + case Provides case sensitive placement of punctuation, + brackets, and math symbols for uppercase text. + frac Replaces number/number sequences with diagonal fractions. + Numbers that touch a slash should not exceed 10 digits. + kern Provides kerning for Latin, Greek, and Cyrillic scripts. + locl Dutch: Replaces j with a stressed version if it follows í. + Sami: Replaces n-form Eng with the preferred N-form version. + Romanian and Moldovan: Replaces ŞşŢţ with the preferred ȘșȚț. + pnum Replaces monospaced digits with proportional versions. + sinf Replaces digits with scientific inferiors below the baseline. + subs Replaces digits with subscript versions on the baseline. + sups Replaces digits with superscript versions. + zero Replaces zero with a slashed version. + + +Supported glyph sets + + Adobe Latin 3 + OpenType W1G + ISO 8859-1 Western European + ISO 8859-2 Central European + ISO 8859-3 South European + ISO 8859-4 North European + ISO 8859-5 Cyrillic + ISO 8859-7 Greek + ISO 8859-9 Turkish + ISO 8859-10 Nordic + ISO 8859-13 Baltic Rim + ISO 8859-14 Celtic + ISO 8859-15 Western European + ISO 8859-16 South-Eastern European + + +Available glyphs + + !"#$%&'()*+,-./0123456789:;<=>? + @ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_ + `abcdefghijklmnopqrstuvwxyz{|}~ + +  ¡¢£¤¥¦§¨©ª«¬ ®¯°±²³´µ¶·¸¹º»¼½¾¿ + ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß + àáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ + ĀāĂ㥹ĆćĈĉĊċČčĎďĐđĒēĔĕĖėĘęĚěĜĝĞğ + ĠġĢģĤĥĦħĨĩĪīĬĭĮįİıIJijĴĵĶķĸĹĺĻļĽľ + ĿŀŁłŃńŅņŇňŊŋŌōŎŏŐőŒœŔŕŖŗŘřŚśŜŝŞş + ŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽž + ƒǺǻǼǽǾǿȘșȚțȷ + + ˆˇˉ˘˙˚˛˜˝ + + ͺ;΄΅Ά·ΈΉΊΌΎΏΐ + ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩΪΫάέήίΰ + αβγδεζηθικλμνξοπρςστυφχψωϊϋόύώ + + ЀЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗИЙКЛМНОП + РСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмноп + рстуфхцчшщъыьэюяѐёђѓєѕіїјљњћќѝўџ + ѢѣѲѳѴѵҐґҒғҔҕҖҗҘҙҚқҜҝҞҟҠҡҢңҤҥҦҧҨҩ + ҪҫҬҭҮүҰұҲҳҴҵҶҷҸҹҺһҼҽӀӁӂӇӈӋӌӏӐӑӒӓ + ӔӕӖӗӘәӜӝӞӟӠӡӢӣӤӥӦӧӨөӮӯӰӱӲӳӴӵӶӷӸӹ + Ԥԥ + + ḂḃḊḋḞḟṀṁṖṗṠṡṪṫẀẁẂẃẄẅẞỲỳ + +      ‒–—―‘’‚‛“”„‟†‡•…‰′″‹›‽‾⁄ + ⁰⁴⁵⁶⁷⁸⁹⁺⁻⁼⁽⁾ⁿ₀₁₂₃₄₅₆₇₈₉₊₋₌₍₎ + ₤₦₩₫€₯₱₹₺₽₿ + ℅ℓ№℗™Ω℮ + ⅛⅜⅝⅞ + ←↑→↓ + ∂∆∏∑−∕∙√∞∟∫≈≠≤≥ + ⌖ + ■▬▮▰▲▶▼◀◆◊●◢◣◤◥ + ☄★☠☢☣⚙⚛⚠⚡⛔ + ❇❈❌❤❰❱❲❳ + fffiflffiffl + 🌌🌍🌎🌏👽💣🔥🔫 + 😁😃😄😆😇😈😉😊😎😐😒😕😘 + 😛😝😞😟😠😣😭😮😲😴😵 + 🚀 + + +Debugging glyphs + +  U+EFFD Font version +  U+F000 Font hinting indicator + + +Changelog + + Xolonium 4.1 2016-11-22 Severin Meyer + Reverted frac OpenType feature to a more stable implementation + + Xolonium 4.0 2016-10-08 Severin Meyer + Decreased width of most glyphs + Thinner vertical stems in Xolonium-Regular + Thicker horizontal stems in Xolonium-Bold + Revised diagonal stems + Lowered middle bars + Revised diacritical bars + Added glyphs: + ӏẞ₿ + U+2007 U+2008 U+2009 U+200A U+202F + U+EFFD U+F000 + Revised glyphs: + $&,JKQRXkwxy~¢¤ßǻ˜ζκλμξφЖУжћѴѵ∕₱₺₦₩€ℓ№≈ffffiffl + ❤🌍🌎🌏😁😄😇😈😉😊😘😭😮😴🚀 + Removed uncommon glyphs: + ʼnſʼҌҍҎҏҾҿӃӄӇӈӚӛӪӫӬӭ + U+0312 U+0313 U+0326 + Simplified OpenType features pnum, zero, and case + Removed OpenType feature dlig + Revised vertical metrics + Merged outlines of composite glyphs in otf version + Added ttf version with custom outlines and instructions + Added woff and woff2 version + + Xolonium 3.1 2015-06-10 Severin Meyer + Added currency glyphs: + ₦₩₫₱₹₺₽ + Revised glyph: + ₯ + Relicensed public release under the SIL Open Font License 1.1 + + Xolonium 3.0 2015-05-04 Severin Meyer + Decreased width of glyphs + Decreased descender height + Increased height of super/subscript glyphs + Revised width of dashes, underscore, and overscore + Sharper bends with more circular proportions + Decreased stroke thickness of mathematical glyphs + Revised diacritical marks + Revised diacritical bars + Revised Cyrillic hooks + Revised glyphs: + GQRYjmuwßŊŒſƒǻfffiffiffl + ΞΨΩδζιξπςστυφω + ЉЄДЛУЭЯбдлэяєљђєћѢѣҨҩҼҽӃӄӘә + #$&'()*,/69?@[]{}~¡£¤¥§©®¿ + ‹›₤€₯ℓ№℗℮←↑→↓∂∏∑∞≈▰☄❈❰❱❲❳😝 + Raised vertical position of mathematical glyphs + Unified advance width of numeral and monetary glyphs + Unified advance width of mathematical glyphs + Revised bearings + Rewrote kern feature + Bolder Xolonium-Bold with improved proportions + Updated glyph names to conform to the AGLFN 1.7 + Revised hints and PS Private Dictionary + Added glyphs: + ӶӷԤԥ + Added OpenType features: + case frac liga locl pnum sinf subs sups zero + + Xolonium 2.4 2014-12-23 Severin Meyer + Added dingbats: + ⛔💣🔥 + Revised size and design of emoticons + Revised dingbats: + ⌖☄☠☣⚙⚛⚠⚡❇❈🌌🌍🌎🌏🔫 + Removed dingbat: + 💥 + + Xolonium 2.3 2014-08-14 Severin Meyer + Bugfixed ε and έ, thanks to bowzee for the feedback + + Xolonium 2.2 2014-03-01 Severin Meyer + Added dingbats: + ⌖◆●❌💥 + Revised dingbats: + •←↑→↓◊☄★☠☣⚙⚛⚠⚡❇❈❤🌌🌍🌎🌏👽🔫🚀 + Removed dingbats: + ♻✪💡📡🔋🔧🔭 + + Xolonium 2.1 2013-10-20 Severin Meyer + Added dingbats: + ←↑→↓❰❱❲❳■▬▮▰▲▶▼◀◢◣◤◥ + ☄★☠☢☣♻⚙⚛⚠⚡✪❇❈❤ + 🌌🌍🌎🌏👽💡📡🔋🔧🔫🔭🚀 + 😁😃😄😆😇😈😉😊😎😐😒😕 + 😘😛😝😞😟😠😣😭😮😲😴😵 + + Xolonium 2.0.1 2013-07-12 Severin Meyer + Reorganised and simplified files + + Xolonium 2.0 2012-08-11 Severin Meyer + Revised bends + Revised thickness of uppercase diagonal stems + Revised diacritical marks + Revised hints and PS Private Dictionary + Revised glyphs: + *1469@DPRly{}§©®¶ÐÞƒΘΞαεζνξνυЄЉЊ + ЏБЗЛУЧЪЫЬЭЯбзлчъыьэяєљњџ•€∂∙√∞∫≠ + Completed glyph sets: + Adobe Latin 3 + OpenType World Glyph Set 1 (W1G) + Ghostscript Standard (ghostscript-fonts-std-8.11) + Added OpenType kern feature + Added Xolonium-Bold + + Xolonium 1.2 2011-02-12 Severin Meyer + Revised glyphs: + D·Ðı + Completed glyph sets: + ISO 8859-7 (Greek) + Unicode Latin Extended-A block + Added glyphs: + †‡•…‰⁄™∂∑−√∞≠≤≥ + + Xolonium 1.1 2011-01-17 Severin Meyer + Revised placement of cedilla and ogonek in accented glyphs + Revised glyphs: + ,;DKTjkvwxy¥§Ð˛€ + Completed glyph sets: + ISO 8859-2 (Central European) + ISO 8859-3 (South European, Esperanto) + ISO 8859-4 (North European) + ISO 8859-5 (Cyrillic) + ISO 8859-9 (Turkish) + ISO 8859-10 (Nordic) + ISO 8859-13 (Baltic Rim) + ISO 8859-14 (Celtic) + ISO 8859-16 (South-Eastern European) + Added glyphs: + ȷʼ̒ ЀЍѐѝ‒–—‘’‚‛“”„‟‹› + + Xolonium 1.0 2011-01-04 Severin Meyer + Completed glyph sets: + ISO 8859-1 (Western European) + ISO 8859-15 (Western European) + Added glyphs: + ĄĆĘŁŃŚŹŻąćęłńśźżıˆˇ˙˚˛˜ diff --git a/fonts/LICENSE.txt b/fonts/LICENSE.txt new file mode 100644 index 0000000..cd6cd46 --- /dev/null +++ b/fonts/LICENSE.txt @@ -0,0 +1,94 @@ +Copyright 2011-2016 Severin Meyer , +with Reserved Font Name Xolonium. + +This Font Software is licensed under the SIL Open Font License, +Version 1.1. This license is copied below, and is also available +with a FAQ at + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/fonts/Xolonium-Regular.ttf b/fonts/Xolonium-Regular.ttf new file mode 100644 index 0000000..031d627 Binary files /dev/null and b/fonts/Xolonium-Regular.ttf differ diff --git a/fonts/Xolonium-Regular.ttf.import b/fonts/Xolonium-Regular.ttf.import new file mode 100644 index 0000000..836a61e --- /dev/null +++ b/fonts/Xolonium-Regular.ttf.import @@ -0,0 +1,35 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://dave7ql2luyk1" +path="res://.godot/imported/Xolonium-Regular.ttf-bc2981e3069cff4c34dd7c8e2bb73fba.fontdata" + +[deps] + +source_file="res://fonts/Xolonium-Regular.ttf" +dest_files=["res://.godot/imported/Xolonium-Regular.ttf-bc2981e3069cff4c34dd7c8e2bb73fba.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +disable_embedded_bitmaps=true +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=4 +keep_rounding_remainders=true +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/main.tscn b/main.tscn index 8611c55..8b6efbd 100644 --- a/main.tscn +++ b/main.tscn @@ -1,39 +1,92 @@ -[gd_scene load_steps=5 format=3 uid="uid://yqtgkxjjexag"] +[gd_scene load_steps=13 format=3 uid="uid://yqtgkxjjexag"] [ext_resource type="Script" uid="uid://v6ovq4snxruc" path="res://Main.cs" id="1_0xm2m"] -[ext_resource type="PackedScene" uid="uid://cfnyfjhp8v5gw" path="res://mob.tscn" id="2_1bvp3"] +[ext_resource type="Texture2D" uid="uid://20l58n0ih2w8" path="res://art/enemyFlyingAlt_1.png" id="2_5vw27"] [ext_resource type="PackedScene" uid="uid://c8n4lue2bn25n" path="res://marble.tscn" id="2_h2yge"] +[ext_resource type="Texture2D" uid="uid://j3he7mqxqv3u" path="res://art/enemyFlyingAlt_2.png" id="3_kek77"] +[ext_resource type="Texture2D" uid="uid://oagj5757wwts" path="res://art/enemySwimming_1.png" id="4_4c57u"] +[ext_resource type="Texture2D" uid="uid://b0ricy0343hpo" path="res://art/enemySwimming_2.png" id="5_efxa6"] +[ext_resource type="Texture2D" uid="uid://cfuwipiglerup" path="res://art/enemyWalking_1.png" id="6_dg77c"] +[ext_resource type="Texture2D" uid="uid://doayjemlvuit1" path="res://art/enemyWalking_2.png" id="7_ycdy4"] -[sub_resource type="Curve2D" id="Curve2D_1bvp3"] -_data = { -"points": PackedVector2Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1152, 0, 0, 0, 0, 0, 1152, 648, 0, 0, 0, 0, 0, 648, 0, 0, 0, 0, 0, 0) +[sub_resource type="CSharpScript" id="CSharpScript_w48qg"] +script/source = "using Godot; +using System; + +public partial class Mob : RigidBody2D +{ + public override void _Ready() + { + var animatedSprite2D = GetNode(\"AnimatedSprite2D\"); + string[] mobTypes = animatedSprite2D.SpriteFrames.GetAnimationNames(); + animatedSprite2D.Play(mobTypes[GD.Randi() % mobTypes.Length]); + } + + // We also specified this function name in PascalCase in the editor's connection window. + private void OnVisibleOnScreenNotifier2DScreenExited() + { + QueueFree(); + } +} +" + +[sub_resource type="SpriteFrames" id="SpriteFrames_pcqmr"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("2_5vw27") +}, { +"duration": 1.0, +"texture": ExtResource("3_kek77") +}], +"loop": true, +"name": &"fly", +"speed": 3.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": ExtResource("4_4c57u") +}, { +"duration": 1.0, +"texture": ExtResource("5_efxa6") +}], +"loop": true, +"name": &"swim", +"speed": 3.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": ExtResource("6_dg77c") +}, { +"duration": 1.0, +"texture": ExtResource("7_ycdy4") +}], +"loop": true, +"name": &"walk", +"speed": 3.0 +}] + +[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_jbnni"] +radius = 36.0 +height = 90.0 + +[sub_resource type="PackedScene" id="PackedScene_vivmo"] +_bundled = { +"conn_count": 0, +"conns": PackedInt32Array(), +"editable_instances": [], +"names": PackedStringArray("Mob", "collision_mask", "gravity_scale", "script", "metadata/_edit_group_", "mobs", "RigidBody2D", "AnimatedSprite2D", "scale", "sprite_frames", "animation", "CollisionShape2D", "rotation", "shape", "VisibleOnScreenEnabler2D", "enable_node_path"), +"node_count": 4, +"node_paths": [], +"nodes": PackedInt32Array(-1, -1, 6, 0, -1, 4, 1, 0, 2, 1, 3, 2, 4, 3, 1, 5, 0, 0, 7, 7, -1, 3, 8, 4, 9, 5, 10, 6, 0, 0, 0, 11, 11, -1, 2, 12, 7, 13, 8, 0, 0, 0, 14, 14, -1, 1, 15, 9, 0), +"variants": [0, 0.0, SubResource("CSharpScript_w48qg"), true, Vector2(0.75, 0.75), SubResource("SpriteFrames_pcqmr"), &"fly", 1.5708, SubResource("CapsuleShape2D_jbnni"), NodePath("../CollisionShape2D")], +"version": 3 } -point_count = 5 [node name="Main" type="Node"] script = ExtResource("1_0xm2m") -MobScene = ExtResource("2_1bvp3") +MobScene = SubResource("PackedScene_vivmo") [node name="Marble" parent="." instance=ExtResource("2_h2yge")] -[node name="MobTimer" type="Timer" parent="."] -wait_time = 0.5 - -[node name="ScoreTimer" type="Timer" parent="."] - -[node name="StartTimer" type="Timer" parent="."] -wait_time = 2.0 -one_shot = true - -[node name="StartPosition" type="Marker2D" parent="."] -position = Vector2(240, 450) - -[node name="MobPath" type="Path2D" parent="."] -curve = SubResource("Curve2D_1bvp3") - -[node name="MobSpawnLocation" type="PathFollow2D" parent="MobPath"] - [connection signal="Hit" from="Marble" to="." method="GameOver"] -[connection signal="timeout" from="MobTimer" to="." method="OnMobTimerTimeout"] -[connection signal="timeout" from="ScoreTimer" to="." method="OnScoreTimerTimeout"] -[connection signal="timeout" from="StartTimer" to="." method="OnStartTimerTimeout"] diff --git a/marble.tscn b/marble.tscn index 93be58f..85b730c 100644 --- a/marble.tscn +++ b/marble.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://c8n4lue2bn25n"] [ext_resource type="Script" uid="uid://b1bipn8tmpggr" path="res://Marble.cs" id="1_7ritg"] -[ext_resource type="Texture2D" uid="uid://bfx7o0vsjshp2" path="res://playerGrey_up1.png" id="2_76m5q"] -[ext_resource type="Texture2D" uid="uid://bqkvfdd2htfry" path="res://playerGrey_up2.png" id="3_4rms2"] -[ext_resource type="Texture2D" uid="uid://emguskfoeupl" path="res://playerGrey_walk1.png" id="4_iy80h"] -[ext_resource type="Texture2D" uid="uid://dimv2j24hgb1w" path="res://playerGrey_walk2.png" id="5_ryns1"] +[ext_resource type="Texture2D" uid="uid://bigvacjklr7in" path="res://art/playerGrey_up1.png" id="2_76m5q"] +[ext_resource type="Texture2D" uid="uid://bskloxogmm7ox" path="res://art/playerGrey_up2.png" id="3_4rms2"] +[ext_resource type="Texture2D" uid="uid://cww2tug20ksn3" path="res://art/playerGrey_walk1.png" id="4_iy80h"] +[ext_resource type="Texture2D" uid="uid://csm4ru8wkc2cb" path="res://art/playerGrey_walk2.png" id="5_ryns1"] [sub_resource type="SpriteFrames" id="SpriteFrames_n7ghd"] animations = [{ diff --git a/mob.tscn b/mob.tscn deleted file mode 100644 index 8bebef3..0000000 --- a/mob.tscn +++ /dev/null @@ -1,67 +0,0 @@ -[gd_scene load_steps=10 format=3 uid="uid://cfnyfjhp8v5gw"] - -[ext_resource type="Texture2D" uid="uid://c1xpmsur8h7bt" path="res://enemyFlyingAlt_1.png" id="1_b3mxk"] -[ext_resource type="Texture2D" uid="uid://duyxe6bvilcac" path="res://enemyFlyingAlt_2.png" id="2_1qmh0"] -[ext_resource type="Texture2D" uid="uid://d1cq0yledu7sl" path="res://enemySwimming_1.png" id="3_gfurk"] -[ext_resource type="Texture2D" uid="uid://dr6tqvwcfdwpv" path="res://enemySwimming_2.png" id="4_ieysi"] -[ext_resource type="Texture2D" uid="uid://dxudw2rt0l078" path="res://enemyWalking_1.png" id="5_cixyi"] -[ext_resource type="Texture2D" uid="uid://c2usp1a4mowsj" path="res://enemyWalking_2.png" id="6_7ulmv"] -[ext_resource type="Script" uid="uid://bmqxvh0q486kb" path="res://Mob.cs" id="7_1qmh0"] - -[sub_resource type="SpriteFrames" id="SpriteFrames_pcqmr"] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": ExtResource("1_b3mxk") -}, { -"duration": 1.0, -"texture": ExtResource("2_1qmh0") -}], -"loop": true, -"name": &"fly", -"speed": 3.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": ExtResource("3_gfurk") -}, { -"duration": 1.0, -"texture": ExtResource("4_ieysi") -}], -"loop": true, -"name": &"swim", -"speed": 3.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": ExtResource("5_cixyi") -}, { -"duration": 1.0, -"texture": ExtResource("6_7ulmv") -}], -"loop": true, -"name": &"walk", -"speed": 3.0 -}] - -[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_jbnni"] -radius = 36.0 -height = 90.0 - -[node name="Mob" type="RigidBody2D"] -collision_mask = 0 -gravity_scale = 0.0 -script = ExtResource("7_1qmh0") -metadata/_edit_group_ = true - -[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] -scale = Vector2(0.75, 0.75) -sprite_frames = SubResource("SpriteFrames_pcqmr") -animation = &"fly" - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -rotation = 1.5708 -shape = SubResource("CapsuleShape2D_jbnni") - -[node name="VisibleOnScreenEnabler2D" type="VisibleOnScreenEnabler2D" parent="."] -enable_node_path = NodePath("../CollisionShape2D")