Skip to content

Commit 2271613

Browse files
chalonversechalonverse
committed
Progress on 14
1 parent 52e97eb commit 2271613

41 files changed

Lines changed: 247 additions & 263 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Chapter14/Assets/CatWarrior.gpmesh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"textures":[
66
"Assets/CatWarrior.png"
77
],
8+
"specularPower":100.0,
89
"vertices":[
910
[1.017971,17.904892,187.382324,-0.058823,0.921569,-0.380392,48,48,48,48,255,0,0,0,0.222700,0.301400],
1011
[0.323929,17.401428,187.014023,-0.380392,0.647059,-0.662745,48,48,48,48,255,0,0,0,0.216700,0.307200],

‎Chapter14/Assets/Cube.gpmesh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"textures":[
66
"Assets/Cube.png"
77
],
8+
"specularPower":100.0,
89
"vertices":[
910
[-0.5,-0.5,-0.5,0,0,-1,0,0],
1011
[0.5,-0.5,-0.5,0,0,-1,1,0],

‎Chapter14/Assets/English.gptext‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"TextMap":[
3-
{ "key": "PauseTitle", "text": "PAUSED" },
4-
{ "key": "ResumeButton", "text": "Resume" },
5-
{ "key": "QuitButton", "text": "Quit" },
6-
{ "key": "QuitText", "text": "Do you want to quit?" },
7-
{ "key": "OKButton", "text": "OK" },
8-
{ "key": "CancelButton", "text": "Cancel" }
9-
]
2+
"TextMap":{
3+
"PauseTitle": "PAUSED",
4+
"ResumeButton": "Resume",
5+
"QuitButton": "Quit",
6+
"QuitText": "Do you want to quit?",
7+
"OKButton": "OK",
8+
"CancelButton": "Cancel"
9+
}
1010
}

‎Chapter14/Assets/Level3.gplevel‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11113,6 +11113,12 @@
1111311113
200.0
1111411114
]
1111511115
}
11116+
},
11117+
{
11118+
"type": "TargetComponent",
11119+
"properties": {
11120+
"updateOrder": 100
11121+
}
1111611122
}
1111711123
]
1111811124
},
@@ -11169,6 +11175,12 @@
1116911175
500.0
1117011176
]
1117111177
}
11178+
},
11179+
{
11180+
"type": "TargetComponent",
11181+
"properties": {
11182+
"updateOrder": 100
11183+
}
1117211184
}
1117311185
]
1117411186
},
@@ -11225,6 +11237,12 @@
1122511237
300.0
1122611238
]
1122711239
}
11240+
},
11241+
{
11242+
"type": "TargetComponent",
11243+
"properties": {
11244+
"updateOrder": 100
11245+
}
1122811246
}
1122911247
]
1123011248
},
@@ -11281,6 +11299,12 @@
1128111299
300.0
1128211300
]
1128311301
}
11302+
},
11303+
{
11304+
"type": "TargetComponent",
11305+
"properties": {
11306+
"updateOrder": 100
11307+
}
1128411308
}
1128511309
]
1128611310
},
@@ -11337,6 +11361,12 @@
1133711361
300.0
1133811362
]
1133911363
}
11364+
},
11365+
{
11366+
"type": "TargetComponent",
11367+
"properties": {
11368+
"updateOrder": 100
11369+
}
1134011370
}
1134111371
]
1134211372
},
@@ -11393,6 +11423,12 @@
1139311423
300.0
1139411424
]
1139511425
}
11426+
},
11427+
{
11428+
"type": "TargetComponent",
11429+
"properties": {
11430+
"updateOrder": 100
11431+
}
1139611432
}
1139711433
]
1139811434
},
@@ -11435,7 +11471,7 @@
1143511471
"skelFile": "Assets/CatWarrior.gpskel",
1143611472
"animFile": "Assets/CatActionIdle.gpanim",
1143711473
"animPlayRate": 1.0,
11438-
"animTime": 0.6669997572898865
11474+
"animTime": 0.0
1143911475
}
1144011476
},
1144111477
{

‎Chapter14/Assets/Plane.gpmesh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"textures":[
66
"Assets/Plane.png"
77
],
8+
"specularPower":100.0,
89
"vertices":[
910
[50.000000,50.000000,-0.000000,-0.003922,-0.003922,1.000000,1.000000,1.000000],
1011
[50.000000,25.000000,-0.000000,-0.003922,-0.003922,1.000000,1.000000,0.750000],

‎Chapter14/Assets/PointLight.gpmesh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
"shader":"BasicMesh",
55
"textures":[
66
"Assets/Sphere.png",
7-
"Assets/Default.png"
7+
"Assets/Default.png"
88
],
9+
"specularPower":100.0,
910
"vertices":[
1011
[0.000000,0.000001,12.500000,-0.003922,-0.003922,0.992157,0.968750,0.000000],
1112
[0.475748,-2.391772,12.259815,0.027451,-0.215686,0.968628,0.968750,0.062500],

‎Chapter14/Assets/Rifle.gpmesh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"textures":[
66
"Assets/Rifle.png"
77
],
8+
"specularPower":100.0,
89
"vertices":[
910
[60.004414,-0.751908,0.341529,0.992157,0.003922,-0.003922,0.611816,0.761719],
1011
[60.003975,-0.533524,0.153569,0.992157,-0.011765,0.003922,0.614746,0.767578],

‎Chapter14/Assets/Russian.gptext‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"TextMap":[
3-
{ "key": "PauseTitle", "text": "ПАУЗА" },
4-
{ "key": "ResumeButton", "text": "Продолжить" },
5-
{ "key": "QuitButton", "text": "Уволиться" },
6-
{ "key": "QuitText", "text": "Вы хотите бросить курить?" },
7-
{ "key": "OKButton", "text": "ОК" },
8-
{ "key": "CancelButton", "text": "Отмена" }
9-
]
2+
"TextMap":{
3+
"PauseTitle": "ПАУЗА",
4+
"ResumeButton": "Продолжить",
5+
"QuitButton": "Уволиться",
6+
"QuitText": "Вы хотите бросить курить?",
7+
"OKButton": "ОК",
8+
"CancelButton": "Отмена"
9+
}
1010
}

‎Chapter14/Assets/Sphere.gpmesh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"Assets/Sphere.png",
77
"Assets/Default.png"
88
],
9+
"specularPower":100.0,
910
"vertices":[
1011
[0.000000,0.000001,12.500000,-0.003922,-0.003922,0.992157,0.968750,0.000000],
1112
[0.475748,-2.391772,12.259815,0.027451,-0.215686,0.968628,0.968750,0.062500],

‎Chapter14/Assets/Target.gpmesh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"textures":[
66
"Assets/Target.png"
77
],
8+
"specularPower":100.0,
89
"vertices":[
910
[-0.000004,-25.881905,96.592583,-0.003922,-0.262745,0.960784,0.908691,0.084106],
1011
[-25.000004,0.000000,100.000000,-0.003922,-0.003922,1.000000,0.941406,0.115601],

0 commit comments

Comments
 (0)