Skip to content

Commit

Permalink
WIP: Continue restructuring framework and incorporating infrastructur…
Browse files Browse the repository at this point in the history
…e from Inner-Tube Climber.
  • Loading branch information
levilindsey committed Mar 17, 2021
1 parent 218d33d commit ad2813f
Show file tree
Hide file tree
Showing 144 changed files with 963 additions and 1,489 deletions.
5 changes: 4 additions & 1 deletion README.md
Expand Up @@ -472,4 +472,7 @@ Surfacer uses the [Gut tool](https://github.com/bitwes/Gut) for writing and runn

- The Surfacer framework is published under the [MIT license](LICENSE).
- All art assets (files under `assets/images/`, `assets/music/`, and `assets/sfx/`) are published under the [CC0 1.0 Universal license](https://creativecommons.org/publicdomain/zero/1.0/deed.en).
- The Surface framework depends on various pieces of third-party code that are licensed separately. [Here is a list of these third-party licenses](./docs/third-party-licenses.txt).
- The Surface framework depends on various pieces of third-party code that are licensed separately. Here are lists of these third-party licenses:
- [addons/scaffold/scaffold_third_party_licenses.gd](./addons/scaffold/scaffold_third_party_licenses.gd)
- [addons/surfacer/surfacer_third_party_licenses.gd](./addons/surfacer/surfacer_third_party_licenses.gd)
- [src/squirrel_away_third_party_licenses.gd](./src/squirrel_away_third_party_licenses.gd)
2 changes: 1 addition & 1 deletion addons/scaffold/assets/images/black_pixel.png.import
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
2 changes: 1 addition & 1 deletion addons/scaffold/assets/images/gui/close_active.png.import
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
2 changes: 1 addition & 1 deletion addons/scaffold/assets/images/gui/close_hover.png.import
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
2 changes: 1 addition & 1 deletion addons/scaffold/assets/images/gui/close_normal.png.import
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/godot-logo-small.png-622c5e23a31c7735554139b1cabea3d6.stex"
path="res://.import/godot_logo_about.png-f2077bfde126855d373e75ddfae5feee.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/images/godot-logo-small.png"
dest_files=[ "res://.import/godot-logo-small.png-622c5e23a31c7735554139b1cabea3d6.stex" ]
source_file="res://addons/scaffold/assets/images/gui/godot_logo_about.png"
dest_files=[ "res://.import/godot_logo_about.png-f2077bfde126855d373e75ddfae5feee.stex" ]

[params]

Expand Down
File renamed without changes
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/godot-logo-splash.png-b3e9742e64e344ac1fec2f6e6fe8c96d.stex"
path="res://.import/godot_logo_splash.png-047afad49405c47deadbef271997ffe5.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/images/gui/godot-logo-splash.png"
dest_files=[ "res://.import/godot-logo-splash.png-b3e9742e64e344ac1fec2f6e6fe8c96d.stex" ]
source_file="res://addons/scaffold/assets/images/gui/godot_logo_splash.png"
dest_files=[ "res://.import/godot_logo_splash.png-047afad49405c47deadbef271997ffe5.stex" ]

[params]

Expand Down
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
2 changes: 1 addition & 1 deletion addons/scaffold/assets/images/gui/pause_active.png.import
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
2 changes: 1 addition & 1 deletion addons/scaffold/assets/images/gui/pause_hover.png.import
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
2 changes: 1 addition & 1 deletion addons/scaffold/assets/images/gui/pause_normal.png.import
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/godot-logo-small.png-b74e2018066206bcaf5246e303207b26.stex"
path="res://.import/snoring_cat_logo_about.png-a5f1d4e59198272852b5a495e0471621.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/images/gui/godot-logo-small.png"
dest_files=[ "res://.import/godot-logo-small.png-b74e2018066206bcaf5246e303207b26.stex" ]
source_file="res://addons/scaffold/assets/images/gui/snoring_cat_logo_about.png"
dest_files=[ "res://.import/snoring_cat_logo_about.png-a5f1d4e59198272852b5a495e0471621.stex" ]

[params]

Expand Down
File renamed without changes
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/snoring_cat_logo_splash.png-a5ff3178886b36b9b3887d0fbf73c24a.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://addons/scaffold/assets/images/gui/snoring_cat_logo_splash.png"
dest_files=[ "res://.import/snoring_cat_logo_splash.png-a5ff3178886b36b9b3887d0fbf73c24a.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
2 changes: 1 addition & 1 deletion addons/scaffold/assets/images/gui/stop_active.png.import
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
2 changes: 1 addition & 1 deletion addons/scaffold/assets/images/gui/stop_hover.png.import
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
2 changes: 1 addition & 1 deletion addons/scaffold/assets/images/gui/stop_normal.png.import
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
2 changes: 1 addition & 1 deletion addons/scaffold/assets/images/transparent_pixel.png.import
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
2 changes: 1 addition & 1 deletion addons/scaffold/assets/images/white_pixel.png.import
Expand Up @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
3 changes: 2 additions & 1 deletion addons/scaffold/data/analytics.gd
Expand Up @@ -181,7 +181,8 @@ func _trigger_collect( \
var body := payload
var entry := _AnalyticsEntry.new(payload)

if !ScaffoldConfig.agreed_to_terms:
if !ScaffoldConfig.agreed_to_terms or \
!ScaffoldConfig.is_data_tracked:
# User hasn't agreed to data collection. Try again later.
_retry_queue.push_back(entry)
return
Expand Down

0 comments on commit ad2813f

Please sign in to comment.