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

Great Sea Islands - Main #1827

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open

Great Sea Islands - Main #1827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
62e565c
- Added outlines of future islands
TitusVonDoom Sep 2, 2020
e112d40
- added topology
TitusVonDoom Sep 2, 2020
00c5d44
- new provinces
TitusVonDoom Sep 3, 2020
2f19cdd
Merge branch 'master' into Nazjatar-terrain
sejtalk Nov 20, 2020
ae5303a
added generated files for new nazjatar provinces(GDC)
sejtalk Nov 20, 2020
6f3ebd3
final new province changes(GDC)
sejtalk Nov 21, 2020
4464f1b
Added province positions and easteregg Blackbeard ruling barren atol(…
sejtalk Nov 21, 2020
635526b
Ankoan
Malicos Nov 21, 2020
acce780
Merge branch 'Nazjatar-terrain' of https://github.com/Warcraft-GoA-De…
Malicos Nov 21, 2020
69afbe7
fixed barren atol positions
sejtalk Nov 21, 2020
9d23459
Merge branch 'Nazjatar-terrain' of https://github.com/Warcraft-GoA-De…
sejtalk Nov 21, 2020
c38b40a
Vashj'ir Snowfall
Malicos Nov 21, 2020
0fc9989
sunken nazjatar and maelstrom underwater territories
sejtalk Nov 21, 2020
37fdcca
syntax fixes
Malicos Nov 23, 2020
6660766
Merge branch 'master' into Nazjatar-terrain
Malicos Nov 25, 2020
282696a
Merge branch 'master' into Nazjatar-terrain
Malicos Nov 25, 2020
c58e916
Update wc_nazjatar_events.txt
Malicos Nov 25, 2020
3957ce1
Nazjatar event groundwork
Malicos Nov 25, 2020
293e58d
Update wc_crisis_events.txt
Malicos Nov 25, 2020
e9bf92b
Merge branch 'master' into Nazjatar-terrain
sejtalk Dec 3, 2020
5ee6fbf
added new murloc dynasty for vashjir and moved fire elementals to new…
sejtalk Dec 3, 2020
8291e46
got rid of moved events and stuff(GDC)
sejtalk Dec 4, 2020
fcd8513
got rid of moved nickname(GDC)
sejtalk Dec 4, 2020
56b207f
removing mode stuff and provinces that got changed(GDC)
sejtalk Dec 4, 2020
d04bc43
Merge remote-tracking branch 'remotes/origin/master' into Nazjatar-te…
zumbak04 Dec 10, 2020
9e2a418
merged provinceDef(GDC)
sejtalk Feb 21, 2021
ae36433
generated files from merged provinceDef(GDC)
sejtalk Feb 21, 2021
6cfd029
copied history to renamed titles and deleted unused one(GDC)
sejtalk Feb 21, 2021
84d74f6
Merge branch 'master' into Nazjatar-terrain
sejtalk Feb 21, 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
4 changes: 3 additions & 1 deletion common/dynasties/60000_pirate.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@

60007 = { name = "Rust" culture = pirate_culture } #Not really lore dynasty, pirates of Tol Barad
60008 = { name = "Dreadbeard" culture = pirate_culture } #Kinda lore dynasty, rulers of Southbreak
60009 = { name = "Cormack" culture = pirate_culture } #Bloodsail Admiral
60009 = { name = "Cormack" culture = pirate_culture } #Bloodsail Admiral

60010 = { name = "Teach" culture = pirate_culture } #Blackbeard, easteregg
3 changes: 2 additions & 1 deletion common/dynasties/6000_murloc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,5 @@
6130 = { name = "Rmmrh" culture=murloc }
6131 = { name = "Rmrhg" culture=murloc }
6132 = { name = "Rmrlgh" culture=murloc }
6133 = { name = "Rlgmh" culture=murloc }
6133 = { name = "Rlgmh" culture=murloc }
6134 = { name = "R'lyeh" culture=murloc }
Loading