mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-24 21:37:18 +00:00
Code Issues Releases Wiki Activity
1,705 Commits 1 Branch 65 Tags 131 MiB
e14b83d400
Commit Graph

1705 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zeno Rogue
12047beb3a fixed the step in configure_edge_display 2018-07-11 12:38:06 +02:00
Zeno Rogue
56f668a7b1 Merge branch 'master' of https://github.com/zenorogue/hyperrogue 2018-07-11 12:34:37 +02:00
Zeno Rogue
69d7c4651a
Merge pull request #53 from Quuxplusone/travis-ci 
Merge Makefiles. Add emscripten to Makefile. Test all platforms on TravisCI.
 2018-07-11 12:38:26 +02:00
Zeno Rogue
d57436848c rectified is GP(1,1) not GP(1,0) 2018-07-11 12:25:33 +02:00
Zeno Rogue
c9f5b1e048 fixed several instances when PTM score would not be recorded when changing modes 2018-07-11 12:25:19 +02:00
Arthur O'Dwyer
8d9a03699e Fix a typo-bug detected by Clang. 
./rogueviz.cpp:1721:47: error: implicit conversion from 'double' to 'int'
      changes value from 0.2 to 0 [-Werror,-Wliteral-conversion]
            dialog::editNumber(i, 1, 1000000, .2, 500, s3, "");
            ~~~~~~                            ^~
 2018-07-10 17:48:31 -07:00
Arthur O'Dwyer
ef562d0d43 TravisCI and Makefile integration for the emscripten build! 
For testing the emscripten build in TravisCI, it looks like some
arcane combination of node + Browserify + the wasmify plugin + maybe
some other stuff *might* work, but I have no real idea yet.

For grabbing the build artifacts from Travis, you can temporarily
insert lines into the .travis.yml such as

    curl --upload-file ./hyper.html https://transfer.sh/hyper.html
    curl --upload-file ./hyper.js https://transfer.sh/hyper.js
    curl --upload-file ./hyper.wasm https://transfer.sh/hyper.wasm

However, "hyper.wasm" is about 2.8 megabytes in size, so this hack
definitely should never become part of the *master* `.travis.yml`.
 2018-07-10 17:48:31 -07:00
Arthur O'Dwyer
5142901772 Merge Makefile.{mac,mgw} into Makefile.simple. 
https://travis-ci.org/Quuxplusone/hyperrogue
 2018-07-10 17:02:56 -07:00
