-
Notifications
You must be signed in to change notification settings - Fork 11
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 #107 from sayterdarkwynd/master
mmm orphans
- Loading branch information
Showing
7,152 changed files
with
21,981 additions
and
3,067 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
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
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
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
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed
BIN
-194 Bytes
...etadded/consumables/omnicakeredone2_RAWMEAT_PHASEFRUIT_GRILLEDSNEEZE_Opaque.png
Binary file not shown.
Binary file not shown.
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.
9 changes: 9 additions & 0 deletions
9
a_notyetadded/contestentries/gramophone/mimic/body/body.monsterpart
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,9 @@ | ||
| { | ||
| "name" : "mimic_gramophone", | ||
| "category" : "mimic_gramophone", | ||
| "type" : "body", | ||
|
|
||
| "frames" : { | ||
| "body" : "mimic_gramophone.png" | ||
| } | ||
| } |
36 changes: 36 additions & 0 deletions
36
a_notyetadded/contestentries/gramophone/mimic/body/default.frames
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,36 @@ | ||
| { | ||
| "frameGrid" : { | ||
| "size" : [88, 48], | ||
| "dimensions" : [5, 8], | ||
|
|
||
| "names" : [ | ||
| [ null, "ground.1", "windup.1","windup.2","windup.3"], | ||
| [ null, "windup.4","windup.5","windup.6","windup.7"], | ||
| [ null, "windup.8","windup.9","windup.10","windup.11"], | ||
| [ null, "windup.12","windup.13","windup.14","windup.15"], | ||
| [ null, "walk.1", "walk.2", "walk.3", "walk.4"], | ||
| [ null, "walk.5", "walk.6", "walk.7", "walk.8"], | ||
| [ null, "slash.1", "slash.2", "slash.3", "slash.4"], | ||
| [ null, "slash.5", "slash.6", "slash.7", "slash.8"] | ||
| ] | ||
| }, | ||
| "aliases" : { | ||
| "winddown.15" : "windup.1", | ||
| "winddown.14" : "windup.2", | ||
| "winddown.13" : "windup.3", | ||
| "winddown.12" : "windup.4", | ||
| "winddown.11" : "windup.5", | ||
| "winddown.10" : "windup.6", | ||
| "winddown.9" : "windup.7", | ||
| "winddown.8" : "windup.8", | ||
| "winddown.7" : "windup.9", | ||
| "winddown.6" : "windup.10", | ||
| "winddown.5" : "windup.11", | ||
| "winddown.4" : "windup.12", | ||
| "winddown.3" : "windup.13", | ||
| "winddown.2" : "windup.14", | ||
| "winddown.1" : "windup.15", | ||
| "idle.1" : "ground.1", | ||
| "idle2.1" : "walk.1" | ||
| } | ||
| } |
Binary file added
BIN
+7.05 KB
a_notyetadded/contestentries/gramophone/mimic/body/mimic_gramophone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
195 changes: 195 additions & 0 deletions
195
a_notyetadded/contestentries/gramophone/mimic/mimic_gramophone.animation
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,195 @@ | ||
| { | ||
| "animatedParts" : { | ||
| "stateTypes" : { | ||
| "body" : { | ||
| "priority" : 0, | ||
| "default" : "idle", | ||
| "states" : { | ||
| "idle" : { | ||
| "frames" : 1 | ||
| }, | ||
| "idle2" : { | ||
| "frames" : 1 | ||
| }, | ||
| "windup" : { | ||
| "frames" : 15, | ||
| "cycle" : 1.2 | ||
| }, | ||
| "winddown" : { | ||
| "frames" : 15, | ||
| "cycle" : 1.2, | ||
| "mode" : "transition", | ||
| "transition" : "idle" | ||
| }, | ||
| "slash" : { | ||
| "frames" : 8, | ||
| "cycle" : 1.2, | ||
| "mode" : "transition", | ||
| "transition" : "walk" | ||
| }, | ||
| "walk" : { | ||
| "frames" : 8, | ||
| "cycle" : 1.2 | ||
| } | ||
| } | ||
| }, | ||
| "damage" : { | ||
| "priority" : 3, | ||
| "default" : "none", | ||
| "states" : { | ||
| "none" : { | ||
| "frames" : 1 | ||
| }, | ||
| "stunned" : { | ||
| "frames" : 1 | ||
| } | ||
| } | ||
| }, | ||
| "releaseParticles" : { | ||
| "default" : "off", | ||
| "states" : { | ||
| "off" : { | ||
| "frames" : 1, | ||
| "properties" : { | ||
| "particleEmittersOff" : [ "releaseParticles" ] | ||
| } | ||
| }, | ||
| "on" : { | ||
| "frames" : 1, | ||
| "cycle" : 0.1, | ||
| "mode" : "transition", | ||
| "transition" : "off", | ||
| "properties" : { | ||
| "particleEmittersOn" : [ "releaseParticles" ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
|
|
||
| "parts" : { | ||
| "body" : { | ||
| "properties" : { | ||
| "transformationGroups" : [ "body" ], | ||
| "offset" : [1.375, 1.125] | ||
| }, | ||
| "partStates" : { | ||
| "body" : { | ||
| "idle" : { | ||
| "properties" : { | ||
| "image" : "<partImage>:idle.<frame>" | ||
| } | ||
| }, | ||
| "idle2" : { | ||
| "properties" : { | ||
| "image" : "<partImage>:idle2.<frame>" | ||
| } | ||
| }, | ||
| "windup" : { | ||
| "properties" : { | ||
| "image" : "<partImage>:windup.<frame>" | ||
| } | ||
| }, | ||
| "winddown" : { | ||
| "properties" : { | ||
| "image" : "<partImage>:winddown.<frame>" | ||
| } | ||
| }, | ||
| "walk" : { | ||
| "properties" : { | ||
| "image" : "<partImage>:walk.<frame>" | ||
| } | ||
| }, | ||
| "slash" : { | ||
| "properties" : { | ||
| "image" : "<partImage>:slash.<frame>" | ||
| }, | ||
| "frameProperties" : { | ||
| "damageArea" : [ | ||
| null, | ||
| [ [-0.0625, 0.75], [0.8125, 2.25], [1.4395, 2.25], [2.25, 1.25], [2.25, -1.5], [1.75, -2.375], [1.25, -2.375] ], | ||
| [ [-0.0625, 0.75], [0.8125, 2.25], [1.4395, 2.25], [2.25, 1.25], [2.25, -1.5], [1.75, -2.375], [1.25, -2.375] ], | ||
| [ [-0.0625, 0.75], [0.8125, 2.25], [1.4395, 2.25], [2.25, 1.25], [2.25, -1.5], [1.75, -2.375], [1.25, -2.375] ] | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "damage" : { | ||
| "stunned" : { | ||
| "properties" : { | ||
| "image" : "<partImage>:hurt.<frame>" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
|
|
||
| "transformationGroups" : { | ||
| "body" : { "interpolated" : true } | ||
| }, | ||
|
|
||
| "effects" : { | ||
| "blink" : { | ||
| "type" : "flash", | ||
| "time" : 0, | ||
| "directives" : "fade=ffffff;0.5" | ||
| } | ||
| }, | ||
|
|
||
| "particleEmitters" : { | ||
| "deathPoof" : { | ||
| "particles" : [ | ||
| { "particle" : "monstersplosion" }, | ||
| { "particle" : "deathember" }, | ||
| { "particle" : "deathember" }, | ||
| { "particle" : "deathember" }, | ||
| { "particle" : "deathember" }, | ||
| { "particle" : "deathember" }, | ||
| { "particle" : "deathember" }, | ||
| { "particle" : "deathember" }, | ||
| { "particle" : "deathember" }, | ||
| { "particle" : "deathfizz1left" }, | ||
| { "particle" : "deathfizz1right" }, | ||
| { "particle" : "deathfizz2left" }, | ||
| { "particle" : "deathfizz2right" }, | ||
| { "particle" : "deathfizz3left" }, | ||
| { "particle" : "deathfizz3right" }, | ||
| { "particle" : "deathfizz4left" }, | ||
| { "particle" : "deathfizz4right" } | ||
| ] | ||
| }, | ||
| "captureParticles" : { | ||
| "particles" : [ | ||
| { "particle" : "monstercapture" } | ||
| ] | ||
| }, | ||
| "releaseParticles" : { | ||
| "particles" : [ | ||
| { "particle" : "monsterrelease" } | ||
| ] | ||
| }, | ||
| "teleportOut" : { | ||
| "particles" : [ | ||
| { "particle" : "monstercapture" } | ||
| ] | ||
| }, | ||
| "teleportIn" : { | ||
| "particles" : [ | ||
| { "particle" : "monsterrelease" } | ||
| ] | ||
| }, | ||
| "levelUp" : { | ||
| "particles" : [ | ||
| { "particle" : "monsterlevelup" } | ||
| ] | ||
| } | ||
| }, | ||
|
|
||
| "sounds" : { | ||
| "aggroHop" : [ "/sfx/npc/monsters/monster_surprise.ogg" ], | ||
| "deathPuff" : [ "/sfx/npc/enemydeathpuff.ogg" ], | ||
| "fire" : [ "/sfx/projectiles/bloodvomit1.ogg", "/sfx/projectiles/bloodvomit2.ogg", "/sfx/projectiles/bloodvomit3.ogg", "/sfx/projectiles/bloodvomit4.ogg", "/sfx/projectiles/bloodvomit5.ogg", "/sfx/projectiles/bloodvomit6.ogg", "/sfx/projectiles/bloodvomit7.ogg" ] | ||
| } | ||
| } |
Oops, something went wrong.