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

[DRAFT] The Stronghold of Security #312

Open
wants to merge 15 commits into
base: develop
Choose a base branch
from
Open

[DRAFT] The Stronghold of Security #312

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1f0b8ed
Add:
May 13, 2021
5fef25b
Remove:
May 13, 2021
5db3096
Merge branch 'develop' into development
May 13, 2021
68f8990
Replace:
May 14, 2021
8037e1f
Merge remote-tracking branch 'src-server/development' into development
May 14, 2021
6ca9840
Fix:
May 14, 2021
8ba28fd
Merge remote-tracking branch 'src-server/development' into development
May 14, 2021
f5f16e4
Add:
May 21, 2021
59d739b
Merge branch 'develop' into development
May 21, 2021
cfdbfc6
Merge branch 'develop' into development
May 23, 2021
2586832
Fix:
May 24, 2021
60c951a
Merge branch 'develop' into development
May 24, 2021
983c63e
Merge branch 'develop' into development
May 26, 2021
18c6753
Add:
May 26, 2021
49a6ba9
Merge branch 'develop' into development
Tynarus Jun 14, 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
Binary file modified cache/main_file_cache.dat2
View file
Open in desktop
Binary file not shown.
Binary file modified cache/main_file_cache.idx255
View file
Open in desktop
Binary file not shown.
Binary file modified cache/main_file_cache.idx5
View file
Open in desktop
Binary file not shown.
Binary file modified cache/main_file_cache.idx6
View file
Open in desktop
Binary file not shown.
8 changes: 8 additions & 0 deletions data/config/items/dungeons/stronghold-of-security/boots.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"rs:Fancy boots": {
src52 marked this conversation as resolved.
Show resolved Hide resolved
"game_id": 9005
},
"rs:Fighting boots": {
"game_id": 9006
}
}
8 changes: 4 additions & 4 deletions data/config/music/musicRegions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@
"songName": "Dance of Death",
"musicTabButtonId": 436,
"regionIds": [
0
9297
]
},
{
Expand Down Expand Up @@ -762,7 +762,7 @@
"songName": "Dogs of War",
"musicTabButtonId": 437,
"regionIds": [
0
7505
]
},
{
Expand Down Expand Up @@ -1076,7 +1076,7 @@
"songName": "Food For Thought",
"musicTabButtonId": 438,
"regionIds": [
0
8017
]
},
{
Expand Down Expand Up @@ -1824,7 +1824,7 @@
"songName": "Malady",
"musicTabButtonId": 439,
"regionIds": [
0
8530
]
},
{
Expand Down
Loading