1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-21 08:00:25 +00:00
Commit Graph

490 Commits

Author SHA1 Message Date
Zeno Rogue
c23209b189 fixed key conflict in 3D config 2020-07-28 22:06:14 +02:00
Zeno Rogue
82f32607e6 MAJOR CHANGE: replaced (transmatrix,band_shift) pair with shiftmatrix 2020-07-28 22:06:14 +02:00
Zeno Rogue
94cac21716 primitive-based rendering of the Berger sphere (very poor) 2020-07-24 23:39:30 +02:00
Zeno Rogue
8223bf354f clearer comment in graph config 2020-07-08 15:47:49 +02:00
Zeno Rogue
02ebc8a96a perfect linewidth option (sometimes does not work correctly -- need to check) 2020-07-03 15:39:52 +02:00
Zeno Rogue
89585f004b fixed some guards (in progress) 2020-07-03 14:42:33 +02:00
Zeno Rogue
e579db31de CLI option -gridoff 2020-05-28 01:39:13 +02:00
Zeno Rogue
5654e632ce added CAP_SDLAUDIO guard 2020-05-22 21:41:24 +02:00
Zeno Rogue
10e03be159 music_out_of_focus now configurable via menu 2020-05-15 14:53:56 +02:00
Arthur O'Dwyer
3e3457bd81 Eliminate some use of CAP_FOO and ISFOO outside of the preprocessor.
The old code worked, but it's strange to use these macros as if
they were C++ `bool` variables at runtime.
2020-05-03 20:57:34 -04:00
Arthur O'Dwyer
f2b7746c1b Move all defaulting-of-CAP_FOO to sysconfig.h.
- The phrase `#ifdef CAP_` should never appear anywhere.

- The phrase `#ifndef CAP_` should appear only in sysconfig.h.

- The phrases `#if CAP_` and `#if !CAP_` may appear wherever,
    as long as "sysconfig.h" is included first.

The rules for `CAP_FOO` equally apply to `ISFOO`.

