shuvit 5 years ago
parent
commit
24c7ba3bcc
34 changed files with 87 additions and 39 deletions
  1. 1
    1
      .gitignore
  2. BIN
      __pycache__/_version.cpython-36.pyc
  3. BIN
      __pycache__/configobj.cpython-36.pyc
  4. 2
    2
      assets/ground_tiles.blend
  5. 2
    2
      assets/user1.blend
  6. 2
    2
      assets/user1.blend1
  7. 2
    2
      characters/annie.blend
  8. 38
    0
      characters/annie.ini
  9. 2
    2
      characters/ralph.ini
  10. 3
    0
      characters/textures/braid01_diffuse.png
  11. 3
    0
      characters/textures/middleage_lightskinned_female_diffuse2.png
  12. 27
    27
      config.ini
  13. BIN
      scripts/__pycache__/Manager.cpython-36.pyc
  14. BIN
      scripts/__pycache__/Record.cpython-36.pyc
  15. BIN
      scripts/__pycache__/Settings.cpython-36.pyc
  16. BIN
      scripts/__pycache__/SortData.cpython-36.pyc
  17. BIN
      scripts/__pycache__/Startup.cpython-36.pyc
  18. BIN
      scripts/__pycache__/active_camera_loc.cpython-36.pyc
  19. BIN
      scripts/__pycache__/bike.cpython-36.pyc
  20. BIN
      scripts/__pycache__/co_ActionState.cpython-36.pyc
  21. BIN
      scripts/__pycache__/colors.cpython-36.pyc
  22. BIN
      scripts/__pycache__/controller2.cpython-36.pyc
  23. BIN
      scripts/__pycache__/grindV2.cpython-36.pyc
  24. BIN
      scripts/__pycache__/inputs.cpython-36.pyc
  25. BIN
      scripts/__pycache__/joy_sens.cpython-36.pyc
  26. BIN
      scripts/__pycache__/load_char.cpython-36.pyc
  27. BIN
      scripts/__pycache__/logo_fades.cpython-36.pyc
  28. BIN
      scripts/__pycache__/menuV3.cpython-36.pyc
  29. BIN
      scripts/__pycache__/pause_menu2.cpython-36.pyc
  30. BIN
      scripts/__pycache__/scene_init.cpython-36.pyc
  31. BIN
      scripts/__pycache__/stance.cpython-36.pyc
  32. BIN
      scripts/__pycache__/walk.cpython-36.pyc
  33. 2
    1
      scripts/co_ActionState.py
  34. 3
    0
      textures/shirt_norm.png

+ 1
- 1
.gitignore View File

@@ -38,7 +38,7 @@ Thumbs.db
38 38
 
39 39
 # User               #
40 40
 ######################
41
-.blend1
41
+*.blend1
42 42
 shuvit_working.blend
43 43
 .pyc
44 44
 replay.dat

BIN
__pycache__/_version.cpython-36.pyc View File


BIN
__pycache__/configobj.cpython-36.pyc View File


+ 2
- 2
assets/ground_tiles.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:cee276c6ed25d5e17ac095f9e02ee9ce08dba12de46627af31046da18f5d5209
3
-size 244531632
2
+oid sha256:5722ddc1fd5506ed0edf2a1eaebff9235ce1e0f6d493083b6d7978a48d57cfa0
3
+size 362010796

+ 2
- 2
assets/user1.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:e4bfd6a46f63d93ef7e388b2b251b9819d1e3fc7b1c3976b1d4808a94a645af1
3
-size 2415508
2
+oid sha256:d4b85e1905c6b07299bf4f6e5587182cfa62f2e374018f89ce7f04e2f978245e
3
+size 2441572

+ 2
- 2
assets/user1.blend1 View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:b849f1bbfec79edaa9c02c2a9292a6a69fb05ce45a61cc92d9ea133db9f17f13
3
-size 2159852
2
+oid sha256:f892c4bb3b175a0538e44a198e192e5bb8ab85535787ff0d8d5ff04f0221f756
3
+size 2436556

+ 2
- 2
characters/annie.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:776aae438811f5c36fc8c80c6ac0f95ab7237475ca9c6ffb45df9d2220e3e34d
3
-size 23467104
2
+oid sha256:e99508665078153c4fef77c8bc194a116193619a6f3cd78713f3a0e291dda88b
3
+size 23468904

+ 38
- 0
characters/annie.ini View File

@@ -0,0 +1,38 @@
1
+#character settings
2
+###################
3
+#annie
4
+
5
+shirt_logo = 5
6
+
7
+shirt_color_r = 0
8
+shirt_color_g = 0.16
9
+shirt_color_b = 0
10
+
11
+shoe_color_r = 0.08
12
+shoe_color_g = 0.05
13
+shoe_color_b = 0.02
14
+#-----------------
15
+
16
+#deck settings
17
+##############
18
+deck_index = 7
19
+deck_color_r = 0.28
20
+deck_color_g = 0.1
21
+deck_color_b = 0
22
+trucks_r = 0
23
+trucks_g = 0.41
24
+trucks_b = 0
25
+
26
+wheel1_r = 0.31
27
+wheel1_g = 0.16
28
+wheel1_b = 0
29
+wheel2_r = 0.31
30
+wheel2_g = 0.16
31
+wheel2_b = 0
32
+wheel3_r = 0.31
33
+wheel3_g = 0.16
34
+wheel3_b = 0
35
+wheel4_r = 0.31
36
+wheel4_g = 0.16
37
+wheel4_b = 0
38
+#-------------------

