-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #77 from ucsd-cse125-sp24/collider-change-heal-ring
Transparent enemy, track alive player, status effect visible
- Loading branch information
Showing
20 changed files
with
516 additions
and
22 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| { | ||
| "asset":{ | ||
| "generator":"Khronos glTF Blender I/O v4.1.63", | ||
| "version":"2.0" | ||
| }, | ||
| "scene":0, | ||
| "scenes":[ | ||
| { | ||
| "name":"Scene", | ||
| "nodes":[ | ||
| 0 | ||
| ] | ||
| } | ||
| ], | ||
| "nodes":[ | ||
| { | ||
| "mesh":0, | ||
| "name":"Torus.001", | ||
| "scale":[ | ||
| 10, | ||
| 10, | ||
| 10 | ||
| ] | ||
| } | ||
| ], | ||
| "materials":[ | ||
| { | ||
| "doubleSided":true, | ||
| "name":"Material.001", | ||
| "pbrMetallicRoughness":{ | ||
| "baseColorTexture":{ | ||
| "index":0 | ||
| }, | ||
| "metallicFactor":0, | ||
| "roughnessFactor":0.5 | ||
| } | ||
| } | ||
| ], | ||
| "meshes":[ | ||
| { | ||
| "name":"Torus.001", | ||
| "primitives":[ | ||
| { | ||
| "attributes":{ | ||
| "POSITION":0, | ||
| "NORMAL":1, | ||
| "TEXCOORD_0":2 | ||
| }, | ||
| "indices":3, | ||
| "material":0 | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "textures":[ | ||
| { | ||
| "sampler":0, | ||
| "source":0 | ||
| } | ||
| ], | ||
| "images":[ | ||
| { | ||
| "mimeType":"image/png", | ||
| "name":"healthy-green", | ||
| "uri":"healthy-green.png" | ||
| } | ||
| ], | ||
| "accessors":[ | ||
| { | ||
| "bufferView":0, | ||
| "componentType":5126, | ||
| "count":5184, | ||
| "max":[ | ||
| 1.0174199342727661, | ||
| 0.017349302768707275, | ||
| 1.0174199342727661 | ||
| ], | ||
| "min":[ | ||
| -1.0174199342727661, | ||
| -0.017349302768707275, | ||
| -1.0174199342727661 | ||
| ], | ||
| "type":"VEC3" | ||
| }, | ||
| { | ||
| "bufferView":1, | ||
| "componentType":5126, | ||
| "count":5184, | ||
| "type":"VEC3" | ||
| }, | ||
| { | ||
| "bufferView":2, | ||
| "componentType":5126, | ||
| "count":5184, | ||
| "type":"VEC2" | ||
| }, | ||
| { | ||
| "bufferView":3, | ||
| "componentType":5123, | ||
| "count":7776, | ||
| "type":"SCALAR" | ||
| } | ||
| ], | ||
| "bufferViews":[ | ||
| { | ||
| "buffer":0, | ||
| "byteLength":62208, | ||
| "byteOffset":0, | ||
| "target":34962 | ||
| }, | ||
| { | ||
| "buffer":0, | ||
| "byteLength":62208, | ||
| "byteOffset":62208, | ||
| "target":34962 | ||
| }, | ||
| { | ||
| "buffer":0, | ||
| "byteLength":41472, | ||
| "byteOffset":124416, | ||
| "target":34962 | ||
| }, | ||
| { | ||
| "buffer":0, | ||
| "byteLength":15552, | ||
| "byteOffset":165888, | ||
| "target":34963 | ||
| } | ||
| ], | ||
| "samplers":[ | ||
| { | ||
| "magFilter":9729, | ||
| "minFilter":9987 | ||
| } | ||
| ], | ||
| "buffers":[ | ||
| { | ||
| "byteLength":181440, | ||
| "uri":"heal-ring.bin" | ||
| } | ||
| ] | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| { | ||
| "asset":{ | ||
| "generator":"Khronos glTF Blender I/O v4.1.63", | ||
| "version":"2.0" | ||
| }, | ||
| "scene":0, | ||
| "scenes":[ | ||
| { | ||
| "name":"Scene", | ||
| "nodes":[ | ||
| 0 | ||
| ] | ||
| } | ||
| ], | ||
| "nodes":[ | ||
| { | ||
| "mesh":0, | ||
| "name":"Torus.001", | ||
| "scale":[ | ||
| 10, | ||
| 10, | ||
| 10 | ||
| ] | ||
| } | ||
| ], | ||
| "materials":[ | ||
| { | ||
| "doubleSided":true, | ||
| "name":"Material.001", | ||
| "pbrMetallicRoughness":{ | ||
| "baseColorTexture":{ | ||
| "index":0 | ||
| }, | ||
| "metallicFactor":0, | ||
| "roughnessFactor":0.5 | ||
| } | ||
| } | ||
| ], | ||
| "meshes":[ | ||
| { | ||
| "name":"Torus.001", | ||
| "primitives":[ | ||
| { | ||
| "attributes":{ | ||
| "POSITION":0, | ||
| "NORMAL":1, | ||
| "TEXCOORD_0":2 | ||
| }, | ||
| "indices":3, | ||
| "material":0 | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "textures":[ | ||
| { | ||
| "sampler":0, | ||
| "source":0 | ||
| } | ||
| ], | ||
| "images":[ | ||
| { | ||
| "mimeType":"image/png", | ||
| "name":"revive-yellow", | ||
| "uri":"revive-yellow.png" | ||
| } | ||
| ], | ||
| "accessors":[ | ||
| { | ||
| "bufferView":0, | ||
| "componentType":5126, | ||
| "count":5184, | ||
| "max":[ | ||
| 1.0174199342727661, | ||
| 0.017349302768707275, | ||
| 1.0174199342727661 | ||
| ], | ||
| "min":[ | ||
| -1.0174199342727661, | ||
| -0.017349302768707275, | ||
| -1.0174199342727661 | ||
| ], | ||
| "type":"VEC3" | ||
| }, | ||
| { | ||
| "bufferView":1, | ||
| "componentType":5126, | ||
| "count":5184, | ||
| "type":"VEC3" | ||
| }, | ||
| { | ||
| "bufferView":2, | ||
| "componentType":5126, | ||
| "count":5184, | ||
| "type":"VEC2" | ||
| }, | ||
| { | ||
| "bufferView":3, | ||
| "componentType":5123, | ||
| "count":7776, | ||
| "type":"SCALAR" | ||
| } | ||
| ], | ||
| "bufferViews":[ | ||
| { | ||
| "buffer":0, | ||
| "byteLength":62208, | ||
| "byteOffset":0, | ||
| "target":34962 | ||
| }, | ||
| { | ||
| "buffer":0, | ||
| "byteLength":62208, | ||
| "byteOffset":62208, | ||
| "target":34962 | ||
| }, | ||
| { | ||
| "buffer":0, | ||
| "byteLength":41472, | ||
| "byteOffset":124416, | ||
| "target":34962 | ||
| }, | ||
| { | ||
| "buffer":0, | ||
| "byteLength":15552, | ||
| "byteOffset":165888, | ||
| "target":34963 | ||
| } | ||
| ], | ||
| "samplers":[ | ||
| { | ||
| "magFilter":9729, | ||
| "minFilter":9987 | ||
| } | ||
| ], | ||
| "buffers":[ | ||
| { | ||
| "byteLength":181440, | ||
| "uri":"revive-ring.bin" | ||
| } | ||
| ] | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Oops, something went wrong.