144 Commits

Author SHA1 Message Date
CoudronJerome
932bea7432 Added images and videos prematurely 2023-05-22 14:51:25 +02:00
a5510ad59f New MacOS build 2023-05-20 15:10:00 +02:00
Louis Adriaens
8d64a32491 Merge branch 'improving-models' into 'development'
Better fingerspelling model

See merge request wesign/unity-application!111
2023-05-20 11:51:00 +00:00
Louis Adriaens
63d7a36e14 Better fingerspelling model 2023-05-20 11:50:59 +00:00
Jerome Coudron
74d73ba648 Merge branch 'WES-XXX-Courses-and-minigames-list-fix' into 'development'
Resolve WES-XXX "Courses and minigames list fix"

See merge request wesign/unity-application!110
2023-05-18 14:15:09 +00:00
Dries Van Schuylenbergh
ad27dfd105 Resolve WES-XXX "Courses and minigames list fix" 2023-05-18 14:15:08 +00:00
b729981edf New MacOS build 2023-05-18 10:23:24 +02:00
Jerome Coudron
a0dd0ae39f Merge branch 'WES-XX-SignPredictorDoc-Little-UI' into 'development'
Wes xx sign predictor doc little ui

See merge request wesign/unity-application!108
2023-05-17 17:36:33 +00:00
Dries Van Schuylenbergh
f63b49ebc7 Wes xx sign predictor doc little ui 2023-05-17 17:36:27 +00:00
Dries Van Schuylenbergh
3dded6c3e6 Merge branch 'WES-167-theme-descriptions' into 'development'
Theme descriptions added

See merge request wesign/unity-application!109
2023-05-17 15:52:10 +00:00
hvbreuge
10649e9b85 Theme descriptions added 2023-05-16 21:58:28 +02:00
Jerome Coudron
349ca1cb44 Merge branch 'WES-XX-SignPredictorDoc-Little-UI' into 'development'
Annotations + Removal of unneeded lines

See merge request wesign/unity-application!107
2023-05-16 11:09:45 +00:00
Jelle De Geest
785e56b883 Annotations + Removal of unneeded lines 2023-05-16 11:09:41 +00:00
Louis Adriaens
8c69ec3cc6 Merge branch 'WES-181-missing-code-doc' into 'development'
Resolve WES-181 "Missing code doc"

See merge request wesign/unity-application!95
2023-05-14 20:18:31 +00:00
Dries Van Schuylenbergh
3d99184717 Resolve WES-181 "Missing code doc" 2023-05-14 20:18:29 +00:00
Jerome Coudron
7505ae7262 Merge branch 'WES-XX-GPU-Test' into 'development'
Wes xx gpu test

See merge request wesign/unity-application!106
2023-05-14 19:41:40 +00:00
Jelle De Geest
1f5b855f61 Wes xx gpu test 2023-05-14 19:41:37 +00:00
Jelle De Geest
384c7a249d Merge branch 'WES-XX-Fix-JustSignGameEndedPanel' into 'development'
Resolve: FIxGameEndedPanel for JustSign

See merge request wesign/unity-application!105
2023-05-14 19:06:35 +00:00
Jerome Coudron
bdf3c05102 Resolve: FIxGameEndedPanel for JustSign 2023-05-14 19:06:34 +00:00
Louis Adriaens
584dc0d97d Merge branch 'WES-189-themes-pictures-wording' into 'development'
Resolve WES-189 "Themes pictures wording"

See merge request wesign/unity-application!103
2023-05-14 17:26:24 +00:00
Helena Van Breugel
084724c175 Resolve WES-189 "Themes pictures wording" 2023-05-14 17:26:22 +00:00
Dries Van Schuylenbergh
1cceb3cb89 Merge branch 'WES-160-fix-unity-editor-crashing' into 'development'
transcoded all video files

See merge request wesign/unity-application!102
2023-05-14 13:18:47 +00:00
Louis Adriaens
f99a73f230 transcoded all video files 2023-05-14 13:18:45 +00:00
Dries Van Schuylenbergh
e0c948292d Merge branch 'WES-XX-PreviewFix' into 'development'
Fixed preview and clothes bug

