Commit Graph

61 Commits

Author SHA1 Message Date
Dries Van Schuylenbergh
3ea0e8e452 Merge branch 'WES-43-integrate-minigame-and-courses' into 'development'
Integrate minigame and courses

See merge request wesign/unity-application!20
2023-03-08 19:07:59 +00:00
Dries Van Schuylenbergh
852a17b0b4 Integrate minigame and courses 2023-03-08 19:07:57 +00:00
Victor Mylle
7e98fea538 Merge branch 'WES-57-test-framework' into 'development'
WES-57-test-framework

See merge request wesign/unity-application!5
2023-03-08 14:15:01 +00:00
Tibe Habils
960f6e0681 WES-57-test-framework 2023-03-08 14:15:00 +00:00
Victor Mylle
adf907a6ca Merge branch 'WES-56-users' into 'development'
Implement simple user creation system

See merge request wesign/unity-application!19
2023-03-08 10:13:11 +00:00
Dries Van Schuylenbergh
a351182aa1 Implement simple user creation system 2023-03-08 10:13:10 +00:00
Dries Van Schuylenbergh
7ed5a959e2 Merge branch 'WES-43-minigame-framework' into 'development'
Resolve WES-43 "Minigame framework"

See merge request wesign/unity-application!18
2023-03-06 12:14:26 +00:00
Dries Van Schuylenbergh
9eebf4e4f2 Resolve WES-43 "Minigame framework" 2023-03-06 12:14:25 +00:00
Tibe Habils
f670c0cd0a Merge branch 'WES-50-courses-basics' into 'development'
wes-50 -> dev

See merge request wesign/unity-application!17
2023-03-05 15:52:00 +00:00
Jerome Coudron
f5689090cd wes-50 -> dev 2023-03-05 15:52:00 +00:00
Victor Mylle
33bdc1464a Update .drone.yml 2023-03-04 22:18:36 +00:00
Dries Van Schuylenbergh
e6e517327f Merge branch 'WES-49-courses-list' into 'development'
Resolve WES-49 "Courses list"

See merge request wesign/unity-application!14
2023-03-04 20:08:28 +00:00
Dries Van Schuylenbergh
ffa28e16dd Resolve WES-49 "Courses list" 2023-03-04 20:08:28 +00:00
Lukas Van Rossem
94e394b26c Merge branch 'WES-59-winning-screen-real' into 'development'
Resolve WES-59 "Winning screen real"

See merge request wesign/unity-application!13
2023-03-02 21:33:15 +00:00
lvrossem
657777ad62 Add winning screen 2023-03-02 22:28:54 +01:00
lvrossem
e00fb02f3b Resolve conflicts 2023-03-02 20:52:01 +01:00
lvrossem
c195ee69b1 Bit of cleanup and comments 2023-03-02 20:32:28 +01:00
lvrossem
56f3d0c195 Kinda sorta finished 2023-03-02 19:29:37 +01:00
lvrossem
630c94836f Bit of cleanup 2023-03-02 17:13:57 +01:00
lvrossem
0abf2096e8 Add timer to spelling bee 2023-03-02 17:11:57 +01:00
lvrossem
359b1db905 Some more work on theme selection 2023-03-02 15:24:34 +01:00
Dries Van Schuylenbergh
836e1cdc4c Fix Resource folder issues 2023-03-02 14:46:19 +01:00
lvrossem
49b91f062e Theme selection screen 2023-03-02 14:42:35 +01:00
Dries Van Schuylenbergh
7a078849c0 Improve folder structure 2023-03-02 13:36:09 +01:00
lvrossem
62ee8b9097 Small refactor to JSON loader 2023-03-02 12:28:19 +01:00
lvrossem
8a27a1fe3b Write comments; some cleanup 2023-03-02 00:33:16 +01:00
lvrossem
493fb34e09 Fix wrong image pathnames 2023-03-02 00:12:52 +01:00
lvrossem
0d629d48ae More work on spelling bee 2023-03-02 00:11:06 +01:00
lvrossem
51f8cc169c Get all words to render correctly 2023-03-01 22:09:55 +01:00
lvrossem
95b17fff22 Finally manage to render a word 2023-03-01 21:16:26 +01:00
lvrossem
ecd24dce04 Get JSON parser to work 2023-03-01 19:43:56 +01:00
lvrossem
994997d279 Correct more typos in words.json and words.txt 2023-03-01 18:17:35 +01:00
lvrossem
7751f0c97d Correct typos in words.json and words.txt 2023-03-01 18:11:00 +01:00
lvrossem
6f339aebae Fix merge conflicts 2023-03-01 17:25:59 +01:00
lvrossem
9cdcb63baf Continue work on spelling bee 2023-03-01 17:19:32 +01:00
Dries Van Schuylenbergh
27abe56106 Add image files 2023-02-28 23:00:16 +01:00
Dries Van Schuylenbergh
836c15ad5f Add JSON file support for easier managment of themes. 2023-02-28 22:59:46 +01:00
Dries Van Schuylenbergh
2c771bdb8d Update words 2023-02-28 22:58:47 +01:00
Dries Van Schuylenbergh
dcd23df3da Update .gitignore for vscode users 2023-02-28 20:36:03 +01:00
Dries Van Schuylenbergh
a3f543f458 Add more words 2023-02-28 14:24:33 +01:00
Dries Van Schuylenbergh
816f631802 Move files to Resources folder 2023-02-28 14:06:38 +01:00
lvrossem
5652259e4e Small refactor to use Resource folder 2023-02-28 12:44:56 +01:00
Dries Van Schuylenbergh
23887d97ec Add Selling Bee words 2023-02-28 12:28:48 +01:00
lvrossem
4fdfd0da84 Read words into list on startup 2023-02-28 12:24:46 +01:00
lvrossem
ef58f9bb19 Add words file and test image 2023-02-28 11:27:27 +01:00
Jelle De Geest
8980464875 Merge branch 'course-implemented' into 'development'
Course implemented

See merge request wesign/unity-application!6
2023-02-26 18:17:35 +00:00
Jelle De Geest
0127eb3c4c Merge branch 'rescale-fullhd' into 'course-implemented'
Rescale fullhd

See merge request wesign/unity-application!4
2023-02-26 18:06:55 +00:00
jeldgees
0bac4ab253 Added missing files 2023-02-25 19:51:02 +01:00
jeldgees
cdf28572b3 Visual overhaul of the main menu 2023-02-25 19:08:57 +01:00
Jerome Coudron
3b319b9792 Merge branch 'rescale-fullhd' into 'course-implemented'
Rescale elements to accomodate Full HD

See merge request wesign/unity-application!3
2023-02-25 14:01:25 +00:00