Skip to content

Commit

Permalink
Update to 2019.1.5
Browse files Browse the repository at this point in the history 
Former-commit-id: 6a42e0f
  • Loading branch information
@CelestialAmber
CelestialAmber committed Jun 5, 2019
1 parent 221e8be commit a93e126
Show file tree
Hide file tree
Showing 2,855 changed files with 154,482 additions and 16,757 deletions.
2 changes: 1 addition & 1 deletion Assets/Audio/Music/Casino Intro.ogg.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6fa9f39f3f2edfb1250250906807af9ce290c5d9
6c9475a779d75bf0dbad618349dc7d9154782837
Binary file removed Assets/Audio/Music/Celadon City Intro.ogg
View file
Binary file not shown.
1 change: 1 addition & 0 deletions Assets/Audio/Music/Celadon City Intro.ogg.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f87c3195ed5e44399c22e233f17305713f70678d
2 changes: 1 addition & 1 deletion Assets/Audio/Music/Cerulean City Intro.ogg.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3cdcdef7e694830ce89d88f3b6c70891b282e468
3a19903a51ddf983a8067250e5eab27ff170d050
1 change: 1 addition & 0 deletions Assets/Audio/Music/Cycling Intro.ogg.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
da991bcbab37e7bda9bce1a06a20c3844b33faf4
0 Assets/Audio/Music/Cycling.ogg.meta → Assets/Audio/Music/Cycling Intro.ogg.meta
View file
File renamed without changes.
1 change: 1 addition & 0 deletions Assets/Audio/Music/Cycling Loop.ogg.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fa32c10b5c77a16c22d2eef99e9f320e3cd21f6e
22 changes: 22 additions & 0 deletions Assets/Audio/Music/Cycling Loop.ogg.meta
View file

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

1 change: 0 additions & 1 deletion Assets/Audio/Music/Cycling.ogg.REMOVED.git-id
View file

This file was deleted.

2 changes: 1 addition & 1 deletion Assets/Audio/Music/Ending.ogg.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d8fb5229aaaf39cffc0d1752e47d24d7d032f1aa
23735742a0eda1c1152d95212aa9a93131d0a97a
Binary file modified Assets/Audio/Music/Evolution Intro.ogg
View file
Binary file not shown.
Binary file modified Assets/Audio/Music/Evolution Loop.ogg
View file
Binary file not shown.
Binary file modified Assets/Audio/Music/Guide Intro.ogg
View file
Binary file not shown.
0 Assets/Audio/Music/Into the Hall.ogg → Assets/Audio/Music/Hall of Fame.ogg
View file
File renamed without changes.
0 Assets/Audio/Music/Into the Hall.ogg.meta → Assets/Audio/Music/Hall of Fame.ogg.meta
View file
File renamed without changes.
Binary file modified Assets/Audio/Music/Jigglypuff's Song.ogg
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Assets/Audio/Music/Lavender Town Intro.ogg.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ac20b54915af1e28cae1befa34c3f753fb03d632
43d22577ef6eaf3bc709483c7f894d9e71f88f5e
Binary file modified Assets/Audio/Music/Nugget Bridge.ogg
View file
Binary file not shown.
Binary file modified Assets/Audio/Music/Oak Research Lab Intro.ogg
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Assets/Audio/Music/Pokemon Gym Intro.ogg.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
737fd9a4364f536465c30e04d59bd9d347351dba
c848082de901b938b6f659f0cc75672490ed1c19
2 changes: 1 addition & 1 deletion Assets/Audio/Music/Pokemon Mansion Intro.ogg.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7ac11293930c11ed2639f3fdc3ea68b93e24eb0e
80630964794d7472605c4351f03d4bc68d97dded
Binary file removed Assets/Audio/Music/Pokemon Tower Intro.ogg
View file
Binary file not shown.
1 change: 1 addition & 0 deletions Assets/Audio/Music/Pokemon Tower Intro.ogg.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
54d4181f09eb392558a12571e9718b0119626c78
Binary file modified Assets/Audio/Music/Professor Oak Loop.ogg
View file
Binary file not shown.
Binary file modified Assets/Audio/Music/Rival Appears Intro.ogg
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Assets/Audio/Music/Rival Champion Battle Intro.ogg.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6f2cb386248a0d5221fa8503e732103e214bfe2b
49be076cf8d378a7591d7b953eea858e36961b8e
2 changes: 1 addition & 1 deletion Assets/Audio/Music/Rival Champion Battle Loop.ogg.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
57783ca33486d81791dbf647a9e74037aac31435
34199baba796ffd8d0793991d097dec83d85a336
Binary file removed Assets/Audio/Music/Route Theme 2 Intro.ogg
View file
Binary file not shown.
1 change: 1 addition & 0 deletions Assets/Audio/Music/Route Theme 2 Intro.ogg.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4d16e303d86a504c23f43f83f8223ec17040365f
2 changes: 1 addition & 1 deletion Assets/Audio/Music/Sylph Company Intro.ogg.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4e117c274253380e4cbd5cdd7ca58895b8e26a7d
50a7b8ca26500c505122c3b8082370b314374aee
2 changes: 1 addition & 1 deletion Assets/Audio/Music/Team Rocket Hideout Intro.ogg.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a1c24da7937c9b0a5d91537e34ef07d3be680da3
8280fc59ab3b8a82aa206f69fabbd7c1325adbb0
Binary file removed Assets/Audio/Music/The Last Road Intro.ogg
View file
Binary file not shown.
1 change: 1 addition & 0 deletions Assets/Audio/Music/The Last Road Intro.ogg.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
38cde18acb9d8189a1b0fe6c85a4f6bb5eb63f8f
Binary file modified Assets/Audio/Music/Trainer Theme (Boy) Intro.ogg
View file
Binary file not shown.
Binary file modified Assets/Audio/Music/Trainer Theme (Girl) Intro.ogg
View file
Binary file not shown.
Binary file modified Assets/Audio/Music/Trainer Theme (Team Rocket) Intro.ogg
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Assets/Audio/Music/Victory Gym Leader Intro.ogg.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
68a155d30ce80b88674f08dbeabfb5a59bb81fbc
c23345c47e8526a6bc3f4279feda8fa3159c9ab1
Binary file modified Assets/Audio/Music/Victory Trainer Intro.ogg
View file
Binary file not shown.
Binary file modified Assets/Audio/Music/Victory Wild Pokemon Intro.ogg
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions Assets/Editor/CreateCustomTextMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ public static class CreateCustomTextMenu
[MenuItem("GameObject/UI/Custom Text",false)]
static void CreateCustomText(MenuCommand menuCommand){
GameObject go = new GameObject("Text");
CustomTextTexture customTextTexture = go.AddComponent<CustomTextTexture>();
customTextTexture.texture = AssetDatabase.LoadAssetAtPath<Texture>("Assets/Fonts/font.png");
customTextTexture.fontAtlas = AssetDatabase.LoadAssetAtPath<FontAtlas>("Assets/Fonts/FontAtlas.asset");
CustomText CustomText = go.AddComponent<CustomText>();
CustomText.texture = AssetDatabase.LoadAssetAtPath<Texture>("Assets/Fonts/font.png");
CustomText.fontAtlas = AssetDatabase.LoadAssetAtPath<FontAtlas>("Assets/Fonts/FontAtlas.asset");
GameObjectUtility.SetParentAndAlign(go, menuCommand.context as GameObject);
Undo.RegisterCreatedObjectUndo(go,"Create " + go.name);
Selection.activeGameObject = go;
Expand Down
8 changes: 8 additions & 0 deletions Assets/Game/Intro Frames.meta
View file

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

8 changes: 8 additions & 0 deletions Assets/Game/Intro Frames/Blue.meta
View file

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

Binary file added Assets/Game/Intro Frames/Blue/bgb-1558368446-00000.bmp
View file
Binary file not shown.
88 changes: 88 additions & 0 deletions Assets/Game/Intro Frames/Blue/bgb-1558368446-00000.bmp.meta
View file

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

Binary file added Assets/Game/Intro Frames/Blue/bgb-1558368446-00001.bmp
View file
Binary file not shown.
88 changes: 88 additions & 0 deletions Assets/Game/Intro Frames/Blue/bgb-1558368446-00001.bmp.meta
View file

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

Binary file added Assets/Game/Intro Frames/Blue/bgb-1558368446-00002.bmp
View file
Binary file not shown.
88 changes: 88 additions & 0 deletions Assets/Game/Intro Frames/Blue/bgb-1558368446-00002.bmp.meta
View file

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

Binary file added Assets/Game/Intro Frames/Blue/bgb-1558368446-00003.bmp
View file
Binary file not shown.
Loading

0 comments on commit a93e126

Please sign in to comment.