There are many one-off macros still tested with `#ifdef`,
including `HAVE_ACHIEVEMENTS`, `PRINT_ACHIEVEMENTS`,
`FAKEWEB`, `FAKE_SDL`, `EASY`, and `WHATEVER`. I don't
have much grasp on what these are used for or how they're
configured, so I'm leaving them alone.
2020-05-03 15:12:12 -04:00
Zeno Rogue
0a6c80e909 refactored flat_model_enabler 2020-04-17 15:54:48 +02:00
Zeno Rogue
09ce04bd4a changed rug clip defaults to show more 2020-04-17 15:01:02 +02:00
Zeno Rogue
64ee50523d more model fixes 2020-04-17 02:29:03 +02:00
Zeno Rogue
7f96c67755 improved Rug in various models 2020-04-17 02:21:44 +02:00
Zeno Rogue
0472bf764f moved all projection-related parameters to a special struct; another copy of that struct created for rug 2020-04-17 00:53:58 +02:00
Zeno Rogue
a380134d29 WRL selectable in menus, fixed some issues 2020-04-16 14:36:45 +02:00
Zeno Rogue
8f99715f0d CLI option -smooths 1 2020-04-12 20:34:02 +02:00
Zeno Rogue
eca6a77753 CLI option -neonnf 2020-04-06 11:25:10 +02:00
Zeno Rogue
f4f6903321 renamed 'line width' option to 'vector graphics mode', and it is now available outside of OpenGL 2020-04-06 10:44:56 +02:00
Zeno Rogue
805c153c9f neon_nofill option; added XLAT to vector options; neon now also disables textured triangles 2020-04-06 10:44:27 +02:00
Zeno Rogue
5c78ba8837 fixed the hotkey in 3d->camera rotation 2020-04-01 12:02:09 +02:00
Zeno Rogue
650604227a face/edge/vertex centering 2020-04-01 12:01:55 +02:00
Zeno Rogue
4d4c904d3b neon_mode is now an enum 2020-03-27 19:38:15 +01:00
Zeno Rogue
11447fcb7b tortoise:: shading now can be disabled 2020-03-22 09:46:13 +01:00
Zeno Rogue
02112cb636 CLI option -precw 2020-03-21 19:04:23 +01:00
Zeno Rogue
64c63b7899 CAP_RAY 2020-03-21 10:49:07 +01:00
Zeno Rogue
9f947c70a7 fat edges in linepatterns in 3D 2020-01-28 17:58:55 +01:00
Zeno Rogue
ca3232c3bb extended 'linewidth' setting: illustration mode, hint about Alt, disable shadows, bright mode, colorblind simulation 2020-01-18 17:11:57 +01:00
Zeno Rogue
11a65b0094 save linepattern colors and multipliers 2020-01-02 16:51:43 +01:00
Zeno Rogue
a37457ead9 precise_width for nicer long lines 2020-01-02 16:51:32 +01:00
Zeno Rogue
cacfa8dee9 oldstyle joystick: smoothening input, ignoring next input 2019-12-27 11:57:08 +01:00
Zeno Rogue
7396024c38 arg:: option -neon 2019-12-26 23:32:18 +01:00
Zeno Rogue
6c61162392 merge 2019-12-26 22:40:41 +01:00
Zeno Rogue
f4613e9945 more bubbles, SE config 2019-12-25 23:04:07 +01:00
Zeno Rogue
769982040d renamed solnihv:: to sn:: and solnih to sn::in() 2019-12-14 12:28:45 +01:00
Zeno Rogue
2678ac4743 neon mode (see the 'line width' setting in graphics) 2019-12-07 11:13:09 +01:00
Zeno Rogue
49460ba379 changed the default axes3 to true 2019-12-06 13:05:11 +01:00
Zeno Rogue
fb557282f4 more guard fix 2019-11-16 14:46:12 +01:00
Zeno Rogue
16f6266b7e fixed guard placement 2019-11-16 08:39:51 +01:00
Zeno Rogue
39332b61eb fixed addparam for old compiler 2019-11-16 03:39:00 +01:00
Zeno Rogue
cba1408021 config:: hooks for extending the config file, added asonov/nilv settings 2019-11-16 01:39:58 +01:00
Zeno Rogue
1e6d221e0a fixed_facing_dir saved 2019-11-14 00:42:36 +01:00
Zeno Rogue
3725b06d0b levellines feature 2019-11-03 13:36:06 +01:00
Zeno Rogue
ffd1295d3a ray:: config hotkey 2019-11-03 02:24:26 +01:00
Zeno Rogue
391f421b98 reduce sightrange in gCrystal344 (assume raycasting) 2019-10-26 15:33:28 +02:00
Zeno Rogue
bd7805e68d ray:: namespace and basic configurator 2019-10-25 14:50:48 +02:00
Zeno Rogue
80a6c4a580 no more weird acting on loadConfig when the file is empty 2019-10-22 12:05:22 +02:00
Zeno Rogue
c527d4e613 ODS in hyperbolic 2019-10-21 22:42:27 +02:00
Zeno Rogue
5ba9788e53 sightranges set for the new geometries 2019-10-12 13:47:58 +02:00
Zeno Rogue
300fb6bcbd increased the default cell generation limit to 250 2019-10-12 13:11:28 +02:00
Zeno Rogue
07abd6384a option 'permaside' (-pside) to permanently move the model to the left side 2019-10-07 00:08:37 +02:00
Zeno Rogue
9850dd557e in 3D geometries, patterns may create walls 2019-10-06 13:05:39 +02:00
Zeno Rogue
13ea55b233 fisheye has parameter 2019-10-05 12:32:16 +02:00
Zeno Rogue
d69cb4e946 SolN manifold 2019-10-03 20:10:48 +02:00
Zeno Rogue
a741446b7b better rendering of Solv into the glitchy region 2019-09-26 13:23:44 +02:00
Zeno Rogue
8833251c8b added some missing CAP_SOLV guards 2019-09-13 19:50:12 +02:00
Zeno Rogue
4d2a65c276 fixed some text errors 2019-09-13 18:13:39 +02:00
Zeno Rogue
a3d9711ec2 more adjustments to disabled CAP_* 2019-09-13 03:10:26 +02:00
Zeno Rogue
c1f9826dca fixed the 'heptagonal mode' option 2019-09-12 22:50:16 +02:00
Zeno Rogue
8927f66968 Y/Z rotation option visible in product 2019-09-12 22:50:16 +02:00
Zeno Rogue
5ad1be2962 crosshair option 2019-09-12 22:50:16 +02:00
Zeno Rogue
3ba485d502 rots::underlying_scale saved to config 2019-09-12 22:50:16 +02:00
Zeno Rogue
e600c0af0a improved the rendering of S2xE rings 2019-09-12 22:50:16 +02:00
Zeno Rogue
848eb8f48b export everything: modules compiled separately 2019-09-12 22:50:16 +02:00
Zeno Rogue
9647cbd47e added #include hyper.h to all cpp files 2019-09-12 22:50:16 +02:00
Zeno Rogue
3e715440cb slr:: awesome default range values 2019-09-12 22:50:15 +02:00
Zeno Rogue
afac8bf24a fixup to shaders and everything 2019-09-12 22:50:15 +02:00
Zeno Rogue
02269267c9 slr:: drawing of looped images, better shader in general, special sightrange setting 2019-09-12 22:50:15 +02:00
Zeno Rogue
1e6970ca28 hybrid:: refactored the common parts of prod and sl2, also used them when applicable 2019-09-12 22:50:15 +02:00
Zeno Rogue
136b931609 PSL(2,R) 2019-09-12 22:50:15 +02:00
Zeno Rogue
a03eb0d913 fixed new geometry handling for Archimedean 2019-09-12 22:50:15 +02:00
Zeno Rogue
2f954d0538 nicer handling of WDIM, GDIM, MDIM, sig 2019-09-12 22:50:15 +02:00
Zeno Rogue
0811f8f2d0 product:: no crash on load when saved 2019-09-12 22:50:14 +02:00
Zeno Rogue
e5fb06e6cd product:: HUD items displayed correctly 2019-09-12 22:50:14 +02:00
Zeno Rogue
14b70224a8 product:: changed plevel_factor default yet again 2019-09-12 22:50:14 +02:00
Zeno Rogue
7920446969 smaller plevel_factor default 2019-09-12 22:50:14 +02:00
Zeno Rogue
ecfef817a9 auto-adjusted plevel 2019-09-12 22:50:13 +02:00
Zeno Rogue
f3dd779947 no more crash when saving config in arcm 2019-09-12 22:50:13 +02:00
Zeno Rogue
9dd131d00a args:: creaturescale and character selection 2019-09-12 22:50:13 +02:00
Zeno Rogue
96bf478482 renamed DIM to GDIM 2019-09-12 22:50:13 +02:00
Zeno Rogue
df9c01f276 models:: Collignon projection 2019-09-12 22:50:13 +02:00
Zeno Rogue
8b1c7bffe4 initial reformatting of comments for Doxygen 2019-09-12 22:50:13 +02:00
Zeno Rogue
ad03115097 further cleanup 2019-09-12 22:50:13 +02:00
Zeno Rogue
5ea055b39e split namespace conformal into models and history 2019-09-12 22:50:12 +02:00
Zeno Rogue
f723a8d419 further cleanup, separated multi.cpp from shmup.cpp 2019-09-12 22:50:12 +02:00
Zeno Rogue
05bd7a905c more header cleanup 2019-09-12 22:50:12 +02:00
Zeno Rogue
e1194ff588 more header cleanup 2019-09-12 22:50:12 +02:00
Zeno Rogue
a423dbd2da more header cleanup 2019-09-12 22:50:12 +02:00
Zeno Rogue
cb666fb24a more header shifting 2019-09-12 22:50:12 +02:00
Zeno Rogue
c2d56fb9bc autohdr.h applied in more files 2019-09-12 22:50:12 +02:00
Zeno Rogue
6ab7535088 sight range for Nil 2019-09-12 22:50:12 +02:00
Zeno Rogue
e62a3c0d8e nilv:: geodesic sightrange 2019-09-12 22:50:12 +02:00
Zeno Rogue
9350053c49 renamed mdSolPerspective to mdGeodesic 2019-09-12 22:50:11 +02:00
Zeno Rogue
4f27b12ca2 nilv:: preliminary implementation 2019-09-12 22:50:11 +02:00
Zeno Rogue
dc54135d5f radarrange configurable 2019-09-12 22:50:11 +02:00
Zeno Rogue
4a8ec3b3c4 fixed key conflict in 3D menu 2019-09-12 22:50:11 +02:00
Zeno Rogue
d4ad45c4da also cells_drawn_limit displayed in add_cells_drawn 2019-09-12 22:50:10 +02:00
Zeno Rogue
ea3e33f23d noclipped cells displayed in add_cells_drawn 2019-09-12 22:50:10 +02:00
Zeno Rogue
1528d63d29 arg:: -fov parameter 2019-09-12 22:50:10 +02:00
Zeno Rogue
917fbac4a2 configurable Sol sight range, and glitch removal 2019-09-12 22:50:10 +02:00
Zeno Rogue
598603c937 geodesics in Sol 2019-09-12 22:50:09 +02:00
Zeno Rogue
cf496e8940 kite-and-dart tiling 2019-09-12 22:50:09 +02:00
Zeno Rogue
a1e1240d33 creature_scale can now be changed in all geometries except standard non-cheater shmup 2019-09-12 22:50:09 +02:00
Zeno Rogue
7baf97521c linewidth multipliers for grid and ring 2019-09-12 22:50:09 +02:00
Zeno Rogue
5476b33e94 fixed to work on OPENGL 1.0 2019-09-12 22:50:08 +02:00
Zeno Rogue
a7e1418ffd scaleSinh100, used in IPD config 2019-09-12 22:50:08 +02:00
Zeno Rogue
22b8a88e07 'scrolling by device rotation' no longer appears in 3D 2019-09-12 22:50:08 +02:00
Zeno Rogue
e1731fce02 'back' button in mouse config 2019-09-12 22:50:08 +02:00
Zeno Rogue
db988058de added a separate option axes3 for highlighting forward, and in different location 2019-09-12 22:50:08 +02:00
Zeno Rogue
dd212d756b fixed the monster color in the minimap for Dragons etc 2019-09-12 22:50:08 +02:00
Zeno Rogue
52a3fcf86f added explanation 'floors in 3D geometries' to tstep 2019-09-12 22:50:07 +02:00
Zeno Rogue
9b721d25d6 eyecolor saved 2019-09-12 22:50:07 +02:00
Zeno Rogue
54df32589c translation fixes 2019-09-12 22:50:06 +02:00
Zeno Rogue
481aa198ad CLI option: -tstep 2019-09-12 22:50:06 +02:00
Zeno Rogue
609fc29119 memory settings saved; adjusted for the lack of get_new_handler on steam 2019-09-12 22:50:06 +02:00
Zeno Rogue
9eae663fe3 3D:: better conformal::rotation system 2019-09-12 22:50:06 +02:00
Zeno Rogue
06301d73fc new memory handling 2019-09-12 22:50:05 +02:00
Zeno Rogue
d235540647 improved 3D settings: more adapted help text, added eye editing 2019-09-12 22:50:05 +02:00
Zeno Rogue
01763d4f12 2D3D:: eye level 2019-09-12 22:50:05 +02:00
Zeno Rogue
b1276e2184 removed the 2D info from the projection dialog in 3D 2019-09-12 22:50:05 +02:00
Zeno Rogue
1c6e6bafb4 moved the parameters from geom3:: to videopar 2019-09-12 22:50:04 +02:00
Zeno Rogue
d811ef85e7 larger sightrange limit in Euclidean 2019-09-12 22:50:03 +02:00
Zeno Rogue
8295251cdc multigame support, including dualmode 2019-09-12 22:50:03 +02:00
Zeno Rogue
b6e303ec7d MAJOR refactoring: all geometry-dependent data (tessf, geom3::, shapes, hpc) are now contained in a structure 2019-09-12 22:50:03 +02:00
Zeno Rogue
28f5b04b83 get_vernum() 2019-09-12 22:50:02 +02:00
Zeno Rogue
ba91bea71c charstyle format depending on vernum 2019-09-12 22:50:02 +02:00
Zeno Rogue
f7d580fa9c replaced fts variants with a single fts 2019-09-12 22:50:02 +02:00
Zeno Rogue
63c843f30f character config now shows the character in all settings 2019-09-12 22:50:02 +02:00
Zeno Rogue
2d039c6e28 backward-compatible hread/hwrite of charstyle 2019-09-12 22:50:00 +02:00
Zeno Rogue
df3e21b310 debug cleanup 2019-09-12 22:50:00 +02:00
Zeno Rogue
402b6aa0ad improved armor models; head lower; configurable human eye color 2019-09-12 22:49:59 +02:00
Zeno Rogue
44194bd354 centering/TPP/camera cleanup 2019-09-12 22:49:50 +02:00
Zeno Rogue
c1d002be6c 3d: set the default sight ranges for every 3D geometry so that the framerate on laptop is around 60 fps 2019-09-12 22:49:46 +02:00
Zeno Rogue
8388a448e7 3d:: an option to limit cell generation 2019-09-12 22:49:45 +02:00
Zeno Rogue
0dc552bac4 2d3d:: remove 3D options from the menu if not available 2019-09-12 22:43:02 +02:00
Zeno Rogue
d07e6eb386 2d3d:: missing guards 2019-09-12 22:43:02 +02:00
Zeno Rogue
f652e6139c 2D3D:: fixed Y/Z orientation 2019-09-12 22:43:01 +02:00
Zeno Rogue
2736c89563 2d3d:: fog effect is now configurable 2019-09-12 22:43:01 +02:00
Zeno Rogue
da49e6c8de 2d3d:: textures on sidewalls 2019-09-12 22:43:01 +02:00
Zeno Rogue
80ce15ded9 3d menu:: no more incorrect errors; change camera position right away in 2d3d 2019-09-12 22:43:01 +02:00
Zeno Rogue
2acfd99d17 refactored switch_* functions (fpp/tpp/always3) 2019-09-12 22:43:01 +02:00
Zeno Rogue
450739b133 2D3D: switch without changing the display 2019-09-12 22:43:01 +02:00
Zeno Rogue
6a7c1438eb 2D3D:: Archimedean no longer crashes after changing 2019-09-12 22:43:01 +02:00
Zeno Rogue
1c4d86e0e9 3D graphics in 2D (first commit) 2019-09-12 22:43:01 +02:00
Zeno Rogue
3b5733c935 enabled antialiasing in web 2019-09-12 22:43:01 +02:00
Zeno Rogue
c8e950cd40 added some missing CAP_ and MAXMDIM guards 2019-09-12 22:43:01 +02:00
Zeno Rogue
a0cf13ac97 better whatever editor 2019-09-12 22:43:00 +02:00
Zeno Rogue
6832f86533 fixup: wall-quality was not set to default 1 2019-09-12 22:43:00 +02:00
Zeno Rogue
4b7cba78ee replaced the sm::A3 flags with newer techniques (also fixes help in 3D config not appearing) 2019-09-12 22:43:00 +02:00
Zeno Rogue
b10b6386f3 3d:: TEXTURE_STEP_3D is now configurable 2019-09-12 22:43:00 +02:00
Zeno Rogue
89a900958b 3d:: sloppy range checking option 2019-09-12 22:43:00 +02:00
Zeno Rogue
3da6090320 dialog:: addBoolItem_action, addBoolItem_action_neg, addBoolItem_choice used when applicable 2019-09-12 22:43:00 +02:00
Zeno Rogue
22c88d0960 moved loadOldConfig to legacy.cpp and disabled it 2019-09-12 22:43:00 +02:00
Zeno Rogue
c20a0cb59e 3d:: wallradar 2019-09-12 22:43:00 +02:00
Zeno Rogue
b24c9d88e8 text fixes 2019-09-12 22:42:58 +02:00
Zeno Rogue
57f2891826 bounded Minefield now works according to the standard Minesweeper rules 2019-09-12 22:42:58 +02:00
Zeno Rogue
80d14c0196 add_action_push consistently; improved some menu hotkeys and ordering; improved some naming 2019-09-12 22:42:58 +02:00
Zeno Rogue
1b73714958 improved some naming 2019-09-12 22:42:58 +02:00
Zeno Rogue
54a32441a7 restructured menus 2019-09-12 22:42:58 +02:00
Zeno Rogue
bd20208fe0 no more 'scrolling by device rotation' option in the menu if not supported 2019-09-12 22:42:58 +02:00
Zeno Rogue
a4d9b46a27 improved projectionDialog: added inverse P, and ortho/Gans directly 2019-09-12 22:38:47 +02:00
Zeno Rogue
9289cdd301 arg:: -gridon option 2019-09-12 22:38:47 +02:00
Zeno Rogue
ab7a322e5e 3d:: smart display for 3D 2019-09-12 22:38:47 +02:00
Zeno Rogue
b5127b0006 3d:: rotation_yz for line animation (la currently still changes directions randomly) 2019-09-12 22:38:47 +02:00
Zeno Rogue
2121aacaaf 3d:: clipping configurable 2019-09-12 22:38:47 +02:00
Zeno Rogue
01a2f0cc5a 3d:: change model orientation in the YZ plane 2019-09-12 22:38:47 +02:00
Zeno Rogue
ba28bf5880 fixup sightranges 2019-09-12 22:38:46 +02:00
Zeno Rogue
cb9513dd0d 3d:: horohex geometry 2019-09-12 22:38:46 +02:00
Zeno Rogue
678747ceff 3d:: horo-rec geometry 2019-09-12 22:38:45 +02:00
Zeno Rogue
ea1b29533c 'towards Gans' option works again 2019-09-12 22:38:45 +02:00
Zeno Rogue
943a8395e5 3d:: 3d is affected by cells_drawn_limit; improved the sightrange edit dialog with more options and better help 2019-09-12 22:38:45 +02:00
Zeno Rogue
9f9670fcdb an option to desaturate colors for anaglyph 2019-09-12 22:38:45 +02:00
Zeno Rogue
679e44d4b1 grid color is now configurable (stdgridcolor) 2019-09-12 22:38:45 +02:00
Zeno Rogue
105de56857 3d:: HoroTris geometry 2019-09-12 22:38:44 +02:00
Zeno Rogue
24e02f8dea reg3:: sightrange no longer changed to 3 2019-09-12 22:38:43 +02:00
Zeno Rogue
cb8e34204f two more Euclidean honeycombs; also split buildpolys into subfunctions 2019-09-12 22:38:43 +02:00
?
2c2cda6157 3D:: sightrange changeable from 3D settings 2019-09-12 22:38:43 +02:00
?
5871a4b208 3d:: radar feature 2019-09-12 22:38:42 +02:00
?
56dc2d18c0 3D:: cleaned up the 3D menu in 3D geometry; also added creature_scale and height_width parameters 2019-09-12 22:38:42 +02:00
?
170648a367 mouse aiming sensitivity is now configurable; set to 0 to disable 2019-09-12 22:38:42 +02:00
?
808111de89 fixup options in 3D 2019-09-12 22:38:42 +02:00
?
d83abeaebb 3D:: disabled menu options which are not available in 3D 2019-09-12 22:38:40 +02:00
?
71f02d5dc2 3d:: mouse aiming 2019-09-12 22:38:40 +02:00
?
6808c4e926 smooth_scrolling now configurable 2019-09-12 22:38:40 +02:00
?
fe174d8873 3D:: elliptic space 2019-09-12 22:38:40 +02:00
?
fb71d4fd15 3D:: sightranges are now configurable 2019-09-12 22:38:40 +02:00
?
fa3a6d193d missing CAP_ANIMATIONS guard 2019-09-12 22:38:39 +02:00
?
c24fa20334 added some missing CAP_RUG flags 2019-09-12 22:38:39 +02:00
?
e39777f04d CAP_ animations etc. cleanup 2019-09-12 22:38:39 +02:00
?
31037574f5 CAP_COMPLEX2 first 2019-09-12 22:38:39 +02:00
?
b25730d5c9 geometry flags part 1 2019-09-12 22:38:39 +02:00
Zeno Rogue
3a8a5a6150 fixed missing CAP_RACING guards 2019-09-12 22:38:39 +02:00
Zeno Rogue
8756b8e27a racing::standard_centering 2019-09-12 22:38:39 +02:00
Zeno Rogue
b38e0b6752 racing:: false princess enemy is shown as female 2019-09-12 22:38:39 +02:00
Zeno Rogue
92b37cf9e2 racing:: save parameters to config 2019-09-12 22:38:38 +02:00
Zeno Rogue
0adfaa55df brownian:: editable level colors 2019-09-12 22:38:38 +02:00
Zeno Rogue
2a7dea4788 no more mobile compass by default in mobile 2019-02-08 16:51:50 +01:00
Zeno Rogue
94ce1eb541 fixed_facing option, not only in racing 2019-02-06 18:48:53 +01:00
Zeno Rogue
8ac1cf8731 fixed some issues with commandline arguments (svg shots made correctly from cli) 2019-02-06 18:48:52 +01:00