_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,461 Commits 2 Branches 0 Tags 47 MiB
376af7d28d
Commit Graph

3461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gregoire Parant
df3c618ffa Merge branch 'develop' into 2daysLimit 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Connexion/ConnectionManager.ts
 2021-12-23 14:23:08 +01:00
David Négrier
3daf7a402e Upgrading ts-node-dev to stable release 2021-12-23 14:15:14 +01:00
Gregoire Parant
fd64fc43a4 Finish 2 days room limit 
- Create modal to register when limit is past
 - Create modal to share the link
 - Use UrlManager to check if limit room is active

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-23 13:09:28 +01:00
David Négrier
bf64f8890d
Merge pull request #1669 from thecodingmachine/develop 
Deploy 2021-12-23
 2021-12-23 12:33:12 +01:00
David Négrier
a82a5caec8 Upgrading testcafe to 1.18.0 2021-12-23 11:46:39 +01:00
David Négrier
9efa115982 Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2021-12-23 11:04:20 +01:00
David Négrier
565ccb10c8
Merge pull request #1662 from thecodingmachine/feat/outline_api 
Adding an API to control players outline
 2021-12-23 10:55:03 +01:00
David Négrier
e34c49fd49 Fixing tests 2021-12-23 10:44:46 +01:00
David Négrier
35463930a0 Sending color outline on connect 2021-12-23 10:22:19 +01:00
Gregoire Parant
60f4cf75c3 Merge branch 'develop' into 2daysLimit 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-12-23 10:02:46 +01:00
David Négrier
482ba9690a Sharing outline color changes in real time 2021-12-22 18:34:36 +01:00
Chasethechicken
6cae134c8f Fix indentation 
To make prettier happy
 2021-12-22 10:13:26 +01:00
Chasethechicken
1ea7b45c7e Fix misplaced semicolon 2021-12-21 23:26:15 +01:00
Chasethechicken
66efdebc78 Fix test map 2021-12-21 23:22:58 +01:00
Chasethechicken
5197428969 Add link to layer visibility test map 2021-12-21 22:24:03 +01:00
Chasethechicken
ee46111d3f Add test instructions 
Also make the invisible and alpha layers seperate areas,
to make success more obvious.
 2021-12-21 22:22:26 +01:00
David Négrier
90f7287860 Adding the ability to set the player's color outline via the scripting API 
(currently not shared with the other players yet)
 2021-12-21 17:02:53 +01:00
David Négrier
e086f6dac0
Merge pull request #1663 from thecodingmachine/fix/map_detail_type_guard 
Fixing new MapDetails type guard
 2021-12-21 16:23:01 +01:00
David Négrier
1544385082
Merge pull request #1665 from albanbruder/fix-admin-message-update 
Fix admin message update in frontend
 2021-12-21 16:22:43 +01:00
Alban Bruder
85c07e3723 Fix admin message update in frontend 2021-12-21 13:03:24 +01:00
Chasethechicken
ba7ea16799 Add test map 2021-12-21 11:47:43 +01:00
David Négrier
e660e25616 Fixing new MapDetails type guard 
It was working improperly with messages from the admin
 2021-12-21 11:37:54 +01:00
Chasethechicken
6f4fe47808 Add missing layer properties 
Enables map makers to set the alpha, visibility, origin and size of layers.

Co-authored-by: jonny <ga86lad@mytum.de>
 2021-12-21 11:31:14 +01:00
PizZaKatZe
f2e37b8cff Clean up now unused function in group model 2021-12-20 16:49:41 +01:00
PizZaKatZe
329f721998
Update back/src/Model/Group.ts 
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2021-12-20 16:46:16 +01:00
David Négrier
e220bf56db
Merge pull request #1658 from albanbruder/fix-admin-message 
Fix: Use specified type in admin message
 2021-12-20 16:05:42 +01:00
David Négrier
26897eb6d1
Merge pull request #1660 from thecodingmachine/fix/room_cleanup_on_error 
Correctly cleaning room in pusher even if an exception occurs
 2021-12-20 15:44:30 +01:00
David Négrier
d792d35d09 Correctly cleaning room in pusher even if an exception occurs 
Closes #1646 (again)
 2021-12-20 15:33:47 +01:00
Alban Bruder
d185c0ee24 fix code styling 2021-12-20 15:14:49 +01:00
David Négrier
7938a7d610
Merge pull request #1659 from thecodingmachine/fix/room_cleanup_on_error 
Properly delete rooms in Pusher in case of connection error and empty room
 2021-12-20 14:29:28 +01:00
David Négrier
e0aab9c0ce Properly delete rooms in Pusher in case of connection error and empty room 
Closes #1646
 2021-12-20 14:16:52 +01:00
Alban Bruder
4ffcebb2e4 Use specified type in admin message 2021-12-20 13:53:54 +01:00
PizZaKatZe
50147db895 Block running in follow mode 2021-12-20 13:36:29 +01:00
PizZaKatZe
21b1313a18 Get rid of buggy open state 2021-12-20 12:50:43 +01:00
Lurkars
3916d9c58e Add follow button to ui, improved flow 2021-12-20 11:35:06 +01:00
Lurkars
2cd088c049 Change follow request to "F" button, use nes-css buttons 2021-12-18 11:58:30 +01:00
PizZaKatZe
5c385c520a Cleanup; pretty 2021-12-18 11:45:17 +01:00
David Négrier
c96b65549f Performing proper cleanup when a user leaves 2021-12-18 11:34:20 +01:00
David Négrier
cd805fab31 Refactoring following code to make a distinction beween followed and following users. 
Also, moving sending messages to the User class.
 2021-12-18 11:34:20 +01:00
David Négrier
fd9cb09de6 Checking if a user should leave a group when someone moves in the group every time. 
This fixes a long standing issue.
 2021-12-18 11:34:20 +01:00
David Négrier
44ff9e30d5 Using id instead of name to identify other Wokas 2021-12-18 11:34:20 +01:00
David Négrier
404404d2bf Fixing pusher build 2021-12-17 10:18:31 +01:00
PizZaKatZe
ab994183e5 Fix not following users getting "stuck" in groups 2021-12-16 21:26:30 +01:00
David Négrier
b33c74da3a
Merge pull request #1645 from thecodingmachine/upgrade_typescript_4.5 
Upgrade Typescript to 4.5
 2021-12-16 17:35:58 +01:00
David Négrier
36f5d42668 Fixing prettier setup on messages 2021-12-16 16:46:22 +01:00
David Négrier
1ed10b0cdd Adding Prettier in messages 2021-12-16 16:40:50 +01:00
David Négrier
fff45c2f92 Adding prettier on messages 2021-12-16 16:27:44 +01:00
David Négrier
8c93801746 Fixing wrong import 2021-12-16 16:18:23 +01:00
David Négrier
805368dd3f Fixing CI with new messages 2021-12-16 16:15:12 +01:00
David Négrier
88a6e80a8f Adding JsonMessages to Docker image 2021-12-16 16:09:59 +01:00