+ 2
- 2
characters/ralph.ini View File

@@ -2,7 +2,7 @@
2 2
 ###################
3 3
 #ralph
4 4
 
5
-shirt_logo = 1
5
+shirt_logo = 4
6 6
 
7 7
 shirt_color_r = 0.54
8 8
 shirt_color_g = 0.4
@@ -15,7 +15,7 @@ shoe_color_b = 0.02
15 15
 
16 16
 #deck settings
17 17
 ##############
18
-deck_index = 2
18
+deck_index = 7
19 19
 deck_color_r = 1
20 20
 deck_color_g = 1.0
21 21
 deck_color_b = 1

+ 3
- 0
characters/textures/braid01_diffuse.png View File

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

+ 3
- 0
characters/textures/middleage_lightskinned_female_diffuse2.png View File

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

+ 27
- 27
config.ini View File

@@ -48,41 +48,41 @@ walk_focal_length = 14
48 48
 #character settings
49 49
 ###################
50 50
 
51
-character = annie
51
+character = becky
52 52
 
53
-shirt_logo = 5
53
+shirt_logo = 3
54 54
 
55
-shirt_color_r = 0
56
-shirt_color_g = 0.16
57
-shirt_color_b = 0
55
+shirt_color_r = 0.61
56
+shirt_color_g = 0.61
57
+shirt_color_b = 0.61
58 58
 
59
-shoe_color_r = 0.08
60
-shoe_color_g = 0.05
59
+shoe_color_r = 0.16
60
+shoe_color_g = 0.02
61 61
 shoe_color_b = 0.02
62 62
 #-----------------
63 63
 
64 64
 #deck settings
65 65
 ##############
66
-deck_index = 7
67
-deck_color_r = 0.28
68
-deck_color_g = 0.1
69
-deck_color_b = 0
70
-trucks_r = 0
71
-trucks_g = 0.41
72
-trucks_b = 0
73
-
74
-wheel1_r = 0.31
75
-wheel1_g = 0.16
76
-wheel1_b = 0
77
-wheel2_r = 0.31
78
-wheel2_g = 0.16
79
-wheel2_b = 0
80
-wheel3_r = 0.31
81
-wheel3_g = 0.16
82
-wheel3_b = 0
83
-wheel4_r = 0.31
84
-wheel4_g = 0.16
85
-wheel4_b = 0
66
+deck_index = 2
67
+deck_color_r = 1
68
+deck_color_g = 1.0
69
+deck_color_b = 1
70
+trucks_r = 0.95
71
+trucks_g = 1.0
72
+trucks_b = 1
73
+
74
+wheel1_r = 0.4
75
+wheel1_g = 0.08
76
+wheel1_b = 0.08
77
+wheel2_r = 0.08
78
+wheel2_g = 0.34
79
+wheel2_b = 0.08
80
+wheel3_r = 0.08
81
+wheel3_g = 0.08
82
+wheel3_b = 0.54
83
+wheel4_r = 0.4
84
+wheel4_g = 0.37
85
+wheel4_b = 0.08
86 86
 #-------------------
87 87
 
88 88
 #2d filter settings

BIN
scripts/__pycache__/Manager.cpython-36.pyc View File


BIN
scripts/__pycache__/Record.cpython-36.pyc View File


BIN
scripts/__pycache__/Settings.cpython-36.pyc View File


BIN
scripts/__pycache__/SortData.cpython-36.pyc View File


BIN
scripts/__pycache__/Startup.cpython-36.pyc View File


BIN
scripts/__pycache__/active_camera_loc.cpython-36.pyc View File


BIN
scripts/__pycache__/bike.cpython-36.pyc View File


BIN
scripts/__pycache__/co_ActionState.cpython-36.pyc View File


BIN
scripts/__pycache__/colors.cpython-36.pyc View File


BIN
scripts/__pycache__/controller2.cpython-36.pyc View File


BIN
scripts/__pycache__/grindV2.cpython-36.pyc View File


BIN
scripts/__pycache__/inputs.cpython-36.pyc View File


BIN
scripts/__pycache__/joy_sens.cpython-36.pyc View File


BIN
scripts/__pycache__/load_char.cpython-36.pyc View File


BIN
scripts/__pycache__/logo_fades.cpython-36.pyc View File


BIN
scripts/__pycache__/menuV3.cpython-36.pyc View File


BIN
scripts/__pycache__/pause_menu2.cpython-36.pyc View File


BIN
scripts/__pycache__/scene_init.cpython-36.pyc View File


BIN
scripts/__pycache__/stance.cpython-36.pyc View File


BIN
scripts/__pycache__/walk.cpython-36.pyc View File


+ 2
- 1
scripts/co_ActionState.py View File

@@ -50,7 +50,8 @@ def main():
50 50
         l_actionState = 'empty'
51 51
         l_requestAction = 'empty'
52 52
         
53
-        
53
+    skater.playAction('blink', 0,100, layer=7, play_mode=0, speed=.25)
54
+
54 55
     def stopActs():
55 56
         skater.stopAction(loop_layer)
56 57
         trucks.stopAction(loop_layer)

+ 3
- 0
textures/shirt_norm.png View File

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

Loading…
Cancel
Save