 KeyMasterOfGozer
|
37ba9defca
Resolved merge conflict by incorporating both.
|
5 years ago |
 julzor
|
542b0cf233
[fixed] blocked the other magic if condition for non-magic svetas
|
5 years ago |
|
julzor
|
3585f37bad
[fixed] blocked magical body change for non-magic starts
|
5 years ago |
|
julzor
|
d98a11d58e
[fixed] missed a $phone_loc in telefon
|
5 years ago |
|
julzor
|
372e0ab4be
[fixed] missing text in furi, natashas pregnant images showing up too early, negative money in sauna, bathroom phone loc selfies
|
5 years ago |
|
KeyMasterOfGozer
|
d07d6c2e55
Merge branch 'master' into dev
|
5 years ago |
|
julzor
|
646f61bd16
[fixed] removed strange gosub in gskino
|
5 years ago |
|
julzor
|
e1c2b01cc3
[fixed] commented out all huntersex dead ends, because the hunters are fubar
|
5 years ago |
|
julzor
|
b9db3589ec
[fixed] missing gs 'stat' in bed2
|
5 years ago |
|
julzor
|
e89d509eee
[fixed] missing willpower in gschool_lessons1
|
5 years ago |
|
julzor
|
4ff619c0e6
[fixed] $boy wasn't defined
|
5 years ago |
|
KeyMasterOfGozer
|
af8687f469
Merge branch 'master' into dev
|
5 years ago |
|
julzor
|
2d7add3466
[fixed] blocked Gaddvor for inhib/exhibitionism
|
5 years ago |
|
julzor
|
3bcc5fab2d
[fixed] missing willpower calculation, missing *clr & cla in gschool_events
|
5 years ago |
|
julzor
|
55a04d0da8
[fixed] moved the brush action in mirror below the routines so that they don't appear
|
5 years ago |
|
julzor
|
3f19480269
[fixed] missing willpower check and missing variable in gschool_events, missing < in gschool_chats2 and replaced ` with ''
|
5 years ago |
|
julzor
|
2e28bd71df
[text edit] removed unnecessary white space to avoid having strange line breaks when the text is longer than the main screen
|
5 years ago |
|
julzor
|
3a766d4360
[fixed] ever changing picture in pharmacy
|
5 years ago |
|
julzor
|
02aa8b8f95
Merge branch 'master' of https://git.catrenelle.com/sovietmercader/glife
|
5 years ago |
|
julzor
|
e0416c286c
[fixed] time travel in din_van
|
5 years ago |
 sovietmercader
|
4164a5b4d6
[fixed] rand_girl_arg in gschool_events was generating boys names instead of girls
|
5 years ago |
|
KeyMasterOfGozer
|
72e3afb4b6
Merge branch 'master' into dev
|
5 years ago |
|
julzor
|
100a2fec21
[fixed] missing default for the mother name
|
5 years ago |
|
julzor
|
32abb2406c
[fixes] wrong version number
|
5 years ago |
|
KeyMasterOfGozer
|
2fc5162f4e
Merge branch 'master' into dev
|
5 years ago |
|
julzor
|
ecc65dee40
Merge branch 'master' of https://git.catrenelle.com/Deroc/glife
|
5 years ago |
|
julzor
|
28031accb5
[changed] version to 0.7.4
|
5 years ago |
|
KeyMasterOfGozer
|
4a8feaeb11
Merge branch 'master' into dev
|
5 years ago |
|
julzor
|
d2557a0c2f
[fixes] last stuff before the release
|
5 years ago |
|
KeyMasterOfGozer
|
291757a407
Merge branch 'master' into dev
|
5 years ago |
