Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge from 1.5 alpha #591

Merged
merged 105 commits into from
Feb 23, 2021
Merged

Merge from 1.5 alpha #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
5b931d2
v1.4.30
Jun 21, 2020
d48737a
Fix for last burg sometimes not appearing in elevation-profile
evolvedexperiment Jun 21, 2020
fe17372
v1.4.31
Jun 21, 2020
f9650ce
v1.4.32
Jun 21, 2020
cc5086a
v1.4.33
Jun 21, 2020
ea1babe
v1.4.34
Jun 21, 2020
f14ca97
v1.4.35
Jun 21, 2020
f424f24
v1.4.36
Jun 22, 2020
468e553
v1.4.37
Jun 26, 2020
60a26a8
Added cell info to elevation profile and corrected some spelling
evolvedexperiment Jun 26, 2020
cf0a446
v1.4.38
Jul 3, 2020
fb28576
Add the ability to regenerate cultures (#495)
mdirienzo Jul 18, 2020
f9d64ac
v1.4.39
Jul 18, 2020
1406222
v1.4.40
Aug 6, 2020
9c5baee
Change filename format of saved files
Phundrak Aug 7, 2020
d65171c
v1.4.41
Aug 7, 2020
0907adc
v1.4.42
Aug 17, 2020
a610a70
Saved files’ filename now holds local time (#505)
Phundrak Aug 8, 2020
3f8cd85
v1.4.43
Aug 20, 2020
6a12f5c
Fix for incorrect mapfile date (#510)
evolvedexperiment Aug 20, 2020
da4c2c0
v1.4.44
Sep 8, 2020
7ac69bb
v1.4.45
Oct 12, 2020
ae58634
fix ReferenceError on changeViewMode (#528)
LeonLenclos Oct 19, 2020
122c456
Added Logging Options to Improve Performance (#529)
OnyxAzryn Oct 21, 2020
fffc831
v1.4.46
Oct 26, 2020
d5d9057
v1.4.47
Nov 8, 2020
6214269
v1.4.48
Dec 5, 2020
12e2600
v1.4.49
Dec 13, 2020
3f42f0c
v1.4.5
Dec 14, 2020
3a55ed1
v1.4.6
Dec 17, 2020
ffc3c98
v1.4.61
Dec 30, 2020
03170ab
v1.4.62
Dec 30, 2020
bc54c01
v1.4.63
Dec 30, 2020
895f2a2
v1.4.64
Dec 30, 2020
ab91fcf
v1.4.65
Dec 30, 2020
e1bc6d9
v1.4.66
Jan 3, 2021
b86d985
v1.5.01 - COA gen integration, first try, embed
Jan 26, 2021
9f10126
v1.5.02 - COA rendering + editor basic UI
Jan 27, 2021
9681825
v1.5.03 - Cultures small rework
Jan 28, 2021
549eefe
v1.5.04 - Emblems layer and on map placement
Jan 29, 2021
56b6eb2
v1.5.04 - Emblems better positioning and rescaling
Jan 30, 2021
32c4566
v1.5.04 - Emblems auto-hide and hightlighting
Jan 30, 2021
3aaddcf
v1.5.04 - smarter coa generation, coa download
Jan 31, 2021
68dc822
v1.5.04 - emblem gallery generator
Feb 1, 2021
a8cf4c0
v1.5.04 - fix redundand : for loaded fonts
Feb 1, 2021
24d2efe
v1.5.05 - optimization, partial d3 removal
Feb 2, 2021
925e7ac
v1.5.05 - emblems regeneration
Feb 2, 2021
7d0bf26
v1.5.06 - canton generation fix
Feb 3, 2021
f4d8b43
v1.5.08 - province/burg regenerate - emblems
Feb 3, 2021
378ed71
v1.5.09 - speak functionality
Feb 3, 2021
5edbd1e
v1.5.10 - supporters
Feb 4, 2021
dc3dbe9
v1.5.11 - moving version to 1.5
Feb 4, 2021
a5b2f23
v1.5.12 - emblems adding, save/load
Feb 8, 2021
d25965b
v1.5.13 - Anarchy state form
Feb 8, 2021
6987474
v1.5.14 - Province/diplom. editors - emblems added
Feb 9, 2021
002160e
v1.5.15 - svg save data cleansing
Feb 10, 2021
2fa5a4f
v1.5.16 - further optimization
Feb 10, 2021
6a1f17b
v1.5.17 - further optimization
Feb 11, 2021
7b27283
layers state fix
Feb 11, 2021
222baaf
v1.5.18 - emblems style settings
Feb 11, 2021
fbdaf30
v1.5.19 - emblems gallery - back button
Feb 11, 2021
4fffb33
v1.5.20 - don't store default style
Feb 11, 2021
63e66b1
v1.5.21 - smarted coa generation
Feb 12, 2021
fd8489b
v1.5.22 - rendered check and style check
Feb 12, 2021
c874c74
v1.5.23 - horsehead2 position fix
Feb 12, 2021
e4e40fa
v1.5.24 - don't append link on save
Feb 12, 2021
2f3f5d0
v1.5.24 - smarter generation
Feb 13, 2021
66bd7b7
v1.5.25 - smarter generation
Feb 14, 2021
1a2eb22
v1.5.26 - ice opacity change
Feb 14, 2021
71ca7a1
v1.5.276 - libs minification
Feb 14, 2021
50c5b72
v1.5.28 - #561 fixed
Feb 14, 2021
0fcb4ee
v1.5.29 - burg type editable
Feb 14, 2021
3abcd21
v1.5.30 - fetch local files to speed up
Feb 14, 2021
a42fd3a
Merge pull request #562 from Azgaar/dev1.5
Feb 14, 2021
79584ff
v1.5.31 - let Armoria know the origin
Feb 14, 2021
67ec838
v1.5.32 - resolve conflicts
Feb 14, 2021
7a712f1
Merge pull request #565 from Azgaar/dev
Feb 14, 2021
380e0ba
v1.5.33 - emblem shape change takes immediate effect
Feb 14, 2021
a494633
Merge pull request #566 from Azgaar/dev
Feb 14, 2021
cd7b954
v1.5.34 - fixed #567
Feb 15, 2021
5ba7653
v1.5.35 - fixed #569
Feb 15, 2021
81fd32e
Merge pull request #570 from Azgaar/dev
Feb 15, 2021
46fe551
v1.5.36 - remove division gaps in firefox
Feb 15, 2021
40bb9c2
v1.5.37 - add defs-emblems on update
Feb 16, 2021
31a7ecb
Merge pull request #572 from Azgaar/dev
Feb 16, 2021
6c29cca
v1.5.38 - #573 fixed
Feb 17, 2021
c2b1341
Merge pull request #574 from Azgaar/dev
Feb 17, 2021
47b1c14
v1.5.40 charges update from API
Feb 18, 2021
66edd3f
v1.5.41 downloadGallery fix, async load
Feb 20, 2021
bd7b7c2
v1.5.42 edit emblem button
Feb 20, 2021
d61970d
v1.5.43 update screen change
Feb 20, 2021
c0ea2a1
Merge pull request #575 from Azgaar/dev
Feb 20, 2021
c6c415b
v1.5.44 - shortcut + spelling
Feb 20, 2021
75c17da
v1.5.45 - highlightEmblem move to debug layer
Feb 20, 2021
1457323
Merge pull request #576 from Azgaar/dev
Feb 20, 2021
4e34e32
v1.5.46 - new patterns
Feb 20, 2021
bcc9786
Merge pull request #577 from Azgaar/dev
Feb 20, 2021
e088c01
v1.5.47 - hold Shift to show emblem area
Feb 20, 2021
7b1e463
v1.5.48 - hunting and nomad type only for small settlements
Feb 20, 2021
cb549d5
Merge pull request #578 from Azgaar/dev
Feb 20, 2021
bfc881b
v1.5.49 - select emblem shape on culture level
Feb 21, 2021
0d27f0e
Merge pull request #581 from Azgaar/dev
Feb 21, 2021
a9a9e8c
v1.5.5 - Copenhagen fix
Feb 22, 2021
d40251a
Merge branch 'alpha' of https://github.com/Azgaar/Fantasy-Map-Generat…
Feb 22, 2021
305d355
Merge branch 'master' into alpha
Feb 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions charges/anchor.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions charges/annulet.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions charges/armillarySphere.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions charges/arrow.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions charges/arrowsSheaf.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading