1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-04 21:26:17 +00:00
Commit Graph

7600 Commits

Author SHA1 Message Date
Zeno Rogue
7c9bea6e1b conflict resolved 2021-07-12 09:55:25 +02:00
Zeno Rogue
6e3471d481
Merge pull request #220 from jruderman/offsetof1
Use offsetof to reduce UB
2021-07-12 09:52:14 +02:00
Zeno Rogue
38530386d0
Merge branch 'master' into offsetof1 2021-07-12 09:52:03 +02:00
Jesse Ruderman
4a6787d0a7 Orb of Lava no longer intimidates allies 2021-07-12 00:50:52 -07:00
Zeno Rogue
e3cf526bca
Merge pull request #223 from jruderman/ub_gravity
Fix UB in draw_gravity_particles
2021-07-12 09:46:56 +02:00
Zeno Rogue
457b918697
Merge pull request #226 from jruderman/sort_empty
Fix UB when shuffling empty vecs
2021-07-12 09:45:58 +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
Zeno Rogue
e39d778b38
Merge pull request #225 from jruderman/ub_draugr
Fix UB: use unsigned add for draugr's cloak color
2021-07-12 09:43:59 +02:00
Jesse Ruderman
123994bdc2 Fix UB when sorting empty vecs 2021-07-11 20:54:25 -07: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
Jesse Ruderman
fdfba9be50 Fix UB in draw_gravity_particles 2021-07-11 19:47:56 -07:00
Zeno Rogue
08cbe8e4e0
Merge pull request #222 from Quuxplusone/fix-warnings
Fix or suppress a bunch of Clang warnings. NFCI.
2021-07-12 00:31:49 +02:00
Arthur O'Dwyer
090e084dd4 Add explicit and override consistently everywhere else. NFCI. 2021-07-11 18:03:08 -04:00
Arthur O'Dwyer
a2989a3d39 Add explicit and override consistently in hprint.cpp. NFCI. 2021-07-11 17:31:05 -04:00
Arthur O'Dwyer
db762ff21a Fix or suppress a bunch of Clang warnings. NFCI. 2021-07-11 17:22:00 -04:00
blargdag
774b93c887 Partial translation of Irradiated Field related strings. 2021-07-11 10:40:59 -07:00
blargdag
fa28f4cfb6 Partial translation of Free Fall strings. 2021-07-11 10:40:38 -07:00
blargdag
e4e3d9ce22 Partial translation of Brown Island related strings. 2021-07-11 10:40:13 -07:00
blargdag
e8f8ea105f Demarcate completed translations. 2021-07-11 10:39:18 -07:00
Jesse Ruderman
98fd1f9c47 Use offsetof to reduce UB 2021-07-11 07:45:55 -07:00
Zeno Rogue
7aec4c3cf1 reg3:: changed the remaining refs to adjacent_dirs to dirdist; S7 to c->type 2021-07-11 16:18:04 +02:00
blargdag
4ed17c65ab Translate some strings for restructured menus. 2021-07-11 06:40:18 -07:00
Zeno Rogue
a727fd29a2
Merge pull request #219 from blargdag/ru-cleanup3
Various cleanups of Russian translation
2021-07-11 15:28:33 +02:00
Zeno Rogue
3f2c8d7479
Merge pull request #218 from jruderman/tbd_indexing
Fix array indexing in totalbulldistance
2021-07-11 15:26:46 +02:00
Zeno Rogue
e9de3ac7d5 Great Walls in bch 2021-07-11 15:07:40 +02:00
blargdag
c0ff53105c More duplicate translation fixes. 2021-07-11 05:39:00 -07:00
blargdag
f3cb7dec28 More cleanups of duplicate translations. 2021-07-11 05:39:00 -07:00
blargdag
15a6bdb217 Cleanup duplicate strings, merge translations. 2021-07-11 05:39:00 -07:00
blargdag
cab7b054ea Fix typo. 2021-07-11 05:10:11 -07:00
blargdag
1288d7b101 Fix some typos. 2021-07-11 05:10:11 -07:00
blargdag
69591dc1d4 "anti-aliasing" 2021-07-11 05:09:47 -07:00
blargdag
7da2a0c141 Missing space at end of line. 2021-07-11 05:09:47 -07:00
Jesse Ruderman
a138fa0952 Fix array indexing in totalbulldistance 2021-07-11 04:07:32 -07:00
Zeno Rogue
53efc30bd5 fixes to Great Wall generation 2021-07-11 12:28:19 +02:00
Zeno Rogue
d06e94d480 Merge branch 'master' of https://github.com/zenorogue/hyperrogue 2021-07-11 11:57:23 +02:00
Zeno Rogue
0e0e4d0212 reg3:: strafe and dirs_adjacent with subcubes -- Great Wall generation works 2021-07-11 11:48:33 +02:00
Zeno Rogue
5f54bf2888 reg3:: compute dirs_adjacent and strafe data for subcubes 2021-07-11 11:03:35 +02:00
Zeno Rogue
cac0b57d7c
Merge pull request #215 from jruderman/kpnull
Fix crash when an unknown princess is in peril
2021-07-11 09:47:03 +02:00
Zeno Rogue
0f0897ecf4
Merge pull request #217 from jruderman/statue_dice
Fix crash by disallowing statue-dice swaps
2021-07-11 09:45:44 +02:00
Zeno Rogue
9722bfc9e7
Merge pull request #216 from jruderman/camelot_vine
Ivy to Vine no longer overwrites Round Table
2021-07-11 09:44:46 +02:00
Jesse Ruderman
b4d6b86872 Fix crash by disallowing statue-dice swaps 2021-07-10 19:15:16 -07:00
Jesse Ruderman
5bb2650820 Ivy to Vine no longer overwrites Round Table 2021-07-10 19:11:18 -07:00
Jesse Ruderman
42f8f5f4cc Fix crash when an unknown princess is in peril 2021-07-10 18:57:54 -07:00
Zeno Rogue
8f8cbfd4c7
Merge pull request #211 from jruderman/rop_atc
reduceOrbPowers: only call mine::auto_teleport_charges once
2021-07-10 22:10:07 +02:00
Zeno Rogue
1d174ef8e4 added missing Polish noun 2021-07-10 22:07:13 +02:00
Zeno Rogue
017a4750ed Merge branch 'master' of https://github.com/zenorogue/hyperrogue 2021-07-10 22:05:38 +02:00
Zeno Rogue
df7d8ee5fc fixed mymake to recompile language.cpp if language-data.cpp changed 2021-07-10 22:05:30 +02:00
Zeno Rogue
b02aae0af8
Merge pull request #209 from jruderman/reverse_winter
Reversing the Curse of Water now gives bonus Orb of Winter
2021-07-10 21:56:07 +02:00
Zeno Rogue
0b4c2e53ba
Merge pull request #210 from jruderman/warp_msgs
Fix some messages when using Orb of the Warp
2021-07-10 20:42:55 +02:00