Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Base Separation #4582

Merged
merged 70 commits into from
Sep 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
3284bda
base sprites and wip changes
ThePotatoGuy Jun 23, 2019
6b38b6b
Merge branch 'content' into base-separation
ThePotatoGuy Jun 24, 2019
904dc6e
finished adding additional acs list
ThePotatoGuy Jun 24, 2019
2c6d27a
Merge branch 'content' into base-separation
ThePotatoGuy Jun 26, 2019
0a1f1d5
Merge branch 'content' into base-separation
ThePotatoGuy Jul 1, 2019
bd538dc
Merge branch 'content' into base-separation
ThePotatoGuy Jul 9, 2019
8a6ce09
adding base lines
ThePotatoGuy Jul 10, 2019
e3ff023
MASPoseArms
ThePotatoGuy Jul 10, 2019
7eab757
integreating with ms sitting
ThePotatoGuy Jul 11, 2019
5367170
trying to add base arms
ThePotatoGuy Jul 14, 2019
da4c6c2
Merge branch 'content' into base-separation
ThePotatoGuy Jul 15, 2019
0ac75a3
rename to arms because thats better
ThePotatoGuy Jul 15, 2019
ad46b1f
arms first function
ThePotatoGuy Jul 15, 2019
f3afccb
now base stuff is good
ThePotatoGuy Jul 21, 2019
cefbda4
new base
ThePotatoGuy Jul 30, 2019
ee7457d
todo for arms to be directional
ThePotatoGuy Jul 30, 2019
afba0eb
new night filter hair sprites
ThePotatoGuy Jul 30, 2019
89dc870
fix extra lines
ThePotatoGuy Aug 3, 2019
21e5c90
def sprites updated
ThePotatoGuy Aug 5, 2019
0bdf2ff
fixed wrong images and made things work
ThePotatoGuy Aug 5, 2019
7307704
renamed hairties bracelet for new format
ThePotatoGuy Aug 6, 2019
b4e84b8
fixed up issues and now this works
ThePotatoGuy Aug 6, 2019
9d1bedc
fixed body 1
ThePotatoGuy Aug 7, 2019
4668517
musicnote neclakce works
ThePotatoGuy Aug 7, 2019
8e5cb30
updated sundress outfit, also added ability to say dont render arms
ThePotatoGuy Aug 8, 2019
1077888
fixed missing necklace and updated sundress with remade versions
ThePotatoGuy Aug 9, 2019
ecd0520
updated night filters
ThePotatoGuy Aug 9, 2019
b4f2e00
updated spritepack nights
ThePotatoGuy Aug 9, 2019
4f5e110
updated mouths and nose
ThePotatoGuy Aug 10, 2019
9b14f62
removed disgust
ThePotatoGuy Aug 10, 2019
9d5c506
updated night filter for blush, sweatdrop, eyebrows, emote, fixed emo…
ThePotatoGuy Aug 10, 2019
01b8f72
fixed leaning emotes
ThePotatoGuy Aug 10, 2019
36a314e
new night filter
ThePotatoGuy Aug 21, 2019
1e1cc1c
fixed emote confuse again
ThePotatoGuy Aug 21, 2019
af66eab
Merge branch 'content' into base-separation
ThePotatoGuy Aug 21, 2019
8d1c419
added upright eyes and tears, also fixes to expression codes for left…
ThePotatoGuy Aug 22, 2019
30db6b1
updated leaning face
ThePotatoGuy Aug 23, 2019
1003537
removed left and right tears
ThePotatoGuy Aug 23, 2019
2ef0e3b
updated santa
ThePotatoGuy Aug 24, 2019
8e4b401
fixed base issue
ThePotatoGuy Aug 24, 2019
dceb2af
updated santa object
ThePotatoGuy Aug 24, 2019
4b5440f
updated neko + witch outfits and spr ojects
ThePotatoGuy Aug 24, 2019
a97f346
night filtesr for promise rings and updates nekowitch
ThePotatoGuy Aug 24, 2019
0f269b5
Merge branch 'mhs-range-adjust' into base-separation
ThePotatoGuy Aug 24, 2019
d990848
additional code
ThePotatoGuy Aug 24, 2019
467125d
need to make fromJSON for pose arms
ThePotatoGuy Aug 24, 2019
1f0bf16
working on unit testing and posearms from json
ThePotatoGuy Aug 25, 2019
e09dc2b
delgate wip
ThePotatoGuy Aug 27, 2019
363089b
unit tests for mpa group
ThePotatoGuy Aug 28, 2019
e3c03e5
jgroup unit tests done
ThePotatoGuy Aug 28, 2019
54a2dc9
fixed some bad unit tests
ThePotatoGuy Aug 28, 2019
2dacfaa
more test caess
ThePotatoGuy Aug 29, 2019
0bc7afa
unit tests verified mpa
ThePotatoGuy Aug 30, 2019
1b6f88c
updated pose map
ThePotatoGuy Aug 30, 2019
a5e5bd6
Merge branch 'content' into base-separation
ThePotatoGuy Aug 30, 2019
da31088
working on mpm 0 unit tests
ThePotatoGuy Aug 30, 2019
af9331c
type 2 unit tests
ThePotatoGuy Aug 31, 2019
474ea3e
all unit tests for MASPoseMap are done
ThePotatoGuy Aug 31, 2019
680cd62
update json format with new sprite splits
ThePotatoGuy Sep 1, 2019
b9a9510
added version to jsons
ThePotatoGuy Sep 1, 2019
65d920c
now parsing the new props
ThePotatoGuy Sep 1, 2019
565f463
small fix
ThePotatoGuy Sep 1, 2019
4b2dade
file ext
ThePotatoGuy Sep 1, 2019
900d4d7
force acs to recommended layers
ThePotatoGuy Sep 1, 2019
850e845
version mismatch
ThePotatoGuy Sep 1, 2019
b4345eb
night table
multimokia Sep 1, 2019
2978f39
leanpose afh fix
ThePotatoGuy Sep 1, 2019
735606c
t pusMerge branch 'base-separation' of github.com:Monika-After-Story/…
ThePotatoGuy Sep 1, 2019
6683345
added types
ThePotatoGuy Sep 1, 2019
4cc2709
santa no longer floats
multimokia Sep 1, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
26 changes: 12 additions & 14 deletions Monika After Story/game/dev/dev_exp_previewer.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ init 999 python:
"td": "dried",
"tp": "pooled",
"tu": "up",
"tl": "left",
"tr": "right",
# "tl": "left",
# "tr": "right",
# "th": "closedhappy",
# "tc": "closedsad",
},
Expand All @@ -183,9 +183,10 @@ init 999 python:
"o": "gasp",
"u": "smug",
"w": "wide",
"x": "disgust",
"x": "angry",
"p": "pout",
"t": "triangle"
"t": "triangle",
# "g": "disgust",
}
}

Expand Down Expand Up @@ -270,7 +271,8 @@ init 999 python:
"w": "Wide Open",
"x": "Grit Teeth",
"p": "Pout",
"t": "Triangle"
"t": "Triangle",
# "g": "Disgust",
},
"time": {
0: "Day",
Expand Down Expand Up @@ -377,8 +379,8 @@ init 999 python:
"td",
"tp",
"tu",
"tl",
"tr",
# "tl",
# "tr",
# "th",
# "tc",
],
Expand All @@ -401,7 +403,8 @@ init 999 python:
"w",
"x",
"p",
"t"
"t",
# "g",
],
"time": [
0,
Expand All @@ -426,13 +429,8 @@ init 999 python:
"winkleft",
"winkright",
),
"left": (
"closedhappy",
"closedsad",
),
"right": (
"pooled": (
"closedhappy",
"closedsad",
),
},
}
Expand Down
Loading