mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-26 18:10:35 +00:00
Code Issues Releases Wiki Activity
1,674 Commits 1 Branch 66 Tags 131 MiB
c1243eea09
Commit Graph

1674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Zeno Rogue
44e26cee3e bugfix 2018-07-09 18:24:11 +02:00
Zeno Rogue
39f50c460a rogueviz:: incorporated 'gamma' as the alpha value of edgecolor; each edge now has edgetype; edge display configuration in the menu 2018-07-09 18:17:40 +02:00
Zeno Rogue
4d1e641663 part now works on unsigned col 2018-07-09 18:12:23 +02:00
Zeno Rogue
2a96937c89 dialog:: add_action to specify an action for the given key immediately after creating an item, rather than in the handler 2018-07-09 18:11:49 +02:00
Zeno Rogue
770dd20613 shift+f2 to shift+f4 can now disable HUD, FPS, and the map 2018-07-09 18:10:28 +02:00
Zeno Rogue
92f6521e42 arghex uses strtoll and returns unsigned 2018-07-09 18:07:47 +02:00
Zeno Rogue
1362916329
Merge pull request #52 from Quuxplusone/misc-portability 
Further MSVC-related cleanups
 2018-07-09 15:02:33 +02:00
Arthur O'Dwyer
de8926ac5d Fix some truncation warnings for the benefit of MSVC. 
rug.cpp(1266): warning C4305: 'argument': truncation from 'double' to 'GLclampf'
    tour.cpp(629): warning C4305: '=': truncation from 'int' to 'bool'
 2018-07-08 22:19:42 -07:00
Arthur O'Dwyer
f10f5a29b2 Fix a couple of issues in MSVC related to min and max. 
MSVC apparently thinks that the result of arithmetic promotions
on an `unsigned:4` bitfield is `unsigned`, not `int`; which then
causes it to fail to deduce whether the `T` in `min<T>` should be
`unsigned` (the type of the LHS) or `int` (the type of the RHS).
Clang and GCC agree that the result of arithmetic promotions on
an `unsigned:4` bitfield should be `int`, so they don't see any
ambiguity here.
 2018-07-08 22:19:30 -07:00
Arthur O'Dwyer
eac2ce1168 Tweak this weird hack for the benefit of MSVC. 
MSVC wrongly complains about the old version:

    game.cpp(6802): error C2664: 'std::pair<hr::cell *,hr::eItem> std::make_pair<hr::cell*&,hr::eItem&>(_Ty1,_Ty2)':
    cannot convert argument 2 from 'hr::eItem' to 'hr::eItem &'
        with
        [
            _Ty1=hr::cell *&,
            _Ty2=hr::eItem &
        ]

And MSVC wrongly complains about this alternative:

    conformal::findhistory.emplace_back(c2, int(c2->item));
    error: no matching function for call to 'std::pair<hr::cell*, hr::eItem>::pair(hr::cell*&, int)'

And MinGW wrongly complains about these alternatives:

    game.cpp:6801:49: error: cannot bind bitfield 'c2->hr::cell::<anonymous>.hr::gcell::item' to 'hr::eItem&'
     conformal::findhistory.emplace_back(c2, c2->item);
                                             ~~~~^~~~

    game.cpp:6801:47: error: cannot bind bitfield 'c2->hr::cell::<anonymous>.hr::gcell::item' to 'hr::eItem&'
     conformal::findhistory.push_back({c2, c2->item});
                                           ~~~~^~~~
 2018-07-08 22:19:20 -07:00
Zeno Rogue
5fa9dcaab5
Merge pull request #50 from AMDmi3/werror 
Enable -Werror in Travis
 2018-07-08 14:41:22 +02:00
Zeno Rogue
b7cf820976 Merge branch 'master' of https://github.com/zenorogue/hyperrogue 2018-07-08 14:34:20 +02:00
Zeno Rogue
27e0431e4e 10.4l 2018-07-08 14:34:05 +02:00
Zeno Rogue
5786d22774 Random Pattern Mode: fixed the Land of Power, treasures appear in the Reptiles. 2018-07-08 14:31:48 +02:00
Zeno Rogue
94371d8469 args:: fixed -geo 2018-07-08 14:19:28 +02:00
Zeno Rogue
adee24229c tactic:: fixed PTM games not recorded when switching modes 2018-07-08 14:19:12 +02:00
Dmitry Marakasov
d551c68a74 Enable -Werror in Travis 2018-07-08 12:41:41 +03:00
Zeno Rogue
e61b68bd37
Merge pull request #49 from Quuxplusone/simple-autotools 
Clean up the autotools; TravisCI for both Linux and OSX
 2018-07-07 16:31:56 +02:00
Zeno Rogue
837ce1d58a 10.4k 2018-07-07 11:15:57 +02:00
Zeno Rogue
98ea11de86 fixed the warnings about comparing int and bool 2018-07-07 11:05:48 +02:00
Zeno Rogue
8b35bf6d4b shards collectable in laMirrorOld 2018-07-07 11:04:44 +02:00
Zeno Rogue
5b5f36004b field quotients now count as confusing (animation did not work correctly in small field quotients) 2018-07-06 20:00:13 +02:00
Zeno Rogue
300dfde6da -geo option works correctly when switching to the same geometry. -qpar2 now generates the extra primes automatically. 2018-07-06 19:59:29 +02:00
Zeno Rogue
4fa25e9883 rogueviz::kohonen:: better diagnostic messages 2018-07-06 19:28:20 +02:00
Zeno Rogue
37ba1b90b2 fixed the command line toggles 2018-07-06 19:28:03 +02:00
Zeno Rogue
939c89472b rogueviz:: an option to disable labels 2018-07-05 09:59:14 +02:00
Zeno Rogue
e24ed2bc87 rogueviz:: fixed some bugs with drawing edges 2018-07-05 09:59:06 +02:00
Zeno Rogue
be7cd38c61 rogueviz:: improved edges in multidraw 2018-07-05 09:58:10 +02:00
Zeno Rogue
dc0d3ea610 rogueviz:: improved edges in multidraw 2018-07-05 09:57:58 +02:00
Zeno Rogue
0c4ab20867 no more weights shown in the description for non-SAG graphs 2018-07-05 09:57:01 +02:00
Zeno Rogue
286ef689a7 edge subdivision now works better in quotient spaces 2018-07-05 09:56:44 +02:00