mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-27 02:20:36 +00:00
Code Issues Releases Wiki Activity
1,547 Commits 1 Branch 66 Tags 131 MiB
332bae84de
Commit Graph

1547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Zeno Rogue
a004afda21 rogueviz::kohonen:: options now use - instead of _; added an option to draw random edges for testing 2018-07-05 09:56:09 +02:00
Zeno Rogue
34d7b1de96 rogueviz::kohonen:: fixed uninitialized variable 2018-07-05 09:55:33 +02:00
Zeno Rogue
a37cfb43bb rogueviz::kohonen:: fixed bugs caused by adding vdatas 2018-07-05 09:55:11 +02:00
Zeno Rogue
3e742bbd24 rogueviz:: new way of drawing for quotient geometries now also used for elliptic and tori 2018-07-05 07:33:09 +02:00
Zeno Rogue
f7ae00fd39 fixed calc_relative_matrix in field quotient geometry 2018-07-05 07:32:27 +02:00
Zeno Rogue
223732bbfb rogueviz::kohonen:: legends 2018-07-05 07:31:27 +02:00
Zeno Rogue
300d0b80ed rogueviz::kohonen:: number of displayed observations per cell dependent on the number of total observations there 2018-07-05 07:30:15 +02:00
Zeno Rogue
2efbccd334 rogueviz:: improved the visualization of edges in quotient geometries 2018-07-04 14:38:08 +02:00
Zeno Rogue
6e1983baa9 rogueviz::kohonen:: additional options (save/load classify in binary format, visualize edges 2018-07-04 14:37:33 +02:00
Zeno Rogue
ddf3ca83cf rogueviz:: edge colors can be adjusted now 2018-07-04 14:35:45 +02:00
Zeno Rogue
87534ac492 rogueviz:: change the vertex shape (make it smaller or disable vertices altogether) 2018-07-04 14:34:58 +02:00
Zeno Rogue
45ddd6303e added a virtual destructor to supersaver to silence a warning 2018-07-03 12:00:02 +02:00
Zeno Rogue
577f050a57 missing line in changelog 2018-07-03 11:55:33 +02:00
Zeno Rogue
e3d406c8dd 10.4j 2018-07-03 04:23:23 +02:00
Zeno Rogue
a8c55be1d1 Orb of Water + Orb of Empathy no longer works on enemies too 2018-07-03 04:22:35 +02:00
Zeno Rogue
1286c66e85 fixed the Prairie bug 2018-07-03 04:18:42 +02:00
Zeno Rogue
ae51914cea rogueviz:: SAG did not work because of a RNG problem -- fixed 2018-07-03 04:14:52 +02:00
Arthur O'Dwyer
c713b9f209 Add a TravisCI badge to the README. 2018-07-01 12:38:08 -07:00
Arthur O'Dwyer
0f0a6c243d Expand the TravisCI integration to test autotools on both Linux and OSX. 2018-07-01 12:38:08 -07:00
Arthur O'Dwyer
0946300663 Clean up the autotools. 
It still seems to work on MinGW mainly by accident,
but at least it's a lot shorter and clearer and more
portable at this point. We can start testing it in
TravisCI and then work on making it work "less by accident"
incrementally.
 2018-07-01 12:38:08 -07:00
Zeno Rogue
23a3cb4a53
Merge pull request #46 from Quuxplusone/direntx 
Switch the Windows "direntx.h" to something that works even on MSVC.
 2018-06-30 17:25:04 +02:00
Zeno Rogue
e5fe57fdbf rogueviz:: fixed the use of rand to hrand 2018-06-30 16:37:39 +02:00
Zeno Rogue
11d9d3de5a renamed the global variable r to hrngen; added a commentr about hrngen; fixed hrandom_shuffle in rogueviz-kohonen 2018-06-30 16:29:37 +02:00
Zeno Rogue
e9c82a5005 Merge branch 'master' of https://github.com/zenorogue/hyperrogue 2018-06-30 16:21:26 +02:00
Zeno Rogue
5ab0f98c83
Merge pull request #47 from Quuxplusone/misc-portability 
Eliminate VLAs; eliminate std::random_shuffle()
 2018-06-30 16:24:43 +02:00
Zeno Rogue
f47e0870a8 renamed the global variable N to blizzard_N 2018-06-30 16:21:06 +02:00
Arthur O'Dwyer
a563f89147 Eliminate an unnecessary <unistd.h> for the benefit of MSVC. 
It's still conditionally included under `CAP_SAVE`, so I think
this won't break any non-MSVC platform.
 2018-06-29 16:51:10 -07:00