See merge request wesign/unity-application!100
2023-05-14 12:37:37 +00:00
Jerome Coudron
7df6ea1ecd Fixed preview and clothes bug 2023-05-14 12:37:36 +00:00
Dries Van Schuylenbergh
e9753a727e Merge branch 'WeSign-Logo' into 'development'
Logo icon

See merge request wesign/unity-application!98
2023-05-14 12:25:58 +00:00
Dries Van Schuylenbergh
a4c29a3146 Merge branch 'WES-187-unit-tests-justsign-and-spellingbee' into 'development'
Resolve WES-187 "Unit tests justsign and spellingbee"

See merge request wesign/unity-application!93
2023-05-14 11:58:09 +00:00
Helena Van Breugel
53fc361af4 Resolve WES-187 "Unit tests justsign and spellingbee" 2023-05-14 11:58:09 +00:00
Louis Adriaens
d593f22c10 Merge branch 'WES-166-Activity-Endscene' into 'development'
Resolve WES-166 "Activity endscene"

See merge request wesign/unity-application!101
2023-05-14 10:58:44 +00:00
Jelle De Geest
9b88537d70 Resolve WES-166 "Activity endscene" 2023-05-14 10:58:43 +00:00
Supaaah1
96b1c9f6bc Logo icon 2023-05-13 16:02:57 +02:00
Louis Adriaens
1e09f09dae Merge branch 'WES-204-user-progress-bug' into 'development'
Resolve WES-204 "User progress bug"

See merge request wesign/unity-application!97
2023-05-13 13:18:38 +00:00
Dries Van Schuylenbergh
1413f80d73 Resolve WES-204 "User progress bug" 2023-05-13 13:18:37 +00:00
Jerome Coudron
227099631e Merge branch 'WES-187-unit-tests-common-and-course' into 'development'
Resolve WES-187 "Unit tests common and course"

See merge request wesign/unity-application!94
2023-05-12 11:53:21 +00:00
Jelle De Geest
48b915acba Resolve WES-187 "Unit tests common and course" 2023-05-12 11:53:17 +00:00
Jelle De Geest
672ff367e2 Merge branch 'WES-203-Course-freezing' into 'development'
Fixed course freezing and other course-ending bugs

See merge request wesign/unity-application!92
2023-05-08 21:38:43 +00:00
CoudronJerome
ae29ef9835 Fixed course freezing and other course-ending bugs 2023-05-08 20:57:09 +02:00
c3ebf48cdc Added new MacOS build 2023-05-08 09:31:24 +02:00
Tibe Habils
59bf2392d8 add windows installer 2023-05-07 22:13:42 +02:00
Jelle De Geest
e9db885301 Merge branch 'new-basic-signs-model' into 'development'
New basic signs model

See merge request wesign/unity-application!90
2023-05-07 21:00:56 +00:00
Jerome Coudron
43887af670 New basic signs model 2023-05-07 21:00:52 +00:00
Jelle De Geest
06aa9206ac Merge branch 'WES-187-unit-tests-hangman-and-minigame' into 'development'
Resolve WES-187-unit-tests-hangman-and-minigame

See merge request wesign/unity-application!87
2023-05-06 11:36:52 +00:00
Jerome Coudron
c24fe037f6 Resolve WES-187-unit-tests-hangman-and-minigame 2023-05-06 11:36:51 +00:00
Dries Van Schuylenbergh
b10358930b Merge branch 'WES-192-fix-progress-screen' into 'development'
Resolve WES-192 "Fix progress screen"

See merge request wesign/unity-application!88
2023-05-04 09:09:53 +00:00
Dries Van Schuylenbergh
89f343780a Resolve WES-192 "Fix progress screen" 2023-05-04 09:09:49 +00:00
Jerome Coudron
259259ac9c Merge branch 'Wes-101-Speedup-Mediapipe' into 'development'
WES 101 speedup mediapipe

