1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-28 14:49:54 +00:00
Commit Graph

7645 Commits

Author SHA1 Message Date
Zeno Rogue
4c0d0e2a6f
Merge pull request #262 from jruderman/pc_peril
Princess Quest no longer shows fail screen merely due to the princess being in peril
2021-07-21 22:38:53 +02:00
Jesse Ruderman
4e44dab836 Princess Quest no longer shows fail screen merely due to the princess being in peril 2021-07-21 13:24:44 -07:00
Zeno Rogue
1769ec6b69 Merge branch 'master' of https://github.com/zenorogue/hyperrogue 2021-07-21 10:51:40 +02:00
Zeno Rogue
cc18251160 rogueviz::embeddings:: mark_signposts_subg 2021-07-21 10:51:06 +02:00
Zeno Rogue
8b3ea9031a nil:: fixed a possible crash due to missing compute_hept() 2021-07-21 10:49:48 +02:00
Zeno Rogue
4425556ebc gp:: conj() function for gp::loc 2021-07-21 10:49:09 +02:00
Zeno Rogue
9941d602f6
Merge pull request #246 from Quuxplusone/adc
Adc
2021-07-21 10:20:41 +02:00
Zeno Rogue
79bc004b2b
Merge pull request #256 from jruderman/dc_far
Prevent dice overlap after an animated die rolls away
2021-07-21 10:16:15 +02:00
Zeno Rogue
cbb98436a1
Merge pull request #257 from jruderman/dc_geom
Fix Dice Reserve crash in geometries that support d6/d12
2021-07-21 10:15:53 +02:00
Zeno Rogue
eedca281ef
Merge pull request #250 from jruderman/mirror_p
Palace no longer generates monsters on mirrors
2021-07-21 10:15:31 +02:00
Zeno Rogue
994b3b9122
Merge pull request #253 from jruderman/regroup_at_8
Hunting Dogs now notify stragglers of failed ambushes
2021-07-21 10:15:11 +02:00
Zeno Rogue
748d8bcf3a
Merge pull request #258 from jruderman/describe_dice_2
Show dice type/value on mouseover
2021-07-21 10:13:58 +02:00
Zeno Rogue
037528a50c
Merge pull request #259 from blargdag/ru_adj
Fix wrong Russian adjective ending.
2021-07-21 10:13:26 +02:00
blargdag
b24d82307b Fix wrong Russian adjective ending. 2021-07-20 15:36:58 -07:00
Jesse Ruderman
362c6f673f Show dice type/value on mouseover 2021-07-20 07:00:48 -07:00
Jesse Ruderman
9ac1f2577a Fix Dice Reserve crash in geometries that support d6/d12 2021-07-20 05:50:02 -07:00
Jesse Ruderman
ecfbe7de49 Prevent dice overlap after an animated die rolls away 2021-07-20 05:39:52 -07:00
Jesse Ruderman
7a7f2476b6 Hunting Dogs now notify stragglers of failed ambushes 2021-07-20 00:45:16 -07:00
Zeno Rogue
cb2d24aca9
Merge pull request #251 from blargdag/freefall2
Translate more strings from Free Fall.
2021-07-20 09:29:38 +02:00
blargdag
9624ff1ee7 Translate more strings from Free Fall. 2021-07-19 15:54:23 -07:00
Zeno Rogue
d765104f7f
Merge pull request #249 from jruderman/ruin_treas
Ruined City treasure now increases with the correct kill types
2021-07-19 20:54:50 +02:00
Zeno Rogue
c1fd437a11
Merge pull request #248 from jruderman/turretb
Cursed Canyon no longer generates monsters in walls
2021-07-19 20:54:16 +02:00
Jesse Ruderman
c894e8dd61 Palace no longer generates monsters on mirrors 2021-07-19 03:33:50 -07:00
Jesse Ruderman
01509406a3 Ruined City treasure now increases with the correct kill types 2021-07-19 02:28:29 -07:00
Jesse Ruderman
6b781bc0d8 Cursed Canyon no longer generates monsters in walls 2021-07-19 02:14:01 -07:00
Arthur O'Dwyer
67a54d3aa1 Finish replacing macro ADC with plain old code. 2021-07-18 17:43:03 -04:00
Arthur O'Dwyer
d606c3183b Replace hr::find_or_null with hr::at_or_null. 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
8c6aba5f6f
Merge pull request #242 from jruderman/slaying_cursed
Allow Orb of Slaying to appear in Cursed Canyon as a prize orb
2021-07-18 18:35:21 +02:00
Zeno Rogue
65065c7e69 Merge branch 'master' of https://github.com/zenorogue/hyperrogue 2021-07-18 18:33:02 +02:00
Zeno Rogue
81e066d0c3 gp:: replaced the magic constants 15, 16, 31, 32 with named constants derived from GOLDBERG_BITS 2021-07-18 18:32:50 +02:00
Zeno Rogue
5a8e31c626
Merge pull request #237 from jruderman/wcheat
Starting in a non-basic land with -W now enables cheat mode
2021-07-18 12:25:51 +02:00
Zeno Rogue
3ae26f5888
Merge pull request #238 from jruderman/a2
Autoplay improvements 2
2021-07-18 12:25:04 +02:00
Zeno Rogue
4dfedc421d
Merge pull request #240 from jruderman/ally_rose
Rose scent can now force the player's allies to walk into rosebushes
2021-07-18 12:23:53 +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
933e789d9a
Merge pull request #236 from blargdag/frogpark
Translation of Frog Park strings.
2021-07-18 12:23:16 +02:00
Zeno Rogue
d0e6ac7d48
Merge pull request #243 from jruderman/woods_bull
Allow Orb of the Woods to appear in Bull Dash as a prize orb
2021-07-18 12:22:37 +02:00
Zeno Rogue
196510d788
Merge pull request #245 from jruderman/weak_hp
Weak attacks no longer affect enemy HP
2021-07-18 12:22:17 +02:00
Zeno Rogue
e567fa2033 IF_KEY_EXISTS used in util.cpp 2021-07-18 12:19:49 +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
Zeno Rogue
ef8b24ff2a added IF_MAP_CONTAINS_KEY macro 2021-07-18 11:53:18 +02:00
Zeno Rogue
cebb0180a5 kohonen:: triangulate in 3D manifolds 2021-07-18 11:40:03 +02:00
Zeno Rogue
04c9bd193a rogueviz:: added a header for kohonen.cpp and (newly added) embeddings.cpp 2021-07-18 11:38:45 +02:00
Zeno Rogue
0fc8dfde15 fixed generate_brm in 3D 2021-07-18 11:15:31 +02:00
Zeno Rogue
6cf00a1c3c stop_game on 3dim variations 2021-07-18 11:15:13 +02:00
Zeno Rogue
c53b60adf5 reg3:: exit -> exception 2021-07-18 11:14:29 +02:00
Zeno Rogue
0701a5e194 reg3:: removed debug that called exit while all was OK 2021-07-18 11:14:22 +02:00
Jesse Ruderman
7d2f2aad7b Weak attacks no longer affect enemy HP 2021-07-17 23:50:57 -07:00