1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-27 14:37:16 +00:00
Commit Graph

1190 Commits

Author SHA1 Message Date
Zeno Rogue
cf75e6f2ab
Merge pull request #323 from jlmjlm/mir-lh
Draw mimics with sword in left hand if PC's sword in left hand.
2022-11-05 16:44:59 +01:00
Zeno Rogue
0ff46ff143 dialog:: DIALOG_WIDE 2022-11-04 23:14:59 +01:00
Zeno Rogue
64a613572a fixed through_wall 2022-10-27 16:06:39 +02:00
Zeno Rogue
f606174445 fixed point_direction 2022-10-27 16:06:39 +02:00
Zeno Rogue
6ef282173f map editor:: building mode 2022-10-27 16:06:39 +02:00
Zeno Rogue
8294246449 dialog:: sm::NARROW_LINES 2022-10-27 16:06:39 +02:00
Zeno Rogue
caa4ac5bb4 sm::AUTO_VALUES to automatically assign option widths 2022-10-27 16:06:39 +02:00
Jacob Mandelson
7e2b8baf2f Draw mimics with sword in left hand if PC's sword in left hand. 2022-10-16 10:02:32 -07:00
Zeno Rogue
f666f51bcd added an option for nonisotropic_weird_transforms 2022-10-11 20:00:33 +02:00
Zeno Rogue
c10906d349 fixed 'penrose staircases' in rot spaces 2022-10-11 20:00:13 +02:00
Zeno Rogue
a1cbf8c906 minecolors and distcolors now accept less/more colors in table 2022-10-06 13:47:00 +02:00
Zeno Rogue
ddf8ea17e3 choice of orb display style 2022-10-06 13:10:57 +02:00
Zeno Rogue
30839fdb15 Orb of Sword II now displays reversed 2022-10-06 08:49:26 +02:00
Jacob Mandelson
6b9728b385 Flip over worm-head shape used in Orb of Domination.
Worms get drawn from tail to head, so the shape used for the head
is upside-down.  Hence it should be flipped over when used as the
icon for the Orb of Domination.
2022-10-05 08:43:16 -07:00
Zeno Rogue
1aa4242ace Orb icon updates 2022-10-04 18:14:16 +02:00
Zeno Rogue
a3e6d79607
Merge pull request #319 from jlmjlm/v12.1+os
Provide orbs with shapes that hint at their function
2022-10-04 16:23:59 +02:00
Zeno Rogue
e459723836 no rug drawn if nomap 2022-09-24 09:12:34 +02:00
Zeno Rogue
804308c03e old_center 2022-09-24 09:12:23 +02:00
Jacob Mandelson
d0564026d7 Small style cleanup. 2022-09-17 15:00:54 -07:00
Jacob Mandelson
71cf4bc678 Merge branch 'orbshapes' into v12.1+os 2022-09-17 14:39:07 -07:00
Jacob Mandelson
f7e8818e01 First draft of ivy leaf for Orb Of Nature. 2022-09-17 13:39:11 -07:00
Zeno Rogue
84a6d2f8f9 hooks_frame is still called when nomap == true 2022-09-17 16:45:43 +02:00
Zeno Rogue
85f214c9a2 fixed the Onyx graphics in inventory 2022-09-17 11:37:25 +02:00
Jacob Mandelson
371a324085 Orb of the Woods and part of a tree icon. 2022-09-16 21:59:23 -07:00
Jacob Mandelson
1ad6b7ebe9 Orbs of Air and Empathy. 2022-09-16 19:24:01 -07:00
Jacob Mandelson
d2c4382e14 First draft of shield shape. 2022-09-16 12:13:20 -07:00
Jacob Mandelson
048ad9a030 Use a pirate hook in the Orb of Space. 2022-09-15 16:02:27 -07:00
Jacob Mandelson
d0273d3ed6 Heptagon + heptagram for the Orb of Summoning. 2022-09-14 21:32:36 -07:00
Jacob Mandelson
df6f9eb86a Single eccentric disk for the Orb of Discord. 2022-09-14 18:23:43 -07:00
Jacob Mandelson
2933b256e0 Use disk segments for Orbs of Vaulting & Phasing. 2022-09-14 18:11:52 -07:00
Jacob Mandelson
360aa921aa Half an hourglass for the Orb of Time. 2022-09-13 10:49:10 -07:00
Zeno Rogue
466cc5cc0a removed redundant pre-changes orbused rollback, and made it more elegant in movegolem 2022-09-09 12:24:21 +02:00
Jacob Mandelson
3081817872 Orb of Invisibility. 2022-08-30 14:49:37 -07:00
Jacob Mandelson
94b2a27b35 Do Orb of Aether. 2022-08-29 19:03:12 -07:00
Jacob Mandelson
f8c9562a74 Do Orb of Trickery. 2022-08-29 18:50:50 -07:00
Jacob Mandelson
ef28ce708e Add lightning bolt to Orb of Storms. 2022-08-29 16:14:59 -07:00
Jacob Mandelson
5239f6eadc Orbs of Lava, Matter, and Stone. 2022-08-29 10:30:37 -07:00
Jacob Mandelson
067f959ab1 Have Orb of Purity use a disk as well. 2022-08-29 10:05:40 -07:00
Jacob Mandelson
c9f24344af Put disks behind the Orbs of Slaying and Undeath too. 2022-08-29 09:55:51 -07:00
Jacob Mandelson
aefbd359e4 For many orb icons, put them on the disk as shadowing, instead of replacing the disk. 2022-08-29 09:44:36 -07:00
Jacob Mandelson
ae284d68e8 Orb of Stunning. 2022-08-28 21:09:24 -07:00
Jacob Mandelson
a6c8894166 Orb of Ferocity. 2022-08-28 20:31:25 -07:00
Jacob Mandelson
e1f3df2e65 Orbs of the Dragon, Domination, and the Mind. 2022-08-28 20:05:03 -07:00
Jacob Mandelson
cc29338305 Use shSmallTreat for Orbs of Change, Choice, and Chaos. 2022-08-28 19:41:16 -07:00
Jacob Mandelson
5ec6783a2d Orb of Purity and Orb of Water. 2022-08-28 19:06:01 -07:00
Jacob Mandelson
afd57fe81d Orbs of Impact and Recall. 2022-08-28 11:10:12 -07:00
Jacob Mandelson
c4a7776977 Flash shape for the Orb of Flash. 2022-08-28 10:55:09 -07:00
Jacob Mandelson
20a6876763 Orb of Winter and Orb of Luck. 2022-08-28 10:25:42 -07:00
Jacob Mandelson
0ebee6a1a3 Orb of Horns & Orb of the Bull. 2022-08-27 18:21:53 -07:00
Jacob Mandelson
f5d4586d0f Orbs of Speed, Safety, and Freedom. 2022-08-27 16:37:49 -07:00
Jacob Mandelson
af4a0c1da9 Orb of Choice: Two small disks. 2022-08-27 15:51:31 -07:00
Jacob Mandelson
46872919ba Orb of Energy and Orb of Intensity. 2022-08-27 12:43:22 -07:00
Jacob Mandelson
cc3065f204 Bodies for Orbs of Triangle, Gravity, Warp, Matter, and Stone. 2022-08-27 11:31:58 -07:00
Jacob Mandelson
591acfebe4 Add hedgehog blade shape to Orb of Thorns. 2022-08-27 05:43:24 -07:00
Jacob Mandelson
1561d84f1b Sword shape for Orb of the Sword I & II. 2022-08-26 21:58:48 -07:00
Jacob Mandelson
3521ee917c Use Pickaxe shape for Orb of Earth ("Digging"). 2022-08-26 19:10:39 -07:00
Jacob Mandelson
064468b480 Added bodies to the Orb of Slaying and Orb of Undeath. 2022-08-26 18:48:21 -07:00
Jacob Mandelson
1f842704ec Add orb bodies for Orb of Slashing & Orb of the Frog. 2022-08-26 15:21:00 -07:00
Jacob Mandelson
b71b34e734 Use turtle shell in the Orb of the Shell. 2022-08-26 14:00:42 -07:00
Jacob Mandelson
d85ad065f6 Make Orb of Beauty use a small rose. 2022-08-26 12:34:04 -07:00
Jacob Mandelson
18e1912884 Show golem in Orb of Life. 2022-08-26 10:04:52 -07:00
Jacob Mandelson
446b23f83d Show a tame bomberbird in the Orb of Friendship. 2022-08-26 08:46:32 -07:00
Zeno Rogue
9f48d4f194 Pearls now use the Disk graphics 2022-08-25 10:38:22 +02:00
Zeno Rogue
e8b3f0c5c9 titlecolor setting 2022-07-23 15:36:27 +02:00
Zeno Rogue
c5650e4e46 savemem:: do not crash because of flashdata not cleared 2022-07-17 14:41:57 +02:00
Zeno Rogue
6225fd38e8 savemem:: removed some more potential crashes 2022-07-17 14:41:57 +02:00
Zeno Rogue
3b4571aa16 3d:: choice of end type for pipes 2022-07-14 11:28:24 +02:00
Zeno Rogue
6c4a53c001 3d:: auto-rotate pipe for nice shading 2022-07-14 11:09:47 +02:00
Zeno Rogue
591d370ea4 centering menus is now configurable 2022-07-12 14:46:31 +02:00
Zeno Rogue
75f58766a2 made background screen darkening consistent and optional 2022-07-05 11:51:06 +02:00
Zeno Rogue
9ae7bb3d7b swords in mirrors are now displayed correctly 2022-06-17 09:43:37 +02:00
Zeno Rogue
784dc0d13a tour:: don't display help on NOTITLE 2022-06-16 23:13:54 +02:00
Zeno Rogue
a703e1af2d dont_display_minecount flag 2022-05-17 09:45:09 +02:00
Zeno Rogue
a6dc4b9314 new projections mostly for Solv: Lie perspective and Lie orthogonal 2022-05-17 09:45:09 +02:00
Zeno Rogue
6fe07c389c fixed smooth movement in modes other than sm::NORMAL 2022-05-06 19:55:09 +02:00
Zeno Rogue
02d195ca0b new screen option sm::SHOWCURSOR 2022-04-30 12:02:05 +02:00
Zeno Rogue
61c3e41e8a gridlines now draw correctly for (ultra)ideal vertices 2022-04-26 16:19:02 +02:00
Zeno Rogue
8489550aed multi:: radar works correctly in split_screen 2022-03-27 22:47:51 +02:00
Zeno Rogue
14ed4b7603 display a hint when player hidden 2022-03-27 22:47:51 +02:00
Zeno Rogue
6d554d6b2e multi:: two-focus projections 2022-03-27 22:47:51 +02:00
Zeno Rogue
a6cbedc944 multi:: PvP, friendly-fire, and self-hits options 2022-03-27 22:47:51 +02:00
Zeno Rogue
37575bcdaf hr::span exported 2022-03-27 22:47:51 +02:00
Zeno Rogue
fbb75309d0 multi:: split_screen for standard shmup, not racing 2022-03-27 22:47:51 +02:00
Zeno Rogue
9a25da1989 multi:: more modern centering 2022-03-27 22:47:50 +02:00
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