See merge request wesign/unity-application!89
2023-05-03 18:48:59 +00:00
Jelle De Geest
bc502361cd WES 101 speedup mediapipe 2023-05-03 18:48:56 +00:00
Jerome Coudron
fb234480f7 Merge branch 'WES-187-unit-tests-account-and-system' into 'development'
Resolve WES-187 "Unit tests account and system"

See merge request wesign/unity-application!86
2023-04-30 15:51:45 +00:00
Dries Van Schuylenbergh
b9bbef8dcf Resolve WES-187 "Unit tests account and system" 2023-04-30 15:51:41 +00:00
Tibe Habils
c4b6c60288 added windows installer 2023-04-24 00:28:36 +02:00
c457a195df New MacOS build 2023-04-24 00:01:54 +02:00
Jelle De Geest
67575cfbbd Merge branch 'fix-testing' into 'development'
Fix code coverage of testing

See merge request wesign/unity-application!83
2023-04-23 21:37:32 +00:00
Tibe Habils
05b230dd9d Fix code coverage of testing 2023-04-23 21:37:31 +00:00
Jelle De Geest
94d2ccfa8d Merge branch 'WES-132-Common-Abstract-Minigame' into 'development'
Resolve WES-132-Common-Abstract-Minigame

See merge request wesign/unity-application!81
2023-04-23 21:20:14 +00:00
Jerome Coudron
966475455a Resolve WES-132-Common-Abstract-Minigame 2023-04-23 21:20:12 +00:00
Jelle De Geest
4fdb8f95cb Merge branch 'demo-day-booth' into 'development'
Demo day booth

See merge request wesign/unity-application!84
2023-04-23 18:50:09 +00:00
Dries Van Schuylenbergh
fcd8acad1e Demo day booth 2023-04-23 18:50:07 +00:00
5b4a3ec4e7 New MacOS build 2023-04-11 19:15:53 +02:00
Louis Adriaens
77850bfbe6 Merge branch 'UI-resolution-fix' into 'development'
Fixed screen scaling

See merge request wesign/unity-application!82
2023-04-11 16:04:01 +00:00
Supaaah1
f9fff14662 Fixed screen scaling 2023-04-11 16:57:21 +02:00
aed09649e3 Added MacOS build 2023-04-10 19:47:35 +02:00
Jelle De Geest
c8dfa96c8f Merge branch 'WES-133-multiple-choice' into 'development'
Resolve WES-133 "Multiple choice"

See merge request wesign/unity-application!77
2023-04-10 15:05:13 +00:00
Tibe Habils
4e9d801e61 Resolve WES-133 "Multiple choice" 2023-04-10 15:05:11 +00:00
Helena Van Breugel
04d9a4bf2b Merge branch 'WES-144-feedback-JustSign' into 'development'
Resolve WES-144 "Feedback justsign"

See merge request wesign/unity-application!79
2023-04-08 20:28:46 +00:00
Helena Van Breugel
2b71bde592 Resolve WES-144 "Feedback justsign" 2023-04-08 20:28:42 +00:00
Dries Van Schuylenbergh
73c4756f19 Merge branch 'WES-XX-persistent-data-controller-backwards-compatible' into 'development'
Fix bug

See merge request wesign/unity-application!80
2023-04-08 19:24:46 +00:00
Dries Van Schuylenbergh
f5615bbef3 Fix bug 2023-04-08 11:31:24 +02:00
Helena Van Breugel
8670fcc4ce Merge branch 'WES-146-UI-Take2' into 'development'
WES-146-UI

See merge request wesign/unity-application!78
2023-04-06 07:20:42 +00:00
Jelle De Geest
e6d10db5ca WES-146-UI 2023-04-06 07:20:41 +00:00
Jelle De Geest
8db7c80dad Merge branch 'WES-128-Hangman-Clear-Feedback' into 'development'
Resolve WES-128-Hangman-Clear_feedback

See merge request wesign/unity-application!74
2023-04-05 20:54:20 +00:00
Jerome Coudron
197a6200c1 Resolve WES-128-Hangman-Clear_feedback 2023-04-05 20:54:20 +00:00
Jelle De Geest
68372d859b Merge branch 'WES-130-feedback-spellingbee' into 'development'
Feedback SpellingBee

