Commit graph

892 commits

Author SHA1 Message Date
Gergely Mészáros, Ph.D
4447826c00
Apostrophe in custom style name freeze FMG (#775)
* fix concurency issue at load

* Fix async concurrency error.

* Fix frozen startup if aposthrope used in style name

Co-authored-by: GoteGuru <monk@geotronic.hu>
2022-04-18 22:41:39 +03:00
Gergely Mészáros, Ph.D
0a406686f1
Redraw emblems after resample & remove aspect change. (#773)
* Redraw emblems after resample.

* Remove aspect change feature on submaps to support more useful crop operation.

Co-authored-by: Mészáros Gergely <monk@geotronic.hu>
2022-04-18 22:41:02 +03:00
Azgaar
0408893db3 markers - adddetails 2022-04-15 15:58:48 +05:00
Azgaar
dcf0d590c6 new markers - cleanup + reducing chances 2022-04-15 15:14:49 +05:00
Azgaar
f6537456ea prettify 2022-04-15 14:53:46 +05:00
doddydad
7efcf65c6a
Additional points of interest (#769)
* A bit variety of points of interest added

* live-server now running, can actually bash things out

* some typos and mirage

* suggestions

* Rarity changes and capitalisation

* Jousts only ever spawn one per map

Co-authored-by: Andrew Rose <andrew.rosed@gmail.com>
Co-authored-by: Azgaar <maxganiev@yandex.ru>
2022-04-15 12:49:50 +03:00
Azgaar
ae0979fc68 prettify 2022-04-15 14:47:56 +05:00
Gergely Mészáros, Ph.D
5703e62177
Dev submaps (#770)
* bioms shouldn't be masked or the style selection box is useless

* fix: misleading comment

* experimental submapping feature

* burg remapping

* Submap with options

* Fix: calculating absolute flux from precipitation normal-value.

* effective distanceScale

* updated resampler

* fix: missing cell

* Fix: River automatic rerender on regeneration.

* FIX: wrong culture migration

* fixed 0 index burg bug, more accurate coast detection for burgs

* FIX: wrong burg cell id

* fix invalid feature number at burg.ports, option to disable regenerations

* Relocate submap

* update height model and scale parameters

* new menu

* Dropbox OAuth implementation and Cloud framework

* add some space

* removing uneccesary logs, defer script load

* map position on planet, fix wrong riverbed generation

* fix:riverbed generation

* better cell sampler

* Auto-Smoothing,dist fix

* FIX: incorrect province copy and minor fix of rebels

* Cleanup

* FIX: water detection bug

* Recompute centers (states, cultures, provinces)

* activating forwardmap

* FIX: port burg relocation algo

* FIX: coast detection (for burgs)

* Fix: invalid html id

* add dot

* update for FMG 1.73

* Update submap gui

* refactored submap ui options

* Copy all visible military units from the old map.

* add info text

* Add Markers.deleteMarker API.

* Lock markers and lock burgs options

* better comment

* submapper gui updates, remove feature mapping on/off

* Fix typo (thx evolvedexperiment)

* fix ugly GUI (2 digit roundoff)

* resample dialog

* Town Promotion to largetown

* don't promote to capitals.

* Fix typo

* round style settings

* do not draw removed burgs

* Fix port cell search algo

* Fix: robust error handling, no error for 0.

* submap: projection moved to options, fix double burg error

* complete rewrite of burg relocation

* findcell by coordinates

* prepare to merge, add comments, remove fluff

* replacing lodash with deepCopy implementation

Co-authored-by: Mészáros Gergely <monk@geotronic.hu>
2022-04-15 12:45:02 +03:00
Azgaar
3cbd451df9 fix for Data Integrity Check log 2022-04-10 14:45:38 +05:00
Azgaar
f2fcef0284 routes - don't break if feature is not found 2022-04-09 21:52:37 +05:00
Azgaar
1bec723d4f style uploadCulturesData, fix removed issue 2022-04-09 20:18:25 +05: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
Gergely Mészáros, Ph.D
4b10b60c69
fix concurency issue at load (#762) 2022-03-30 21:14:51 +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
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
4978db4d1e increase number of states by default 2022-02-19 22:28:03 +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
389df14cef supporters update 2022-02-15 23:58:54 +03:00
Azgaar
0c6f98070e notes editor - add separator 2022-02-15 00:15:42 +03:00
Azgaar
00f8a62c3b notes - disallow iframe actions 2022-02-15 00:10:55 +03:00
Azgaar
3c72a2908d notes editor - reorganize buttons 2022-02-14 23:56:28 +03:00
Azgaar
b970ea12ad notes editor - dynamically load 'tiny' script 2022-02-14 23:53:15 +03:00
Azgaar
fe8457ac4c notes editor - use tiny cloud editor 2022-02-14 22:51:31 +03:00
Azgaar
ff669fca50 round numbers 2022-02-12 21:37:06 +03:00
Azgaar
02f36de6d9 type fix + supporters update 2022-02-11 21:52:30 +03:00
Azgaar
b151e95bc7 supporters update 2022-02-08 10:15:00 +03:00
Azgaar
aee78071c6 dropbox - load script dynamically 2022-02-08 00:47:17 +03:00
Azgaar
8e480be704 load auto-update sctipt dynamically 2022-02-07 22:17:16 +03:00
Azgaar
ab5cb82390 zone editor - add type check on load 2022-02-07 00:24:34 +03:00
Azgaar
2c269d5d2c zone editor - hide filtered zone 2022-02-07 00:20:20 +03:00
Azgaar
f8d2719218 zone editor - filter by type 2022-02-07 00:05:04 +03:00
Azgaar
5acc3b156b zone editor - restore init state + type display 2022-02-06 23:36:44 +03:00
Ángel Montero Lamas
8e7ccbd50d
Zone filter (#728)
* Adding zone type dropdown to index.html

* added zone type filter to zones-editor.js

* zoneTypes dialog

add and delete types, dialog

* filtering types

* correct filter button and prompt

The filter button now works on click with an added zonesEditorAddLines(); on function toggleFilterTable().

If the table is empty, a message appears on a line giving advice.

* Amount of types and fixes

Fixed some spacing in zoneTypes dialog, and made a count for the amount of zones per type.

* Minor changes for zone types

* dialog for types on a button

New button for the zone Types dialog.

* typo in index.html

* update on click add type

Co-authored-by: Evolvedexperiment <evolvedexperiment@gmail.com>
Co-authored-by: Azgaar <maxganiev@yandex.ru>
2022-02-06 23:09:30 +03:00
Azgaar
451cd60d4d add only used hatchings on export 2022-02-06 22:38:58 +03:00
Ángel Montero Lamas
81f037004c
Color picker hatches 14-60 (#726)
* Color picker hatches 14-60

Added hatches to number 14 to 60.
Updated the code of the color picker to accept multiples rows of hatches.

Changed the size of fillRectPointer from 0.9 em to 1.5 em.

Added an Update code to upgrade maps to 1.72 to have a grid of 60 svg hatches. Without the update, loaded files appeared with the rectangles for hatches 14-60 empty.

* Hatches ordered

Reworked the code to put back rows of 14 hatches. Reordered the first 14 hatches to defaault.
Made 3 rows, so 42 hatches.

* Cleaned code and fixes

Cleaned </pattern> in index.html line 152.
Put back: width=".9em" height=".9em" style="margin-bottom:-1px"> for fill.

* mouseover hatches

Fixed some typos. Changed mousemove for mouseover and moved the calling of the function tip from the each function to the original place at 519.
The arrow function changed to one that tells the id.

* Copies hatching from defElements into map svg, and hatching removed from saved map files.

* Removed haching completely from map svg

* Hatching copy for clone is now done before unused pattern removal

* Added back code that removes the unused hatching group

Co-authored-by: Evolvedexperiment <evolvedexperiment@gmail.com>
Co-authored-by: Azgaar <maxganiev@yandex.ru>
2022-02-06 21:56:16 +03:00
Azgaar
8537cb1c76 altas style by LordGnome 2022-02-06 21:45:00 +03:00