Commit Graph

286 Commits

Author SHA1 Message Date
Natalia Gawron 766b323042 added log out into player dashboard, deleted unused elements 2021-01-10 18:03:17 +01:00
Natalia Gawron c700651427 hotfix 2021-01-10 17:53:45 +01:00
Natalia Gawron 0d3ee36121 Merge pull request 'SES-139 added dialog on character click in gm screen' (#62) from SES-139 into dev
Reviewed-on: #62
2021-01-10 17:45:53 +01:00
Łukasz Góreczny 6200459bdb merge 2021-01-10 17:45:25 +01:00
Natalia Gawron 82eb65e679 Merge pull request 'SES-137 Weapon table added' (#64) from SES-137 into dev
Reviewed-on: #64
2021-01-10 17:43:55 +01:00
Łukasz Góreczny 94192b41eb merge 2021-01-10 16:20:20 +01:00
Łukasz Góreczny eefd121157 Merge pull request 'SES-135 abilities card' (#63) from SES-135 into dev
Reviewed-on: #63
2021-01-10 16:02:19 +01:00
Łukasz Góreczny 27a2028001 SES-137 Weapon table added 2021-01-10 15:59:32 +01:00
Natalia Gawron dccbdb8f4a SES-135 resolved conflicts 2021-01-10 15:52:36 +01:00
Natalia Gawron e414e321b6 SES-135 changes property characterId 2021-01-10 15:32:49 +01:00
Natalia Gawron 868c05ef99 SES-135 deleted unused elements, added style CSS 2021-01-10 15:29:43 +01:00
Łukasz Góreczny edb72d1701 SES-139 added dialog on character click in gm screen 2021-01-10 15:28:14 +01:00
Natalia Gawron c805fd2cb3 SES-140 added CSS 2021-01-10 14:47:50 +01:00
Natalia Gawron 3627f987da SES-135 connected method with backend, fixed card with stats UI 2021-01-10 00:01:59 +01:00
Łukasz Góreczny 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
Natalia Gawron 07af6cdbf6 SES-140 deleted unused elements 2021-01-09 22:14:25 +01:00
Natalia Gawron 145491fd2a SES-13 implemented getCharacterStats method 2021-01-09 22:12:20 +01:00
Natalia Gawron ad951c9cf8 Merge pull request 'SES-138 added table with armor in gm screen' (#60) from SES-138 into dev
Reviewed-on: #60
2021-01-09 19:43:07 +01:00
Natalia Gawron 736debbb96 SES-140 connected Player with SignalR 2021-01-09 16:58:17 +01:00
Łukasz Góreczny b43720cab8 SES-138 added table with armor in gm screen 2021-01-09 15:12:53 +01:00
Łukasz Góreczny 2ff3509c30 fix gitignore 2021-01-09 14:14:42 +01:00
Łukasz Góreczny 461a547db7 fix xml files 2021-01-09 14:13:47 +01:00
Łukasz Góreczny ff83237c95 Merge pull request 'SES-130 Endpoint Pancerzy' (#54) from SES-130 into dev
Reviewed-on: #54
2021-01-09 14:11:09 +01:00
Łukasz Góreczny 48d9ba09f9 Merge branch 'dev' into SES-130 2021-01-09 14:10:27 +01:00
Łukasz Góreczny 046ba41ebb Merge pull request 'SES-129 Endpoint zaklęć' (#53) from SES-129 into dev
Reviewed-on: #53
2021-01-09 14:09:32 +01:00
Łukasz Góreczny 3ee90ae9e1 merge 2021-01-09 14:09:05 +01:00
Łukasz Góreczny 166d8eb47a Merge pull request 'SES-128 Endpoint Broni' (#52) from SES-128 into dev
Reviewed-on: #52
2021-01-09 14:07:05 +01:00
Łukasz Góreczny 0a932a00d7 merge 2021-01-09 14:06:47 +01:00
Łukasz Góreczny 73099fbd90 add ignore 2021-01-09 14:06:01 +01:00
Natalia Gawron 7ecda94c7b Merge pull request 'SES-136' (#58) from SES-136 into dev
Reviewed-on: #58
2021-01-08 20:43:56 +01:00
Natalia Gawron d542652a8b Merge branch 'dev' into SES-136 2021-01-08 20:39:04 +01:00
Łukasz Góreczny 9103feccfb Merge pull request 'SES-131 Endpoint OtherEquipment' (#55) from SES-131 into dev
Reviewed-on: #55
2021-01-08 20:06:24 +01:00
Karol Górzyński fa2077c5fb SES-131 Merge 2021-01-08 17:53:52 +01:00
Karol Górzyński 67cb189ef4 SES-129 Merge 2021-01-08 17:52:35 +01:00
Karol Górzyński 6c3e23a1ea SES-131 Add Error Reponse 2021-01-08 17:47:43 +01:00
Karol Górzyński 2461605557 Merge branch 'dev' into SES-130 2021-01-08 17:45:38 +01:00
Karol Górzyński ab0aae1cdb SES-130 Add Error Reponse 2021-01-08 17:45:02 +01:00
Karol Górzyński 146abad9f5 SES-129 Add errorReponse 2021-01-08 17:42:57 +01:00
Karol Górzyński 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
Karol Górzyński 68ab7ceebd SES-128 Fix Error response 2021-01-08 17:38:05 +01:00
Karol Górzyński c39c0b442a Merge branch 'dev' into SES-128 2021-01-08 17:35:45 +01:00
Karol Górzyński 20d81f4bf5 SES-128 Add ErrorResponse 2021-01-08 17:35:31 +01:00
Łukasz Góreczny bb2876f7a3 SES-136 spell table model create 2021-01-08 14:55:26 +01:00
Łukasz Góreczny 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
Łukasz Góreczny 085d406216 Merge pull request 'SES-132 Endpoint podstawowych informacji' (#56) from SES-132 into dev
Reviewed-on: #56
2021-01-08 14:24:40 +01:00
Łukasz Góreczny ae72c1ddac SES-136 class update 2021-01-07 18:52:27 +01:00
Karol Górzyński b588292daf SES-134 Add service to subtract HP 2021-01-07 18:05:22 +01:00
Karol Górzyński 12a30784e1 SES-129 Add endpoint for all Spells 2021-01-07 17:43:30 +01:00
Karol Górzyński 0cb1a61c3a Add endpoint for characterBasicInfo 2021-01-07 17:39:16 +01:00
Karol Górzyński 527a3f695f SES-132 Added Service and Interface for basic character info 2021-01-07 17:39:01 +01:00