1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-10 23:59:55 +00:00
Commit Graph

1815 Commits

Author SHA1 Message Date
Zeno Rogue
b6f47dd907
Merge branch 'master' into makefile-fixes 2018-06-17 18:22:20 +02:00
Zeno Rogue
b2cc825ec9 smart celldistance did not work with non-standard tori -- replacing with a dumb one for now 2018-06-17 18:14:33 +02:00
Zeno Rogue
35301f0a68 movement animations now work in quotient geometries 2018-06-17 17:51:26 +02:00
Zeno Rogue
95a2f617cf Rock Snakes from the Snake Nest now keep their colors in other lands 2018-06-17 12:15:46 +02:00
Zeno Rogue
9e712ae8ea more Ivy in Goldberg jungle 2018-06-17 12:13:24 +02:00
Zeno Rogue
f699f73f1a texture:: undo clears pixels_to_draw; the number of pixels_to_draw displayed in the editor 2018-06-17 12:06:01 +02:00
Zeno Rogue
69429ba4d4 creating Mimics in the map editor now works correctly 2018-06-17 12:03:39 +02:00
Zeno Rogue
06de0989cd fixed saving the full texture 2018-06-17 12:03:05 +02:00
Zeno Rogue
e7a9cebbee fixed some issues with gp/texture 2018-06-17 12:02:47 +02:00
Zeno Rogue
e743e18156 10.4c 2018-06-17 12:02:06 +02:00
Arthur O'Dwyer
db3e5d1009 Minor fixes for Mac and MinGW.
Eliminate a format-string warning by using less template magic:
https://stackoverflow.com/questions/12573968/how-to-use-gccs-printf-format-attribute-with-c11-variadic-templates

Fix one `%Ld` in `rogueviz.cpp` that should have been `%lld`.

Rename `savepng.c` into `savepng.cpp` so that we don't have to care about
the system's C compiler; it builds fine using the same C++ options as
HyperRogue itself.

Figure out how to get `-DCAP_PNG` and `-DCAP_ROGUEVIZ` working on Mac,
and document them.
Assume that roughly the same things should also work on MinGW.

Consistency on `STDSIZE`, even though it doesn't suffice for C++17 conformance.
It *almost* suffices; the one place where Clang still complains even with
`-std=c++17 -DSTDSIZE -Wno-sign-compare` is here:

    ./fieldpattern.cpp:757:51: error: non-constant-expression cannot be narrowed from type 'unsigned long' to 'int' in initializer list
          [-Wc++11-narrowing]
          ex.primes.emplace_back(primeinfo{nextprime, size(fp.matrices) / S7, (bool) fp.wsquare});
                                                      ^~~~~~~~~~~~~~~~~~~~~~