See merge request wesign/unity-application!76
2023-04-05 13:40:55 +00:00
Helena Van Breugel
2a7dd16f5f Feedback SpellingBee 2023-04-05 13:40:54 +00:00
Jerome Coudron
e6b0cbd596 Merge branch 'WES-143-feedback-courses' into 'development'
Resolve WES-143 "Feedback courses"

See merge request wesign/unity-application!73
2023-04-04 18:24:20 +00:00
Helena Van Breugel
c358ac59e4 Resolve WES-143 "Feedback courses" 2023-04-04 18:24:17 +00:00
Dries Van Schuylenbergh
c20cd89c3a Merge branch 'WES-117-persistent-data-handling' into 'development'
Resolve WES-117 "Persistent data handling"

See merge request wesign/unity-application!72
2023-04-04 17:00:50 +00:00
Dries Van Schuylenbergh
5f4408063f Resolve WES-117 "Persistent data handling" 2023-04-04 17:00:47 +00:00
3499e61bb0 Added CoreML model (for Mac) 2023-04-03 20:52:01 +02:00
Jelle De Geest
aefc75f3c4 Merge branch 'WES-100-NatML-Integration' into 'development'
Resolve WES-100 "Natml integration"

See merge request wesign/unity-application!70
2023-04-03 14:14:50 +00:00
Jelle De Geest
f95e34c6fe Resolve WES-100 "Natml integration" 2023-04-03 14:14:49 +00:00
Dries Van Schuylenbergh
edf1805a92 Merge branch 'WES-131-Feedback-Refactor-Manual-Merge' into 'development'
Resolve WES-131-Feedback-REfactor

See merge request wesign/unity-application!71
2023-04-02 12:28:00 +00:00
Jerome Coudron
a808e73a29 Resolve WES-131-Feedback-REfactor 2023-04-02 12:27:59 +00:00
Jelle De Geest
b955d2164c Merge branch 'WES-145-Consistency-controllers' into 'development'
Resolve WES-145 "Consistency controllers"

See merge request wesign/unity-application!68
2023-03-30 21:28:50 +00:00
Helena Van Breugel
e96f1ff7ca Resolve WES-145 "Consistency controllers" 2023-03-30 21:28:48 +00:00
Jelle De Geest
b8cdcd128b Merge branch 'WES-127-Refactor-ThemeList' into 'development'
Resolve WES-127-Refactor_Themelist

See merge request wesign/unity-application!69
2023-03-30 21:10:39 +00:00
Jerome Coudron
ea13788199 Resolve WES-127-Refactor_Themelist 2023-03-30 21:10:35 +00:00
Tibe Habils
564ec209c7 Add windows installer 2023-03-26 20:42:59 +02:00
a3735af649 Added macos build 2023-03-26 22:27:44 +02:00
Victor Mylle
692b4318bf Update .drone.yml 2023-03-26 19:36:48 +00:00
Jelle De Geest
0015c1453c Merge branch 'WES-88-Scoreboard' into 'development'
Resolve WES-88 "Scoreboard"

See merge request wesign/unity-application!66
2023-03-26 18:01:52 +00:00
Helena Van Breugel
c78ef0e773 Resolve WES-88 "Scoreboard" 2023-03-26 18:01:51 +00:00
Dries Van Schuylenbergh
45f545b13f Merge branch 'WES-112-windows-installer' into 'development'
Added basic installer

See merge request wesign/unity-application!65
2023-03-26 14:22:45 +00:00
Tibe Habils
d3af75f676 Added basic installer 2023-03-26 14:22:42 +00:00
Tibe Habils
5f7216f24c Merge branch 'hot-fix-common-tests' into 'development'
common tests fix

See merge request wesign/unity-application!61
2023-03-26 11:47:52 +00:00
Tibe Habils
b012e40df8 common tests fix 2023-03-26 11:47:48 +00:00
Jerome Coudron
f69e2385fc Merge branch 'WES-110-spelling-bee-tests' into 'development'
Spelling bee tests

