1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-03 00:39:55 +00:00
Commit Graph

362 Commits

Author SHA1 Message Date
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