So, we fix that up too, in this patch.
2018-06-16 23:20:50 -07:00
Zeno Rogue
8fe482ec16 improved the installation instructions for non-Linux 2018-06-15 00:14:24 +02:00
Zeno Rogue
b0d9305665 fixed markup 2018-06-15 00:10:10 +02:00
Zeno Rogue
239713de6b updated the version number in config script, and README.md 2018-06-15 00:09:35 +02:00
Zeno Rogue
0054b09b5c minor Android fixes 2018-06-15 00:03:05 +02:00
Zeno Rogue
d7d9f2e82d added the missing Shader.java 2018-06-14 00:07:24 +02:00
Zeno Rogue
1eaaac4d77 made the web version compile 2018-06-14 00:06:54 +02:00
Zeno Rogue
b342159475 upgraded the version number in the Android manifest to 10.4b 2018-06-13 20:56:34 +02:00
Zeno Rogue
8cacb3c687 10.4b 2018-06-13 01:04:45 +02:00
Zeno Rogue
bcc3fd1019 more Android fixes 2018-06-13 01:04:33 +02:00
Zeno Rogue
c0266a7164 renamed 'near' to 'isnear' ('near' is a non-standard keyword) 2018-06-13 00:42:27 +02:00
Zeno Rogue
945c8a3f71 removed the dependence of stop_game on switchWhat with CAP_DAILY 2018-06-13 00:41:02 +02:00
Zeno Rogue
fbba325587 silenced the uninitialized variable warning 2018-06-13 00:40:36 +02:00
Zeno Rogue
c1ef5938fc added the GitHub contributors to the in-game credits 2018-06-13 00:13:53 +02:00
Zeno Rogue
28a4768ea4 more uniformization of add/back, 'space' in grapheditor works in autocheat, fixed missing XLAT in surface 2018-06-13 00:11:26 +02:00
Zeno Rogue
3881a7dd97 more cleanup with uniformizing the keys for 'back' and 'help' 2018-06-13 00:00:01 +02:00
Zeno Rogue
44affc3e9d resolved conflicts introduced by merging zenorogue/hyperrogue#21 2018-06-12 23:28:06 +02:00
Zeno Rogue
b614116129 fixed Makefile.mgw as in zenorogue/hyperrogue#31 2018-06-12 23:14:25 +02:00
Zeno Rogue
56baba800b moved more includes to sysconfig.h 2018-06-12 23:10:20 +02:00
Zeno Rogue
50eaba3efd changes from zenorogue/hyperrogue#27 2018-06-12 22:40:06 +02:00
Zeno Rogue
520e5e5dbb pass lambdas to functions by reference, not by value zenorogue/hyperrogue#25 2018-06-12 22:17:08 +02:00
Zeno Rogue
c23d893df2 Change the return type of handleKeyFile to void, and unswap the arguments. zenorogue/hyperrogue#25 2018-06-12 22:12:15 +02:00
Zeno Rogue
e9fb8e0196 Merge branch 'Quuxplusone-minor-fixes' 2018-06-12 21:57:24 +02:00
Zeno Rogue
75b096c58d conflicts resolved 2018-06-12 21:57:00 +02:00
Zeno Rogue
e564dd5588
Merge pull request #22 from AMDmi3/patch-1
Only apply -std=c++11 to C++ flags
2018-06-12 21:44:23 +02:00
Zeno Rogue
78e817c70b
Merge pull request #28 from Quuxplusone/thumper-and-boat
Pushing a thumper through a boat is no longer allowed.
2018-06-12 21:43:31 +02:00
Zeno Rogue
d4536fa568
Merge pull request #20 from Quuxplusone/yendor-fixes
Yendor-related fixes
2018-06-12 21:41:35 +02:00
Zeno Rogue
9c501642c5 added the Banach-Tarski vis to the RogueViz presentation 2018-06-12 21:16:52 +02:00
Zeno Rogue
a2ec40537d Hunter dogs (guarding/regrouping) and sometimes wolves no longer count as a different kill type (not counted in total kills) 2018-06-12 21:13:59 +02:00
Zeno Rogue
6ca99e347f gp:: fixed the non-3D display of rock formations 2018-06-12 19:39:23 +02:00
Zeno Rogue
097be66f65 improved the torus/hyperrug/native sphere geometry; modelscale is set when you do this 2018-06-12 19:26:34 +02:00
Zeno Rogue
8f183b7afb Orb of Love no longer incresaes the displayed score in the Strange Challenge 2018-06-12 18:26:20 +02:00
Zeno Rogue
c5468db000 fixed some issues with adjacency taken into account incorrectly with Hedgehogs/Flailguards/Pikemen and Warp/halfvines 2018-06-12 16:05:39 +02:00
Zeno Rogue
fc23c64c5e orb of Horns, and other cases caring about opposite cells, now work correctly in nonstandard geometries 2018-06-12 16:04:33 +02:00
Zeno Rogue
03999b75ca marked Orb of Lava as useless in the Haunted Woods 2018-06-11 18:43:30 +02:00
Zeno Rogue
cc5909e999 fixed the Earth Elementals falling/dying in RRV 2018-06-11 18:43:13 +02:00
Zeno Rogue
147cedfd4e Orb of Recall no longer creates holes in the Yendorian Forest 2018-06-11 18:14:54 +02:00
Zeno Rogue
928570d7f1 tactic:: fixed a bug which caused forgetting the PTM game when 'reseting special modes' 2018-06-11 18:13:10 +02:00
Zeno Rogue
147f3f89f2 hr:: namespaces in the Android version 2018-06-11 18:03:27 +02:00
Zeno Rogue
adb65430a6 rogueviz:: links in rogueviz-video 2018-06-11 18:00:51 +02:00