See merge request wesign/unity-application!58
2023-03-25 22:47:27 +00:00
Tibe Habils
37905a904c Spelling bee tests 2023-03-25 22:47:25 +00:00
Dries Van Schuylenbergh
0019a4d07f Merge branch 'WES-XX-ScriptableList-Index-Fix' into 'development'
Resolve WES-XX-ScriptableList-Index-Fix

See merge request wesign/unity-application!62
2023-03-25 17:16:42 +00:00
Jerome Coudron
4402e80d0c Resolve WES-XX-ScriptableList-Index-Fix 2023-03-25 17:16:41 +00:00
Jelle De Geest
d95a6590d5 Merge branch 'test-accounts' into 'development'
Test accounts

See merge request wesign/unity-application!60
2023-03-25 15:35:27 +00:00
Dries Van Schuylenbergh
7b6eb4db69 Test accounts 2023-03-25 15:35:26 +00:00
Jerome Coudron
8696aff135 Merge branch 'Common-Interfaces-Tests' into 'development'
Resolve Common-Interfaces-Tests

See merge request wesign/unity-application!63
2023-03-25 13:12:56 +00:00
Jerome Coudron
001cf6dedb Resolve Common-Interfaces-Tests 2023-03-25 13:12:55 +00:00
Lukas Van Rossem
669bcb3793 Merge branch 'WES-89-justsign-music' into 'development'
Resolve WES-89 "Justsign music"

See merge request wesign/unity-application!64
2023-03-25 11:34:09 +00:00
Lukas Van Rossem
668b769094 Resolve WES-89 "Justsign music" 2023-03-25 11:34:08 +00:00
Victor Mylle
fee989006c Update .drone.yml 2023-03-24 09:12:39 +00:00
Supaaah1
b3913c281a Review fix 2023-03-23 13:21:43 +01:00
Louis Adriaens
b0c0cdc095 Merge branch 'progress-fix' into 'development'
Fix CourseProgressCard prefab missing script reference

See merge request wesign/unity-application!59
2023-03-23 12:09:44 +00:00
Dries Van Schuylenbergh
db37a16155 Fix CourseProgressCard prefab missing script reference 2023-03-23 12:09:43 +00:00
Tibe Habils
9c7366e49c Merge branch 'WES-113-commons-tests' into 'development'
Resolve WES-113 "Commons tests"

See merge request wesign/unity-application!56
2023-03-23 11:35:15 +00:00
Tibe Habils
5a5a1f1542 Resolve WES-113 "Commons tests" 2023-03-23 11:35:14 +00:00
Louis Adriaens
0e997666e2 Merge branch 'New_Model' into 'development'
Added model from A - Z

See merge request wesign/unity-application!54
2023-03-23 11:10:58 +00:00
Victor Mylle
6ef35cabd4 Added model from A - Z 2023-03-23 11:10:55 +00:00
Tibe Habils
2581cd6137 Merge branch 'Code-Coverage' into 'development'
Code coverage

See merge request wesign/unity-application!57
2023-03-22 22:03:45 +00:00
Victor Mylle
800f0ae77f Code coverage 2023-03-22 22:03:44 +00:00
Dries Van Schuylenbergh
bb11f4d743 Merge branch 'WES-75-hangman-integration' into 'development'
Resolve WES-75 "Hangman integration"

See merge request wesign/unity-application!55
2023-03-22 16:46:11 +00:00
Jelle De Geest
f835adaa23 Resolve WES-75 "Hangman integration" 2023-03-22 16:46:07 +00:00
f9298a055a Add code analysis package 2023-03-21 11:57:39 +01:00
Dries Van Schuylenbergh
2e3dd2e26d Fix bug with inconsistent project build settings 2023-03-20 19:22:26 +01:00
Tibe Habils
f2743408a3 Merge branch 'WES-75_Hangman' into 'development'
Introduced Hangman in DEV-compatible branch

See merge request wesign/unity-application!53
2023-03-19 23:02:50 +00:00
Jerome Coudron
e23de9a2d3 Introduced Hangman in DEV-compatible branch 2023-03-19 23:02:50 +00:00
Lukas Van Rossem
b5328d0b9d Merge branch 'WES-81-justsign-new' into 'development'
Decent first prototype

