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

377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ł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
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
Karol Górzyński
dcf17cf1de SES-152 Add Endpoint to get shopkeepers 2021-01-20 19:04:46 +01:00
Karol Górzyński
39fbd6c3bf SES-152 Add Interfaces (fix typo) 2021-01-20 18:55:11 +01:00
Karol Górzyński
b31cf9c703 SES-152 Add profiles and services 2021-01-20 18:54:56 +01:00
Karol Górzyński
3e1f7cd637 SES-152 Add Basic ViewModels for sshopkeepers 2021-01-20 18:54:11 +01:00
Karol Górzyński
561db899da SES-152 Add migration for Shopkeepers 2021-01-20 18:53:40 +01:00
Karol Górzyński
92fbe801b0 SES-152 Add Seed methods for Shopkeepers 2021-01-20 18:53:20 +01:00
Karol Górzyński
8fe7584682 SES-152 Add Repositories for Shopkeepers 2021-01-20 18:52:53 +01:00
Karol Górzyński
3fcc2d77b0 SES-152 Add Tables for shopkeepers 2021-01-20 18:52:02 +01:00
Natalia Gawron
d0cddafbac Merge pull request 'SES-159' (#78) from SES-159 into dev 
Reviewed-on: #78
 2021-01-20 17:53:54 +01:00
Łukasz Góreczny
b2436c7dc9 error on move fix 2021-01-20 17:48:45 +01:00
Łukasz Góreczny
905c26d873 working dialog on gm screen 2021-01-20 14:37:55 +01:00
Łukasz Góreczny
226dd666f5 SES-159 review fixes 2021-01-20 10:58:55 +01:00
Łukasz Góreczny
f3cfe2a326 SES-159 turn tracker final 2021-01-19 13:50:11 +01:00
Łukasz Góreczny
0d696c5bcd SES-159 turn tracker base 2021-01-19 11:49:20 +01:00
Łukasz Góreczny
5259a2ec57 Merge pull request 'SES-147 throw dialogs - player' (#77) from SES-147 into dev 
Reviewed-on: #77
 2021-01-16 21:57:58 +01:00
Natalia Gawron
c9b2f15521 Merge branch 'dev' into SES-147 2021-01-16 21:56:15 +01:00
Natalia Gawron
0d0e03218d Merge pull request 'SES-151 Added shopkeepers table' (#76) from SES-151 into dev 
Reviewed-on: #76
 2021-01-16 21:55:31 +01:00
Natalia Gawron
686e1b374a resolved conflicts 2021-01-16 21:53:41 +01:00
Natalia Gawron
a16f03a720 SES-147 displaying score whith other information 2021-01-16 21:49:22 +01:00
Łukasz Góreczny
0d69bbfe75 SES-151 Added shopkeepers table 2021-01-16 20:33:34 +01:00
Natalia Gawron
5949512a38 SES-147 fixed css for mobile 2021-01-16 20:03:37 +01:00
Natalia Gawron
f3c1edbc2c Merge pull request 'SES-146 Added spells dialog' (#75) from SES-146 into dev 
Reviewed-on: #75
 2021-01-16 19:33:21 +01:00
Łukasz Góreczny
e199b01f50 merge 2021-01-16 19:32:29 +01:00
Natalia Gawron
a7ac3e65f2 Merge pull request 'SES-149 Added sevice and monster table' (#74) from SES-149 into dev 
Reviewed-on: #74
 2021-01-16 19:24:44 +01:00
Łukasz Góreczny
35cbec16f7 SES-146 Added spells dialog 2021-01-15 23:24:50 +01:00
Natalia Gawron
b740fdc3b4 SES-147 display dialog for ST and other skills also 2021-01-15 22:55:19 +01:00
Natalia Gawron
bf58d05503 SES-147 modified UI dialog throw 2021-01-15 20:32:12 +01:00
Łukasz Góreczny
b71fcaa385 SES-149 Added sevice and monster table 2021-01-15 20:30:41 +01:00
Łukasz Góreczny
f99437e3ab Merge pull request 'SES-157 Create characters from templates' (#73) from SES-157 into dev 
Reviewed-on: #73
 2021-01-15 18:58:20 +01:00