ggurdin
|
3ce03ecc2f
|
adjust position of points gain animation over new messages
|
2024-08-23 14:19:22 -04:00 |
|
ggurdin
|
f8020279c6
|
Merge branch 'main' into learning-analytics-summary
|
2024-08-23 10:31:00 -04:00 |
|
ggurdin
|
54040d841a
|
add draft construct uses while using language assistance, added morphs to learning progress indicators
|
2024-08-21 14:01:24 -04:00 |
|
ggurdin
|
c263e7b872
|
Merge pull request #580 from pangeachat/switch-staging-branch
Switch staging branch
|
2024-08-14 11:37:59 -04:00 |
|
ggurdin
|
2d4285a4ae
|
added job to switch to the development branch
|
2024-08-14 11:37:11 -04:00 |
|
ggurdin
|
9b1e0c6e2d
|
in main deploy github action, switch target branch from main to development
|
2024-08-14 11:31:50 -04:00 |
|
ggurdin
|
75234e6a6f
|
inital work for having a 2-stage progress bar and saving draft analytics locally
|
2024-08-14 09:07:10 -04:00 |
|
ggurdin
|
e1bd9aa026
|
Merge pull request #577 from pangeachat/story-game
base timer off of game state event
|
2024-08-13 17:13:07 -04:00 |
|
ggurdin
|
f8efc75929
|
Merge branch 'main' into story-game
|
2024-08-13 17:12:59 -04:00 |
|
ggurdin
|
7f731e1406
|
base timer off of game state event
|
2024-08-13 17:12:28 -04:00 |
|
ggurdin
|
6678ed001b
|
Merge pull request #575 from pangeachat/story-game
moved timer sync logic to seperate function, don't hide bot messages …
|
2024-08-13 09:46:31 -04:00 |
|
ggurdin
|
4eb31a12e8
|
Merge branch 'main' into story-game
|
2024-08-13 09:46:18 -04:00 |
|
ggurdin
|
e8bb166fae
|
moved timer sync logic to seperate function, don't hide bot messages after end of round
|
2024-08-13 09:45:36 -04:00 |
|
ggurdin
|
78c6eb18bf
|
Merge pull request #574 from pangeachat/story-game
Story game
|
2024-08-12 17:38:43 -04:00 |
|
ggurdin
|
f4a0fbaacb
|
Revert "Revert "don't show user avatars or display names in chats""
This reverts commit 07fa96cdc9.
|
2024-08-12 17:35:23 -04:00 |
|
ggurdin
|
012b20b09f
|
some small tweaks
|
2024-08-12 17:24:53 -04:00 |
|
Kelrap
|
72a6f30227
|
Timer does not automatically start
|
2024-08-12 17:15:57 -04:00 |
|
ggurdin
|
fa36eb605c
|
improved listening for bot messages
|
2024-08-12 17:09:37 -04:00 |
|
Kelrap
|
d2bcdaa7db
|
Add timer to round model
|
2024-08-12 16:51:35 -04:00 |
|
Kelrap
|
1a841d382f
|
Add getter for remaining time
|
2024-08-12 16:04:11 -04:00 |
|
Kelrap
|
e7f3b9e73a
|
Adds countdown timer to chat
|
2024-08-12 16:02:03 -04:00 |
|
ggurdin
|
2b574f42c1
|
added completer and recursive function to start a new round at the end of a round
|
2024-08-12 15:42:33 -04:00 |
|
ggurdin
|
ac6ddc6d0e
|
added logic for auto-starting round on bot message
|
2024-08-12 15:36:02 -04:00 |
|
ggurdin
|
ea1c1a6840
|
added prototype of GameRound model
|
2024-08-12 14:58:45 -04:00 |
|
ggurdin
|
368eae1014
|
Merge pull request #571 from pangeachat/revert-anonymous
Revert "don't show user avatars or display names in chats"
|
2024-08-12 14:49:27 -04:00 |
|
ggurdin
|
07fa96cdc9
|
Revert "don't show user avatars or display names in chats"
This reverts commit a36c52ff87.
|
2024-08-12 14:48:46 -04:00 |
|
ggurdin
|
afc758ed3d
|
Merge pull request #570 from pangeachat/anonymous
don't show user avatars or display names in chats
|
2024-08-12 11:44:16 -04:00 |
|
ggurdin
|
a36c52ff87
|
don't show user avatars or display names in chats
|
2024-08-12 11:43:44 -04:00 |
|
ggurdin
|
105d2d5fae
|
Merge pull request #567 from pangeachat/remove-error-button-padding
Remove error button padding
|
2024-08-09 15:48:06 -04:00 |
|
ggurdin
|
0466a94bfa
|
Merge branch 'main' into remove-error-button-padding
|
2024-08-09 15:47:56 -04:00 |
|
ggurdin
|
6225c17acd
|
Merge pull request #568 from pangeachat/update-learning-settings-description
Update learning settings description
|
2024-08-09 15:45:23 -04:00 |
|
ggurdin
|
74841c5df0
|
Merge branch 'main' into update-learning-settings-description
|
2024-08-09 15:45:08 -04:00 |
|
ggurdin
|
474198c7a1
|
Merge branch 'main' into learning-analytics-summary
|
2024-08-09 10:06:37 -04:00 |
|
ggurdin
|
a83e9745fa
|
Merge pull request #569 from pangeachat/update-android-target-sdk
Updated android target SDK to follow google's guidelines, also bumped…
|
2024-08-09 10:06:03 -04:00 |
|
ggurdin
|
9ea37bce5a
|
Updated android target SDK to follow google's guidelines, also bumped version number
|
2024-08-09 10:05:30 -04:00 |
|
Kelrap
|
51705ba485
|
Remove outdated info
|
2024-08-08 16:25:16 -04:00 |
|
Kelrap
|
c27c250590
|
Removes error button padding
|
2024-08-08 15:24:50 -04:00 |
|
ggurdin
|
f5c81fe8ec
|
merge main, resolve conflicts
|
2024-08-07 17:05:09 -04:00 |
|
ggurdin
|
b15a4ef5a7
|
Merge pull request #565 from pangeachat/replace-access-token
replace accessToken with matrix access token
|
2024-08-07 12:50:53 -04:00 |
|
ggurdin
|
b8bd90a44d
|
replace accessToken with matrix access token
|
2024-08-07 12:48:28 -04:00 |
|
ggurdin
|
8adf15a1f4
|
Merge pull request #560 from pangeachat/559-role-play-mode
559 text adventure mode
|
2024-08-07 11:50:38 -04:00 |
|
ggurdin
|
3f7c154d2e
|
Merge branch 'main' into 559-role-play-mode
|
2024-08-07 11:50:20 -04:00 |
|
WilsonLe
|
c193c928a1
|
implement dynamic zone label and title shared component
|
2024-08-07 11:27:22 -04:00 |
|
WilsonLe
|
49921e47e4
|
Merge branch '559-role-play-mode' of https://github.com/pangeachat/client into 559-role-play-mode
|
2024-08-07 10:59:47 -04:00 |
|
WilsonLe
|
62d71285a4
|
fix text adventure title padding
|
2024-08-07 10:59:43 -04:00 |
|
ggurdin
|
fb104ecca1
|
Merge pull request #518 from pangeachat/512-bump-matrix-sdk
bump matrix sdk version, fixes timeline memory issue
|
2024-08-07 10:54:52 -04:00 |
|
ggurdin
|
500e54bed9
|
Merge branch 'main' into 512-bump-matrix-sdk
|
2024-08-07 10:54:44 -04:00 |
|
ggurdin
|
04012481fa
|
Merge branch 'main' into 559-role-play-mode
|
2024-08-07 10:17:12 -04:00 |
|
ggurdin
|
396aa70bc9
|
Merge pull request #563 from pangeachat/input-bar-improvements
choreographer pulls roomID from chat so input bar key does not change…
|
2024-08-07 10:01:12 -04:00 |
|
ggurdin
|
7165060041
|
choreographer pulls roomID from chat so input bar key does not change after setting choreo roomID, resolving issues with input bar auto-focus
|
2024-08-07 09:59:01 -04:00 |
|