shuvit 4 days ago
parent
commit
75617cc9c4

+ 2
- 2
assets/pit.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:319534b8bbcc13536aad272e00d4f48b3001a9190477cb8ad2eff31d2e9d46a2
3
-size 603780
2
+oid sha256:c4a502eb2d910c6cb07482406644300ec77ad71069e1436ef57fbc03dc8f48a9
3
+size 624768

+ 3
- 0
assets/rail_b.blend View File

@@ -0,0 +1,3 @@
1
+version https://git-lfs.github.com/spec/v1
2
+oid sha256:02ad45f13aa3bdcf0b5c03df3ec76bb7dc54afb32082562d019045031d928518
3
+size 1393752

+ 2
- 2
assets/roads.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:2e247580efb10db5846657716d44f431dca0b0b151cd7b044330a6a07bb31a7d
3
-size 38013944
2
+oid sha256:324102985e96bb79660e3f3d154376b166dba01e5c9868cb6bac3194943c636e
3
+size 38009904

+ 3
- 0
assets/stairs_b.blend View File

@@ -0,0 +1,3 @@
1
+version https://git-lfs.github.com/spec/v1
2
+oid sha256:982da320581d0a0a7b403983b59b3a4819568d848b8a19acb58beecf0cf47b1b
3
+size 614848

+ 2
- 2
assets/user2.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:bf158ff219bd03871e389d67a124b3c4bca23d759260690fbf929026b2ae0d5b
3
-size 4963076
2
+oid sha256:2c6e1a5d7885adeb6d8f3ff3e559e53a1c04b13c5c46d5191fcc45520e9d1d4a
3
+size 5516252

+ 1
- 1
scripts/actionPlayer.py View File

@@ -488,4 +488,4 @@ def main(cont):
488 488
 	else:
489 489
 		skater.stopAction(5)	
490 490
 
491
-	own['eaState'].Execute()
491
+	#own['eaState'].Execute()

+ 19
- 4
scripts/actionsFSMlist.py View File

@@ -388,6 +388,21 @@ reg_manual_right = a_class(
388 388
 	None)
389 389
 
390 390
 
391
+reg_opos_in = a_class(
392
+	#player armature action name, start, end frames
393
+	'nopos_in_j3', 1, 80,
394
+	#deck action name, start, end frames  
395
+	'b_reg', 1, 10,
396
+	#layer, speed, mode (0 = play, 1 = loop), blendin
397
+	1, 1, 1, 15,
398
+	#intro, length
399
+	None, 0,
400
+	#exits
401
+	['reg_opos'],
402
+	#force exit, frame
403
+	'reg_opos', 78,
404
+	#opposite
405
+	'fak_opos')
391 406
 
392 407
 reg_opos = a_class(
393 408
 	#player armature action name, start, end frames
@@ -397,7 +412,7 @@ reg_opos = a_class(
397 412
 	#layer, speed, mode (0 = play, 1 = loop), blendin
398 413
 	1, 1, 1, 15,
399 414
 	#intro, length
400
-	None, 0,
415
+	'reg_opos_in', 80,
401 416
 	#exits
402 417
 	['reg_roll', 'reg_turnRight', 'reg_turnLeft', 'reg_pump', 'reg_pump_left', 'reg_pump_right', 'reg_push', 'reg_push_goof', 'reg_powerslide', 'reg_fs_powerslide', 'reg_manual', 'reg_nmanual', 'reg_offboard', 'reg_air', 'reg_air_nose', 'reg_air_tail', 'reg_manual_left', 'reg_manual_right', 'reg_nmanual_left', 'reg_nmanual_right'],
403 418
 	#force exit, frame
@@ -700,9 +715,9 @@ reg_nmanual_right = a_class(
700 715
 
701 716
 reg_land = a_class(
702 717
 	#player armature action name, start, end frames
703
-	'reg_land', 1, 40,
718
+	'reg_land_j', 1, 50,
704 719
 	#deck action name, start, end frames  
705
-	'b_reg', 1, 40,
720
+	'b_reg', 1, 50,
706 721
 	#layer, speed, mode (0 = play, 1 = loop), blendin
707 722
 	1, 1, 0, 10,
708 723
 	#intro, length
@@ -710,7 +725,7 @@ reg_land = a_class(
710 725
 	#exits
711 726
 	lands,
712 727
 	#force exit, frame
713
-	'reg_roll', 20,
728
+	'reg_roll', 25,
714 729
 	#opposite
715 730
 	None)
716 731
 

+ 3
- 0
textures/concrete_ground_01_d.png View File

@@ -0,0 +1,3 @@
1
+version https://git-lfs.github.com/spec/v1
2
+oid sha256:80cd451596a26c76b1100835d72d2e83a52fbfd0aac3f925452b113134f25204
3
+size 2036953

+ 3
- 0
textures/concrete_ground_01_n.png View File

@@ -0,0 +1,3 @@
1
+version https://git-lfs.github.com/spec/v1
2
+oid sha256:bd40006fffea5c8768be7867ce56385bf9c35301032cd4a5ea8f0159ba8a9540
3
+size 1839751

+ 3
- 0
textures/concrete_ground_01_r.png View File

@@ -0,0 +1,3 @@
1
+version https://git-lfs.github.com/spec/v1
2
+oid sha256:93961cf74c66c4223992ff90fedfd86fe389b505f20d34e68482c84638ae077e
3
+size 712636

Loading…
Cancel
Save