Skip to content

Commit

Permalink
Merge pull request #18 from Gemmstone/owner-development
Browse files Browse the repository at this point in the history
Fixed some settings bugs
  • Loading branch information
Gemmstone authored Aug 21, 2024
2 parents fa1faa6 + b699fee commit a72bd16
Show file tree
Hide file tree
Showing 3,736 changed files with 9,713 additions and 4,019 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,7 @@
"posGuitarDownX": 0,
"posGuitarDownY": 0,
"rotationGuitarDown": 0,
"animation_idle": false
"animation_idle": false,
"move": true,
"animation_name_screaming": "None"
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,7 @@
"posGuitarDownX": 0,
"posGuitarDownY": 0,
"rotationGuitarDown": 0,
"animation_idle": false
"animation_idle": false,
"move": true,
"animation_name_screaming": "None"
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,7 @@
"posGuitarDownX": 0,
"posGuitarDownY": 0,
"rotationGuitarDown": 0,
"animation_idle": false
"animation_idle": false,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Controllers.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,7 @@
"animation_idle": true,
"originXwhammy": -100,
"originYwhammy": 280,
"degWhammy": 28
"degWhammy": 28,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Controllers_001.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,7 @@
"animation_idle": true,
"originXwhammy": -100,
"originYwhammy": 280,
"degWhammy": 25
"degWhammy": 25,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Controllers_002.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,7 @@
"animation_idle": true,
"originXwhammy": 280,
"originYwhammy": -100,
"degWhammy": 25
"degWhammy": 25,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Controllers_003.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,7 @@
"animation_idle": true,
"originXwhammy": -100,
"originYwhammy": 280,
"degWhammy": 25
"degWhammy": 25,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Controllers_004.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,7 @@
"animation_idle": true,
"originXwhammy": -100,
"originYwhammy": 280,
"degWhammy": 25
"degWhammy": 25,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Controllers_005.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,7 @@
"animation_idle": true,
"originXwhammy": -100,
"originYwhammy": 280,
"degWhammy": -25
"degWhammy": -25,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Pen_001.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,7 @@
"cursorScaleX": 0.03,
"cursorScaleY": 0.03,
"track_mouse_x": 1,
"track_mouse_y": 1
"track_mouse_y": 1,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Pen_002.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,7 @@
"cursorScaleX": 0.03,
"cursorScaleY": 0.03,
"track_mouse_x": 1,
"track_mouse_y": 1
"track_mouse_y": 1,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Pen_003.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,7 @@
"cursorScaleX": 0.03,
"cursorScaleY": 0.03,
"track_mouse_x": 1,
"track_mouse_y": 1
"track_mouse_y": 1,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Pen_004.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,7 @@
"cursorScaleX": 0.03,
"cursorScaleY": 0.03,
"track_mouse_x": 1,
"track_mouse_y": 1
"track_mouse_y": 1,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Pen_005.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,7 @@
"cursorScaleX": 0.03,
"cursorScaleY": 0.03,
"track_mouse_x": 1,
"track_mouse_y": 1
"track_mouse_y": 1,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Pen_006.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,7 @@
"cursorScaleX": 0.03,
"cursorScaleY": 0.03,
"track_mouse_x": 1,
"track_mouse_y": 1
"track_mouse_y": 1,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Pen_007.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,7 @@
"cursorScaleX": 0.03,
"cursorScaleY": 0.03,
"track_mouse_x": 1,
"track_mouse_y": 1
"track_mouse_y": 1,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Tablet Black-Pink.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,7 @@
"posGuitarDownX": 0,
"posGuitarDownY": 0,
"rotationGuitarDown": 0,
"animation_idle": false
"animation_idle": false,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Tablet Black.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,7 @@
"posGuitarDownX": 0,
"posGuitarDownY": 0,
"rotationGuitarDown": 0,
"animation_idle": false
"animation_idle": false,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Tablet Blue Pastel.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,7 @@
"posGuitarDownX": 0,
"posGuitarDownY": 0,
"rotationGuitarDown": 0,
"animation_idle": false
"animation_idle": false,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Tablet Blue.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,7 @@
"posGuitarDownX": 0,
"posGuitarDownY": 0,
"rotationGuitarDown": 0,
"animation_idle": false
"animation_idle": false,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Tablet Indigo Pastel.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,7 @@
"posGuitarDownX": 0,
"posGuitarDownY": 0,
"rotationGuitarDown": 0,
"animation_idle": false
"animation_idle": false,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Tablet Indigo.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,7 @@
"posGuitarDownX": 0,
"posGuitarDownY": 0,
"rotationGuitarDown": 0,
"animation_idle": false
"animation_idle": false,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Tablet Pink.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,7 @@
"posGuitarDownX": 0,
"posGuitarDownY": 0,
"rotationGuitarDown": 0,
"animation_idle": false
"animation_idle": false,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Tablet Red Pastel.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,7 @@
"posGuitarDownX": 0,
"posGuitarDownY": 0,
"rotationGuitarDown": 0,
"animation_idle": false
"animation_idle": false,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Tablet Violet Pastel.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,7 @@
"posGuitarDownX": 0,
"posGuitarDownY": 0,
"rotationGuitarDown": 0,
"animation_idle": false
"animation_idle": false,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Tablet White.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,7 @@
"posGuitarDownX": 0,
"posGuitarDownY": 0,
"rotationGuitarDown": 0,
"animation_idle": false
"animation_idle": false,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Tablet Yellow Pastel.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,7 @@
"posGuitarDownX": 0,
"posGuitarDownY": 0,
"rotationGuitarDown": 0,
"animation_idle": false
"animation_idle": false,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/Tablet Yellow.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,7 @@
"posGuitarDownX": 0,
"posGuitarDownY": 0,
"rotationGuitarDown": 0,
"animation_idle": false
"animation_idle": false,
"move": true,
"animation_name_screaming": "None"
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,7 @@
"posGuitarDownX": 0,
"posGuitarDownY": 0,
"rotationGuitarDown": 0,
"animation_idle": false
"animation_idle": false,
"move": true,
"animation_name_screaming": "None"
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,7 @@
"posGuitarDownX": 0,
"posGuitarDownY": 0,
"rotationGuitarDown": 0,
"animation_idle": false
"animation_idle": false,
"move": true,
"animation_name_screaming": "None"
}
4 changes: 3 additions & 1 deletion Assets/Chereverie/Controllers/hands.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,7 @@
"posGuitarDownX": 0,
"posGuitarDownY": 0,
"rotationGuitarDown": 0,
"animation_idle": false
"animation_idle": false,
"move": true,
"animation_name_screaming": "None"
}
3 changes: 2 additions & 1 deletion Assets/Chereverie/Controllers/hands_001.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,6 @@
"title": "hands_001.png",
"track_mouse_x": 1,
"track_mouse_y": 1,
"use_css": false
"use_css": false,
"move": true
}
3 changes: 2 additions & 1 deletion Assets/Chereverie/Controllers/hands_002.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,6 @@
"title": "hands_002.png",
"track_mouse_x": 1,
"track_mouse_y": 1,
"use_css": false
"use_css": false,
"move": true
}
3 changes: 2 additions & 1 deletion Assets/Chereverie/Controllers/hands_003.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,6 @@
"title": "hands_003.png",
"track_mouse_x": 1,
"track_mouse_y": 1,
"use_css": false
"use_css": false,
"move": true
}
3 changes: 2 additions & 1 deletion Assets/Chereverie/Controllers/hands_004.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,6 @@
"title": "hands_004.png",
"track_mouse_x": 1,
"track_mouse_y": 1,
"use_css": false
"use_css": false,
"move": true
}
3 changes: 2 additions & 1 deletion Assets/Chereverie/Controllers/hands_005.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,6 @@
"title": "hands_005.png",
"track_mouse_x": 1,
"track_mouse_y": 1,
"use_css": false
"use_css": false,
"move": true
}
3 changes: 2 additions & 1 deletion Assets/Chereverie/Controllers/hands_006.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,6 @@
"title": "hands_006.png",
"track_mouse_x": 1,
"track_mouse_y": 1,
"use_css": false
"use_css": false,
"move": true
}
3 changes: 2 additions & 1 deletion Assets/Chereverie/Controllers/hands_007.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,6 @@
"title": "hands_007.png",
"track_mouse_x": 1,
"track_mouse_y": 1,
"use_css": false
"use_css": false,
"move": true
}
3 changes: 2 additions & 1 deletion Assets/Chereverie/Controllers/hands_008.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,6 @@
"title": "hands_008.png",
"track_mouse_x": 1,
"track_mouse_y": 1,
"use_css": false
"use_css": false,
"move": true
}
3 changes: 2 additions & 1 deletion Assets/Chereverie/Controllers/hands_009.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,6 @@
"title": "hands_009.png",
"track_mouse_x": 1,
"track_mouse_y": 1,
"use_css": false
"use_css": false,
"move": true
}
3 changes: 2 additions & 1 deletion Assets/Chereverie/Controllers/hands_010.png.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,6 @@
"title": "hands_010.png",
"track_mouse_x": 1,
"track_mouse_y": 1,
"use_css": false
"use_css": false,
"move": true
}
Loading

0 comments on commit a72bd16

Please sign in to comment.