Shuvit-Org
/
shuvit
Watch 4
Star 3
Fork 0
Code Issues 9 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

sorting shrit and deck lists

shuvit 5 years ago
parent
273d232632
commit
1f28d11e3b
33 changed files with 17 additions and 17 deletions
Unified View Show Diff Stats
  1. 1
    1
      Recordings/shuvit replay.dat
  2. BIN
      __pycache__/_version.cpython-36.pyc
  3. BIN
      __pycache__/configobj.cpython-36.pyc
  4. 2
    2
      assets/ground_tiles.blend
  5. 2
    2
      characters/becky.blend
  6. 2
    2
      characters/becky.blend1
  7. 2
    2
      characters/becky.ini
  8. 2
    2
      characters/ralph.blend
  9. 2
    2
      characters/ralph.blend1
  10. 2
    2
      config.ini
  11. BIN
      scripts/__pycache__/Manager.cpython-36.pyc
  12. BIN
      scripts/__pycache__/Record.cpython-36.pyc
  13. BIN
      scripts/__pycache__/Settings.cpython-36.pyc
  14. BIN
      scripts/__pycache__/SortData.cpython-36.pyc
  15. BIN
      scripts/__pycache__/Startup.cpython-36.pyc
  16. BIN
      scripts/__pycache__/active_camera_loc.cpython-36.pyc
  17. BIN
      scripts/__pycache__/bike.cpython-36.pyc
  18. BIN
      scripts/__pycache__/co_ActionState.cpython-36.pyc
  19. BIN
      scripts/__pycache__/colors.cpython-36.pyc
  20. BIN
      scripts/__pycache__/controller2.cpython-36.pyc
  21. BIN
      scripts/__pycache__/grindV2.cpython-36.pyc
  22. BIN
      scripts/__pycache__/inputs.cpython-36.pyc
  23. BIN
      scripts/__pycache__/joy_sens.cpython-36.pyc
  24. BIN
      scripts/__pycache__/load_char.cpython-36.pyc
  25. BIN
      scripts/__pycache__/logo_fades.cpython-36.pyc
  26. BIN
      scripts/__pycache__/menuV3.cpython-36.pyc
  27. BIN
      scripts/__pycache__/pause_menu2.cpython-36.pyc
  28. BIN
      scripts/__pycache__/scene_init.cpython-36.pyc
  29. BIN
      scripts/__pycache__/stance.cpython-36.pyc
  30. BIN
      scripts/__pycache__/walk.cpython-36.pyc
  31. 2
    2
      scripts/colors.py
  32. BIN
      six/__pycache__/__init__.cpython-36.pyc
  33. BIN
      six/__pycache__/six.cpython-36.pyc

+ 1
- 1
Recordings/shuvit replay.dat
File diff suppressed because it is too large
View File


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 
 version https://git-lfs.github.com/spec/v1
 1 
 version https://git-lfs.github.com/spec/v1
2 
-oid sha256:cc3fc902a7137fef19dbc53547306c2f40e9d2256a7e4a7eb1152c8003899f64
3 
-size 244372444
2 
+oid sha256:1891d62eef9a8ef6b97e3b938ccc41ebaba76b10ed4c8955554e537310341f7c
3 
+size 244531632

+ 2
- 2
characters/becky.blend View File

1 
 version https://git-lfs.github.com/spec/v1
 1 
 version https://git-lfs.github.com/spec/v1
2 
-oid sha256:96221c0bf493308d6a28d89370ec2201322eeaddd533d6ab21c6c1c76341a3d4
3 
-size 3744012
2 
+oid sha256:347adbceaf8e77cf99838c92fb95377ab6996613831157a271f0ed1299f02e02
3 
+size 3760844

+ 2
- 2
characters/becky.blend1 View File

1 
 version https://git-lfs.github.com/spec/v1
 1 
 version https://git-lfs.github.com/spec/v1
2 
-oid sha256:8cc0c90b8350ff232737f82317802d167315dfcaf9eb3a8df7eb80b5e0ac54cf
3 
-size 4558936
2 
+oid sha256:05d44a3ffc953f4ce39b9536b0417312c7ef77381ee51ec304a41cd0d2cc4f2f
3 
+size 3756724

