Squashed commit of the following: (#474)

commit a6ce193ce5
Merge: 6105bb4f 9b24ac48
Author: minenice55 <star.elementa@gmail.com>
Date:   Wed Jun 14 01:23:31 2023 +0000

    Merge pull request #473 from minenice55/easings-fix

    Enum Parsing Fix

commit 9b24ac4838
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 21:21:13 2023 -0400

    fix all parsing of enums, removed the "special case" for eases

    update to latest Jukebox

commit 6105bb4f64
Merge: 576b4a00 8df235a8
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 21:39:15 2023 +0000

    Merge pull request #469 from minenice55/jukebox-update

    Jukebox Package Update

commit 576b4a0017
Merge: 99804457 10f8fa7f
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 21:39:08 2023 +0000

    Merge pull request #458 from AstrlJelly/MiscAdditions_4

    Bug Fixes + Feature Additions

commit 10f8fa7f5a
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 17:38:24 2023 -0400

    add "updater" for the old marching entity

commit 118cd4993d
Merge: 1c1c731d 99804457
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 17:22:01 2023 -0400

    Merge branch 'release_1' into pr/458

commit 8df235a85b
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 16:55:02 2023 -0400

    let play mode start if no song file is loaded

    fix issue with loading large audio files

commit 9980445723
Merge: aff1e3d8 2f595824
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 18:32:40 2023 +0000

    Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve

    Fixed weird curve stuff on game switch in working dough

commit 2f59582460
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 19:24:13 2023 +0200

    Fixed weird curve stuff on game switch in working dough

commit aff1e3d889
Merge: b40ec128 c9accfa5
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 16:09:21 2023 +0000

    Merge pull request #470 from Rapandrasmus/WorkingDoughFixes

    Fixed small balls not working in working dough

commit c9accfa52d
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 18:07:13 2023 +0200

    Fixed small balls not working in working dough

commit b40ec128a5
Merge: 9f953d50 95c9b346
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 14:56:58 2023 +0000

    Merge pull request #467 from Rapandrasmus/WorkingDoughRework

    Working Dough rework

commit 95c9b34695
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 16:13:08 2023 +0200

    modernised rockers pass turn

commit 0debf55391
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 16:03:08 2023 +0200

    Rhythm tweezers pass turn now works like working dough

commit 6eac745eae
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 15:51:35 2023 +0200

    gandw on balls has been added

commit 349867d983
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 14:59:56 2023 +0200

    Proper inactive handling now

commit d469c6c3fa
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 13:52:15 2023 +0200

    OnSpawnBall reimplemented

commit dd290b3331
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 13:37:09 2023 +0200

    new sounds

commit 757e1c2c5e
Author: minenice55 <star.elementa@gmail.com>
Date:   Mon Jun 12 17:18:37 2023 -0400

    update Jukebox to latest version

    fixes for inferred entity loading

commit 8ce1d8276b
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 21:36:57 2023 +0200

    ball transporter anims for pass turn

commit af0d9bae19
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 20:38:48 2023 +0200

    working dough converted, need to fix eveerything though

commit db21d51673
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 18:36:41 2023 +0200

    Converted everything to new curves and made playerballs handle themselves input-wise

commit 41157a038c
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 14:04:32 2023 +0200

    Some new curves

commit 7d754f5706
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 12:03:21 2023 +0200

    Rockers can do it too now

commit c196947251
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 11:58:31 2023 +0200

    You can now place inputs on top of pass turn for rhythm tweezers

commit 9f953d505f
Merge: 2a8d8d6f df120f08
Author: minenice55 <star.elementa@gmail.com>
Date:   Sun Jun 11 15:55:40 2023 -0400

    Merge branch 'master' into release_1

commit 2a8d8d6fd2
Merge: 9e3e5942 13adf5b0
Author: minenice55 <star.elementa@gmail.com>
Date:   Sun Jun 11 19:53:47 2023 +0000

    Merge pull request #465 from minenice55/dont_infer_track

    Don't infer the track field when importing converted v0 riq coming from unknown origin

commit 13adf5b07b
Author: minenice55 <star.elementa@gmail.com>
Date:   Sun Jun 11 15:52:14 2023 -0400

    don't infer track when importing a v0 riq from another program

commit 9e3e594209
Author: minenice55 <star.elementa@gmail.com>
Date:   Sun Jun 11 12:12:25 2023 -0400

    make base datamodels for special entity reading (#463)

    * make base datamodels for special entity reading

    * fix crop stomp breaking when no game switch or remix end is set

    * fix save shortcut

    fix loading charts with no music

commit 1c1c731dd1
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 23:00:30 2023 -0400

    add updater for marching orders turn

commit 210be54ba3
Merge: 67b6658c af8395fb
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 22:36:10 2023 -0400

    Merge branch 'release_1' into pr/458

commit af8395fb6a
Merge: 81eafec9 b1fab52a
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 22:30:32 2023 -0400

    Merge branch 'master' into release_1

commit 81eafec986
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 22:27:58 2023 -0400

    editor fixes (#459)

    * ditch loading dialog

    doesn't show up when it's supposed to

    * format song offset in editor

    * remove VorbisPlugin

    * Update Editor.cs

commit 67b6658cd3
Author: AstrlJelly <bdlawson115@gmail.com>
Date:   Sat Jun 10 16:55:10 2023 -0400

    convert float to double and all that

commit a4b66367fd
Merge: 08a664ba b1fab52a
Author: AstrlJelly <bdlawson115@gmail.com>
Date:   Sat Jun 10 16:01:44 2023 -0400

    Merge remote-tracking branch 'upstream/master' into MiscAdditions_4

commit 08a664ba2a
Merge: faf3fbf9 b7afd697
Author: AstrlJelly <bdlawson115@gmail.com>
Date:   Sat Jun 10 15:21:22 2023 -0400

    Merge remote-tracking branch 'upstream/master' into MiscAdditions_4

commit faf3fbf97c
Author: AstrlJelly <bdlawson115@gmail.com>
Date:   Sat Jun 10 15:18:45 2023 -0400

    a lot

    * munchy monk input + mustache fixes
    * fork lifter and pajama party bopping
    * meat grinder miss bop fix
    * cloud monkey Real
    * marching orders Go! was broken
    * force march doesn't break when it's too early from a game switch
    * you can use the March! block without the marching now

commit bb2ae74339
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 15:13:29 2023 -0400

    Integration of Jukebox Library (#451)

    * add Jukebox library

    todo:
    - saving / loading of new format
    - inferrence of unknown data like past versions
    - move the temporary float casts to proper use of double
    - make sound related functions take double for timing
    - inform people that the Jukebox sound player was renamed to SoundByte lol

    * make sound, input scheduling, and super curve use double precision

    * successfully load charts

    * editor works again

    v1 riqs can be saved and loaded

    * first tempo and volume markers are unmovable

    fix loading of charts' easing values

    * use gsync / freesync

    * update Jukebox refs to SoundByte

    * game events use double part 1

    Air Rally - Glee Club converted

    * don't load song if chart load fails

    * finish conversion of all minigames

    * remove editor waveform toggle

    * timeline now respects added song offset length

    clear cache files on app close
    prepped notes for dsp sync

    * update timeline length when offset changed

    * update to latest Jukebox

    * make error panel object in global game manager

    * improve conductor music scheduling

    * added error message box

    fix first game events sometimes not playing
This commit is contained in:
minenice55 2023-06-13 21:28:21 -04:00 committed by GitHub
parent 81384fe7fb
commit 534b06301d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 261 additions and 265 deletions

View file

@ -111,17 +111,13 @@ namespace HeavenStudio
{
try
{
if (type == typeof(Util.EasingFunction.Ease) && (pType == typeof(string) || pType == typeof(int) || pType == typeof(long)))
if (type.IsEnum)
{
if (pType == typeof(int) || pType == typeof(long) || pType == typeof(Jukebox.EasingFunction.Ease))
{
e[propertyName] = (Util.EasingFunction.Ease)e[propertyName];
}
if (pType == typeof(string))
e.dynamicData[propertyName] = (int)Enum.Parse(type, (string)e[propertyName]);
else
e[propertyName] = Enum.Parse(typeof(Util.EasingFunction.Ease), (string)e[propertyName]);
e.dynamicData[propertyName] = (int)e[propertyName];
}
else if (type.IsEnum)
e[propertyName] = (int)e[propertyName];
else if (pType == typeof(Newtonsoft.Json.Linq.JObject))
e[propertyName] = e[propertyName].ToObject(type);
else
@ -196,7 +192,7 @@ namespace HeavenStudio
e.dynamicData.Add(param.propertyName, ((EntityTypes.Integer)param.parameter).val);
else if (type == typeof(EntityTypes.Float))
e.dynamicData.Add(param.propertyName, ((EntityTypes.Float)param.parameter).val);
else if (type.IsEnum && param.propertyName != "ease")
else if (type.IsEnum)
e.dynamicData.Add(param.propertyName, (int)param.parameter);
else
e.dynamicData.Add(param.propertyName, Convert.ChangeType(param.parameter, type));
@ -211,17 +207,13 @@ namespace HeavenStudio
e.dynamicData[param.propertyName] = (int)e[param.propertyName];
else if (type == typeof(EntityTypes.Float))
e.dynamicData[param.propertyName] = (float)e[param.propertyName];
else if (type == typeof(Util.EasingFunction.Ease) && (pType == typeof(string) || pType == typeof(int) || pType == typeof(long)))
{
if (pType == typeof(int) || pType == typeof(long) || pType == typeof(Jukebox.EasingFunction.Ease))
{
e.dynamicData[param.propertyName] = (Util.EasingFunction.Ease)e[param.propertyName];
}
else
e.dynamicData[param.propertyName] = Enum.Parse(typeof(Util.EasingFunction.Ease), (string)e[param.propertyName]);
}
else if (type.IsEnum)
e.dynamicData[param.propertyName] = (int)e[param.propertyName];
{
if (pType == typeof(string))
e.dynamicData[param.propertyName] = (int)Enum.Parse(type, (string)e[param.propertyName]);
else
e.dynamicData[param.propertyName] = (int)e[param.propertyName];
}
else if (pType == typeof(Newtonsoft.Json.Linq.JObject))
e.dynamicData[param.propertyName] = e[param.propertyName].ToObject(type);
else

View file

@ -1,219 +1,219 @@
ManifestFileVersion: 0
CRC: 2726306962
CRC: 759703038
AssetBundleManifest:
AssetBundleInfos:
Info_0:
Name: ctrpillow/common
Dependencies: {}
Info_1:
Name: karate/common
Dependencies: {}
Info_1:
Name: ntridol/common
Dependencies: {}
Info_2:
Name: agbmarcher/common
Name: ctrpillow/common
Dependencies: {}
Info_3:
Name: rvlbooks/locale.en
Dependencies: {}
Info_4:
Name: ntridol/locale.jp
Dependencies: {}
Info_5:
Name: agbmarcher/locale.jp
Dependencies: {}
Info_6:
Name: ntrdj/common
Dependencies:
Dependency_0: rvldate/common
Info_4:
Name: ctrpillow/locale.en
Dependencies: {}
Info_5:
Info_7:
Name: ntrsamurai/common
Dependencies: {}
Info_6:
Name: ntridol/common
Dependencies: {}
Info_7:
Name: rvlbooks/locale.en
Dependencies: {}
Info_8:
Name: ntridol/locale.jp
Name: ntrcoin/common
Dependencies: {}
Info_9:
Name: rvlbooks/common
Dependencies: {}
Info_10:
Name: ctrcatchy/common
Name: agbmarcher/common
Dependencies: {}
Info_11:
Name: agbmarcher/locale.en
Name: ctrcatchy/common
Dependencies: {}
Info_12:
Name: karate/locale.en
Name: agbmarcher/locale.en
Dependencies: {}
Info_13:
Name: agbmarcher/locale.jp
Name: ctrpillow/locale.ko
Dependencies: {}
Info_14:
Name: ctrpillow/locale.ko
Name: karate/locale.en
Dependencies: {}
Info_15:
Name: ctrpillow/locale.jp
Dependencies: {}
Info_16:
Name: ntrcoin/common
Name: ctrpillow/locale.en
Dependencies: {}
Info_17:
Name: ntrsamurai/locale.en
Dependencies: {}
Info_18:
Name: ntrsoccer/common
Dependencies: {}
Name: rvldate/common
Dependencies:
Dependency_0: ntrdj/common
Info_19:
Name: rvlfork/common
Dependencies: {}
Name: agbtap/common
Dependencies:
Dependency_0: ntridol/common
Info_20:
Name: rvlseal/locale.en
Name: ctrinterpreter/common
Dependencies: {}
Info_21:
Name: agbspacedance/locale.jp
Name: rvlbadminton/locale.en
Dependencies: {}
Info_22:
Name: rvlseal/common
Dependencies: {}
Info_23:
Name: agbclap/common
Dependencies: {}
Info_24:
Name: ntrshugyo/locale.en
Dependencies: {}
Info_25:
Name: ntrninja/common
Dependencies: {}
Info_26:
Name: agbbatter/common
Name: agbquiz/common
Dependencies:
Dependency_0: karate/common
Info_23:
Name: ntrtunnel/common
Dependencies: {}
Info_24:
Name: rvlinterview/common
Dependencies: {}
Info_25:
Name: ntrshugyo/locale.en
Dependencies: {}
Info_26:
Name: ntrninja/common
Dependencies: {}
Info_27:
Name: pcomeat/common
Dependencies: {}
Info_28:
Name: rvldough/common
Name: ntrsoccer/common
Dependencies: {}
Info_29:
Name: rvlrocket/common
Dependencies: {}
Info_30:
Name: ctrinterpreter/common
Dependencies: {}
Info_31:
Name: rvlseesaw/locale.en
Dependencies: {}
Info_32:
Name: rvlseesaw/common
Dependencies: {}
Info_33:
Name: agbwizard/common
Dependencies: {}
Info_34:
Name: rvldrum/common
Dependencies: {}
Info_35:
Name: agbtoss/common
Dependencies: {}
Info_36:
Name: rvlinterview/common
Dependencies: {}
Info_37:
Name: ntrbackbeat/common
Dependencies: {}
Info_38:
Name: rvlinterview/locale.en
Dependencies: {}
Info_39:
Name: agbexplode/common
Dependencies: {}
Info_40:
Name: rvlrotation/locale.en
Dependencies: {}
Info_41:
Name: ctrteppan/common
Dependencies: {}
Info_42:
Name: ctrbear/common
Dependencies: {}
Info_43:
Name: ntrboxshow/locale.en
Dependencies: {}
Info_44:
Name: agbhair/common
Dependencies: {}
Info_45:
Name: rvlbadminton/common
Dependencies: {}
Info_46:
Name: rvllegs/common
Dependencies: {}
Info_47:
Name: rvlbadminton/locale.en
Dependencies: {}
Info_48:
Name: agbtap/common
Dependencies:
Dependency_0: ntridol/common
Info_49:
Name: ntrchorus/locale.en
Dependencies: {}
Info_50:
Name: agbspacedance/common
Dependencies: {}
Info_51:
Name: rvldate/common
Dependencies:
Dependency_0: ntrdj/common
Info_52:
Name: rvlrotation/common
Dependencies: {}
Info_53:
Name: ntrboxshow/common
Dependencies: {}
Info_54:
Name: ntrassembly/common
Dependencies: {}
Info_55:
Name: ntrpingpong/common
Dependencies: {}
Info_56:
Name: agbquiz/common
Dependencies:
Dependency_0: karate/common
Info_57:
Name: ctrintro/common
Dependencies: {}
Info_58:
Name: agboffbeat/common
Info_30:
Name: rvlrocket/common
Dependencies: {}
Info_59:
Name: mobtrick/common
Dependencies: {}
Info_60:
Name: ntrcork/common
Dependencies: {}
Info_61:
Name: ntrchorus/common
Dependencies: {}
Info_62:
Name: rvllegs/locale.en
Dependencies: {}
Info_63:
Name: ntrshugyo/common
Dependencies: {}
Info_64:
Name: pcosomen/common
Dependencies: {}
Info_65:
Info_31:
Name: agbbatter/common
Dependencies:
Dependency_0: karate/common
Info_32:
Name: ntrstomp/common
Dependencies: {}
Info_66:
Info_33:
Name: agbspacedance/locale.jp
Dependencies: {}
Info_34:
Name: agbghost/common
Dependencies: {}
Info_67:
Name: ntrtunnel/locale.en
Info_35:
Name: ctrteppan/common
Dependencies: {}
Info_68:
Name: ntrtunnel/common
Info_36:
Name: rvlbadminton/common
Dependencies: {}
Info_69:
Info_37:
Name: rvlseesaw/common
Dependencies: {}
Info_38:
Name: rvldough/common
Dependencies: {}
Info_39:
Name: rvlfork/common
Dependencies: {}
Info_40:
Name: mobtrick/common
Dependencies: {}
Info_41:
Name: rvlinterview/locale.en
Dependencies: {}
Info_42:
Name: rvlseal/locale.en
Dependencies: {}
Info_43:
Name: agbtoss/common
Dependencies: {}
Info_44:
Name: rvlrotation/common
Dependencies: {}
Info_45:
Name: agbhair/common
Dependencies: {}
Info_46:
Name: rvllegs/locale.en
Dependencies: {}
Info_47:
Name: agbwizard/common
Dependencies: {}
Info_48:
Name: pcosomen/common
Dependencies: {}
Info_49:
Name: agbspacedance/common
Dependencies: {}
Info_50:
Name: ctrbear/common
Dependencies: {}
Info_51:
Name: ntrassembly/common
Dependencies: {}
Info_52:
Name: ntrbackbeat/common
Dependencies: {}
Info_53:
Name: ntrcork/common
Dependencies: {}
Info_54:
Name: rvlrotation/locale.en
Dependencies: {}
Info_55:
Name: rvllegs/common
Dependencies: {}
Info_56:
Name: agboffbeat/common
Dependencies: {}
Info_57:
Name: ntrpingpong/common
Dependencies: {}
Info_58:
Name: ntrsoccer/locale.en
Dependencies: {}
Info_59:
Name: rvlseal/common
Dependencies: {}
Info_60:
Name: agbclap/common
Dependencies: {}
Info_61:
Name: ntrboxshow/common
Dependencies: {}
Info_62:
Name: ntrshugyo/common
Dependencies: {}
Info_63:
Name: agbexplode/common
Dependencies: {}
Info_64:
Name: ntrboxshow/locale.en
Dependencies: {}
Info_65:
Name: rvlseesaw/locale.en
Dependencies: {}
Info_66:
Name: ntrchorus/common
Dependencies: {}
Info_67:
Name: rvldrum/common
Dependencies: {}
Info_68:
Name: ntrchorus/locale.en
Dependencies: {}
Info_69:
Name: ntrtunnel/locale.en
Dependencies: {}

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3295541411
CRC: 1122017321
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: d691f8e7ab026ae0af6a7d5b7ae9768b
Hash: 7a6ba1a59eb400a7c52f9daf4fe9b3dd
TypeTreeHash:
serializedVersion: 2
Hash: 4f2ec9d4a37fcaf8265a07a3a5b7905b
@ -96,4 +96,4 @@ Assets:
- Assets/Resources/Sprites/Games/Spaceball/baseball.png
- Assets/Resources/Sprites/Games/Spaceball/Animations/Idle.anim
Dependencies:
- C:/Users/rasmu/OneDrive/Dokumenter/GitHub/HeavenStudio/Assets/StreamingAssets/karate/common
- F:/Github/HeavenStudio/Assets/StreamingAssets/karate/common

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 4285283603
CRC: 1593665114
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: b90d22e37d42b5cc71409ec1671da401
Hash: 44c3bdbc8066d8b9f8d29f107c6df42d
TypeTreeHash:
serializedVersion: 2
Hash: b7dda81a5a0adc681edb9e6a78b49c82

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 2706586621
CRC: 2499785235
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 38c8b8fc314a6dbc223338bed4d0ec90
Hash: 5baf37b7b0b37b1a89bba8fe8011d367
TypeTreeHash:
serializedVersion: 2
Hash: 6ab6f5dbbbc64091fe41d0a8194baa43

View file

@ -1,5 +1,5 @@
ManifestFileVersion: 0
CRC: 1219842047
CRC: 2493667358
Hashes:
AssetFileHash:
serializedVersion: 2

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3910519356
CRC: 638092860
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: ab8866c439462ff8003599378ddda237
Hash: 258bdeeaf15739d0b2cda5ee4321e42f
TypeTreeHash:
serializedVersion: 2
Hash: b20f138d4c27c64a38b438efe12d137f

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 2776406185
CRC: 2136332037
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 2e302cf48b40bc531bd32b21fc9e3dc2
Hash: bb75796a540b9d56585a025e55afb25a
TypeTreeHash:
serializedVersion: 2
Hash: 78b02268f01f8b6a77a608289ecb9d38
@ -108,4 +108,4 @@ Assets:
- Assets/Resources/Sfx/games/quizShow/hostDPad.ogg
- Assets/Resources/Sfx/games/quizShow/hostExplode.ogg
Dependencies:
- C:/Users/rasmu/OneDrive/Dokumenter/GitHub/HeavenStudio/Assets/StreamingAssets/karate/common
- F:/Github/HeavenStudio/Assets/StreamingAssets/karate/common

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 940254835
CRC: 4065572778
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 1bc9632ce0bab6e32880981e2618e8b3
Hash: e3031a21c5953b972c8984aaf4d95f0b
TypeTreeHash:
serializedVersion: 2
Hash: ddb2c4a70034b0784bb73c06ec09460c

View file

@ -3,7 +3,7 @@ CRC: 3317229876
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: b67be0d3f6a8b7b385b6d81c034e7e05
Hash: feadaf1bb10efdd7ecb80e3bdf44f16f
TypeTreeHash:
serializedVersion: 2
Hash: 15c41fad7e66ce2236de71530bb543ef
@ -115,4 +115,4 @@ Assets:
- Assets/Resources/Sprites/Games/TapTrial/Animations/Giraffe/Giraffe.controller
- Assets/Resources/Sprites/Games/TapTrial/Animations/girl_bop/Bop.anim
Dependencies:
- C:/Users/rasmu/OneDrive/Dokumenter/GitHub/HeavenStudio/Assets/StreamingAssets/ntridol/common
- F:/Github/HeavenStudio/Assets/StreamingAssets/ntridol/common

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 435520197
CRC: 1343714519
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: a6b7c0a19453a1a0398bcb15e81ed8f5
Hash: a2bdf947ec7535dd0f3a7ab45fc9b661
TypeTreeHash:
serializedVersion: 2
Hash: 01ef6a58e233b3cb8a54b2d9152d3e5e

View file

@ -3,7 +3,7 @@ CRC: 763472146
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: ecb00cf092701b5128cc9bf5b020bcbe
Hash: 5941e1757fea6a56f10397ebd34c5ae8
TypeTreeHash:
serializedVersion: 2
Hash: cb525cb072c33c8e5692f23a42da04e4

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3779117211
CRC: 2232750411
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 3df64602dae1644c40a73e63047b5d91
Hash: 3fccd3f78801be327adeaf644d0b6bbe
TypeTreeHash:
serializedVersion: 2
Hash: 6a87535638e108a5e3588d5397c1cf0a

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 2347972319
CRC: 3237643733
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 812f8de04338cbb289b3aeb7d0c1255a
Hash: d7df6dc0bc2560d650eb8f8469f30c57
TypeTreeHash:
serializedVersion: 2
Hash: 05da4ec6b369274f98afefde205bcdc6

View file

@ -1,12 +1,12 @@
ManifestFileVersion: 0
CRC: 1820358078
CRC: 1473235682
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 43643198b112932a4fdf0b1da91e8a08
Hash: 9c7e0e1b2c67ac5bd40cbd9eb89b6beb
TypeTreeHash:
serializedVersion: 2
Hash: a7c568f5d3a8f80a33b7dd26fe5a006a
Hash: fcb38c44c374dbbc10b37e4f25d6f505
HashAppended: 0
ClassTypes:
- Class: 1

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 155563867
CRC: 2004251384
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 97088bda9b9c1bf5d6f7e5b3edd169e0
Hash: e1b76f6c4fa51db462b357a07e8aa8f3
TypeTreeHash:
serializedVersion: 2
Hash: b1f31a5996a0bf184f0808b1ad67ba96

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 2722877296
CRC: 825088556
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: b6bd878ea9f8df0fcf2bc0c4581be791
Hash: e4bd15a1d4546fcb6056288aea7b1c47
TypeTreeHash:
serializedVersion: 2
Hash: 4f48d293ee91ce284b1290faa2bbe09e

View file

@ -3,7 +3,7 @@ CRC: 3751846126
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 93a0fe7ec76132ff5555c8a88ffb4c04
Hash: ff172c079432477f741da8d24ff06529
TypeTreeHash:
serializedVersion: 2
Hash: 4f8cce0d9f727657ad6578352d0da0f2

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3878722035
CRC: 3661077965
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 177c5870d328f716aa0421272c9470f9
Hash: 4616adb8a22566f01490d11ad570b4a4
TypeTreeHash:
serializedVersion: 2
Hash: f54a1062817f77cb49f442d230fcc49b

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3381801303
CRC: 2081450428
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 2f51d8702488d5789c7b6cf29d74fa86
Hash: 304db464c2bead81b6428e9f6599cfdf
TypeTreeHash:
serializedVersion: 2
Hash: 8f8d4a3f1f8c01578a5ce13063d68dc6

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 2871784295
CRC: 1014792037
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: a320d8fdb11da9cf2bf295285a4a38a2
Hash: a13b9b7ae5fc7cd834f5837f06a15414
TypeTreeHash:
serializedVersion: 2
Hash: 33a4c8442a7cb8448a93c2fa6c1d77eb
@ -125,4 +125,4 @@ Assets:
- Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud1.ogg
- Assets/Resources/Sprites/Games/DJSchool/Animations/Student/IdleBop.anim
Dependencies:
- C:/Users/rasmu/OneDrive/Dokumenter/GitHub/HeavenStudio/Assets/StreamingAssets/rvldate/common
- F:/Github/HeavenStudio/Assets/StreamingAssets/rvldate/common

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 4034070136
CRC: 2219224297
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 2d6f852362177521846ca2d732523b32
Hash: 39ab0a3b922fddd5c5f8503433d5681b
TypeTreeHash:
serializedVersion: 2
Hash: 22daffce395c47caabb8dcd800097d0d

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3182147957
CRC: 3533234474
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: a0076561256160326184dfb7ad07d97c
Hash: 75fc3826026a12e7d7956e4f3168c0fc
TypeTreeHash:
serializedVersion: 2
Hash: 2f052be846612c7db995ad748fa5776c

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3439164552
CRC: 2551889369
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: dd77521c6af51aacb6f1ea5fdc19bbd1
Hash: e6e89066cb6285a98253746ce6d2f1ab
TypeTreeHash:
serializedVersion: 2
Hash: a60012dadf81e61c9a13d1a8e11bb664

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 1911076014
CRC: 2661374951
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 49426dfd99db6a07775ec45a2d4591ce
Hash: 3fe3c2898ca2af1ad73c853576b8eb1b
TypeTreeHash:
serializedVersion: 2
Hash: 10404da84d789c089050e7869762db38

View file

@ -1,12 +1,12 @@
ManifestFileVersion: 0
CRC: 2709514228
CRC: 1147724731
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: b0e0b074d6e4e7939ca79e071af768bb
Hash: 6a9e69be6eb63dfd9189f44f901843bc
TypeTreeHash:
serializedVersion: 2
Hash: 069e62d6c3f2f01ee43f5b820760a801
Hash: 91fa2f9c7ee652a4a4a405c50ad96d66
HashAppended: 0
ClassTypes:
- Class: 1
@ -96,8 +96,10 @@ Assets:
- Assets/Resources/Sprites/Games/MunchyMonk/Animations/Givers/TwoGiver/TwoGiveIn.anim
- Assets/Resources/Sprites/Games/MunchyMonk/Animations/Givers/OneGiver/OneIdle.anim
- Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/IdleRight.anim
- Assets/Resources/Sprites/Games/MunchyMonk/Animations/CloudMonkey/CloudMonkeyAnim.controller
- Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Eat.anim
- Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/Stache3Bop.anim
- Assets/Resources/Sprites/Games/MunchyMonk/Animations/CloudMonkey/Bop.anim
- Assets/Resources/Games/munchyMonk.prefab
- Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/NoseRed.anim
- Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/GoLeft.anim

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 1127646842
CRC: 1066416111
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: c0a60a571806bf4973a9611111e1247d
Hash: c6883dfb23673608c96404e04760523b
TypeTreeHash:
serializedVersion: 2
Hash: 178c8be186c9c9195df8cbc397bf239f

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 1926041378
CRC: 889841618
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 8b0a19c55dd3bfc2277888737c316393
Hash: 6dfe3050277df130402e36e5fc6afe4f
TypeTreeHash:
serializedVersion: 2
Hash: ee5a1c4d119c5785c396deba9ffbfd13

View file

@ -1,12 +1,12 @@
ManifestFileVersion: 0
CRC: 2939698592
CRC: 2174683718
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 92fec8d1796d1d4f772b70eea7b1f646
Hash: 0a1835884c57c32693dc11e506a8acf0
TypeTreeHash:
serializedVersion: 2
Hash: beb35b6f5e7e9e62226f65e58eb3fd60
Hash: 28722b046145a3595b15a970ac70a44b
HashAppended: 0
ClassTypes:
- Class: 1

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3195205475
CRC: 2157779923
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 86dd3b6fd865b5b0d0e9d3cfd254f59b
Hash: 24e41b869e54b1e85f1cc07d5da635c5
TypeTreeHash:
serializedVersion: 2
Hash: 757ac36bf07fc7472c165ca27f3563b7

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3923060005
CRC: 2749792628
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 9ea25df45a892548185b67338679385a
Hash: f773ca51c88e7b4e6b682486385883f0
TypeTreeHash:
serializedVersion: 2
Hash: 85ee816236efbc3eb8eee4328b833881

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 517210605
CRC: 930172043
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 129fec45a185d42f8c6f80460b3722ea
Hash: 9b9dc66adc2b1846f9419d9a58cb6759
TypeTreeHash:
serializedVersion: 2
Hash: d7a2aa66ed419696bcac7084279f269a
@ -113,4 +113,4 @@ Assets:
- Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHappy.anim
- Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHide.anim
Dependencies:
- C:/Users/rasmu/OneDrive/Dokumenter/GitHub/HeavenStudio/Assets/StreamingAssets/ntrdj/common
- F:/Github/HeavenStudio/Assets/StreamingAssets/ntrdj/common

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3049152735
CRC: 2398193307
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 814ad6a6b85fbff30bbec94e01c84c95
Hash: df47fd12298183f93c6709b885dec51e
TypeTreeHash:
serializedVersion: 2
Hash: 1937315467cf052612009b19bb313daf

View file

@ -1,12 +1,12 @@
ManifestFileVersion: 0
CRC: 2711973842
CRC: 2309535096
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 41a1a48ac6650eda0efa9ce1314d8e55
Hash: cf4e6927b4e9b8a575b45039e0c0abf3
TypeTreeHash:
serializedVersion: 2
Hash: 53def56f25d546c75e3bb18007f20c09
Hash: e1450635167e416808d99615e8a3bc8b
HashAppended: 0
ClassTypes:
- Class: 1
@ -71,33 +71,38 @@ SerializeReferenceClassIdentifiers:
Assets:
- Assets/Resources/Sprites/Games/ForkLifter/Fork Lifter 2P/SOME01_81fba35a_1.png
- Assets/Resources/Sfx/games/forkLifter/cough_2.wav
- Assets/Resources/Sfx/games/forkLifter/sigh.ogg
- Assets/Resources/Sprites/Games/ForkLifter/Animations/Player_Bop.anim
- Assets/Resources/Sprites/Games/ForkLifter/Animations/Hand_GrabObject.anim
- Assets/Resources/Sprites/Games/ForkLifter/Animations/Player_Eat_Comeback.anim
- Assets/Resources/Sprites/Games/ForkLifter/Fork Lifter 2P/SOME01_7517e2b3_5.png
- Assets/Resources/Sfx/games/forkLifter/flickPrepare.ogg
- Assets/Resources/Sfx/games/forkLifter/zoomFast.ogg
- Assets/Resources/Sfx/games/forkLifter/gulp.ogg
- Assets/Resources/Sprites/Games/ForkLifter/Animations/Flicked_Object.anim
- Assets/Resources/Sfx/games/forkLifter/cough_1.wav
- Assets/Resources/Sfx/games/forkLifter/disappointed.ogg
- Assets/Resources/Sprites/Games/ForkLifter/Fork Lifter 1P/GameSprites.png
- Assets/Resources/Sprites/Games/ForkLifter/Fork Lifter 2P/SOME01_098ca4b6_5.png
- Assets/Resources/Sprites/Games/ForkLifter/Animations/Player_Stab.anim
- Assets/Resources/Sprites/Games/ForkLifter/Animations/Hand_Prepare.anim
- Assets/Resources/Sprites/Games/ForkLifter/Fork Lifter 1P/Prologue_Shadow.png
- Assets/Resources/Games/forkLifter.prefab
- Assets/Resources/Sprites/Games/ForkLifter/Prologue_Shadow2.png
- Assets/Resources/Sprites/Games/ForkLifter/Prologue_Pea.png
- Assets/Resources/Sfx/games/forkLifter/stab.ogg
- Assets/Resources/Sprites/Games/ForkLifter/Animations/Hand.controller
- Assets/Resources/Sprites/Games/ForkLifter/Animations/Hand_Idle.anim
- Assets/Resources/Sprites/Games/ForkLifter/Fork Lifter 2P/SOME01_c728aca2_5.png
- Assets/Resources/Sprites/Games/ForkLifter/Fork Lifter 1P/Epilogue.png
- Assets/Resources/Sfx/games/forkLifter/sigh.ogg
- Assets/Resources/Sprites/Games/ForkLifter/Animations/Player_Eat_Comeback.anim
- Assets/Resources/Sfx/games/forkLifter/zoomFast.ogg
- Assets/Resources/Sprites/Games/ForkLifter/Animations/Flicked_Object.anim
- Assets/Resources/Sfx/games/forkLifter/cough_1.wav
- Assets/Resources/Sprites/Games/ForkLifter/Fork Lifter 2P/SOME01_098ca4b6_5.png
- Assets/Resources/Sprites/Games/ForkLifter/Fork Lifter 1P/Prologue_Shadow.png
- Assets/Resources/Sprites/Games/ForkLifter/Animations/Conductor.controller
- Assets/Resources/Sprites/Games/ForkLifter/Animations/Object.controller
- Assets/Resources/Sprites/Games/ForkLifter/Prologue_Pea.png
- Assets/Resources/Sfx/games/forkLifter/stabnohit.ogg
- Assets/Resources/Sprites/Games/ForkLifter/Fork Lifter 2P/SOME01_50d1f7cf_5.png
- Assets/Resources/Sfx/games/forkLifter/stabnohit.ogg
- Assets/Resources/Sprites/Games/ForkLifter/Prologue_Title.png
- Assets/Resources/Sprites/Games/ForkLifter/Fork Lifter 1P/Prologue_Fork.png
- Assets/Resources/Sfx/games/forkLifter/stab.ogg
- Assets/Resources/Sprites/Games/ForkLifter/Animations/Hand_Bop.anim
- Assets/Resources/Sprites/Games/ForkLifter/Animations/Player_Idle.anim
- Assets/Resources/Sprites/Games/ForkLifter/Animations/Hand.controller
- Assets/Resources/Sprites/Games/ForkLifter/Prologue_Juice.png
- Assets/Resources/Sprites/Games/ForkLifter/Fork Lifter 2P/SOME01_4dd19e1a_5.png
- Assets/Resources/Sprites/Games/ForkLifter/Fork Lifter 2P/SOME01_0a0120eb_6.png
@ -105,9 +110,6 @@ Assets:
- Assets/Resources/Sprites/Games/ForkLifter/Animations/Player.controller
- Assets/Resources/Sfx/games/forkLifter/flick.ogg
- Assets/Resources/Sprites/Games/ForkLifter/Animations/Hand_Flick.anim
- Assets/Resources/Sprites/Games/ForkLifter/Animations/Hand_Idle.anim
- Assets/Resources/Sprites/Games/ForkLifter/Fork Lifter 2P/SOME01_c728aca2_5.png
- Assets/Resources/Sfx/games/forkLifter/zoom.ogg
- Assets/Resources/Sprites/Games/ForkLifter/Fork Lifter 1P/Epilogue.png
- Assets/Resources/Sprites/Games/ForkLifter/Animations/Player_Eat.anim
Dependencies: []

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3025961969
CRC: 445211871
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 3ff1ff2cf9adf04658676cf10f2e6f10
Hash: 46d9fbe7b468ea9f28764f68a9c513ad
TypeTreeHash:
serializedVersion: 2
Hash: 3e8c7d8755f6df3ed3fcea84d97f9900

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3446959443
CRC: 1162087280
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 1fa4e45464a35277630d436f0857ec2f
Hash: 484537858b6ffdd69e57af0b7020f1d1
TypeTreeHash:
serializedVersion: 2
Hash: ffb5d2113fd2d590f8537bbc04f36b07

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 1066493538
CRC: 2308209677
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: e5813385a0b9b59819c85887beaca3dc
Hash: f249e3150747d3b7659b09822db8ad95
TypeTreeHash:
serializedVersion: 2
Hash: 6ddefc915b4006f12246ed1f50bf5b87

View file

@ -7,7 +7,7 @@
"dependencies": {
"com.unity.nuget.newtonsoft-json": "3.2.1"
},
"hash": "f1813255c1d322b6fe207de4361bbf288f9cda03"
"hash": "fd70aafabe1e0388c717a873b7739ba7f2d5421d"
},
"com.unity.2d.sprite": {
"version": "1.0.0",