Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
55fa8ea
Merge pull request #28 from pgsweet/shreya
shreya-bluehen-2025 Apr 9, 2025
9c65bb5
Added gems and dragon blood
TGlenn13 Apr 9, 2025
a341b93
Merge branch 'main' of https://github.com/pgsweet/Code-And-Cauldron i…
TGlenn13 Apr 9, 2025
37d55cc
added sprites
pgsweet Apr 9, 2025
718b78b
minor changes
pgsweet Apr 10, 2025
44788bf
new build
pgsweet Apr 10, 2025
d11fdd3
started work on levels
pgsweet Apr 11, 2025
cca3b6a
new build
pgsweet Apr 11, 2025
9a109f3
Merge pull request #29 from pgsweet/pgsweet-working
pgsweet Apr 11, 2025
c67c0ec
fixed new build
pgsweet Apr 11, 2025
d2c13f5
Merge pull request #30 from pgsweet/pgsweet-working
pgsweet Apr 11, 2025
2ba8cf6
NOW ITS FIXED
pgsweet Apr 11, 2025
829ae68
Merge pull request #31 from pgsweet/pgsweet-working
pgsweet Apr 11, 2025
619c5e0
updated build
pgsweet Apr 11, 2025
44ff27e
Merge pull request #32 from pgsweet/pgsweet-working
pgsweet Apr 11, 2025
b14a72e
maybe?
pgsweet Apr 11, 2025
9adc7e9
Merge pull request #33 from pgsweet/pgsweet-working
pgsweet Apr 11, 2025
c147757
potential build fix
pgsweet Apr 11, 2025
59abfd2
trying again
pgsweet Apr 11, 2025
8461a37
test
pgsweet Apr 11, 2025
6687031
Merge pull request #34 from pgsweet/pgsweet-working
pgsweet Apr 11, 2025
7cc9f94
Added potions and made bottles in crate empty
TGlenn13 Apr 11, 2025
ec54e12
clean build
pgsweet Apr 11, 2025
0f09be1
Merge pull request #35 from pgsweet/pgsweet-working
pgsweet Apr 11, 2025
d4a4984
updated build
pgsweet Apr 11, 2025
1937a8d
fixed build again
pgsweet Apr 11, 2025
d2c1a48
added help menu for alpha game
pgsweet Apr 12, 2025
d8d1b9b
Merge pull request #36 from pgsweet/pgsweet-working
pgsweet Apr 12, 2025
f22420c
something different?
pgsweet Apr 12, 2025
8159b18
Merge pull request #37 from pgsweet/pgsweet-working
pgsweet Apr 12, 2025
64851ec
what
pgsweet Apr 12, 2025
e6ccf3f
Merge pull request #38 from pgsweet/pgsweet-working
pgsweet Apr 12, 2025
74c58e7
added hover panel
pgsweet Apr 12, 2025
e539562
Merge pull request #39 from pgsweet/pgsweet-working
pgsweet Apr 12, 2025
a4fc56e
maybe fix
pgsweet Apr 12, 2025
eead831
Merge pull request #40 from pgsweet/pgsweet-working
pgsweet Apr 12, 2025
3d9fbeb
i forgot to move the files
pgsweet Apr 12, 2025
8820038
Merge pull request #41 from pgsweet/pgsweet-working
pgsweet Apr 12, 2025
253d0ae
Merge remote-tracking branch 'origin/tglenn-environment' into pgsweet…
pgsweet Apr 14, 2025
d58ca1f
Made bottles clear
TGlenn13 Apr 14, 2025
96afea4
Merge remote-tracking branch 'origin/tglenn-environment' into pgsweet…
pgsweet Apr 14, 2025
c7209ba
added new sprites
pgsweet Apr 14, 2025
d446aff
slight changes
pgsweet Apr 15, 2025
5b3d95b
end of working
pgsweet Apr 15, 2025
ae7801f
Merge pull request #42 from pgsweet/tglenn-environment
pgsweet Apr 15, 2025
b5e594c
Merge branch 'main' into pgsweet-working
pgsweet Apr 15, 2025
f9868d8
fixed everything being shifted
pgsweet Apr 16, 2025
6890d84
book added
shreya-bluehen-2025 Apr 16, 2025
94831b9
added potion crafts
pgsweet Apr 16, 2025
07a31ab
started level system
pgsweet Apr 21, 2025
c14b75e
Merge branch 'main' into pgsweet-working
pgsweet Apr 21, 2025
c056c0b
Merge pull request #45 from pgsweet/pgsweet-working
pgsweet Apr 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Assets/Prefabs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

259 changes: 259 additions & 0 deletions Assets/Prefabs/level0.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,259 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4972855246859370460
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5795714366146834148}
- component: {fileID: 1232780114696059035}
- component: {fileID: 3623510220900645818}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5795714366146834148
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4972855246859370460}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 560011410237846213}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1232780114696059035
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4972855246859370460}
m_CullTransparentMesh: 1
--- !u!114 &3623510220900645818
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4972855246859370460}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 0
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 24
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &7634360581336924420
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 560011410237846213}
- component: {fileID: 7349494003081037121}
- component: {fileID: 8040953383338606866}
- component: {fileID: 5016788019158567840}
m_Layer: 5
m_Name: level0
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &560011410237846213
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7634360581336924420}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5795714366146834148}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -370, y: 415}
m_SizeDelta: {x: 80, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7349494003081037121
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7634360581336924420}
m_CullTransparentMesh: 1
--- !u!114 &8040953383338606866
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7634360581336924420}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &5016788019158567840
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7634360581336924420}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 8040953383338606866}
m_OnClick:
m_PersistentCalls:
m_Calls: []
7 changes: 7 additions & 0 deletions Assets/Prefabs/level0.prefab.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Resources/Items/Amethyst.aseprite
Binary file not shown.
Loading