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

1106 Commits

Author SHA1 Message Date
Charlotte Peppers
6663a33df4
Merge branch 'zenorogue:master' into main 2022-03-07 17:44:10 -07:00
Charlotte Peppers
904faabd96
Added tower to canvas floor options, added new Flashing Effects option which currently effects storms and some curses 2022-03-07 17:37:35 -07:00
Charlotte Peppers
ab08a69cc6
Added Canvas Floor and Canvas Darkness options 2022-03-06 20:01:59 -07:00
Charlotte Peppers
6117d626d8
Merge branch 'zenorogue:master' into main 2022-03-06 17:10:14 -07:00
Zeno Rogue
0429c8353a fixed a crash when drawing aura in some projections 2022-03-01 09:23:51 +01:00
Zeno Rogue
67a19d93bb added missing MAXMDIM guards 2022-02-17 21:00:10 +01:00
Charlotte Peppers
9a731572f6
Added idle animation option, fixed palace hypersian rugs using "ticks" instead of "pticks" 2022-01-31 14:39:41 -07:00
Zeno Rogue
b99e0f448f draw fishtails on friends with empathy 2022-01-08 18:53:57 +01:00
Zeno Rogue
6078f53dbc fixed colors in coxeter 2021-11-07 09:07:51 +01:00
Zeno Rogue
3ece943c9f fixup to intra editing (point_direction was missing) 2021-09-18 01:39:30 +02:00
Zeno Rogue
663e334e38 intra:: first version 2021-09-16 21:30:26 +02:00
Zeno Rogue
bdeee41e98 fixed rot spaces 2021-08-08 17:11:05 +02:00
Zeno Rogue
8ca6d3407a
Merge pull request #271 from jruderman/nestcolors
Adjust Snake Nest colors so drawMonster can add them without overflowing to black
2021-08-04 19:14:43 +02:00
Jesse Ruderman
07035f3c09 Fix raised colors in Snake Nest 2021-08-02 19:40:05 -07:00
Jesse Ruderman
34b4ffffae Fix highlight colors for snakes 2021-08-02 12:14:21 -07:00
Jesse Ruderman
74ae7a72c5 Adjust Snake Nest colors so drawMonster can add them without overflowing to black 2021-08-02 12:06:10 -07:00
Zeno Rogue
c53270ca16 introduced rulegen.cpp which generates strict_tree_rules for arb 2021-07-31 15:13:44 +02:00
Arthur O'Dwyer
67a54d3aa1 Finish replacing macro ADC with plain old code. 2021-07-18 17:43:03 -04:00
Arthur O'Dwyer
3c8a9e5274 Replace macro ADC with a plain old function hr::span_at. 2021-07-18 17:30:07 -04:00
Arthur O'Dwyer
74052ef2bf Replace IF_KEY_EXISTS with a plain old function, not a macro. 2021-07-18 17:21:38 -04:00
Zeno Rogue
65065c7e69 Merge branch 'master' of https://github.com/zenorogue/hyperrogue 2021-07-18 18:33:02 +02:00
Zeno Rogue
7f3382c08f
Merge pull request #241 from jruderman/mutivy_stun
ASCII monsters: don't draw stun stars for Mutant Ivy
2021-07-18 12:23:30 +02:00
Zeno Rogue
cd60b0ffb3 renamed IF_MAP_CONTAINS_KEY to IF_KEY_EXISTS, and used a better implementation 2021-07-18 12:19:49 +02:00
Zeno Rogue
18c6aa7823 ADC now checks IF_MAP_CONTAINS_KEY 2021-07-18 11:53:35 +02:00
Jesse Ruderman
c24e32de7c ASCII monsters: don't draw stun stars for Mutant Ivy 2021-07-17 02:24:38 -07:00
Zeno Rogue
5c21b64060 reg3:: new variation, bch_oct 2021-07-13 15:12:03 +02:00
Zeno Rogue
c4e85c16d3 full cellshape computed in hybrid geometries 2021-07-12 20:54:16 +02:00
Zeno Rogue
44ac254f98
Merge pull request #224 from jruderman/ub_familiar
Fix UB drawing Familiar's eye
2021-07-12 09:44:37 +02:00
Jesse Ruderman
0c810d0f8d Fix UB: use unsigned add for draugr's cloak color 2021-07-11 20:02:35 -07:00
Jesse Ruderman
0c83642f20 Fix UB drawing Familiar's eye 2021-07-11 19:56:29 -07:00
Zeno Rogue
7da49c9d2f fixed Nil and Sol 2021-07-09 22:32:00 +02:00
Zeno Rogue
9a319e2d2a refactored shvid_full and wall_offset as virtual functions 2021-07-09 22:32:00 +02:00
Zeno Rogue
3e1e0f3f18 renamed get_face_vertices to get_face_vertex_count, and added new get_face_vertices 2021-07-07 23:32:22 +02:00
Zeno Rogue
567436ed2f CLI option -uqf 2021-07-07 18:26:40 +02:00
Zeno Rogue
f8d406a458 basic darkval for subcubes 2021-07-07 18:26:14 +02:00
Zeno Rogue
4b3f72cc56 3D variations: subcubes 2021-07-07 01:48:20 +02:00
Zeno Rogue
910d312acd fixed item graphics 2021-06-17 09:44:48 +02:00
Zeno Rogue
b71e436cb6 added some missing CAP_* guards 2021-06-09 04:33:55 +02:00
Zeno Rogue
f94163bb78 curses thrown are now animated 2021-06-06 10:35:55 +02:00
Zeno Rogue
63570af240 XGD: filled circles and start with clearscreen 2021-06-03 13:26:10 +02:00
Zeno Rogue
be5194958e refactored to use isDie if applicable 2021-06-01 13:07:56 +02:00
Zeno Rogue
874ede836d fixed face_the_player to orient ASCII correctly in VR 2021-06-01 13:07:55 +02:00
Zeno Rogue
db06438823 brought back the color for laDice 2021-06-01 13:07:55 +02:00
Zeno Rogue
12c1009039 improved theme for Dice Heaven and Cursed Canyon 2021-06-01 13:07:55 +02:00
Zeno Rogue
2973cada6d dice:: added Angry Dice 2021-06-01 13:07:55 +02:00
Zeno Rogue
6a6ed4ea0d first version of the Land of Dice 2021-06-01 13:07:36 +02:00
Zeno Rogue
b879682d82 added lmouseover_distant 2021-06-01 13:07:36 +02:00
Zeno Rogue
773e3afd7c floor color for laCursed 2021-05-23 16:00:50 +02:00
Zeno Rogue
8f4a0935b9 more XLAT refactoring, and preparation for gentrans.cpp 2021-05-23 16:00:50 +02:00
Zeno Rogue
0f767e16b6 XLAT refactor continued 2021-05-23 16:00:50 +02:00
Zeno Rogue
99d8e8d424 graphical effects for some curses 2021-05-23 16:00:49 +02:00
Zeno Rogue
e78a170e7e added some missing CAP_SDL and CAP_GL guards 2021-05-23 16:00:49 +02:00
Zeno Rogue
d22965a1da monster added: Hag 2021-05-17 14:18:45 +02:00
Zeno Rogue
bdc428e8b1 MAXMDIM guard 2021-05-09 02:25:41 +02:00
Zeno Rogue
6504e949b9 no inner line drawn in rings 2021-05-09 02:25:05 +02:00
Zeno Rogue
61891c4eb8 implemented curses 2021-05-02 15:16:29 +02:00
Zeno Rogue
46683b06fe extra Orb shapes 2021-05-02 13:39:09 +02:00
Zeno Rogue
3146fdd02f hybrid:: draw_underlying_space no longer covers the screen in e2xe, and also fixed the orientation in product 2021-05-01 14:14:28 +02:00
Zeno Rogue
639122e314 added faraway monster highlight as in @still-flow's pull request 2021-04-30 19:44:54 +02:00
Zeno Rogue
4eb780f237 no more 'press SPACE to find the player' if no mapeditor::drawplayer 2021-04-15 17:56:17 +02:00
Zeno Rogue
91cf680182 improved ASCII: fixed domination 2021-04-15 17:55:58 +02:00
Zeno Rogue
9291e47400 improved ASCII: fixed viies 2021-04-15 17:55:46 +02:00
Zeno Rogue
885c377dd5 ASCII displayed for terracotta warriors in the ASCII mode 2021-04-15 17:17:01 +02:00
Zeno Rogue
a3add19eba improvements to ASCII items & monsters: PC movement animated on radar; movement is animated; available in 3D graphical modes 2021-04-15 15:26:32 +02:00
Zeno Rogue
4b1b0516f3 choice of the land structure 2021-04-11 22:15:40 +02:00
Zeno Rogue
0c1086f81f fixed incorrect clipping in H2xE 2021-04-07 21:04:25 +02:00
Zeno Rogue
bcf014a6dc fixed clipping planes affecting 2D geometries 2021-04-07 20:25:27 +02:00
Zeno Rogue
75961e6543 in canvas 2.5D, no ceiling if canvas_default_wall == waInvisibleFloor 2021-04-07 18:13:45 +02:00
Zeno Rogue
939cfc209e one more guard fixup 2021-03-30 11:33:35 +02:00
Zeno Rogue
5a73510c4f added some guards for MAXMDIM >= 4 and CAP_SOLV 2021-03-30 11:27:48 +02:00
Zeno Rogue
4a80af6912 asonov:: added a geometry flag to recognize Arnold's cat 2021-03-25 10:57:48 +01:00
Zeno Rogue
355b8df23a added colors.cpp for all color-related functions 2021-03-25 10:56:20 +01:00
Zeno Rogue
0f081fb1ab stereographic projection added 2021-03-21 12:51:50 +01:00
Zeno Rogue
54661a975f another missing CAP_VR guard 2021-03-09 16:22:22 +01:00
Zeno Rogue
16143f3c9f frustum culling in VR 2021-03-09 16:04:53 +01:00
Zeno Rogue
56485f20a9 various changes and fixes to make coolfog and sky work correctly in VR 2021-03-09 13:12:53 +01:00
Zeno Rogue
95d4e942e2 removed obsolete profiling 2021-03-09 10:45:44 +01:00
Zeno Rogue
f00696711a HyperRogue ported to SDL2 (in mymake do -sdl2) 2021-03-06 14:53:25 +01:00
Zeno Rogue
40d450676e more fixes to multiplayer 2021-03-06 11:46:13 +01:00
Zeno Rogue
9844125d78 vr:: emptyscreen() so that VR knows what to do if there is no screen 2021-02-07 22:55:11 +01:00
Zeno Rogue
de0fc0f452 added missing CAP_VR guard 2021-02-07 22:55:11 +01:00
Zeno Rogue
1da9622c67 generalized VR UI placement 2021-02-07 22:55:11 +01:00
Zeno Rogue
fd67ec2385 vr:: improved performance? 2021-02-07 22:55:10 +01:00
Zeno Rogue
db00cf3ae4 vr:: better face_the_player 2021-02-07 22:55:10 +01:00
Zeno Rogue
cafc265cc6 vr:: controller ray now extend to the correct distance 2020-12-31 19:11:14 +01:00
Zeno Rogue
1b976d364b uniform VR control 2020-12-31 19:11:14 +01:00
Zeno Rogue
1dc2041dab disable aura in vr 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
8a63307ed5 moved mouse-line from rug to drawMarkers 2020-12-31 19:11:14 +01:00
Zeno Rogue
e6ff8c041f pointing in 2D modes 2020-12-31 19:11:14 +01:00
Zeno Rogue
9c9afceb41 Princess hug animation 2020-12-26 18:09:09 +01:00
Zeno Rogue
68ab6fedc6 fixed a bug when moving animation with m.s == m.t 2020-12-25 06:08:19 +01:00
Zeno Rogue
0de8ce9a10 initial implementation of VR 2020-11-22 17:58:40 +01:00
Zeno Rogue
8a5d4db2c3 shot:: default_screenshot_content now calls gamescreen, which correctly renders multi-game and some other things 2020-11-14 13:17:55 +01:00
Zeno Rogue
d7351d169a fixed some pconf/vpconf bugs 2020-11-08 12:09:42 +01:00
Zeno Rogue
71e8f84cec using GLWRAP 2020-11-08 11:49:19 +01:00
Zeno Rogue
358d94f020 fixed camera-rotated aura for stretch 2020-11-05 18:26:37 +01:00
Zeno Rogue
14555bf1b4 fixed the aura when camera angle changed 2020-11-05 16:26:50 +01:00
Zeno Rogue
37a18eafd8 fixed a bug which allowed change range 2020-11-05 15:24:58 +01:00
Zeno Rogue
fd9fb83540 panini: frustum_culling disabling done nicely 2020-11-01 21:38:45 +01:00
Zeno Rogue
6513b3a87e Panini projection 2020-11-01 21:20:54 +01:00
Zeno Rogue
00f900a04c gamescreen should now be able to draw multiple screens in screenshot 2020-11-01 20:23:14 +01:00
Zeno Rogue
d64c5e338c extra guards 2020-10-15 16:33:52 +02:00
Zeno Rogue
abde8f049c fixed precise_mouseover on sphere 2020-09-21 12:00:25 +02:00
Zeno Rogue
5aaa7f2b27 orb of domination X is no longer huge 2020-09-16 23:49:17 +02:00
Zeno Rogue
f02170ba28 Mirror Spirits now face the original player 2020-09-16 23:49:17 +02:00
Zeno Rogue
9b9e7ccaf2 fixed errors with mirrors walls: monsters face the player correctly; mimics in mirrors display their X-signs correctly; player in mirror displays their X sign while previously they did not 2020-09-16 23:49:17 +02:00
Zeno Rogue
e26f8f5a5b optimized inverses 2020-09-16 23:49:17 +02:00
Zeno Rogue
cea3da31fc separated highlight 2020-09-16 23:49:17 +02:00
Zeno Rogue
c11e552318 an option to disable drawing centerover 2020-09-16 23:49:13 +02:00
Zeno Rogue
acc9b40431 no_find_player option 2020-09-11 11:16:59 +02:00
Zeno Rogue
b90df0d37b correct key buffering 2020-09-11 11:14:32 +02:00
Zeno Rogue
92502dc75e no 'find the player' in sphere 2020-08-05 01:18:08 +02:00
Zeno Rogue
81d1066596 display other players in 2.5D radar 2020-08-01 16:48:08 +02:00
Zeno Rogue
e8a462da0e fixed pushdown 2020-07-28 22:06:14 +02:00
Zeno Rogue
67595a4ed3 redone hrmap::draw() function to keep DRY 2020-07-28 22:06:14 +02:00
Zeno Rogue
26a98237e0 'monster face the player: changed the code to simpler and better 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
958388eec2 fixed colors of underwater compasses and rugs 2020-07-24 16:21:11 +02:00
Zeno Rogue
f3c35de400 more guards cont. 2020-07-03 14:48:36 +02:00
Zeno Rogue
89585f004b fixed some guards (in progress) 2020-07-03 14:42:33 +02:00
Zeno Rogue
2a0b0101fd raycasting in 2D 2020-06-03 15:11:20 +02:00
Zeno Rogue
7bb4407273 flip_dark 2020-05-29 02:42:54 +02:00
Zeno Rogue
b785a0a7cc frustum_culling can now be disabled 2020-05-25 02:27:23 +02:00
Zeno Rogue
61e249a3af fixed skies in the new lands 2020-05-16 01:06:47 +02:00
Zeno Rogue
033a9099d6 improved discrete animation while affine 2020-05-15 22:52:52 +02:00
Zeno Rogue
437722fe58 'light' movestar now has size adjusting to geometry 2020-05-15 15:30:04 +02:00
Zeno Rogue
9c676d082a WASD keys and VI keys as help for keyboard users options 2020-05-15 15:28:59 +02:00
Zeno Rogue
e8461d8661 fixed legs in rotspaces being drawn far away 2020-05-15 14:54:11 +02: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
1f31c2cd7a more safe clipping in Sol 2020-04-29 15:19:25 +02:00
Zeno Rogue
6f6586b3f2
Merge branch 'master' into hooks-naming 2020-04-19 13:39:07 +02:00
Zeno Rogue
c24658bf38 more drawing tool improvements; no crash drawing tool; restart editors will ask for confirmation 2020-04-17 20:34:49 +02:00
Zeno Rogue
ad233a1e19 drawing tool 2020-04-17 20:04:33 +02:00
Zeno Rogue
14cb26b986 fixed the Handsome Gardener's Flower 2020-04-17 15:03:23 +02:00
Zeno Rogue
c0115e60e9 added some more debug lines to DF_GRAPH 2020-04-17 15:03:05 +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
7f08ca01a2 fat edges are now printable 2020-04-15 16:21:30 +02:00
Arthur O'Dwyer
0d42168139 Make hookset<T> a pointer type, just like purehookset.
No more declaring `hookset<T> *hooks_foo`; now it's just
`hookset<T> hooks_foo` at global scope. This clears the way to
make `hookset<T>` into a class type if we want.
2020-04-12 10:50:18 -04:00
Arthur O'Dwyer
934e3d9a42 Consistently name every hookset with prefix hooks_. NFC.
I'm sure this causes massive merge-conflicts in the non-public code,
but I think it'd be a good idea, if only to avoid confusion between
e.g. `clearMemory` and the-variable-formerly-known-as `clearmemory`.
2020-04-12 10:49:32 -04:00
Zeno Rogue
e4a8b73819 nisot:: nicer precision setting 2020-04-11 15:08:24 +02:00
Zeno Rogue
c0e0e1562f export wrap_drawfullmap 2020-04-11 00:41:57 +02:00
Zeno Rogue
43fd94bed6 fixed flashes disappearing 2020-04-06 09:48:34 +02:00
Zeno Rogue
7fc0d5b051 less awkward map position in portrait 2020-04-06 09:13:20 +02:00
Zeno Rogue
cfbd5f830c fixed some warnings and errors with ll to int assignment 2020-04-06 09:13:20 +02:00
Zeno Rogue
6817ed42ad allowIncreasedSight now returns true after gameover 2020-04-02 12:56:26 +02:00
Arthur O'Dwyer
5cc8a41beb Turn C-style casts into reinterpret_casts for clarity. NFC. 2020-03-23 14:48:41 -04:00
Arthur O'Dwyer
13bf666e29 Lambdas can't have default arguments until C++14.
Arguably this is a reason to upgrade from C++11 to C++14,
or to give up completely on `-pedantic`, but I think it's
easy enough to eliminate these few nits.
2020-03-23 14:38:57 -04:00
Arthur O'Dwyer
a0da10b408 Remove extraneous semicolons to quiet pedantic GCC warnings. 2020-03-23 14:38:57 -04:00
Zeno Rogue
8aaeb4ea69 sight range changing no longer considered cheating in arb 2020-03-22 12:02:58 +01:00