s426135
/
session-companion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
406 Commits 4 Branches 0 Tags 1.4 MiB
Commit Graph

406 Commits

Author SHA1 Message Date
Łukasz Góreczny b6204e81e7 pagination and sort fix 2021-01-25 18:38:50 +01:00
Łukasz Góreczny 8ff2711363 fix bugs 2021-01-25 11:50:18 +01:00
Natalia Gawron 55a77aec8c Merge pull request 'SES-160 shop on gm and player screen' (#85) from SES-160 into dev 
Reviewed-on: #85
 2021-01-23 21:50:01 +01:00
Łukasz Góreczny 5bd30e36f7 merge 2021-01-23 21:39:51 +01:00
Łukasz Góreczny 1ee65ef764 Merge pull request 'SES-156 create character from template' (#86) from SES-156 into dev 
Reviewed-on: #86
 2021-01-23 21:34:41 +01:00
Natalia Gawron 4f94e86a7c SES-156 create character from template 2021-01-23 20:39:42 +01:00
Łukasz Góreczny 123d1673b6 SES-160 log fix 2021-01-23 19:53:19 +01:00
Łukasz Góreczny 9d36c16600 SES-160 function to buy items 2021-01-23 19:36:24 +01:00
Natalia Gawron 4ede197d83 SES-156 WIP - step 2 - creating character 2021-01-22 22:09:41 +01:00
Natalia Gawron 706b2aa0fa SES-156 displaying template list, created basic UI, fixed backend service 2021-01-22 21:27:37 +01:00
Łukasz Góreczny 0a5b7a06f4 SES-160 game-master page 2021-01-22 21:15:19 +01:00
Natalia Gawron 9c41f51820 SES-156 added routing for creating character 2021-01-22 19:46:09 +01:00
Łukasz Góreczny ba91bea4ea Merge branch 'dev' into SES-160 2021-01-22 08:43:23 +01:00
Łukasz Góreczny 844137b551 fix typo 2021-01-22 08:42:52 +01:00
Łukasz Góreczny 18aebc4733 Merge pull request 'SES-164 Ujednolicenie Api response' (#82) from SES-164 into dev 
Reviewed-on: #82
 2021-01-22 08:40:24 +01:00
Łukasz Góreczny 92b8366cef frontend fix 2021-01-22 08:39:55 +01:00
Łukasz Góreczny bbf28330e6 Create shopkeeper endpoint 2021-01-22 08:37:31 +01:00
Łukasz Góreczny e048fe71a3 merge 2021-01-22 08:01:35 +01:00
Łukasz Góreczny 3f164b7e17 extra methods 2021-01-22 08:00:03 +01:00
Łukasz Góreczny fc57fcbaba Merge pull request 'SES-165 players tables' (#84) from SES-165 into dev 
Reviewed-on: #84
 2021-01-22 07:46:29 +01:00
Natalia Gawron d43cac8129 resolved conflicts with dev 2021-01-21 21:13:17 +01:00
Natalia Gawron 98079872ca SES-165 updated css for mobile 2021-01-21 21:06:37 +01:00
Natalia Gawron c31075e54f SES-165 updated css 2021-01-21 20:50:29 +01:00
Natalia Gawron 44e6fd20b9 SES-165 added other equipment table connected with backend 2021-01-21 19:47:37 +01:00
Natalia Gawron 47f5132f14 SES-165 added armors table connected with backend 2021-01-21 18:43:39 +01:00
Łukasz Góreczny b0aaea1474 controller update 2021-01-21 18:29:41 +01:00
Łukasz Góreczny 0e0079d973 Merge branch 'dev' into SES-160 2021-01-21 18:23:53 +01:00
Łukasz Góreczny 32d645ea19 Merge pull request 'SES-154 Endpoint zmiany statusu sklepikarza' (#80) from SES-154 into dev 
Reviewed-on: #80
 2021-01-21 18:22:17 +01:00
Łukasz Góreczny ef7678fa69 merge 2021-01-21 18:21:59 +01:00
Łukasz Góreczny 20dec1e4eb get all shopkeepers 2021-01-21 18:19:24 +01:00
Natalia Gawron cac19da882 Merge pull request 'SES-158 Added function to send message to player' (#83) from SES-158 into dev 
Reviewed-on: #83
 2021-01-21 17:51:33 +01:00
Natalia Gawron 8a7426cda5 Merge branch 'dev' into SES-158 2021-01-21 17:51:04 +01:00
Łukasz Góreczny f9c41061e1 Merge pull request 'SES-153 Endpoint tworzący sklepikarza' (#81) from SES-153 into dev 
Reviewed-on: #81
 2021-01-21 17:36:29 +01:00
Łukasz Góreczny 60895fd395 merge 2021-01-21 13:08:57 +01:00
Łukasz Góreczny d5d9247edd added snackbar 2021-01-21 13:06:30 +01:00
Karol Górzyński 3a8090dab7 SES-164 Change bad references 2021-01-20 21:08:18 +01:00
Karol Górzyński ee05b0d381 SES-164 Add new constructors and change succesResponse 2021-01-20 21:06:28 +01:00
Natalia Gawron 96ff8ae45f SES-165 created weapon teble for player, connected with backend 2021-01-20 20:57:59 +01:00
Karol Górzyński 42c786b1d0 SES-153 Add endpoint to create new Shopkeeper with items 2021-01-20 20:54:39 +01:00
Karol Górzyński 99f177887f SES-153 Add new service, to create new shopkeeper with items 2021-01-20 20:54:19 +01:00
Karol Górzyński 69e23bf187 SES-153 Added Profile 2021-01-20 20:53:54 +01:00
Karol Górzyński 93a6631cc3 SES-153 Change and add new ViewModels 2021-01-20 20:53:34 +01:00
Karol Górzyński f7dc48b008 SES-154 Add Reqired fields in EquiplmentController 2021-01-20 19:57:41 +01:00
Karol Górzyński 0b29aca44d SES-154 Add Endpoint to change shopkeeper status 2021-01-20 19:57:20 +01:00
Karol Górzyński dde7039ad4 SES-154 Add Service that changes shopkeeper status 2021-01-20 19:56:51 +01:00
Karol Górzyński c3dda1de44 SES-154 Fix seed beacuse multiple shopkeepers cannot be active at the same time 2021-01-20 19:33:46 +01:00
Łukasz Góreczny 3466b54785 Merge pull request 'SES-152 Endpoint zwracający sklepikarzy' (#79) from SES-152 into dev 
Reviewed-on: #79
 2021-01-20 19:26:09 +01:00
Karol Górzyński afe8b5e184 Merge branch 'SES-152' of git.wmi.amu.edu.pl:s426135/session-companion into SES-152 2021-01-20 19:14:50 +01:00
Karol Górzyński 22069cae7d SES-152 Apply feedback 2021-01-20 19:14:42 +01:00
Karol Górzyński d572db69ca Merge branch 'dev' into SES-152 2021-01-20 19:05:59 +01:00