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

0.11.3 #1

Merged
merged 909 commits into from
Jul 4, 2020
Merged
Changes from 1 commit
Commits
Show all changes
909 commits
Select commit Hold shift + click to select a range
8249fba
Update script-topics.rpy
kirillPro2020 Jun 10, 2020
9c52474
New Fun Fact: Origins of Coffee
lunulae Jun 10, 2020
90fc86b
Update script-fun-facts.rpy
lunulae Jun 10, 2020
7197e36
Update script-fun-facts.rpy
lunulae Jun 10, 2020
962ff1b
tears up now don't shift
multimokia Jun 11, 2020
7bc6d0e
Becoming a full-time streamer
multimokia Jun 11, 2020
7ed8c92
optimize loveme opendoor greet + an exp
multimokia Jun 11, 2020
97a19d9
Add requested changes
Jun 11, 2020
ad6619f
conflicts
multimokia Jun 11, 2020
ff066fd
Add seen_label condition
Jun 11, 2020
691e7b5
reset slider value
Booplicate Jun 11, 2020
b91b976
Merge pull request #5900 from Booplicate/smol_fix_for_sliders
multimokia Jun 11, 2020
3e1b3f5
Add action, remove random
Jun 11, 2020
384c20d
Add return statement
Jun 11, 2020
5cda838
Add proposals
Jun 11, 2020
72068a4
Comma consistency
Jun 11, 2020
f7e0dec
Change ENAMORED -> LOVE, add proposals
Jun 11, 2020
134b0b8
Change ENAMORED -> LOVE, add proposals
Jun 11, 2020
0b34cda
Merge branch 'master' of github.com:scpketer/MonikaModDev
Jun 11, 2020
3f38186
Update script-songs.rpy
Booplicate Jun 11, 2020
3383386
fix missing nw
multimokia Jun 12, 2020
7f41269
update
multimokia Jun 12, 2020
a78442d
am big dum and put this in the wrong place
multimokia Jun 12, 2020
1e8c225
fix other issues, stripEVL removes dates by def
multimokia Jun 12, 2020
d958615
space cops
multimokia Jun 12, 2020
7e1f58d
Apply suggestions from code review
lunulae Jun 12, 2020
1c85834
Change event properties; add conditional lines
Jun 12, 2020
e17afc7
Change event properties; add conditional lines
Jun 12, 2020
c6ebaf7
Update script-songs.rpy
LooseEthics Jun 12, 2020
20773bb
Update script-songs.rpy
LooseEthics Jun 12, 2020
91a4a67
Added nw, fixed spritecode
LooseEthics Jun 12, 2020
1befcd0
better input
Booplicate Jun 12, 2020
2fad74c
Fixed timing because Moni talks too fast
LooseEthics Jun 12, 2020
b74f261
Added 5hubsb
LooseEthics Jun 12, 2020
911d609
Missing spaces
LooseEthics Jun 12, 2020
a7e0227
fix closedsad
multimokia Jun 12, 2020
3c06c28
edits
jmwall24 Jun 13, 2020
f7c530b
the
multimokia Jun 13, 2020
e0ba8d6
Merge pull request #5898 from lunulae/patch-5
jmwall24 Jun 13, 2020
d8055d7
Update script-topics.rpy
fromulus Jun 13, 2020
af5bd30
Update Monika After Story/game/script-topics.rpy
fromulus Jun 13, 2020
b84e88c
Requested changes
fromulus Jun 13, 2020
c977b3c
Update script-topics.rpy
fromulus Jun 13, 2020
04bf86f
Update script-topics.rpy
kirillPro2020 Jun 13, 2020
2456e02
adjusts to tear blinks + gen prereqs + fixes
multimokia Jun 13, 2020
d891193
jankflix
multimokia Jun 13, 2020
2edb0a6
some exp things + consist
multimokia Jun 13, 2020
634d1ce
filter weather maps now are verified probably. also disp is good now …
ThePotatoGuy Jun 14, 2020
0ee6afb
some exps
multimokia Jun 14, 2020
d9d55f7
edits
jmwall24 Jun 14, 2020
589ebe0
Merge branch 'content' into pr/5891
jmwall24 Jun 14, 2020
1226741
sprite
jmwall24 Jun 14, 2020
70f9440
edits
jmwall24 Jun 14, 2020
8faf5a9
Merge branch 'content' into pr/5856
jmwall24 Jun 14, 2020
485573d
sprites
jmwall24 Jun 14, 2020
ba0773a
smol edits
jmwall24 Jun 14, 2020
35b4c97
Timing change
LooseEthics Jun 14, 2020
d79790f
smol rephrasings
multimokia Jun 14, 2020
cba7c78
Update script-songs.rpy
LooseEthics Jun 14, 2020
8b294cf
Revert "Update script-songs.rpy"
LooseEthics Jun 14, 2020
2d7e1f6
Another timing change
LooseEthics Jun 14, 2020
7bfcb37
handle some categories
multimokia Jun 14, 2020
421f427
Merge pull request #5891 from Abc2557/patch-3
jmwall24 Jun 14, 2020
acd54bf
Merge pull request #5856 from scpketer:master
multimokia Jun 14, 2020
8c3c946
Merge pull request #5902 from Booplicate/lamour_toujours
jmwall24 Jun 14, 2020
34ee994
basic structure
LooseEthics Jun 14, 2020
bfd34cf
fix an extend issue
multimokia Jun 15, 2020
801c939
fixed algorithm issues
ThePotatoGuy Jun 15, 2020
3a54cf4
new islands images
ThePotatoGuy Jun 15, 2020
669131a
Merge pull request #5852 from multimokia/FarewellsWorkLikeGreetings
ThePotatoGuy Jun 15, 2020
df24c1d
Merge branch 'content' into filtering-backgrounds
ThePotatoGuy Jun 15, 2020
50ab8f7
Added pauses
fromulus Jun 15, 2020
879edc5
Update script-topics.rpy
kirillPro2020 Jun 15, 2020
b7d42c2
expressions
LooseEthics Jun 15, 2020
f44bcaf
syntax
LooseEthics Jun 15, 2020
62054a4
missing statements, better glitch, choice fix
LooseEthics Jun 15, 2020
e9e74e7
Update Monika After Story/game/script-greetings.rpy
LooseEthics Jun 15, 2020
4a2cbdf
generated 3kua
LooseEthics Jun 15, 2020
57a523a
some exps
multimokia Jun 15, 2020
5c53028
With
Rai99 Jun 16, 2020
cb58358
Music, right?
Rai99 Jun 16, 2020
0a6957e
associated with negative stimuli
Rai99 Jun 16, 2020
058a75c
Trip to some
Rai99 Jun 16, 2020
c3b8eb8
Merge pull request #5816 from Booplicate/better_text_substitution
multimokia Jun 16, 2020
06dcce9
Merge remote-tracking branch 'upstream/content' into 0.11.2-Typos
multimokia Jun 16, 2020
3a7e7e8
no more {a_an} tag
multimokia Jun 16, 2020
51b70ef
Adding wonderwall + analysis
Daiozen Jun 17, 2020
6a52579
fix
Daiozen Jun 17, 2020
f3c2ab6
fixing affection check
Daiozen Jun 17, 2020
7273228
Merge branch 'content' into pr/5793
jmwall24 Jun 18, 2020
2619035
Apply suggestions from code review
Daiozen Jun 18, 2020
a233234
Apply suggestions from code review
Daiozen Jun 18, 2020
8ea47f9
use our function instead
Booplicate Jun 19, 2020
1ff68c6
Merge branch 'content' into better_input
Booplicate Jun 19, 2020
3dbebb8
Update Monika After Story/game/script-songs.rpy
Daiozen Jun 20, 2020
c3312aa
Update Monika After Story/game/script-songs.rpy
Daiozen Jun 20, 2020
2717170
Applying rest of the suggestions from dlg review
Daiozen Jun 20, 2020
2fddb9c
changes
jmwall24 Jun 20, 2020
b010b7f
Merge branch 'content' into pr/5925
jmwall24 Jun 20, 2020
b9afd17
fix an issue in snowballfight
multimokia Jun 20, 2020
4ad54ba
change conditional
multimokia Jun 20, 2020
ae1ee60
make greetings eval conditionals in global store
multimokia Jun 20, 2020
bbd370e
fec
multimokia Jun 20, 2020
356fc26
feck 2
jmwall24 Jun 20, 2020
9d697e2
Merge pull request #5925 from LooseEthics/greeting-code-help
jmwall24 Jun 20, 2020
c1353c3
conflicts
multimokia Jun 20, 2020
0b7e572
Nap brb
Rai99 Jun 21, 2020
53adf58
You're
Rai99 Jun 21, 2020
af8f986
TODO, add a fallback filter displayable
ThePotatoGuy Jun 21, 2020
b394e34
More Fun Facts
paragonfist Jun 21, 2020
1d8b745
fix placement of this
multimokia Jun 21, 2020
52e4cb3
Falling in Love at a Coffee Shop song
lunulae Jun 21, 2020
6e04318
First topic
Freshairkaboom Jun 21, 2020
056fcd3
Update Monika After Story/game/script-topics.rpy
Freshairkaboom Jun 21, 2020
009ff86
Update Monika After Story/game/script-topics.rpy
Freshairkaboom Jun 21, 2020
ba0e395
edits
jmwall24 Jun 21, 2020
ebd4450
Merge branch 'content' into pr/5933
jmwall24 Jun 21, 2020
b2028f7
sprite
jmwall24 Jun 21, 2020
9cb7f94
Update script-topics.rpy
lunulae Jun 21, 2020
dac6252
Update script-topics.rpy
lunulae Jun 21, 2020
c231e97
Update Monika After Story/game/script-topics.rpy
lunulae Jun 21, 2020
8be1c66
cleaning up
multimokia Jun 21, 2020
4bff71b
Merge branch 'content' into pr/5906
jmwall24 Jun 21, 2020
de2c74b
too much conflict resolution
jmwall24 Jun 21, 2020
b27924f
cleaning up
multimokia Jun 21, 2020
647d74b
conflicts
multimokia Jun 21, 2020
001ab16
Update Monika After Story/game/script-topics.rpy
lunulae Jun 21, 2020
1d640a9
conflicts
multimokia Jun 21, 2020
a6d8e45
cleanup^2
multimokia Jun 22, 2020
68a1c2d
Merge pull request #5945 from multimokia/GreetConditionsInGlobalStore
multimokia Jun 22, 2020
79a7efd
Merge pull request #5933 from Daiozen/patch-16
jmwall24 Jun 22, 2020
9bf1b50
edits
jmwall24 Jun 22, 2020
738f8ec
very smol
jmwall24 Jun 22, 2020
f0b6ddf
Merge pull request #5906 from LooseEthics/new_song_cant_help_falling_…
jmwall24 Jun 22, 2020
d07ba00
Merge pull request #5946 from Rai99/Nap-brb
multimokia Jun 22, 2020
7770a80
Merge branch 'content' into pr/5952
jmwall24 Jun 22, 2020
f284d0d
edits
jmwall24 Jun 22, 2020
0f97c70
Merge pull request #5952 from lunulae/patch-6
jmwall24 Jun 22, 2020
cd0104e
changed some wording
lunulae Jun 22, 2020
cfac6f4
adjusting the end a little bit
lunulae Jun 22, 2020
d786581
trying a different ending bit
lunulae Jun 22, 2020
afbbe4d
Update script-topics.rpy
Freshairkaboom Jun 22, 2020
430e9ad
Forgot to include
Freshairkaboom Jun 22, 2020
41d57b8
weather class updates. this might be functional now
ThePotatoGuy Jun 22, 2020
3189f0e
Woopsie
Freshairkaboom Jun 22, 2020
f0c4fc0
some edits
multimokia Jun 22, 2020
3cdc9ce
Update script-brbs.rpy
fromulus Jun 22, 2020
931db7c
Merge remote-tracking branch 'upstream/content' into pr/5954
Booplicate Jun 22, 2020
581f388
weather has been transitioned
ThePotatoGuy Jun 22, 2020
b091ea9
sunset weather has been added
ThePotatoGuy Jun 22, 2020
3289e2e
s'more cleaning up
multimokia Jun 23, 2020
a343a3a
Merge pull request #5956 from lunulae/patch-8
multimokia Jun 23, 2020
15ec485
fixed progpoint bug
ThePotatoGuy Jun 23, 2020
35bd9b4
Merge branch 'content' into filtering-backgrounds
ThePotatoGuy Jun 23, 2020
182ec91
flag check for farewells
ThePotatoGuy Jun 23, 2020
73747cd
island protecc
ThePotatoGuy Jun 23, 2020
972340d
small fixes
ThePotatoGuy Jun 23, 2020
fbfc52a
comment clarification
ThePotatoGuy Jun 23, 2020
6c0719f
comment cliarifation agaian
ThePotatoGuy Jun 23, 2020
33195ae
remove todos
ThePotatoGuy Jun 23, 2020
828e10b
Apply suggestions from code review
paragonfist Jun 23, 2020
c79acf1
Update Monika After Story/game/script-fun-facts.rpy
paragonfist Jun 23, 2020
f7a369c
Update script-fun-facts.rpy
paragonfist Jun 23, 2020
c2fb8ea
30 minutes sunset and sunrise
ThePotatoGuy Jun 24, 2020
d282ad9
Requested
fromulus Jun 24, 2020
e2cda77
edits
multimokia Jun 24, 2020
1acf014
conflicts
multimokia Jun 24, 2020
86a793e
rain sunset and bookmarks event hiding
ThePotatoGuy Jun 25, 2020
86b2bdd
atl sprites on load then we dont have to loop twice
ThePotatoGuy Jun 25, 2020
9303b71
Requested 2
fromulus Jun 25, 2020
ae04909
this has bugged me for months
multimokia Jun 25, 2020
f618205
Merge pull request #5909 from Booplicate/better_input
multimokia Jun 25, 2020
32e50ef
cleanup
multimokia Jun 25, 2020
598fdb6
punc
multimokia Jun 25, 2020
4dbbab1
conflicts
multimokia Jun 25, 2020
978b11f
remove aff group checks, use funcs instead
multimokia Jun 25, 2020
912d4e4
Some cleaning
multimokia Jun 25, 2020
9dcf854
sprites
multimokia Jun 25, 2020
8430ab6
Merge pull request #5857 from multimokia/ActiveWindowDetectionForLinux
multimokia Jun 25, 2020
613e980
Power Naps Topic
Rai99 Jun 26, 2020
36ba5c1
few things
jmwall24 Jun 26, 2020
de57f38
few things
jmwall24 Jun 26, 2020
4a28ad9
Merge pull request #5948 from paragonfist/patch-11
multimokia Jun 26, 2020
5681336
Merge pull request #5959 from fromulus/patch-4
multimokia Jun 26, 2020
60ef5e1
edits
jmwall24 Jun 26, 2020
9453695
Merge pull request #5913 from fromulus/patch-3
jmwall24 Jun 26, 2020
1c47de4
Updates to the script
Freshairkaboom Jun 27, 2020
addcc8a
Update Monika After Story/game/script-topics.rpy
Freshairkaboom Jun 27, 2020
51a83f9
Sculptor analogy
Freshairkaboom Jun 27, 2020
266093d
Merge branch 'Freshairkaboom/branch/master' of https://github.com/Fre…
Freshairkaboom Jun 27, 2020
8bdefa3
Update Monika After Story/game/script-topics.rpy
Freshairkaboom Jun 27, 2020
1a5ffe2
Rewrote the last part
Freshairkaboom Jun 27, 2020
f1c96c7
Merge branch 'Freshairkaboom/branch/master' of https://github.com/Fre…
Freshairkaboom Jun 27, 2020
e877c6f
Merge pull request #5791 from multimokia/RefreshedSomeExps
multimokia Jun 28, 2020
296b96f
Rewriting of the entire text
Freshairkaboom Jun 28, 2020
43eebc7
Merge branch 'content' into pr/5793
jmwall24 Jun 28, 2020
3d58014
edits
jmwall24 Jun 28, 2020
8a4f48c
cleanup, hist remove
multimokia Jun 28, 2020
e9b57bb
more cleaning up + one more flow
multimokia Jun 28, 2020
109231a
fix a copy/paste err + handle the intro even more
multimokia Jun 28, 2020
6d9212a
I thought I fixed this oof
multimokia Jun 28, 2020
233b536
a
multimokia Jun 28, 2020
b728f2b
this was a decoration
multimokia Jun 28, 2020
2d2c0d2
few things
jmwall24 Jun 28, 2020
7a600ae
Merge branch 'content' into pr/5954
jmwall24 Jun 28, 2020
d2bb3f6
sprite
jmwall24 Jun 28, 2020
d446054
Merge pull request #5954 from Freshairkaboom/Freshairkaboom/branch/ma…
multimokia Jun 28, 2020
5093983
Merge remote-tracking branch 'upstream/content' into patch-14
multimokia Jun 28, 2020
da0005d
uno mas
multimokia Jun 28, 2020
f03a4cb
dos mas
jmwall24 Jun 28, 2020
41811be
i quit
jmwall24 Jun 28, 2020
04e380d
we all quit
Booplicate Jun 28, 2020
7431c49
never ending
jmwall24 Jun 28, 2020
8f78af8
cleanup
multimokia Jun 28, 2020
ca56cf4
conflicts
multimokia Jun 28, 2020
1d201c0
Merge pull request #5793 from Daiozen/patch-14
jmwall24 Jun 28, 2020
12d0c7a
Merge branch 'content' into pr/5647
jmwall24 Jun 28, 2020
e3d00fd
few things
jmwall24 Jun 29, 2020
645d0ec
GH bad
jmwall24 Jun 29, 2020
5911dd3
Merge pull request #5762 from ThePotatoGuy/filtering-backgrounds
ThePotatoGuy Jun 29, 2020
ef4c7ae
Merge pull request #5647 from kirillPro2020/patch-2
jmwall24 Jun 29, 2020
1e7f992
call local label fix
ThePotatoGuy Jun 29, 2020
1e138d6
store.
multimokia Jun 29, 2020
2d2c88e
cleaning up
multimokia Jun 29, 2020
602a113
conflicts
multimokia Jun 29, 2020
0b9cb08
conflicts
multimokia Jun 29, 2020
e6fe835
some exp things
multimokia Jun 29, 2020
f4ac7d3
don't reiterate what it is
multimokia Jun 29, 2020
cdedc10
less repetition in the brb
multimokia Jun 29, 2020
922e32b
few things
jmwall24 Jun 29, 2020
f9d654b
Merge pull request #5972 from Rai99/Power-Naps-Topic
jmwall24 Jun 29, 2020
8ed085d
how did we miss this?
multimokia Jun 29, 2020
d227aeb
just shade
multimokia Jun 29, 2020
0c341db
Have
multimokia Jun 30, 2020
87ac456
better
multimokia Jun 30, 2020
dbe74fa
missing dissolve
multimokia Jun 30, 2020
afb7bd7
Update script-topics.rpy
fromulus Jun 30, 2020
781023e
Merge pull request #5986 from multimokia/FixWinterIslandCrash
multimokia Jun 30, 2020
9aae14f
Just until
multimokia Jun 30, 2020
3d3483d
Merge pull request #5990 from fromulus/patch-5
jmwall24 Jun 30, 2020
6e0e408
remove the unstable exception + docs
multimokia Jul 1, 2020
5d3567d
cleaning up
multimokia Jul 3, 2020
899de79
sprite
multimokia Jul 3, 2020
2c39e43
space
multimokia Jul 3, 2020
15eb0e9
remove todo
Legendkiller21 Jul 3, 2020
4c987ec
Also get rid of the hehehe.txt file
multimokia Jul 3, 2020
f21768d
Merge branch 'content' into pr/5704
jmwall24 Jul 3, 2020
06287a7
Merge pull request #5704 from Rai99/0.11.2-Typos
ThePotatoGuy Jul 4, 2020
0201e6b
vesrion change
ThePotatoGuy Jul 4, 2020
2b70f16
forgot
ThePotatoGuy Jul 4, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Have
  • Loading branch information
multimokia committed Jun 30, 2020
commit 0c341db670a356b86c9bf2aafc43240ddb07660e
2 changes: 1 addition & 1 deletion Monika After Story/game/script-topics.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -14622,7 +14622,7 @@ label monika_translating_poetry:
m 3esc "'He who lost everything and he who had everything.'"
m 3ekbsa "'Last hawser, in you creaks my last longing.'"
m 1dubsa "'In my barren land you are the final rose.'"
m 3eka "Had you ever heard this poem before, [player]? It's from a Chilean poet named Pablo Neruda."
m 3eka "Have you ever heard this poem before, [player]? It's from a Chilean poet named Pablo Neruda."
m 1rusdla "That's one translation I found for it, anyway..."
m 1eua "Isn't it funny how you can come up with all kinds of interpretations from the same original text?"
m 3hub "It's like each person translating it added their own little tweak!"
Expand Down