jonny
|
318749e5a8
|
develop merge
|
2021-06-17 11:30:16 +02:00 |
|
David Négrier
|
f6554a1082
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe-api-refactor
# Conflicts:
# front/src/iframe_api.ts
|
2021-06-17 11:23:56 +02:00 |
|
|
jonny
|
dab3f1f844
|
removed zoned popups
|
2021-06-03 22:01:42 +02:00 |
|
|
jonny
|
8a1376e966
|
refactored to key based types
|
2021-05-28 02:28:11 +02:00 |
|
|
jonny
|
5fd82c1188
|
minor cleanup
|
2021-05-28 01:50:58 +02:00 |
|
|
jonny
|
ab631c5dc4
|
register callbacks
should be done now
|
2021-05-28 01:46:08 +02:00 |
|
|
jonny
|
fd5b598b63
|
Bubble [WIP] (still need to do the javascript part)
|
2021-05-28 01:18:00 +02:00 |
|
|
jonny
|
540e5783b6
|
cowebsite
navigation
sound
player
extraction
|
2021-05-28 01:14:10 +02:00 |
|
|
jonny
|
cbe93d7164
|
[WIP] fixed cherry pick conflicts
|
2021-05-28 00:34:40 +02:00 |
|
|
jonny
|
2de2d114a1
|
added typedef for subobject types
extracted popup functions
# Conflicts:
# front/package-lock.json
# front/package.json
# front/src/iframe_api.ts
|
2021-05-28 00:30:51 +02:00 |
|
|
jonny
|
1a1ab30574
|
extraction idea
# Conflicts:
# front/src/Api/ScriptUtils.ts
# front/src/iframe_api.ts
|
2021-05-28 00:29:21 +02:00 |
|