 Kevin_Smarts
|
b05c4c440b
[fixed] changes reverted in error
|
3 years ago |
 Thavus
|
4434d48697
merge from upstream
|
3 years ago |
|
Kevin_Smarts
|
eefc94847b
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
3 years ago |
|
Kevin_Smarts
|
2987e24b31
Merge remote-tracking branch 'Thavus/master'
|
3 years ago |
|
Thavus
|
073e3f11af
pull from upstream
|
3 years ago |
 Kevin_Smarts
|
039ad61d9d
Merge branch 'master' of n07-5l4y3r/glife into master
|
3 years ago |
|
Kevin_Smarts
|
3a3c1c59c3
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
3 years ago |
|
Kevin_Smarts
|
23dbf6dc60
[fixed] Missed some = too
|
3 years ago |
|
Thavus
|
f2773d5838
use the new hypno random event
|
3 years ago |
|
Thavus
|
2aac4b601e
remove orgasm changes
|
3 years ago |
|
Thavus
|
612340e778
updating hypno stuff
|
3 years ago |
|
Kevin_Smarts
|
a9715197b7
[fixed] Missed a couple of $
|
3 years ago |
|
Kevin_Smarts
|
74ee157743
[fixed] Missing commas
|
3 years ago |
 n075l4y3r
|
9a6234b6c1
added darkmode syntax highlighting files for notepad++
|
3 years ago |
|
Kevin_Smarts
|
992720be56
[changed] removed the old analorgasm variable and fixed the various places where it was called for when it is now handled in arousal
|
3 years ago |
|
Kevin_Smarts
|
9327f1d573
Merge remote-tracking branch 'Gwen/master'
|
3 years ago |
|
Kevin_Smarts
|
298bf0a661
[fixed] Missed the end off these variable names
|
3 years ago |
 rachels
|
37f70ed2d1
update notepad++ file according to current project structure (done by haariger_haru)
|
3 years ago |
|
Kevin_Smarts
|
258276bc5f
[changed] The remaining files updated to new masturbation arousal code
|
3 years ago |
 Gwen
|
46a61a3cd5
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
3 years ago |
|
Kevin_Smarts
|
caf1332037
Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master'
|
3 years ago |
 bgkjdgbizgblzdgbr
|
e5f398f10f
[Added] The exams and studying for the exams for the first semester at uni. Still missing is an update to cikl that wil register if you actually pass the semester or not, which will come later. But since we don't have a second semester yet it don't really matter that much.
|
3 years ago |
|
Kevin_Smarts
|
f695e954f4
Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master'
|
3 years ago |
|
bgkjdgbizgblzdgbr
|
c02d8ebb04
[Changed] You will now also be able to lear the teachers pet trait in university.
|
3 years ago |
|
Kevin_Smarts
|
b0120800bf
Merge remote-tracking branch 'Anya/master'
|
3 years ago |
|
Kevin_Smarts
|
e25e897b2a
[changed] Butt slut changes in trait but exp no in stat yet so it will not work
|
3 years ago |
|
Kevin_Smarts
|
26620fe40f
[changed] Masturbation in arousal counting seperately and split anal, clitorial and vaginal orgasms for better tracking and more accuracy
|
3 years ago |
 Anya
|
2fc22a4311
[added] Kendra stuff for nutluck
|
3 years ago |
|
bgkjdgbizgblzdgbr
|
c3a3241cd2
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
3 years ago |
|
Anya
|
0c74be47b2
[changed] all lake and pool images not event-specific to use a single folder
|
3 years ago |
