Commit Graph

377 Commits

Author SHA1 Message Date
d3f9d79af1 Merge branch 'dev' of git.wmi.amu.edu.pl:s426135/session-companion into SES-157 2021-01-15 18:15:16 +01:00
2005670077 Merge pull request 'SES-148 Endpointy dla Armor i Weapon' (#71) from SES-148 into dev
Reviewed-on: #71
2021-01-14 16:45:04 +01:00
46f2e3d158 Merge pull request 'SES-144 Seed tabeli przeciwników' (#72) from SES-144 into dev
Reviewed-on: #72
2021-01-14 16:44:25 +01:00
d21f9ecc4e Merge branch 'SES-148' of git.wmi.amu.edu.pl:s426135/session-companion into SES-148 2021-01-13 21:50:59 +01:00
d26d9278a3 SES-148 Implement feedback 2021-01-13 21:50:21 +01:00
12ecf5e935 SES-157 Add endpoint to create character from templates 2021-01-13 21:41:12 +01:00
42eeb72f1a Update 'SessionCompanion/SessionCompanion/Controllers/EquipmentController.cs' 2021-01-13 21:17:24 +01:00
e6dc7deeb9 SES-144 Preform migration 2021-01-13 21:14:43 +01:00
151d63fc24 SES-144 Add seed methods for monster seeding 2021-01-13 21:14:13 +01:00
100d8a6806 SES-144 Add json 2021-01-13 21:13:42 +01:00
ad92ad468b SES-148 CharacterWeaponViewModel doesnt need valid ID anymore 2021-01-13 20:24:10 +01:00
71f01a167c SES-148 Add changing weapoin mechanic 2021-01-13 19:29:32 +01:00
3ca90663b2 SES-148 Add Endpoint to add new weapon to character 2021-01-13 17:37:25 +01:00
8a7c50b307 SES-148 Change endpoint location 2021-01-13 17:29:03 +01:00
3facffb771 SES-148 resolve conflicts 2021-01-13 17:27:57 +01:00
108dc89fd7 SES-148 finished character armor 2021-01-13 17:10:41 +01:00
09863e9b8e SES-148 Added reference 2021-01-13 09:37:20 +01:00
80873d2dfc Merge pull request 'SES-150 fix bug that you can log as same user multiple times' (#66) from SES-150 into dev
Reviewed-on: #66
2021-01-13 09:30:32 +01:00
d146ea3b78 Merge branch 'dev' into SES-150 2021-01-13 09:30:06 +01:00
7d790cfdc8 Merge pull request 'SES-142 Added endpoints for character equipment' (#65) from SES-142 into dev
Reviewed-on: #65
2021-01-13 09:29:47 +01:00
deab61d1f2 Merge branch 'dev' into SES-142 2021-01-13 09:29:27 +01:00
f56b4ce009 Merge pull request 'SES-155 Endpoint that retuns basic infor for template character' (#70) from SES-155 into dev
Reviewed-on: #70
2021-01-13 09:25:52 +01:00
19c7a08703 Merge pull request 'SES-143 Add Monster Table' (#69) from SES-143 into dev
Reviewed-on: #69
2021-01-13 09:22:48 +01:00
95b995fd2d SES-148 Add Armor changing, but not ready yet 2021-01-12 23:27:59 +01:00
81d3be7dd8 SES-155 Added endpoint that retuns basic infor for template character 2021-01-12 22:22:56 +01:00
28fce7c075 SES-147 edded Tooltips and basic dialog model 2021-01-12 21:40:24 +01:00
fad8b27797 SES-143 Add monster related reposittories and ViewModel 2021-01-12 20:49:04 +01:00
f31b41f942 SES-143 Add Monster releated tables 2021-01-12 20:47:09 +01:00
f8b7fe6243 Merge pull request 'SES-163 implemented clean store if user click on logout' (#68) from SES-163 into dev
Reviewed-on: #68
2021-01-12 19:09:35 +01:00
2255777840 constitution ability style css fix 2021-01-12 17:59:36 +01:00
d9d3fba1b2 Merge branch 'dev' into SES-163 2021-01-12 17:44:41 +01:00
b2af139799 SES-163 implemented clean store if user click on logout 2021-01-12 17:42:47 +01:00
057f4f2e52 fix footer not showing up 2021-01-12 16:13:52 +01:00
55077fc27b fix % in range 2021-01-12 16:02:58 +01:00
1fc14dc5c8 Merge pull request 'SES-145 Tables in GM screen are now connected to backend' (#67) from SES-145 into dev
Reviewed-on: #67
2021-01-12 15:55:45 +01:00
11b117d85c SES-145 Removed console logs 2021-01-12 15:46:38 +01:00
d84ecd91a1 SES-145 Tables in GM screen are now connected to backend 2021-01-12 14:07:49 +01:00
abb484abf1 SES-142 Added endpoints for character equipment 2021-01-12 12:46:50 +01:00
16b6dbe977 clean debug and console log 2021-01-12 10:42:44 +01:00
538c58c1e4 fix skill list null error 2021-01-12 10:42:17 +01:00
9f51f12cca SES-150 fix bug that you can log as same user multiple times 2021-01-12 10:33:59 +01:00
766b323042 added log out into player dashboard, deleted unused elements 2021-01-10 18:03:17 +01:00
c700651427 hotfix 2021-01-10 17:53:45 +01:00
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
6200459bdb merge 2021-01-10 17:45:25 +01:00
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
94192b41eb merge 2021-01-10 16:20:20 +01:00
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
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