See merge request wesign/unity-application!52
2023-03-19 19:39:32 +00:00
Lukas Van Rossem
44d3398e03 Decent first prototype 2023-03-19 19:39:31 +00:00
Lukas Van Rossem
c9ee031df3 Merge branch 'WES-97-Integrate-SignPredictor-in-SpellingBee' into 'development'
Resolve WES-97 "Integrate signpredictor in spellingbee"

See merge request wesign/unity-application!48
2023-03-19 17:37:52 +00:00
Dries Van Schuylenbergh
3abc24a39c Resolve WES-97 "Integrate signpredictor in spellingbee" 2023-03-19 17:37:50 +00:00
Tibe Habils
f827c29d3a Merge branch 'tests-setup' into 'development'
Tests setup

See merge request wesign/unity-application!45
2023-03-19 16:22:42 +00:00
Tibe Habils
0a4cb9e8c6 Tests setup 2023-03-19 16:22:40 +00:00
Helena Van Breugel
ac000132a9 Merge branch 'WES-80-Data' into 'development'
Resolve WES-80 "Data"

See merge request wesign/unity-application!49
2023-03-18 22:32:38 +00:00
Helena Van Breugel
a19d89db03 Resolve WES-80 "Data" 2023-03-18 22:32:36 +00:00
Jerome Coudron
8ff5c6c4c8 Merge branch 'WES-90-Integrate-SignPredictor-in-courses' into 'development'
Resolve WES-90 "Integrate signpredictor in courses"

See merge request wesign/unity-application!47
2023-03-18 19:53:19 +00:00
Louis Adriaens
746906294b Resolve WES-90 "Integrate signpredictor in courses" 2023-03-18 19:53:17 +00:00
Dries Van Schuylenbergh
1a75791d62 Merge branch 'WES-95-user-progress' into 'development'
Resolve WES-95 "User progress"

See merge request wesign/unity-application!43
2023-03-18 10:25:50 +00:00
Dries Van Schuylenbergh
9dfadece44 Resolve WES-95 "User progress" 2023-03-18 10:25:49 +00:00
Dries Van Schuylenbergh
5e26970bad Merge branch 'WES-113-write-tests' into 'development'
Resolve WES-113 "Write tests"

See merge request wesign/unity-application!44
2023-03-16 12:36:47 +00:00
Louis Adriaens
f6e6afe340 Resolve WES-113 "Write tests" 2023-03-16 12:36:46 +00:00
Dries Van Schuylenbergh
96fb3c89c3 Merge branch 'WES-99-cc-refactor' into 'development'
Resolve WES-99 "Cc refactor"

See merge request wesign/unity-application!42
2023-03-14 10:56:43 +00:00
Dries Van Schuylenbergh
dfc69ddd76 Resolve WES-99 "Cc refactor" 2023-03-14 10:56:42 +00:00
Lukas Van Rossem
59d69f7412 Merge branch 'WES-76-87-themeselection' into 'development'
Resolve WES-76 "87 themeselection"

See merge request wesign/unity-application!41
2023-03-13 21:49:42 +00:00
Lukas Van Rossem
a267301ab6 Resolve WES-76 "87 themeselection" 2023-03-13 21:49:40 +00:00
Dries Van Schuylenbergh
94ec7e0359 Change directories 2023-03-12 23:15:36 +01:00
Dries Van Schuylenbergh
0c795b09bc Merge branch 'development' of gitlab.ilabt.imec.be:wesign/unity-application into development 2023-03-12 23:10:51 +01:00
Dries Van Schuylenbergh
8501edb03a Add builds 2023-03-12 23:10:30 +01:00
Victor Mylle
cef72508cc Update .drone.yml 2023-03-12 22:03:42 +00:00
Victor Mylle
17abca46ea Update .drone.yml 2023-03-12 21:51:51 +00:00
26 changed files with 664 additions and 42 deletions

View File

