Skip to content

Commit

Permalink
Merge pull request #844 from Logg-y/master
Browse files Browse the repository at this point in the history
Miscellaneous fixes
  • Loading branch information
Logg-y authored Nov 15, 2024
2 parents 23a0ced + 2039941 commit cf2ec75
Showing 22 changed files with 1,605 additions and 1,145 deletions.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -24,3 +24,12 @@ server/*
*.csv


cryptographic_secret
database/*
.vs/*
logs/*
modules/*
nwsync/*
*.ini
servervault/*
override/*
327 changes: 288 additions & 39 deletions nwn-base-scripts/nwscript.nss

Large diffs are not rendered by default.

1,536 changes: 768 additions & 768 deletions seeded_database/tmapsolutions.txt

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions src/are/beg_helm2.are.json
Original file line number Diff line number Diff line change
@@ -2907,6 +2907,10 @@
}
]
},
"TileBrdrDisabled": {
"type": "byte",
"value": 0
},
"Tileset": {
"type": "resref",
"value": "tic01"
4 changes: 4 additions & 0 deletions src/are/core.are.json
Original file line number Diff line number Diff line change
@@ -15979,6 +15979,10 @@
}
]
},
"TileBrdrDisabled": {
"type": "byte",
"value": 0
},
"Tileset": {
"type": "resref",
"value": "tcm02"
14 changes: 14 additions & 0 deletions src/gic/core.gic.json
Original file line number Diff line number Diff line change
@@ -6254,6 +6254,20 @@
"type": "cexostring",
"value": "On the Advanced tab, replace <Place text here> with whatever information you wish to appear on the Map of an area."
}
},
{
"__struct_id": 5,
"Comment": {
"type": "cexostring",
"value": ""
}
},
{
"__struct_id": 5,
"Comment": {
"type": "cexostring",
"value": ""
}
}
]
}
84 changes: 42 additions & 42 deletions src/git/beg_helm2.git.json
Original file line number Diff line number Diff line change
@@ -35518,15 +35518,15 @@
},
"X": {
"type": "float",
"value": 20.6904
"value": 20.69
},
"Y": {
"type": "float",
"value": 25.4425
"value": 25.44
},
"Z": {
"type": "float",
"value": 0.5585
"value": 0.0
}
},
{
@@ -42569,15 +42569,15 @@
},
"X": {
"type": "float",
"value": 63.0452
"value": 63.05
},
"Y": {
"type": "float",
"value": 66.96550000000001
"value": 66.97
},
"Z": {
"type": "float",
"value": 0.511
"value": 0.0
}
},
{
@@ -42794,15 +42794,15 @@
},
"X": {
"type": "float",
"value": 64.5003
"value": 64.5
},
"Y": {
"type": "float",
"value": 66.9453
"value": 66.95
},
"Z": {
"type": "float",
"value": 0.511
"value": 0.0
}
},
{
@@ -43019,15 +43019,15 @@
},
"X": {
"type": "float",
"value": 65.6583
"value": 65.66
},
"Y": {
"type": "float",
"value": 66.9937
"value": 66.98999999999999
},
"Z": {
"type": "float",
"value": 0.511
"value": 0.0
}
},
{
@@ -43244,15 +43244,15 @@
},
"X": {
"type": "float",
"value": 66.619
"value": 66.62
},
"Y": {
"type": "float",
"value": 67.015
"value": 67.02
},
"Z": {
"type": "float",
"value": 0.511
"value": 0.0
}
},
{
@@ -43469,15 +43469,15 @@
},
"X": {
"type": "float",
"value": 66.6275
"value": 66.63
},
"Y": {
"type": "float",
"value": 67.8503
"value": 67.84999999999999
},
"Z": {
"type": "float",
"value": 0.511
"value": 0.0
}
},
{
@@ -43694,15 +43694,15 @@
},
"X": {
"type": "float",
"value": 65.66679999999999
"value": 65.67
},
"Y": {
"type": "float",
"value": 67.8291
"value": 67.83
},
"Z": {
"type": "float",
"value": 0.511
"value": 0.0
}
},
{
@@ -43919,15 +43919,15 @@
},
"X": {
"type": "float",
"value": 64.50879999999999
"value": 64.51000000000001
},
"Y": {
"type": "float",
"value": 67.7807
"value": 67.78
},
"Z": {
"type": "float",
"value": 0.511
"value": 0.0
}
},
{
@@ -44144,15 +44144,15 @@
},
"X": {
"type": "float",
"value": 63.0537
"value": 63.05
},
"Y": {
"type": "float",
"value": 67.8009
"value": 67.8
},
"Z": {
"type": "float",
"value": 0.511
"value": 0.0
}
},
{
@@ -44369,15 +44369,15 @@
},
"X": {
"type": "float",
"value": 65.4684
"value": 65.47
},
"Y": {
"type": "float",
"value": 67.6859
"value": 67.69
},
"Z": {
"type": "float",
"value": 0.511
"value": 0.0
}
},
{
@@ -44594,15 +44594,15 @@
},
"X": {
"type": "float",
"value": 63.7746
"value": 63.77
},
"Y": {
"type": "float",
"value": 67.503
"value": 67.5
},
"Z": {
"type": "float",
"value": 0.511
"value": 0.0
}
},
{
@@ -44819,15 +44819,15 @@
},
"X": {
"type": "float",
"value": 67.1473
"value": 67.15000000000001
},
"Y": {
"type": "float",
"value": 67.4575
"value": 67.45999999999999
},
"Z": {
"type": "float",
"value": 1.371
"value": 0.86
}
},
{
@@ -45044,15 +45044,15 @@
},
"X": {
"type": "float",
"value": 62.1873
"value": 62.19
},
"Y": {
"type": "float",
"value": 67.4575
"value": 67.45999999999999
},
"Z": {
"type": "float",
"value": 1.371
"value": 0.86
}
},
{
@@ -45273,15 +45273,15 @@
},
"X": {
"type": "float",
"value": 64.68729999999999
"value": 64.69
},
"Y": {
"type": "float",
"value": 66.6575
"value": 66.66
},
"Z": {
"type": "float",
"value": 1.671
"value": 1.16
}
}
]
Loading

0 comments on commit cf2ec75

Please sign in to comment.