Commit graph

239 commits

Author SHA1 Message Date
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
b49d6e8ad6 fix drone compilation 2021-01-17 22:24:14 +00:00
752c3bda34 add wine to compile image 2021-01-15 13:41:41 +00:00
e7bcd197df fix compile errir 2021-01-15 12:31:24 +00:00
c3f4e7cd70 performance optimization 2021-01-15 12:30:41 +00:00
92ccdbbc2d icons 2021-01-15 11:36:12 +00:00
8e840ece27 fixed shader rendering 2021-01-15 11:11:28 +00:00
d3f8fd23f4 backend 2021-01-14 23:34:24 +00:00
24b773d845 improved shader performance 2021-01-14 23:34:14 +00:00
be8e56cf27 working shader 2021-01-09 20:50:57 +00:00
07685fcd9c Shader galore 2021-01-09 00:38:19 +00:00
519b7518ff rooms and corridors 2021-01-02 00:58:24 +00:00
ee42010866 rooms 2021-01-02 00:45:23 +00:00
901d8ff8c3 progress 2021-01-01 18:35:35 +00:00
f9c6b1c02f progress 2020-12-31 14:32:37 +00:00
Michele Scandura
b66612ab27 boh 2020-12-23 12:22:13 +00:00
6f96b2af97 drawing modes 2020-12-22 10:14:07 +00:00
Michele Scandura
b21a7c7ef2 tiles and lines 2020-12-21 16:29:59 +00:00
9a38a595a7 Merge pull request 'develop' (#20) from develop into master
Reviewed-on: michele/Map#20
2020-12-14 09:58:07 +00:00
9085f4d5cb Merge branch 'master' into develop 2020-12-13 23:16:38 +00:00
03708e9d53 zipping on tag 2020-12-13 23:13:36 +00:00