Commit graph

  • 8f3d9277ac Merging master into develop David Négrier 2021-06-29 18:39:43 +02:00
  • 33ee190b0f
    Merge pull request #1246 from thecodingmachine/OpenWebSiteScriptAllowAPI David Négrier 2021-06-29 18:27:54 +02:00
  • 3c77ce945d
    Improving docs David Négrier 2021-06-29 18:26:21 +02:00
  • c5949a0337 Fixing linting David Négrier 2021-06-29 17:57:19 +02:00
  • ef0d422a49 Fixing building of typings David Négrier 2021-06-29 17:55:19 +02:00
  • 285712bfc7 Fixing building of typings David Négrier 2021-06-29 17:31:01 +02:00
  • 1cd18db560 Fixing broken NPM typings package build David Négrier 2021-06-29 16:59:54 +02:00
  • 95bd639124 More statement GRL 2021-06-29 16:50:33 +02:00
  • 3afc725af6
    Merge pull request #1245 from thecodingmachine/cowebsiteAllowApibyScript David Négrier 2021-06-29 16:10:22 +02:00
  • 6462773e7f Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 GRL 2021-06-29 14:16:19 +02:00
  • b457ce493b Suppress console.log GRL 2021-06-29 09:44:57 +02:00
  • dad8cdef8b Merge branch 'develop' of github.com:thecodingmachine/workadventure into OpenWebSiteScriptAllowAPI GRL 2021-06-29 09:42:20 +02:00
  • 65d1e4e768 Add CHANGELOG and a map for test GRL 2021-06-29 09:40:15 +02:00
  • ec75509725
    Merge pull request #839 from ValdoTR/new-favicon David Négrier 2021-06-29 09:03:15 +02:00
  • 445449d2db remove port change for sync Lurkars 2021-06-29 08:40:24 +02:00
  • 81f2c8b746 Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenu Lurkars 2021-06-29 08:37:08 +02:00
  • c264364752 Twemoji Emote Menu Lurkars 2021-06-29 08:37:01 +02:00
  • 723001e1e7 Added better favicon Valdo Romao 2021-06-29 00:12:00 +01:00
  • 389ca25b6a Cowebsite opened by script can use Iframe Api GRL 2021-06-28 18:00:48 +02:00
  • 4cf5a6f7a0 Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into new-favicon Valdo Romao 2021-06-28 15:56:28 +01:00
  • 5c3a207c72 Merge branch 'cowebsiteAllowApibyScript' of github.com:thecodingmachine/workadventure into cowebsiteAllowApibyScript GRL 2021-06-28 16:13:53 +02:00
  • 06920a2271 Use dynamic Iframe API GRL 2021-06-28 16:13:38 +02:00
  • 9ab73c0aa0
    Update docs/maps/api-reference.md GRL78 2021-06-28 16:05:29 +02:00
  • feab5da2ad Allow a website opened by script to use iframe_api GRL 2021-06-28 15:55:30 +02:00
  • 49d627ca38
    Merge pull request #1244 from thecodingmachine/warning_message_on_iframe_api David Négrier 2021-06-28 15:24:55 +02:00
  • 3fd4f9d384 Adding a warning message if an unauthorized iFrame tries to communicate with WA David Négrier 2021-06-28 15:20:27 +02:00
  • 1e57028e6e Renaming changeTile to setTiles David Négrier 2021-06-28 14:58:49 +02:00
  • 319db95bc8 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 David Négrier 2021-06-28 14:50:26 +02:00
  • 0c5774a48f
    Merge pull request #1229 from jonnytest1/cache-fix David Négrier 2021-06-28 14:18:45 +02:00
  • 71a5e29ae4 Making script URL dynamic David Négrier 2021-06-28 14:13:49 +02:00
  • 86cb118378 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 David Négrier 2021-06-28 14:12:10 +02:00
  • 46ae4fda74
    Merge pull request #1242 from thecodingmachine/iframe_load_url David Négrier 2021-06-28 14:10:32 +02:00
  • 303d2a7837 Adding a warning regarding the "controlled" XSS in iframe.html David Négrier 2021-06-28 13:55:17 +02:00
  • 7f79c2dc4a Making the test page URL dynamic depending on the environment David Négrier 2021-06-28 13:54:49 +02:00
  • d38cec0b51 Merge branch 'metadataScriptAPIV2' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 GRL 2021-06-28 13:48:44 +02:00
  • 651b0a4518 Add test map for changing tiles by script in index GRL 2021-06-28 12:03:06 +02:00
  • ed84dacb9c Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 GRL 2021-06-28 12:01:08 +02:00
  • 330a795fee Trying to find iframe_api.js URL script dynamically David Négrier 2021-06-28 11:51:13 +02:00
  • 917f3728d5 added callback in example jonny 2021-06-28 11:17:22 +02:00
  • 9643c7adf9 added callback documentation jonny 2021-06-28 11:16:29 +02:00
  • f18291e9d2 Referencing test in index.html and adding some text in the test map. David Négrier 2021-06-28 10:06:56 +02:00
  • 0b161a2368
    Fixing typos David Négrier 2021-06-28 09:56:18 +02:00
  • b182a08ca2 correction from review GRL 2021-06-28 09:33:13 +02:00
  • b0eb241fc3 oO something kept movin the comment to the next line jonny 2021-06-25 18:45:15 +02:00
  • bbdf0a1289 fixed merge conflict jonny 2021-06-25 18:20:16 +02:00
  • 7f61e9addd Merge remote-tracking branch 'remotes/upstream/develop' into tiles-start-positions jonny 2021-06-25 18:14:40 +02:00
  • abfa010bbf added husky to gitignore jonny 2021-06-25 18:07:03 +02:00
  • 769e0fcc29 refactor to position object jonny 2021-06-25 18:03:43 +02:00
  • c7fa5cab8b cleanup jonny 2021-06-25 17:57:09 +02:00
  • f536d538ea added backwards compatible check and maps jonny 2021-06-25 17:35:42 +02:00
  • 7d12d8561a Merge branch 'develop' of github.com:thecodingmachine/workadventure into audioPlayerImprovements Lurkars 2021-06-25 16:13:26 +02:00
  • 4c8ee41cf2 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop Lurkars 2021-06-24 18:28:12 +02:00
  • 63d4c99d15
    Merge pull request #1235 from thecodingmachine/fix_map_change David Négrier 2021-06-24 17:08:06 +02:00
  • ac97cf5772 Fixing a lock when the player is moving from one room to the other David Négrier 2021-06-24 17:02:57 +02:00
  • d28f0bed50 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop Lurkars 2021-06-24 15:43:06 +02:00
  • 8c8649b584
    Merge pull request #1232 from thecodingmachine/fixCollides David Négrier 2021-06-24 15:19:10 +02:00
  • 66bceb577a
    Merge pull request #1233 from thecodingmachine/fixMenuCrash Kharhamel 2021-06-24 13:51:58 +02:00
  • 120f19af65
    Add anthoer note for https://github.com/thecodingmachine/workadventure/issues/932#issuecomment-867562208 Guy Sheffer 2021-06-24 14:35:18 +03:00
  • 116c56be81 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop Lurkars 2021-06-24 13:04:28 +02:00
  • a094e16c1f FIX: solved a menu crash kharhamel 2021-06-24 12:14:28 +02:00
  • dcc7f2a686 Fix collides GRL 2021-06-24 12:10:44 +02:00
  • c79603d7fa Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 GRL 2021-06-24 11:55:07 +02:00
  • 2f282e3469 peerStore loading order caused issues. Fixed in GameScene (+ extracted a few stores in their files) David Négrier 2021-06-24 11:54:09 +02:00
  • 4903911d62 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 GRL 2021-06-24 11:33:29 +02:00
  • a666bf310b Change Tiles GRL 2021-06-24 11:31:29 +02:00
  • 6ed8ce9af1
    Merge pull request #1163 from thecodingmachine/svelte_video_overlay David Négrier 2021-06-24 10:53:35 +02:00
  • e4708149e0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into svelte_video_overlay David Négrier 2021-06-24 10:49:55 +02:00
  • 8d59680de5 Removing useless code David Négrier 2021-06-24 10:36:47 +02:00
  • 5ed61012f0 Created a PeerStatus type instead of "connecting" | "connected" | "error" | "closed" David Négrier 2021-06-24 10:34:36 +02:00
  • 52a90e52d4
    Merge pull request #1226 from thecodingmachine/apply_prettier_on_push_and_back David Négrier 2021-06-24 10:29:21 +02:00
  • 3e464580ea Fixing eslint ignore broken by Prettier David Négrier 2021-06-24 10:23:32 +02:00
  • 10c3d6dee2 Applying Prettier on pusher and back David Négrier 2021-06-24 10:09:10 +02:00
  • a0418ddb78 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop Lurkars 2021-06-24 09:19:55 +02:00
  • d1178b1a01 immutableData was never assigned jonny 2021-06-23 20:19:38 +02:00
  • 5472d220ba added trigger message code jonny 2021-06-23 17:32:32 +02:00
  • 06b7f5ba2f Applying prettier in CI for pusher and back containers David Négrier 2021-06-23 17:13:16 +02:00
  • 3cf0a9ee84
    Merge pull request #1225 from thecodingmachine/apply_prettier_on_pusher_and_back David Négrier 2021-06-23 17:12:16 +02:00
  • 0828dd8af3 Making max line length to 120 David Négrier 2021-06-23 16:58:57 +02:00
  • 3f0ef2d31a Fixing prettier run command David Négrier 2021-06-23 16:56:33 +02:00
  • f6d3783f6c Removing git add from lint-staged since it is not necessary since v10 David Négrier 2021-06-23 16:50:00 +02:00
  • 3eab074e2a Setting up lint-staged on front and back David Négrier 2021-06-23 16:45:38 +02:00
  • ecbadda65a
    Merge pull request #1224 from thecodingmachine/prettier David Négrier 2021-06-23 16:34:21 +02:00
  • 9f9cf5a3bb Fixing .gitignore files David Négrier 2021-06-23 16:30:42 +02:00
  • 4cac260f81 Adding prettier on back and pusher (not running them right now) David Négrier 2021-06-23 16:23:16 +02:00
  • f4209515a1
    Merge pull request #1080 from thecodingmachine/metadataScriptingApi David Négrier 2021-06-23 15:57:14 +02:00
  • d2be9fa931 Adding contributing guide explaining how to setup the precommit hook David Négrier 2021-06-23 15:54:13 +02:00
  • c0bfec7b11 Adding Prettier configuration David Négrier 2021-06-23 15:51:31 +02:00
  • a5f0cadccd
    Create codeql-analysis.yml David Négrier 2021-06-23 15:29:02 +02:00
  • 6237672855
    Create SECURITY.md David Négrier 2021-06-23 15:26:17 +02:00
  • 54d392be82 fixed not returnin null if parsed from url jonny 2021-06-23 15:06:38 +02:00
  • 95d8cf9257 Change requested GRL 2021-06-23 14:54:06 +02:00
  • 12da5e64f8 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi GRL 2021-06-23 14:43:23 +02:00
  • a3eb715414 Improving wa-maps doc layout David Négrier 2021-06-23 14:41:35 +02:00
  • 64847cd465 adjusted null if no hash jonny 2021-06-23 12:42:24 +02:00
  • b20b4abb9e allow start hashes in tiles jonny 2021-06-23 12:32:36 +02:00
  • 24cc340cb9 Merge branch 'metadataScriptingApi' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2 GRL 2021-06-23 12:02:29 +02:00
  • 2a2cea2cd5 Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi GRL 2021-06-23 11:40:08 +02:00
  • bdb32a29e1 New methods refactored GRL 2021-06-23 11:32:11 +02:00
  • 633fa9f870
    Merge pull request #1210 from jonnytest1/functional-tile-properties David Négrier 2021-06-23 11:18:02 +02:00
  • af67d9b513 Migrating WA-Maps page to this repo and documenting the fact that tiles properties can now be used. David Négrier 2021-06-23 10:44:55 +02:00