Commit graph

209 commits

Author SHA1 Message Date
18b79b79fa Merge branch 'master' into campaign
All checks were successful
continuous-integration/drone/push Build is passing
2021-08-21 14:03:07 +01:00
866b554dde new build image
Some checks failed
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is failing
2021-08-21 11:58:19 +00:00
68c41478d9 boh
Some checks failed
continuous-integration/drone/push Build is failing
2021-08-20 14:51:45 +01:00
22d1a7bb8c revert
Some checks failed
continuous-integration/drone/push Build is failing
2021-08-20 14:49:11 +01:00
cb9d6387d1 will it break
Some checks reported errors
continuous-integration/drone/push Build encountered an error
2021-08-20 14:47:48 +01:00
cd24313ac4 drone bump
Some checks failed
continuous-integration/drone/push Build is failing
2021-08-20 14:42:41 +01:00
bd6c3bdd43 revert monogame dev upgrade
Some checks failed
continuous-integration/drone/push Build is failing
2021-08-20 14:38:52 +01:00
ef51f1baf2 always pull basecompile
Some checks failed
continuous-integration/drone/push Build is failing
2021-08-20 14:15:20 +01:00
92b5bab7ec monogame dev update
Some checks failed
continuous-integration/drone/push Build is failing
2021-08-20 14:11:34 +01:00
a13fb49942 wiring up new auth endpoint 2021-05-28 23:14:40 +01:00
b6999cef0a small improvements to campaign management 2021-05-27 23:20:47 +01:00
bab170552e basic player management 2021-02-21 22:59:43 +00:00
350a283b5e cleanup 2021-02-20 00:21:03 +00:00
aa472f9e29 db and auth refactoring 2021-02-20 00:18:07 +00:00
0e1c16ab91 refactoring backend structure 2021-02-15 23:35:55 +00:00
dcc59f7b69 first campaing bits 2021-02-11 23:47:32 +00:00
3ca5db1f47 Merge branch 'master' into develop 2021-02-11 21:52:07 +00:00
9f130c94f4 Update 'README.md'
Some checks failed
continuous-integration/drone Build is failing
2021-02-11 12:33:30 +00:00
344363df6f delete db 2021-02-11 10:38:28 +00:00
f00b295b5e Merge pull request 'develop' (#42) from develop into master
Reviewed-on: michele/Map#42
2021-02-11 10:35:06 +00:00
7b552a0c61 Merge pull request 'ping on map feature complete' (#41) from pingOnMap into develop
Reviewed-on: michele/Map#41
2021-02-11 10:17:45 +00:00
9e9e03b4c7 remove commented out code 2021-02-11 10:04:56 +00:00
73c8ca4e0f refined player pointers. final ping changes 2021-02-11 10:03:40 +00:00
efc9e13737 improvin player pointers 2021-02-10 23:27:20 +00:00
bce97de302 ping on map feature complete 2021-02-09 17:13:52 +00:00
17cce56866 Merge pull request 'Multiple players visible in cell' (#40) from multiPlayerPerCell into develop
Reviewed-on: michele/Map#40
2021-02-04 23:56:08 +00:00
4619844607 Multiple players visible in cell 2021-02-04 23:18:08 +00:00
5434766207 Merge pull request 'roomDrawingArea' (#39) from roomDrawingArea into develop
Reviewed-on: michele/Map#39
2021-02-04 15:35:03 +00:00
85274034f3 code cleanup 2021-02-04 14:45:40 +00:00
47ea480b18 Display room size while drawing 2021-02-04 13:10:24 +00:00
0ad11e20bd Merge branch 'master' into develop 2021-02-04 11:38:50 +00:00
f9ae572ffd Merge pull request 'overlaySearch' (#38) from overlaySearch into develop
Reviewed-on: michele/Map#38
2021-02-04 11:08:01 +00:00
808c0538be searchable overlays, overlay name on hover 2021-02-04 11:06:17 +00:00
afc94fd698 fix stash conflicty 2021-02-04 10:02:53 +00:00
5f7d48e149 Merge pull request 'Allow two walls on same node' (#37) from wallsFix into develop
Reviewed-on: michele/Map#37
2021-02-04 09:59:04 +00:00
b4120d1769 Merge pull request 'Highlight selected toolbar button' (#36) from highlightIconsToolbar into develop
Reviewed-on: michele/Map#36
2021-02-04 09:58:01 +00:00
7ca9d83e6d Merge pull request 'new walls' (#35) from newWallIcons into develop
Reviewed-on: michele/Map#35
2021-02-04 09:57:04 +00:00
0290c61799 new walls 2021-02-04 09:33:35 +00:00
4e6f8195e7 Highlight selected toolbar button 2021-02-03 21:45:51 +00:00
3bcfa82fad Allow two walls on same node 2021-02-03 17:35:38 +00:00
5227b3ba49 Merge pull request 'develop' (#26) from develop into master
Reviewed-on: michele/Map#26
2021-01-22 20:07:32 +00:00
87380b1a18 Merge pull request 'perf updates' (#25) from performance into develop
Reviewed-on: michele/Map#25
2021-01-22 18:28:51 +00:00
ebd7b18bd7 perf updates 2021-01-22 15:05:36 +00:00
4ceb62570d Merge pull request 'adding missing sync logic' (#23) from develop into master
Reviewed-on: michele/Map#23
2021-01-18 19:22:33 +00:00
39c7eb316e adding missing sync logic 2021-01-18 16:39:09 +00:00
94661cfb1b Merge pull request 'develop' (#22) from develop into master
Reviewed-on: michele/Map#22
2021-01-18 14:55:06 +00:00
e02096f34c Merge pull request 'doodlemode' (#21) from doodlemode into develop
Reviewed-on: michele/Map#21
2021-01-18 13:31:51 +00:00
5c0608c537 backward compatible small fixes 2021-01-18 10:05:40 +00:00
70abe86ae3 revert changes 2021-01-17 22:39:18 +00:00
9909be7e13 base image version 2021-01-17 22:33:15 +00:00