backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2025-12-23 20:41:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
1148 commits 12 branches 20 tags 65 MiB
Commit graph

1148 commits

This branch
This branch
All branches
Author SHA1 Message Date
GoteGuru
e2a6b16c6c Fix port cell search algo 2022-04-06 23:06:47 +00:00
GoteGuru
f30b7bb2bf do not draw removed burgs 2022-04-06 22:39:17 +00:00
GoteGuru
d7ced7271e round style settings 2022-04-06 22:34:35 +00:00
GoteGuru
dba158bc3c Fix typo 2022-04-06 22:05:18 +00:00
GoteGuru
c34193c64d don't promote to capitals. 2022-04-06 21:52:30 +00:00
GoteGuru
eb4900446d Town Promotion to largetown 2022-04-06 21:52:04 +00:00
GoteGuru
2cec7e930b resample dialog 2022-04-06 17:43:31 +00:00
GoteGuru
f71766d8b4 fix ugly GUI (2 digit roundoff) 2022-04-06 17:43:12 +00:00
GoteGuru
1bf71c25fa Fix typo (thx evolvedexperiment) 2022-04-06 17:42:48 +00:00
Mészáros Gergely
3827f878e7 submapper gui updates, remove feature mapping on/off 2022-04-06 18:16:21 +02:00
Mészáros Gergely
5db436d627 Merge branch 'upstream' into dev-submaps 2022-04-05 01:38:36 +02:00
Mészáros Gergely
7e94e05d5b better comment 2022-04-05 01:28:22 +02:00
Azgaar
d18bb87ddf update supporters 2022-04-05 00:18:04 +05:00
Azgaar
1d29a468d7 Merge branch 'master' of https://github.com/Azgaar/Fantasy-Map-Generator 2022-04-05 00:14:05 +05:00
Azgaar
fcda552719 addPortal fix 2022-04-05 00:14:01 +05:00
Mészáros Anna Veronika
af62ff915c
Dev csv (#761) 
* import cultures feature

* remove debug messages

* code cleanup
 2022-04-02 23:42:54 +03:00
GoteGuru
5461685d23 Lock markers and lock burgs options 2022-04-01 00:38:44 +00:00
GoteGuru
77bac478af Add Markers.deleteMarker API. 2022-03-31 23:33:57 +00:00
Mészáros Gergely
7de5874800 Merge branch 'upstream' into dev-submaps 2022-04-01 00:53:51 +02:00
Mészáros Gergely
15f52e7acc Merge branch 'upstream' into dev-submaps 2022-03-31 22:29:42 +02:00
Mészáros Gergely
6c2c024333 add info text 2022-03-31 22:29:06 +02:00
Gergely Mészáros, Ph.D
1384daf6f9
Bugfix (#763) 
* fix concurency issue at load

* Fix async concurrency error.

Co-authored-by: GoteGuru <monk@geotronic.hu>
 2022-03-31 23:16:04 +03:00
GoteGuru
385fdca868 Copy all visible military units from the old map. 2022-03-31 00:31:28 +00:00
GoteGuru
9b618544e6 Merge branch 'upstream' into dev-submaps 2022-03-30 19:42:51 +00:00
Gergely Mészáros, Ph.D
4b10b60c69
fix concurency issue at load (#762) 2022-03-30 21:14:51 +03:00
Mészáros Gergely
9afef4d7aa refactored submap ui options 2022-03-30 17:50:07 +02:00
Mészáros Gergely
1a62cc97e2 Update submap gui 2022-03-23 22:27:30 +01:00
Mészáros Gergely
9d96135ba4 update for FMG 1.73 2022-03-23 21:29:48 +01:00
Azgaar
79b7df1c95 not allow to select text on svg 2022-03-22 00:14:15 +03:00
Azgaar
8473b9ed01 update supporters 2022-03-19 20:04:06 +03:00
Azgaar
fc971e4902 rivers: if points data is wrong, ignore points 2022-03-19 20:03:16 +03:00
Azgaar
ab3c8c9e04 Merge branch 'master' of https://github.com/Azgaar/Fantasy-Map-Generator 2022-03-18 23:13:19 +03:00
Azgaar
94871b21bc remove premium tinymce tools 2022-03-18 23:13:14 +03:00
evolvedexperiment
d19ea0896d
Old World template by ReneHP (#758) 2022-03-15 11:50:48 +03:00
Azgaar
bc02850cf7 split array to separate functions 2022-03-07 22:59:43 +03:00
Basile Clement
edfcad4e8c
Generate a legend for manually added markers (#753) 
Markers added by procedural generation have custom notes depending on
the type of marker (e.g. dungeons have a procedurally generated map);
however, the notes for markers manually added by the user are empty.

This patch separates the cell selection logic from the legend and name
generation logic in markers-generator.js, so that the latter can be
shared with manually added markers.  There is some additional
simplifications such as storing the dx/dy/px/min/each values directly in
the markers table to simplify the writing of the generic "list and add"
loop in `generateTypes()`.

Currently, the legend is only generated when adding a marker of the same
type as an existing marker, and only when a legend generation function
is available for that type.  To generate a marker of a type that is not
currently present on the map, one must first change the type field of an
existing marker (which will not get a procedural note), then use "Add
additional marker of that type".  The UI for this can be improved later.

Co-authored-by: Basile Clement <basile-github@clement.pm>
 2022-03-07 22:29:08 +03:00
Mészáros Gergely
7e8f77d0b3 Merge branch 'upstream' into dev-submaps 2022-03-07 13:04:25 +01:00
LordGnomeMBE
3ac075319f
Update atlas.json (#748) 2022-02-24 01:24:26 +03:00
Azgaar
8b3b64626f fix scaleBar change 2022-02-23 23:34:31 +03:00
Azgaar
c2ceb227ad select template correctly 2022-02-23 22:14:25 +03:00
Azgaar
395a7c28a9 Merge branch 'master' of https://github.com/Azgaar/Fantasy-Map-Generator 2022-02-23 10:40:47 +03:00
Azgaar
d51ec465ac supporters update 2022-02-23 10:40:44 +03:00
juacom99
e1b0688615
Fix Height Map preview download image size (#746) 2022-02-21 23:32:06 +03:00
Azgaar
97a864dde8
Merge pull request #744 from Azgaar/predefined-heightmaps 
Predefined heightmaps
 2022-02-19 23:17:29 +03:00
Azgaar
8db9d315be pump version to 1.732 2022-02-19 23:15:57 +03:00
Azgaar
4978db4d1e increase number of states by default 2022-02-19 22:28:03 +03:00
Azgaar
9777df9a67 toggle loading menu 2022-02-19 22:22:30 +03:00
Azgaar
5b6ec0cc2e set size for pre-defined maps 2022-02-19 21:18:02 +03:00
Azgaar
7f13f1c367 predefined-heightmaps 2022-02-19 19:29:05 +03:00
Azgaar
d570886816 predefined-heightmaps 2022-02-19 19:28:22 +03:00