@@ -1,42 +0,0 @@
## Description
_Please provide a brief summary of the changes in this merge request._
_If possible, add a short screengrab or some screenshots of the changes._
## Testing Instructions
_Please provide instructions on how the code reviewers can test your changes:_
1. [Step 1]
2. [Step 2]
3. [Step 3]
4. ...
_Please include any specific information on test data, configurations, or other requirements that are necessary to properly test the changes._
Once you've tested the changes, please confirm that they work as expected and that there are no regressions or unexpected side effects. If any issues are discovered during testing, please include detailed steps to reproduce the issue in the merge request comments. Thank you!
## Related Issues
_Please list any related issues or pull requests that are relevant to this merge request._
_E.g. WES-XXX-..._
## Known bugs or issues
_Please list any known bugs or issues related to the changes in this merge request._
## Checklist
- [ ] I have filled in this template.
- [ ] I have tested my changes thoroughly (both in the editor + **build and run (ctrl+B)**!).
- [ ] I have added appropriate unit tests.
- [ ] I have added appropriate playmode tests.
- [ ] I have updated the user documentation as necessary.
- [ ] Code reviewed by 2 people.
## Additional Notes
_Please add any additional notes or comments that may be helpful for reviewers to understand your changes._
/assign_reviewer @wesign/unityappreviewers

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 822a9c030bec4a6448d2366def70f975
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 199 KiB

View File

@@ -0,0 +1,135 @@
fileFormatVersion: 2
guid: 7ed57b438a2692241992af655b5f723a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

View File

@@ -0,0 +1,135 @@
fileFormatVersion: 2
guid: fe5316fcc0fa35d48b2e51c3ed17f3e1
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 KiB

View File

@@ -0,0 +1,135 @@
fileFormatVersion: 2
guid: 8e96013989e8b854787668484d72ae11
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 129 KiB

View File

@@ -0,0 +1,135 @@
fileFormatVersion: 2
guid: 63be1ab44f7c8c9449a21a8667fd5214
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cd21bc87689209041b7af8615b8e08ac
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: f7e4961f93ff914409feef44e452710e
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3e882272056fc4ddfa14de161aaba2ba, type: 3}

View File

@@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 6ff61ac9f394b3247871ae741cb880fb
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 8264490bef67c46f2982e6dd3f5e46cd, type: 3}

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b4e4a4b06b6fb4749b74453c24c9dbd2
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 13c641c78592f8b43abc13fd4ee38dfb
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@@ -0,0 +1,18 @@
fileFormatVersion: 2
guid: 249d4f0400f5e2143ac8550249dd1d9f
VideoClipImporter:
externalObjects: {}
serializedVersion: 2
frameRange: 0
startFrame: -1
endFrame: -1
colorSpace: 0
deinterlace: 0
encodeAlpha: 0
flipVertical: 0
flipHorizontal: 0
importAudio: 1
targetSettings: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@@ -0,0 +1,18 @@
fileFormatVersion: 2
guid: 31c878d088749d24eba4f98a9f710e4c
VideoClipImporter:
externalObjects: {}
serializedVersion: 2
frameRange: 0
startFrame: -1
endFrame: -1
colorSpace: 0
deinterlace: 0
encodeAlpha: 0
flipVertical: 0
flipHorizontal: 0
importAudio: 1
targetSettings: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@@ -0,0 +1,18 @@
fileFormatVersion: 2
guid: 6e7387c0f3d0e754991013397ce486eb
VideoClipImporter:
externalObjects: {}
serializedVersion: 2
frameRange: 0
startFrame: -1
endFrame: -1
colorSpace: 0
deinterlace: 0
encodeAlpha: 0
flipVertical: 0
flipHorizontal: 0
importAudio: 1
targetSettings: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@@ -0,0 +1,18 @@
fileFormatVersion: 2
guid: 356bd679f94cf0f41bac3e707aada6ec
VideoClipImporter:
externalObjects: {}
serializedVersion: 2
frameRange: 0
startFrame: -1
endFrame: -1
colorSpace: 0
deinterlace: 0
encodeAlpha: 0
flipVertical: 0
flipHorizontal: 0
importAudio: 1
targetSettings: {}
userData:
assetBundleName:
assetBundleVariant: