Commit Graph

246 Commits

Author SHA1 Message Date
94192b41eb merge 2021-01-10 16:20:20 +01:00
27a2028001 SES-137 Weapon table added 2021-01-10 15:59:32 +01:00
dccbdb8f4a SES-135 resolved conflicts 2021-01-10 15:52:36 +01:00
e414e321b6 SES-135 changes property characterId 2021-01-10 15:32:49 +01:00
868c05ef99 SES-135 deleted unused elements, added style CSS 2021-01-10 15:29:43 +01:00
edb72d1701 SES-139 added dialog on character click in gm screen 2021-01-10 15:28:14 +01:00
c805fd2cb3 SES-140 added CSS 2021-01-10 14:47:50 +01:00
3627f987da SES-135 connected method with backend, fixed card with stats UI 2021-01-10 00:01:59 +01:00
b13a34044b Merge pull request 'SES-140 connected Player with SignalR' (#61) from SES-140 into dev
Reviewed-on: #61
2021-01-09 22:24:28 +01:00
07af6cdbf6 SES-140 deleted unused elements 2021-01-09 22:14:25 +01:00
145491fd2a SES-13 implemented getCharacterStats method 2021-01-09 22:12:20 +01:00
736debbb96 SES-140 connected Player with SignalR 2021-01-09 16:58:17 +01:00
b43720cab8 SES-138 added table with armor in gm screen 2021-01-09 15:12:53 +01:00
461a547db7 fix xml files 2021-01-09 14:13:47 +01:00
48d9ba09f9 Merge branch 'dev' into SES-130 2021-01-09 14:10:27 +01:00
3ee90ae9e1 merge 2021-01-09 14:09:05 +01:00
0a932a00d7 merge 2021-01-09 14:06:47 +01:00
73099fbd90 add ignore 2021-01-09 14:06:01 +01:00
d542652a8b Merge branch 'dev' into SES-136 2021-01-08 20:39:04 +01:00
fa2077c5fb SES-131 Merge 2021-01-08 17:53:52 +01:00
67cb189ef4 SES-129 Merge 2021-01-08 17:52:35 +01:00
6c3e23a1ea SES-131 Add Error Reponse 2021-01-08 17:47:43 +01:00
2461605557 Merge branch 'dev' into SES-130 2021-01-08 17:45:38 +01:00
ab0aae1cdb SES-130 Add Error Reponse 2021-01-08 17:45:02 +01:00
146abad9f5 SES-129 Add errorReponse 2021-01-08 17:42:57 +01:00
5fb593cba1 Merge branch 'SES-128' of git.wmi.amu.edu.pl:s426135/session-companion into SES-128 2021-01-08 17:38:25 +01:00
68ab7ceebd SES-128 Fix Error response 2021-01-08 17:38:05 +01:00
c39c0b442a Merge branch 'dev' into SES-128 2021-01-08 17:35:45 +01:00
20d81f4bf5 SES-128 Add ErrorResponse 2021-01-08 17:35:31 +01:00
bb2876f7a3 SES-136 spell table model create 2021-01-08 14:55:26 +01:00
7075e8ef88 Merge pull request 'SES-134 Serwis do odejmowania HP' (#57) from SES-134 into dev
Reviewed-on: #57
2021-01-08 14:25:52 +01:00
ae72c1ddac SES-136 class update 2021-01-07 18:52:27 +01:00
b588292daf SES-134 Add service to subtract HP 2021-01-07 18:05:22 +01:00
12a30784e1 SES-129 Add endpoint for all Spells 2021-01-07 17:43:30 +01:00
0cb1a61c3a Add endpoint for characterBasicInfo 2021-01-07 17:39:16 +01:00
527a3f695f SES-132 Added Service and Interface for basic character info 2021-01-07 17:39:01 +01:00
c0c8718eb0 SES-132 Added new ViewModel and Profile 2021-01-07 17:38:36 +01:00
28a27472a8 SES-130 Add Controler for other equipment and endpoint that returns it 2021-01-07 16:56:49 +01:00
0c29cb0554 SES-130 Create Armor Controller and Endpoint to return all armor 2021-01-07 16:45:54 +01:00
99da683632 Add controller that returns all weapons 2021-01-07 16:33:29 +01:00
16a132dccd SES-136 Added list 2021-01-07 15:30:21 +01:00
3cc4dace5d SES-133 Create method to send message and changed Dictionary model 2021-01-07 10:51:08 +01:00
b8c77084b2 typo fix 2021-01-04 09:39:27 +01:00
f6ff8aaf20 Add Migration 2021-01-04 01:05:45 +01:00
7640d788d0 Resolve Conflicts 2021-01-04 01:03:29 +01:00
015ef0dbaa Seed Statistics Data 2021-01-04 00:59:23 +01:00
95f20adb03 Added new VM 2021-01-04 00:59:05 +01:00
ca0bbe22a4 SES-118 Added Controller 2021-01-04 00:58:46 +01:00
6ca10bd803 SES-118 Addes services 2021-01-04 00:58:31 +01:00
b53ece536b Created custom mappings 2021-01-04 00:58:10 +01:00
1bce1e94e8 Create endpoint 2021-01-03 19:50:04 +01:00
5cd626e799 Created methods to get stats 2021-01-03 19:49:37 +01:00
b1f2ff17f2 Created new ViewModel 2021-01-03 19:49:15 +01:00
cd8f3228ba Fix(comment) test that throw error 2021-01-03 16:29:03 +01:00
8ca94d33b8 Add Migrations 2021-01-03 16:28:27 +01:00
6f7b71ad70 Modify scripts to seed data 2021-01-03 16:28:13 +01:00
5206a700f8 Added data file 2021-01-03 16:27:12 +01:00
883d1835d1 Resolving problems 2021-01-03 15:54:18 +01:00
4e6ecf39b9 Merge branch 'dev' into SES-124 2021-01-02 20:37:25 +01:00
9781b5da1f SES-124 display component, small changes 2021-01-02 20:36:55 +01:00
03366a3540 merge 2021-01-02 20:02:16 +01:00
fadeaf1c43 fix 2021-01-02 20:00:15 +01:00
9296e1713b SES-124 Created ability cards 2021-01-02 19:53:03 +01:00
aeafc97679 Merge branch 'dev' into SES-120 2021-01-02 17:36:31 +01:00
e1c42cf07f SES-120 Fix typo 2021-01-02 17:35:30 +01:00
da96fea874 SES-120 Preform Migration 2021-01-02 17:35:16 +01:00
de3b7e3315 SES-120 Added scripts to populate armors and weapons 2021-01-02 17:34:45 +01:00
809362175d SES-120 Added necessary Jsons 2021-01-02 17:32:45 +01:00
dcbc5326dc Merge pull request 'SES-117' (#46) from SES-117 into dev
Reviewed-on: #46
2021-01-02 16:34:54 +01:00
ebbd30fc30 Merge branch 'dev' into SES-119 2021-01-02 13:03:33 +01:00
03bca2c11f SES-117 small changes 2021-01-02 00:43:52 +01:00
45288b2e3e SES-117 implemented basic player dashboard page 2021-01-02 00:40:54 +01:00
543bc41f3f Added base for ability cards 2021-01-01 22:14:01 +01:00
02d7304de3 prettier config 2020-12-30 12:17:31 +01:00
3c52e2d65d merge 2020-12-30 11:49:12 +01:00
329ac81ed2 SES-116 backend fix 2020-12-30 11:43:57 +01:00
a7aaacb2e5 SES-116 Update icons rmd and package json 2020-12-30 11:41:24 +01:00
f75e20876b SES-116 Fix Icons on right panel 2020-12-30 11:38:58 +01:00
18d1b75c4a connected with backend - select character 2020-12-28 17:39:55 +01:00
665ef65ec0 conneted with backend - get user characters list 2020-12-28 17:03:53 +01:00
7b430e05cb SES-116 Database update and icons fix 2020-12-28 14:59:42 +01:00
d61c3f620f added pointer class, updated mockup character list 2020-12-28 13:38:45 +01:00
9477b7346b merge 2020-12-28 11:28:08 +01:00
6dc97aa9c3 Merge branch 'dev' into SES-114 2020-12-27 22:12:48 +01:00
2a5e04bbd1 SES-116 Get lsit of logged characters 2020-12-27 21:17:19 +01:00
fe5921fa57 SES-116 Small fix on backend 2020-12-27 21:17:00 +01:00
4b0382a931 SES-121 Added spells tables 2020-12-27 20:08:19 +01:00
89c25d4342 SES-119 Added items tables 2020-12-27 19:47:13 +01:00
e17e3ace58 SES-123 Added reducers and miissed unsubscribe 2020-12-27 17:55:28 +01:00
b82393a62b SES-123 Lint errors fix 2020-12-27 16:33:02 +01:00
607145f45f Icon module register 2020-12-27 16:25:12 +01:00
b9c44c9120 SES-123 Icons module added 2020-12-27 16:25:00 +01:00
004619d6dd SES-114 Adder Errors to register view and user can no longer register with two different passwords 2020-12-23 13:06:01 +01:00
d6da8436bc Merge branch 'dev' into frontend-tests 2020-12-21 20:38:29 +01:00
e47ba17121 added e2e test - zad.3 lab 9 2020-12-21 20:36:32 +01:00
e5196c3513 Tests added 2020-12-21 18:08:51 +01:00
1fc3e040e7 merge v2 2020-12-21 16:56:32 +01:00
c1f520fbc5 merge 2020-12-21 16:56:14 +01:00
f426f5029b Change to login to role 2020-12-21 16:54:22 +01:00
b49bdae96a SES-103 WIP 2020-12-21 16:17:14 +01:00