Skip to content

Commit

Permalink
Merge pull request #354 from JacobSeto/ShowcaseBugFix
Browse files Browse the repository at this point in the history 
Showcase bug fix
  • Loading branch information
@chvelez19
chvelez19 authored May 18, 2024
2 parents 3955640 + 3fd4682 commit 4e8a69b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 120 deletions.
120 changes: 0 additions & 120 deletions assets/levelsJson/tutorial1.tmj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,6 @@
"name":"assetName",
"type":"string",
"value":"labBg"
},
{
"name":"pulsePerBeat",
"type":"float",
"value":1
},
{
"name":"pulseScale",
"type":"float",
"value":1.1
},
{
"name":"shrinkRate",
"type":"float",
"value":0.01
}],
"rotation":0,
"type":"Pulse",
Expand Down Expand Up @@ -1366,21 +1351,6 @@
"name":"assetName",
"type":"string",
"value":"stop_1"
},
{
"name":"pulsePerBeat",
"type":"float",
"value":1
},
{
"name":"pulseScale",
"type":"float",
"value":1.1
},
{
"name":"shrinkRate",
"type":"float",
"value":0.01
}],
"rotation":0,
"type":"Pulse",
Expand All @@ -1399,21 +1369,6 @@
"name":"assetName",
"type":"string",
"value":"stop_2"
},
{
"name":"pulsePerBeat",
"type":"float",
"value":1
},
{
"name":"pulseScale",
"type":"float",
"value":1.1
},
{
"name":"shrinkRate",
"type":"float",
"value":0.01
}],
"rotation":0,
"type":"Pulse",
Expand Down Expand Up @@ -1468,21 +1423,6 @@
"name":"assetName",
"type":"string",
"value":"dead_2"
},
{
"name":"pulsePerBeat",
"type":"float",
"value":1
},
{
"name":"pulseScale",
"type":"float",
"value":1.1
},
{
"name":"shrinkRate",
"type":"float",
"value":0.01
}],
"rotation":0,
"type":"Pulse",
Expand All @@ -1501,21 +1441,6 @@
"name":"assetName",
"type":"string",
"value":"stop_0"
},
{
"name":"pulsePerBeat",
"type":"float",
"value":1
},
{
"name":"pulseScale",
"type":"float",
"value":1.1
},
{
"name":"shrinkRate",
"type":"float",
"value":0.01
}],
"rotation":0,
"type":"Pulse",
Expand All @@ -1534,21 +1459,6 @@
"name":"assetName",
"type":"string",
"value":"yield_1"
},
{
"name":"pulsePerBeat",
"type":"float",
"value":1
},
{
"name":"pulseScale",
"type":"float",
"value":1.1
},
{
"name":"shrinkRate",
"type":"float",
"value":0.01
}],
"rotation":0,
"type":"Pulse",
Expand Down Expand Up @@ -1585,21 +1495,6 @@
"name":"assetName",
"type":"string",
"value":"arrow_13"
},
{
"name":"pulsePerBeat",
"type":"float",
"value":1
},
{
"name":"pulseScale",
"type":"float",
"value":1.1
},
{
"name":"shrinkRate",
"type":"float",
"value":0.01
}],
"rotation":0,
"type":"Pulse",
Expand Down Expand Up @@ -1672,21 +1567,6 @@
"name":"assetName",
"type":"string",
"value":"dead_0"
},
{
"name":"pulsePerBeat",
"type":"float",
"value":1
},
{
"name":"pulseScale",
"type":"float",
"value":1.1
},
{
"name":"shrinkRate",
"type":"float",
"value":0.01
}],
"rotation":0,
"type":"Pulse",
Expand Down
2 changes: 2 additions & 0 deletions core/src/edu/cornell/gdiac/rabbeat/GameController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1522,6 +1522,8 @@ public void pauseAction ( int sel){
displayStartCutScenes = true;
showLevel9StartingScreen[0] = false;
showLevel9StartingScreen[1] = false;
} else {
displayStartCutScenes = false;
}
break;
case 0: // Resume Level
Expand Down

0 comments on commit 4e8a69b

Please sign in to comment.