1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-20 07:30:26 +00:00
Commit Graph

483 Commits

Author SHA1 Message Date
Zeno Rogue
712d01e290 no more capitals in sightrange_style 2021-02-01 03:12:39 +01:00
Zeno Rogue
8ecb229920 more setting improvements 2021-02-01 03:11:15 +01:00
Zeno Rogue
b40fc679af renamed addparamsaver to param_type 2021-02-01 01:45:10 +01:00
Zeno Rogue
298c051beb saver enums 2021-02-01 01:35:34 +01:00
Zeno Rogue
044518e18e rewritten 3D settings in the new standard 2021-01-31 20:45:00 +01:00
Zeno Rogue
7fc1ce8b45 changed parameter order in float_setting 2021-01-31 20:44:34 +01:00
Zeno Rogue
3d6e38a321 a system for all settings in one place 2021-01-31 19:55:33 +01:00
Zeno Rogue
b28b2cc5c4 moved more settings from config.cpp to shot and racing 2021-01-31 18:53:52 +01:00
Zeno Rogue
a59ddc6c31 moved some paramsavers from config to models and history 2021-01-31 18:45:17 +01:00
Zeno Rogue
7d5fb11c26 removed param list, changed addsaver to addparamsaver 2021-01-31 18:34:54 +01:00
Zeno Rogue
2835cd522a addparamsaver function 2020-12-31 19:11:14 +01:00
Zeno Rogue
e4e1a856e6 replace vrhr::state checking with nicer functions 2020-12-31 19:11:14 +01:00
Zeno Rogue
3b6071e9fb cli option dmc 2020-12-31 19:11:13 +01:00
Zeno Rogue
fd715d4057 fixed the default value for FoV 2020-12-25 06:07:42 +01:00
Zeno Rogue
6392f97bfc fixed setting the default value in addsaverenum without CAP_CONFIG 2020-12-23 23:40:15 +01:00
Zeno Rogue
0de8ce9a10 initial implementation of VR 2020-11-22 17:58:40 +01:00
Zeno Rogue
3082b88139 Panini setting resets all shaders, not only raycaster 2020-11-14 12:52:49 +01:00
Zeno Rogue
56164ab172 zoom_or_fov takes panini limits into account 2020-11-08 12:43:07 +01:00
Zeno Rogue
0cdd73c24d in 3D config, automatic TPP/FPP now appears on top, as you usually want this, not 'use 3D models' 2020-11-07 15:47:19 +01:00
Zeno Rogue
17c39c3ca2 missing guards in menuitem_*_volume, also no change of music volume when no music_available 2020-11-06 16:11:19 +01:00
Zeno Rogue
3b7295c26a fixed merge 2020-11-06 15:43:18 +01:00
Zeno Rogue
28383c94e0
Merge branch 'master' into fix_hyperroid 2020-11-06 15:40:59 +01:00
Zeno Rogue
76618db2e6
Merge pull request #138 from still-flow/bringris_music
Add background music volume controller to Bringris
2020-11-06 11:18:58 +01:00
still-flow
2319dce683 refactor sound-related settings
also only show music volume setting when music is available
2020-11-06 06:21:02 +03:00
Zeno Rogue
b1cb66e468
Merge pull request #129 from Quuxplusone/unordered-map
Remove USE_UNORDERED_MAP because it has bit-rotted.
2020-11-05 20:03:13 +01:00
Zeno Rogue
1da4ce95d9 highlight mode setting should be saved now 2020-11-05 15:08:56 +01:00
Zeno Rogue
3288eb0c5a panini: max_fov_angle() now just returns 360 if panini_alpha is out of range 2020-11-01 21:37:59 +01:00
Zeno Rogue
6513b3a87e Panini projection 2020-11-01 21:20:54 +01:00
Zeno Rogue
2cc06e39ba changed the default texture_step to 4 2020-11-01 21:16:08 +01:00
Zeno Rogue
8c4b700466 show_hyperboloid_flat option 2020-11-01 20:10:08 +01:00
Zeno Rogue
2ccd0fab9c do not save OSM if not CAP_INV 2020-11-01 11:30:31 +01:00
Zeno Rogue
8ce684d628 removing and changing defaults in savers 2020-10-26 11:51:39 +01:00
Arthur O'Dwyer
d163a01b8a Remove USE_UNORDERED_MAP because it has bit-rotted.
Trying to compile with `-DUSE_UNORDERED_MAP` produces lots of compiler errors
like these, because of missing `std::hash` specializations.
Also, `#define unordered_map map` is just evil!

```
./nonisotropic.cpp:875:36: note: in instantiation of template class 'std::__1::unordered_map<hr::nilv::mvec, hr::heptagon *,
      std::__1::hash<hr::nilv::mvec>, std::__1::equal_to<hr::nilv::mvec>, std::__1::allocator<std::__1::pair<const hr::nilv::mvec, hr::heptagon
      *> > >' requested here
    unordered_map<mvec, heptagon*> at;
                                   ^

./nonisotropic.cpp:239:58: note: in instantiation of template class 'std::__1::unordered_map<std::__1::pair<hr::heptagon *, hr::heptagon *>,
      hr::heptagon *, std::__1::hash<std::__1::pair<hr::heptagon *, hr::heptagon *> >, std::__1::equal_to<std::__1::pair<hr::heptagon *,
      hr::heptagon *> >, std::__1::allocator<std::__1::pair<const std::__1::pair<hr::heptagon *, hr::heptagon *>, hr::heptagon *> > >'
      requested here
    unordered_map<pair<heptagon*, heptagon*>, heptagon*> at;
                                                         ^

./nonisotropic.cpp:457:49: error: no matching member function for call to 'iadj'
      while(h1->distance < h2->distance) back = iadj(h2, down) * back, h2 = h2->cmove(down);
                                                ^~~~
cell.cpp:42:15: note: candidate function not viable: no known conversion from 'hr::sn::hrmap_solnih' to 'hr::hrmap' for object argument
  transmatrix iadj(heptagon *h, int d) {
              ^
cell.cpp:41:22: note: candidate function not viable: no known conversion from 'hr::sn::hrmap_solnih' to 'hr::hrmap' for object argument
  struct transmatrix iadj(cell *c, int i) { cell *c1 = c->cmove(i); return adj(c1, c->c.spin(i)); }
                     ^
```
2020-10-19 13:15:29 -04:00
Zeno Rogue
d64c5e338c extra guards 2020-10-15 16:33:52 +02:00
still-flow
a8691f0d8e fix hyperroid builds
- add cap guards where necessary
- adapt to new `shiftpoint` datatype and function interfaces thereof
2020-10-05 21:48:56 +03:00
Zeno Rogue
b37d7b9808 camera_speed and camera_rot_speed configurable from menu, also they work where they should now 2020-09-16 23:49:17 +02:00
Zeno Rogue
54e33f9151 save extra model parameters 2020-09-16 23:49:17 +02:00
Zeno Rogue
45ff7a4e10 CLI option -via-shader 2020-09-11 11:13:29 +02:00
Zeno Rogue
18ab187547 rotational model of Nil, and change Nil rotation 2020-09-11 11:13:18 +02:00
Zeno Rogue
644d20cd89 smartrange area-based 2020-08-20 16:49:47 +02:00
Zeno Rogue
a27419cf97 cool fog effect now can be disabled 2020-08-01 16:47:21 +02:00
Zeno Rogue
7c3c34c3d8 sky-based fog in 2.5D 2020-08-01 13:59:53 +02:00
Zeno Rogue
3c198a3672 fixed potential memory error in sightranges 2020-08-01 13:58:03 +02:00
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