Zeno Rogue
332bae84de debugging display is used with both cheater and autocheat 2018-07-10 23:03:02 +02:00
Zeno Rogue
ba587ae40d fixed the barrier-nowall generation in a4 2018-07-10 23:02:27 +02:00
Zeno Rogue
3345999180 gp:: Warped Coast and Crystal World do not work in a4 2018-07-10 21:55:54 +02:00
Zeno Rogue
a91195bda1 bugfix: Raging Bull / Orb of the Bull / Orb of Horns worked correctly only on hexagons and heptagonsm 2018-07-10 21:51:28 +02:00
Zeno Rogue
f316be6793 marked Whirlpool as not working in a4 2018-07-10 21:29:33 +02:00
Zeno Rogue
291f326634 fixed buildEquidistant by using MODFIXER instead of 42 2018-07-10 21:24:31 +02:00
Zeno Rogue
bc558a18df gp:: ok, chamfered appears, but it is correctly called 'expanded' 2018-07-10 21:18:07 +02:00
Zeno Rogue
b2ba4efc40 gp:: in a4, replaced '2x bitruncated' with 'rectified'; better active display on 'bitruncated'; hidden 'chamfered' 2018-07-10 21:11:02 +02:00
Zeno Rogue
0d194af3d1 gp:: avoid crash in dir_bitrunc457 2018-07-10 21:04:40 +02:00
Zeno Rogue
cee40849e8 gp:: in the dialog, slider ranges from 0 to 8 (not from 1 to 10) 2018-07-10 21:04:20 +02:00
Zeno Rogue
c0d2a1cad6 gp:: no more using football-colorable graphics for R'Lyeh etc. on a4 2018-07-10 18:29:31 +02:00
Zeno Rogue
6c02c9879a gp:: drawrec(boundary) removed, no longer needed 2018-07-10 18:14:49 +02:00
Zeno Rogue
489b9a328d linepatterns:: patTriRings now works with a4 2018-07-10 18:03:58 +02:00
Zeno Rogue
f94c85a4fa gp:: distance calculation 2018-07-10 18:03:41 +02:00
Zeno Rogue
aaf0a949c3 gp:: base_distlimit adjusted in a4 2018-07-10 18:01:55 +02:00
Zeno Rogue
d986ed7617 gp:: more concentrated tree 2018-07-10 18:01:42 +02:00
Zeno Rogue
711efc3be4 gp::fixed land not generating sometimes in a4 2018-07-10 14:25:55 +02:00
Zeno Rogue
84afa659c8 geometry changing now keeps gp:: state if possible -- no longer disable when switching to nonorientable or a4 2018-07-10 13:17:55 +02:00
Zeno Rogue
c1105aa263 fixed keys not working in the quit screen 2018-07-10 13:16:04 +02:00
Zeno Rogue
12cfc0b0b5 fixed the size of Krakens and shMagicSword on euclid4 2018-07-10 13:15:49 +02:00
Zeno Rogue
def5a8d5a2 gp:: ishept, pseudohept, and kraken_pseudohept for a4 2018-07-10 13:15:26 +02:00
Zeno Rogue
587b63a761 fixed Kraken movement on squares 2018-07-10 13:14:28 +02:00
Zeno Rogue
5cd8f695a3 Goldberg-Coxeter construction for order-4 tilings (everything seems to work except distance calculations) 2018-07-10 04:13:35 +02:00
Zeno Rogue
a7fa9d7525 hooks_draw no longer prevents other shmup::monsters from displaying 2018-07-09 21:14:52 +02:00
Zeno Rogue
8caa1f1354 rogueviz:: fixed the mouseover labels; also 'canvas' removed automatically 2018-07-09 21:14:29 +02:00
Zeno Rogue
d48207cd2f fixed: (mode.flags AND) torusconfig::TF_HEX 2018-07-09 21:04:23 +02:00
Zeno Rogue
0c42b32efc all the references to RogueViz from main HR removed, except 'rogueviz.cpp' included with CAP_ROGUEVIZ. RogueViz can be compiled eitehr by setting CAP_ROGUEVIZ=1 or by linking rogueviz.cpp 2018-07-09 21:03:46 +02:00
Zeno Rogue
ef182b225e all hr functions/variables used in rogueviz now listed in hyper.h 2018-07-09 21:02:23 +02:00
Zeno Rogue
887deae03f rogueviz:: timetowait set for iterations 2018-07-09 20:40:28 +02:00
Zeno Rogue
6e4e9e0a46 SVG links no longer use an additional field in polytodraw -- they are a new type of polyunion now 2018-07-09 20:40:05 +02:00
Zeno Rogue
f721c243d2 removed DOSHMUP 2018-07-09 20:38:20 +02:00
Zeno Rogue
6303b8033b rogueviz:: help done via hooks 2018-07-09 20:09:56 +02:00
Zeno Rogue
26b4e1a7ab rogueviz:: rogueviz::on is no longer checked anywhere in the main hr 2018-07-09 19:58:13 +02:00
Zeno Rogue
3a8293df27 rogueviz:: tutorial, start/main menu, and welcome message done as hooks 2018-07-09 19:55:56 +02:00
Zeno Rogue
d523ceabfd rogueviz::shmup:: all references to rogueviz in shmup replaced with handlers 2018-07-09 19:32:34 +02:00
Zeno Rogue
9a1ec47034 removed a call to rogueviz::processKey 2018-07-09 19:00:47 +02:00
Zeno Rogue
508c63d731 calls to rogueviz::mark and rogueviz::fixparam from HR main are now replaced by hooks 2018-07-09 18:59:12 +02:00
Zeno Rogue
827ae794d6 rogueviz:: matrix memoization in multidraw 2018-07-09 18:56:51 +02:00
Zeno Rogue
e6bdfcc94f rogueviz::kohonen::clear (not used yet) 2018-07-09 18:56:27 +02:00
Zeno Rogue
c42fb45fca in winner, use HUGE_VAL instead of 1e20 2018-07-09 18:55:43 +02:00
Zeno Rogue
1bd49df841 Merge branch 'master' of https://github.com/zenorogue/hyperrogue 2018-07-09 18:43:09 +02:00
Zeno Rogue
dd8e30e041 RogueViz legend as HUD replacement, lists edge types too 2018-07-09 18:39:34 +02:00