1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-14 01:14:48 +00:00
Commit Graph

322 Commits

Author SHA1 Message Date
Zeno Rogue
6f6586b3f2
Merge branch 'master' into hooks-naming 2020-04-19 13:39:07 +02:00
Zeno Rogue
4ffbe27784 pen width and paint color are now defined in mapeditor.cpp not texture.cpp 2020-04-18 16:10:56 +02:00
Zeno Rogue
f504eef7df fixed the lacking virtual desctructor 2020-04-18 14:32:54 +02:00
Zeno Rogue
c24658bf38 more drawing tool improvements; no crash drawing tool; restart editors will ask for confirmation 2020-04-17 20:34:49 +02:00
Zeno Rogue
62c6651392 drawing tool improvements 2020-04-17 20:18:50 +02:00
Zeno Rogue
ad233a1e19 drawing tool 2020-04-17 20:04:33 +02:00
Zeno Rogue
0472bf764f moved all projection-related parameters to a special struct; another copy of that struct created for rug 2020-04-17 00:53:58 +02:00
Arthur O'Dwyer
934e3d9a42 Consistently name every hookset with prefix hooks_. NFC.
I'm sure this causes massive merge-conflicts in the non-public code,
but I think it'd be a good idea, if only to avoid confusion between
e.g. `clearMemory` and the-variable-formerly-known-as `clearmemory`.
2020-04-12 10:49:32 -04:00
Zeno Rogue
e4a8b73819 nisot:: nicer precision setting 2020-04-11 15:08:24 +02:00
Arthur O'Dwyer
a0da10b408 Remove extraneous semicolons to quiet pedantic GCC warnings. 2020-03-23 14:38:57 -04:00
Zeno Rogue
b2a6ae304d fixed a bug in loading maps from old versions 2020-03-22 09:48:24 +01:00
Zeno Rogue
2ccb48f765 WFC can be experimented with 2020-03-07 04:47:10 +01:00
Zeno Rogue
27e19ca5ca mapeditor:: canvas_default_wall can be set now 2020-01-28 17:58:55 +01:00
Zeno Rogue
2271a67506 removed the MAX_EDGE limit 2020-01-18 16:03:32 +01:00
Zeno Rogue
31b9310552 fixup mineadj -> mine_adjacency_rule 2019-12-27 11:57:23 +01:00
Zeno Rogue
cb4ce17598 mapeditor:: read/write mineadj 2019-12-27 11:33:22 +01:00
Zeno Rogue
c247936e34 removed the functions queuechr -- use queuestr now 2019-12-26 23:38:28 +01:00
Zeno Rogue
d5c8aebf16 renamed binary:: to bt:: and binarytiling to bt::in() 2019-12-14 12:05:01 +01:00
Zeno Rogue
f772f9b7fd replaced 'archimedean' with 'arcm::in()' 2019-12-14 11:57:23 +01:00
Zeno Rogue
0a9ec78c18 remplace euclid6, euclid4, 'euclid && \!archimedean && \!penrose' with standard_tiling(), euc::in(dimension, s7) 2019-12-14 11:57:23 +01:00
Zeno Rogue
ddb5d07ff6 cleanup in Euclidean 2019-12-08 10:59:09 +01:00
Zeno Rogue
59e58693f4 mapeditor:: correct and efficient ghosts when using a larger range or quotient spaces 2019-12-06 14:03:54 +01:00
Zeno Rogue
25bc0f56de kth-turn product space (via CLI) 2019-11-30 18:06:48 +01:00
Zeno Rogue
0ff27cc5b8 save torus periods 2019-11-30 18:06:47 +01:00
Zeno Rogue
1cba452f07 rewritten the Euclidean geometry 2019-11-30 18:06:47 +01:00
Zeno Rogue
9b329ef901 fixed loading product maps (especially Archimedean product maps) 2019-11-23 23:09:06 +01:00
Zeno Rogue
222e4aa78b mapeditor:: save geometry details 2019-11-23 21:08:47 +01:00
Zeno Rogue
021f99aafa save compatibility: field quotient configured 2019-11-22 23:16:06 +01:00
Zeno Rogue
85a08d205d refactored celldraw 2019-10-25 12:44:41 +02:00
Zeno Rogue
848eb8f48b export everything: modules compiled separately 2019-09-12 22:50:16 +02:00
Zeno Rogue
9647cbd47e added #include hyper.h to all cpp files 2019-09-12 22:50:16 +02:00
Zeno Rogue
96d7496043 refactored all the operations on View 2019-09-12 22:50:15 +02:00
Zeno Rogue
a03eb0d913 fixed new geometry handling for Archimedean 2019-09-12 22:50:15 +02:00
Zeno Rogue
2f954d0538 nicer handling of WDIM, GDIM, MDIM, sig 2019-09-12 22:50:15 +02:00
Zeno Rogue
201098efe9 convenience functions zforward_dir and zpush0 2019-09-12 22:50:15 +02:00
Zeno Rogue
c83b5b9ad8 product:: draw editor 2019-09-12 22:50:14 +02:00
Zeno Rogue
96bf478482 renamed DIM to GDIM 2019-09-12 22:50:13 +02:00
Zeno Rogue
cd4bee08f7 disabled just_direction in mapeditor distances 2019-09-12 22:50:13 +02:00
Zeno Rogue
aede994403 mapeditor:: geodesic spheres and constant X/Y/Z in nonisotropic, also the grid is configurable 2019-09-12 22:50:13 +02:00
Zeno Rogue
0b4cba3c23 mapeditor:: geodesic spherical coordinates in nisot, works correctly in 3D 2019-09-12 22:50:13 +02:00
Zeno Rogue
cc0584f7d1 mapeditor:: fixed UI elements crashing into each other 2019-09-12 22:50:13 +02:00
Zeno Rogue
8b1c7bffe4 initial reformatting of comments for Doxygen 2019-09-12 22:50:13 +02:00
Zeno Rogue
4ec7652861 cleanup mapeditor 2019-09-12 22:50:12 +02:00
Zeno Rogue
a76a5dd265 further cleanup 2019-09-12 22:50:12 +02:00
Zeno Rogue
f4eda1d76e removed function fixdir 2019-09-12 22:50:12 +02:00
Zeno Rogue
c131e21198 namespace hyperpoint_vec removed 2019-09-12 22:50:12 +02:00
Zeno Rogue
9565ce198f fixed a crash on loading saved maps 2019-09-12 22:50:11 +02:00
Zeno Rogue
dd212d756b fixed the monster color in the minimap for Dragons etc 2019-09-12 22:50:08 +02:00
Zeno Rogue
f35e383214 fixed a crash in draw editor 2019-09-12 22:50:06 +02:00
Zeno Rogue
5519252fd0 added some missing CAP_* guards 2019-09-12 22:50:04 +02:00
Zeno Rogue
949b0d60db mapedtior:: fixed loading arcm maps 2019-09-12 22:50:04 +02:00
Zeno Rogue
1c6e6bafb4 moved the parameters from geom3:: to videopar 2019-09-12 22:50:04 +02:00
Zeno Rogue
e8417e5c51 dual:: mapeditor save feature works correctly 2019-09-12 22:50:03 +02:00
Zeno Rogue
b6e303ec7d MAJOR refactoring: all geometry-dependent data (tessf, geom3::, shapes, hpc) are now contained in a structure 2019-09-12 22:50:03 +02:00
Zeno Rogue
1b93ecd5a3 vernum uniformization 2019-09-12 22:50:02 +02:00
Zeno Rogue
f7d580fa9c replaced fts variants with a single fts 2019-09-12 22:50:02 +02:00
Zeno Rogue
8518f97ded text files are now read with scan(fhstream&...) functions and written with print(...) functions 2019-09-12 22:50:02 +02:00
Zeno Rogue
d796635dfa draw: 3d models now should appear correctly 2019-09-12 22:50:01 +02:00
Zeno Rogue
bfb0b3f070 quicker editing of 3d models 2019-09-12 22:50:01 +02:00
Zeno Rogue
bfdb292d5f draw: fixed color changing 2019-09-12 22:50:01 +02:00
Zeno Rogue
89a4daaf53 draw: change grid position in 3D 2019-09-12 22:50:01 +02:00
Zeno Rogue
90b206dec3 draw: 'statue' displayed when editing statues; floors display 'pick something' in 3D 2019-09-12 22:50:01 +02:00
Zeno Rogue
995fea41b4 better point placing in 3D modeller 2019-09-12 22:50:01 +02:00
Zeno Rogue
b85f6e66b1 2d3d:: save always3 when saving map 2019-09-12 22:50:00 +02:00
Zeno Rogue
3da6090320 dialog:: addBoolItem_action, addBoolItem_action_neg, addBoolItem_choice used when applicable 2019-09-12 22:43:00 +02:00
Zeno Rogue
3ac1e45130 backward compatibility after changing NODIR 2019-09-12 22:43:00 +02:00
Zeno Rogue
562f43dc1f throw exception on rspin in 3D 2019-09-12 22:42:59 +02:00
Zeno Rogue
1820919095 draw editor displays all coordinates in 3D 2019-09-12 22:42:59 +02:00
Zeno Rogue
5fb9578000 3d:: draw:: fixed z-level changing 2019-09-12 22:42:58 +02:00
Zeno Rogue
36b4b60d46 3d::draw:: added shading 2019-09-12 22:42:58 +02:00
Zeno Rogue
80d14c0196 add_action_push consistently; improved some menu hotkeys and ordering; improved some naming 2019-09-12 22:42:58 +02:00
Zeno Rogue
a52755bf50 some fixes due to weird action in git 2019-09-12 22:38:43 +02:00
?
699109ef2a 3d:: draw:: model from triangles 2019-09-12 22:38:43 +02:00
?
c46bedd23b 3d::draw:: crosshair 2019-09-12 22:38:42 +02:00
?
41ed04b2ee 3d:: basic adjustment of the graphics editor to 3D 2019-09-12 22:38:42 +02:00
?
f879a2c21c draw:: z-level can now be set for each layer 2019-09-12 22:38:42 +02:00
?
4ac186437b editable statues 2019-09-12 22:38:42 +02:00
?
cc98858aa0 added missing geometry guards to mapeditor 2019-09-12 22:38:42 +02:00
?
b0c21f0626 3d:: mapeditor works 2019-09-12 22:38:42 +02:00
?
99aa7e420b CAP_POLY part 1 2019-09-12 22:38:39 +02:00
?
b25730d5c9 geometry flags part 1 2019-09-12 22:38:39 +02:00
Zeno Rogue
c80df92acb text fixes, PL translation updated 2019-09-12 22:38:39 +02:00
?
a2c46eacc4 fixed unused variables 2019-02-08 18:05:57 +01:00
?
162542b616 parts pushed too fast 2019-02-08 17:39:46 +01:00
Zeno Rogue
6abb527854 added missing CAP_TEXTURE guards 2019-02-08 16:55:35 +01:00
Zeno Rogue
381071ab4c 10.5e loads the 11.0e format 2019-02-06 18:54:29 +01:00
Zeno Rogue
26fe57ef92 mapeditor:: an option to change new canvas cells without clearing the map 2019-02-06 18:48:53 +01:00
Zeno Rogue
44c3e2eb0a mapeditor:: no more crashing on 'c'opying outside of map 2019-02-06 18:48:53 +01:00
Zeno Rogue
41ee2f4a7c mapeditor saves color_formula 2019-02-06 18:48:53 +01:00
Zeno Rogue
daf9a5906a mapeditor:: save more data: multiplayer positions, rosewaves, turncount (ocean waves), mutant ivy phase 2019-02-06 18:48:53 +01:00
Zeno Rogue
35043b5528 tortoise flags are now editable with Shift+G and saved into saved levels 2019-02-06 18:48:53 +01:00
Zeno Rogue
78adac4e10 an option to disable wandering monsters; settings (reptilecheat, autocheat, safety etc) configurable in map editor; save items/kills and some other settings 2019-02-06 18:48:53 +01:00
Zeno Rogue
645e4fa56c shift+G screen is now editable 2019-02-06 18:48:52 +01:00
Zeno Rogue
7a589090d3 texture:: texture ghosts are now shown correctly 2019-02-06 18:48:52 +01:00
Zeno Rogue
b7dd69f99e fix to geometry specifics saving 2018-12-15 14:16:57 +01:00
Zeno Rogue
4b89d1dfd7 fixed some bugs with modecode and save format 2018-12-14 21:35:46 +01:00
Zeno Rogue
362e13ba4c mapeditor:: saving geometry specifics, fixed format 2018-12-14 19:30:54 +01:00
Zeno Rogue
c73b598d93 screenshots are more configurable now 2018-12-14 19:30:17 +01:00
Zeno Rogue
6274beb6f6 try to load floors 2018-12-14 19:27:12 +01:00
Zeno Rogue
2fa265ac10 implemented a better system for logging and binary output 2018-11-24 21:23:02 +01:00
Zeno Rogue
d935febf09 refactored some global and stereo:: variables into display_data structure 2018-11-18 18:26:56 +01:00
Zeno Rogue
d69e952729 animate parameters from the edit dialog 2018-11-11 11:27:36 +01:00
Zeno Rogue
d1d2a300c4 refactored the degree constant 2018-11-11 11:25:59 +01:00
Zeno Rogue
198ae61ae4 creating [Baby] Tortoises in the map editor now creates 'local' ones at first, and random ones on another click 2018-09-13 00:35:21 +02:00
Zeno Rogue
0d138f3c75 load/save compressed data in RogueViz kohonen 2018-09-07 15:15:00 +02:00
Zeno Rogue
1ab460ffb1 type color_t should now be consistently used for colors; reimplemented drawqueue in OO fashion 2018-09-04 19:53:42 +02:00
Zeno Rogue
98f6851288 moved the implementation of -noplayer and -canvas options from mapeditor to pattern, as they are relevant without map editor (e.g. online) 2018-09-02 15:10:50 +02:00
Zeno Rogue
a7f1e560c5 subcodes can be (de)selected in the pattern selection 2018-08-30 19:14:04 +02:00
Zeno Rogue
6de0f0a8aa instead of nonbitrunc, gp::on and irr::on, there is one variable, variation 2018-08-28 17:17:34 +02:00
Zeno Rogue
1af2c04407 enum class used for PPR 2018-08-28 14:27:23 +02:00
Zeno Rogue
89f0a6ba8a some more bugfixes 2018-08-28 14:09:36 +02:00
Zeno Rogue
f009e80689 crash fixed again 2018-08-28 13:47:51 +02:00
Zeno Rogue
25c09154dc fixed a crash when drawing inventory items while drawcell is also NULL; priority functions now use PPR_DEFAULT not -1; priority is passed as PPR not int 2018-08-28 13:45:11 +02:00
Zeno Rogue
7ff722ba59 angle measurement and grid display now take coldcenter into account correctly 2018-08-28 05:40:15 +02:00
Zeno Rogue
114fd59752 vector graphics editor now can calculate areas 2018-08-28 05:39:41 +02:00
Zeno Rogue
c17efce3b5 PAT_TYPES now separate from PAT_NONE; PAT_* constants now use enum 2018-08-28 04:05:32 +02:00
Zeno Rogue
ff84f63abd Fixed mapediting floorshapes. Also works nicely for all geometries now. Enum used for shapegroups. 2018-08-27 19:27:35 +02:00
Zeno Rogue
be6748cbb3 Archimedean tilings are now saved correctly in map editor and texture mode 2018-08-22 00:02:08 +02:00
Zeno Rogue
e1c49a83fa fixed displayspin in syntetic 2018-08-19 16:28:36 +02:00
Zeno Rogue
682f804576 major rewrite: unified the common parts of heptagon and cell via struct connection<T> and struct walker<T> 2018-08-18 00:46:45 +02:00
Zeno Rogue
1b44899624 line quality option 2018-08-01 11:07:22 +02:00
Zeno Rogue
329a2fa783 fixed the compilation without CAP_COMMANDLINE or without CAP_SVG or fakemobile 2018-07-22 12:50:03 +02:00
Zeno Rogue
4de4d3e640 arg:: split the big if list in config.cpp 2018-07-21 16:58:50 +02:00
Zeno Rogue
9d682aee45 moved more commandline options to their modules 2018-07-20 00:04:23 +02:00
Zeno Rogue
30cb9158cb moved svg and PNG screenshot to a new file screenshots.cpp; moved some commandline arguments from commandline.cpp to their respective modules 2018-07-19 23:46:58 +02:00
Arthur O'Dwyer
fbc7cd3212 Fix -Wempty-body warnings on GCC. 2018-07-17 16:53:46 -07: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
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
Zeno Rogue
98ea11de86 fixed the warnings about comparing int and bool 2018-07-07 11:05:48 +02:00
Zeno Rogue
f1f1098d95 removed some remaining references to sval, fixed the compilation of RogueViz 2018-06-29 12:16:35 +02:00
Zeno Rogue
0d0eb06886
Merge branch 'master' into misc-windows 2018-06-28 15:13:42 +02:00
Zeno Rogue
cf8dffd6b8 fixed bugs with manual celllisters 2018-06-28 13:35:03 +02:00
Zeno Rogue
d11044a80a refactoring: sval/aitmp is no more, celllister(manual) used instead 2018-06-28 12:59:35 +02:00
Arthur O'Dwyer
817f690ae3 Silence a couple of warnings with -DCAP_TEXTURE=0 (the default on MinGW). 2018-06-27 03:01:58 -07:00
Zeno Rogue
63869c6d33 renamed the size function to isize 2018-06-22 14:47:24 +02:00
Zeno Rogue
8f8a259992 new quotient geometries 2018-06-22 01:48:46 +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
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
56baba800b moved more includes to sysconfig.h 2018-06-12 23:10:20 +02:00
Zeno Rogue
4c619e60dd moved all the HyperRogue stuff except RogueViz to namespace 'hr' -- useful when using hr as a library 2018-06-11 01:58:31 +02:00
Zeno Rogue
98246d3066 more cleanup in parameters, restartGame cleanup 2018-06-11 00:58:38 +02:00
Zeno Rogue
666ddb007e MAJOR REWRITE of floor patterns 2018-05-07 20:13:56 +02:00
Zeno Rogue
8dcaed3aaf gp:: acknowledged in save game, save map, scorelist, modecode 2018-04-11 00:30:50 +02:00
Zeno Rogue
033c626dfc restartGame, wrong mode, and resetModes now use constants instead of magic char names 2018-04-09 18:05:23 +02:00
Zeno Rogue
ac37b6df99 more elegant cellwalkers 2018-03-24 12:59:01 +01:00
Zeno Rogue
2c09c5ee56 structurized textures.cpp 2018-03-17 21:12:46 +01:00
Zeno Rogue
283c6bba39 cleanup: arguments 2018-02-26 13:14:20 +01:00
Zeno Rogue
082bd44c2a fixed zoom while editing texture 2018-02-20 22:12:31 +01:00