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

326 Commits

Author SHA1 Message Date
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
Zeno Rogue
c8d655184b when loading textures in the texture mode, you can now tune individual triangles 2018-02-13 23:25:44 +01:00
Zeno Rogue
cab8a0a38f Works online now! 2018-02-11 19:08:17 +01:00
Zeno Rogue
64adb6f0ea updated the header comments to 2018, also added the missing ones 2018-02-09 00:40:26 +01:00
Zeno Rogue
ad172724e8 made it compile with RUG on emscripten (at least it should -- it does not work for me because of an emscripten bug apparently) 2018-02-03 14:31:17 +01:00
Zeno Rogue
22d3d2590f some work on the savemem feature 2018-01-26 01:45:49 +01:00
Zeno Rogue
1d2b20b015 disable saveHQSX without CAP_SDL 2018-01-20 17:50:30 +01:00
Zeno Rogue
9c8b16e9d0 some translation fixes, Russian updated 2018-01-08 23:23:00 +01:00
Zeno Rogue
5bf6d54c7d changed chamfered to bitruncated 2018-01-06 22:34:03 +01:00
Zeno Rogue
3fc196e0c0 fixed CAP_TEXTURE disabling 2018-01-05 17:30:03 +01:00
Zeno Rogue
7b6be5da7c HQ/SVG shots in the editors now include the aura background, and you can choose the file (use Shift+F6 for the old way) 2018-01-05 14:19:22 +01:00
Zeno Rogue
495dbba809 renamed 'truncated' to 'chamfered' 2018-01-04 18:39:04 +01:00
Zeno Rogue
f3cf1e06bf fixed hiding player in grapheditor 2018-01-04 18:28:07 +01:00
Zeno Rogue
3412a50b3d line/circle tools added to the texture editor; grid color changing in texture editor 2018-01-04 12:25:02 +01:00
Zeno Rogue
154bd54607 fixed/extended the mouse zoom etc. 2017-12-30 17:00:35 +01:00
Zeno Rogue
11569c693d big change: more configuration for the torus (and also Klein bottle) 2017-12-28 16:46:10 +01:00
Zeno Rogue
ae70662495 moving the screen center 2017-12-25 10:26:50 +01:00
Zeno Rogue
8c7abbc33e list of colors and brush sizes 2017-12-22 22:34:01 +01:00
Zeno Rogue
dd108cde6b symmetric texture editing 2017-12-22 21:57:55 +01:00
Zeno Rogue
5a2ae1a865 simplified cellgroups 2017-12-22 21:37:30 +01:00
Zeno Rogue
6234be507b grid improvements: changeable color, straight lines drawn correctly, angles shown relative to coldcenter 2017-12-22 21:23:17 +01:00
Zeno Rogue
4bee0c85a7 undo in texture editor 2017-12-22 20:59:04 +01:00
Zeno Rogue
57a5337b9f CAP_TEXTURE can be off; right-size textures loaded without scaling; SPF_FULLSYM 2017-12-21 11:36:07 +01:00
Zeno Rogue
37cc910031 color dialog uses reactions now 2017-12-19 14:34:38 +01:00
Zeno Rogue
e5c22834fe texture editing improved 2017-12-18 23:42:08 +01:00
Zeno Rogue
3e0f751a2c texture editing 2017-12-18 00:24:56 +01:00
Zeno Rogue
e2080cd91e more intuitive file dialogs; texture config saving 2017-12-14 12:10:40 +01:00
Zeno Rogue
9933f373d2 improvements to patterns; codenumbers also display directions 2017-12-09 08:06:41 +01:00
Zeno Rogue
4fa764c175 filedialog and infix moved from mapeditor.cpp to dialogs.cpp 2017-12-09 04:01:56 +01:00
Zeno Rogue
635d1f911c Refactoring: moved all the remaining pattern code from mapeditor to pattern2 2017-12-09 03:48:30 +01:00
Zeno Rogue
87b6b8b372 Snakes Nest v1 2017-12-05 19:43:45 +01:00
Zeno Rogue
9b2f9ecc14 Pattern-related functions moved from cells and mapeditor to pattern2s; three-color patterns 2017-12-05 16:19:22 +01:00
Zeno Rogue
dadbbf244f 'siblings' patterns on spheres 2017-12-03 18:24:34 +01:00
Zeno Rogue
3c600d7d6b simple patterns for weird hyperbolic 2017-12-03 16:13:17 +01:00
Zeno Rogue
f2af1d63f6 field pattern on Euclidean does torus instead of crashing 2017-12-03 16:12:20 +01:00
Zeno Rogue
c5324ff2f5 more pattern editing for g46 2017-12-03 12:59:57 +01:00
Zeno Rogue
d6376e1ddf emeraldpattern on a46; fixed/improved darkening when sidedialog not available; pattern dialogs are now sidedialogs 2017-12-03 11:48:02 +01:00
Zeno Rogue
b5e7e32726 commandline option to load picture file 2017-12-03 09:52:17 +01:00
Zeno Rogue
d8a647d972 brightness behind the sphere configurable; works a bit better with transparency now 2017-11-13 12:23:42 +01:00
Zeno Rogue
d444f8d2e2 bug with the last commit 2017-11-13 00:50:32 +01:00
Zeno Rogue
950942eae2 dragon/dragon head on the list; more efficient mapeditor; fixed bugs with copying on new geometries; copying now also copies HP/stuntime 2017-11-13 00:37:18 +01:00
Zeno Rogue
7274e6ad20 fixed incorrect warning message when loading pics 2017-11-07 14:42:12 +01:00
Zeno Rogue
908d581c15 fixed crash happening sometimes when loading a different geometry 2017-11-07 14:39:54 +01:00
Zeno Rogue
8c39251b6a saving the geometry correctly in map editor 2017-11-07 14:08:50 +01:00
Zeno Rogue
35b192405d fixed some references to fp43; preradom patterns no longer crash in Torus 2017-11-06 23:29:10 +01:00
Zeno Rogue
44ea56baf2 you can now hold in map editor to paint multiple cells 2017-11-06 23:22:13 +01:00
Zeno Rogue
483e335db8 fixed glitches in Warp+Mirror 2017-11-06 23:11:40 +01:00
Zeno Rogue
59b2c6b644 made changing patterns work in other geometry 2017-11-06 21:15:14 +01:00
Zeno Rogue
ae5938e1a4 renamed the variable 'purehepta' to 'nontruncated' 2017-10-30 12:24:41 +01:00
Zeno Rogue
345bd94c0d parially done mirrors; field pattern in weirdhyperbolic; fake other patterns in weirdhyperbolic 2017-10-29 10:52:02 +01:00
Zeno Rogue
016ade10c6 lots of work on the new geometries 2017-10-29 01:57:34 +02:00
Zeno Rogue
62de2588cf 'u' loads the current monster image; Jiang Shi shape 2017-10-04 22:27:51 +02:00
Zeno Rogue
cbd3805361 fixed editing colors in the graph editor 2017-10-04 21:25:40 +02:00
Zeno Rogue
9d20c2f7fd one layer option (ctrl+L) for creating animations 2017-09-03 21:11:33 +02:00
Zeno Rogue
fef663e1b3 Filtering by keyboard in the World Overview screen 2017-08-18 02:47:49 +02:00
Zeno Rogue
130fefa4c4 10.0g 2017-08-06 14:50:16 +02:00
Zeno Rogue
8cb8e2a3ec updated to 10.0c 2017-07-23 01:33:27 +02:00
Zeno Rogue
ce5650a81f 10.0 2017-07-16 23:00:55 +02:00
Zeno Rogue
a6f176510e better mode handling 2017-07-12 19:50:39 +02:00
Zeno Rogue
94efef5d65 further work for 10.0 2017-07-12 18:03:53 +02:00
Zeno Rogue
069f7b0caf Major refactoring, multisampling 2017-07-10 20:47:38 +02:00
Zeno Rogue
22c9217219 work in progress for 10.0 2017-07-04 15:38:33 +02:00
Zeno Rogue
7c66469394 other changes in 9.4n 2017-06-18 18:52:15 +02:00
Zeno Rogue
4addcaa71f update to 9.4l 2017-06-09 03:41:33 +02:00
Zeno Rogue
c2cff957cf update to 9.4k 2017-05-31 18:33:50 +02:00
Zeno Rogue
1c99cd647e commited changes from 9.4i and some extra 2017-05-27 21:40:40 +02:00
Zeno Rogue
4570fa2ea4 fixes for Emscripten, and for compiling without tutorial 2017-04-15 04:48:59 +02:00
Zeno Rogue
499d4cc025 added Football and Dark Rainbow to predesigned patterns 2017-04-04 11:19:39 +02:00
Zeno Rogue
645a64e8c9 expansion, ctrl+E cheat, fix with distance calculation 2017-04-04 11:13:15 +02:00
Zeno Rogue
b7450edef5 9.4d 2017-03-31 21:41:09 +02:00
Zeno Rogue
58e053f183 Updated the source files to 9.4c 2017-03-23 11:53:57 +01:00
Eryk Kopczyński
3237ff455e Updated to 8.3j 2016-08-26 11:58:03 +02:00
Zeno Rogue
19055633b0 Updated HyperRogue sources to 7.4f. 2016-01-02 11:09:13 +01:00