+ 2
- 2
characters/becky.ini View File

2 
 ###################
 2 
 ###################
3 
 #becky
 3 
 #becky
4
4
5 
-shirt_logo = 2
5 
+shirt_logo = 3
6
6
7 
 shirt_color_r = 0.61
 7 
 shirt_color_r = 0.61
8 
 shirt_color_g = 0.61
 8 
 shirt_color_g = 0.61
15
15
16 
 #deck settings
 16 
 #deck settings
17 
 ##############
 17 
 ##############
18 
-deck_index = 0
18 
+deck_index = 2
19 
 deck_color_r = 1
 19 
 deck_color_r = 1
20 
 deck_color_g = 1.0
 20 
 deck_color_g = 1.0
21 
 deck_color_b = 1
 21 
 deck_color_b = 1

+ 2
- 2
characters/ralph.blend View File

1 
 version https://git-lfs.github.com/spec/v1
 1 
 version https://git-lfs.github.com/spec/v1
2 
-oid sha256:29eed6d82bd40a2ca6ca8fb9060c4fc2aa78eab75621e452e1f04bb9484c57cc
3 
-size 3270524
2 
+oid sha256:d1a9b45eb1dda54f2710ff103e5329f02940c3b7485b90236818988a5f0e47b7
3 
+size 3274308

+ 2
- 2
characters/ralph.blend1 View File

1 
 version https://git-lfs.github.com/spec/v1
 1 
 version https://git-lfs.github.com/spec/v1
2 
-oid sha256:2181900bf7864a7c8b1c51c70d40dcc6e6390ab874fa285d2ee461319a6a8f77
3 
-size 5128460
2 
+oid sha256:29eed6d82bd40a2ca6ca8fb9060c4fc2aa78eab75621e452e1f04bb9484c57cc
3 
+size 3270524

+ 2
- 2
config.ini View File

50
50
51 
 character = becky
 51 
 character = becky
52
52
53 
-shirt_logo = 2
53 
+shirt_logo = 3
54
54
55 
 shirt_color_r = 0.61
 55 
 shirt_color_r = 0.61
56 
 shirt_color_g = 0.61
 56 
 shirt_color_g = 0.61
63
63
64 
 #deck settings
 64 
 #deck settings
65 
 ##############
 65 
 ##############
66 
-deck_index = 0
66 
+deck_index = 2
67 
 deck_color_r = 1
 67 
 deck_color_r = 1
68 
 deck_color_g = 1.0
 68 
 deck_color_g = 1.0
69 
 deck_color_b = 1
 69 
 deck_color_b = 1

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
- 2
scripts/colors.py View File

136 
         linux = True
 136 
         linux = True
137 
     deckList = []
137 
     deckList = []
138 
     deckList = glob.glob(fileName)
 138 
     deckList = glob.glob(fileName)
139 
-    dict['deckList'] = deckList
139 
+    dict['deckList'] = sorted(deckList)
140
140
141 
     ID = texture.materialID(deck, 'MAdeck')
 141 
     ID = texture.materialID(deck, 'MAdeck')
142 
     deck_texture = texture.Texture(deck, ID)
 142 
     deck_texture = texture.Texture(deck, ID)
172 
         linux = True
172 
         linux = True
173 
     shirtList = []
173 
     shirtList = []
174 
     shirtList = glob.glob(fileName2)
 174 
     shirtList = glob.glob(fileName2)
175 
-    dict['shirtList'] = shirtList
175 
+    dict['shirtList'] = sorted(shirtList)
176
176
177 
     ID = texture.materialID(shirt, 'MAshirt')
 177 
     ID = texture.materialID(shirt, 'MAshirt')
178 
     shirt_texture = texture.Texture(shirt, ID)
 178 
     shirt_texture = texture.Texture(shirt, ID)

BIN
six/__pycache__/__init__.cpython-36.pyc View File


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


Write Preview
Loading…
Cancel
Save