 Thavus
|
073e3f11af
pull from upstream
|
vor 3 Jahren |
 Kevin_Smarts
|
039ad61d9d
Merge branch 'master' of n07-5l4y3r/glife into master
|
vor 3 Jahren |
 Kevin_Smarts
|
3a3c1c59c3
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
vor 3 Jahren |
|
Kevin_Smarts
|
23dbf6dc60
[fixed] Missed some = too
|
vor 3 Jahren |
|
Thavus
|
f2773d5838
use the new hypno random event
|
vor 3 Jahren |
|
Thavus
|
2aac4b601e
remove orgasm changes
|
vor 3 Jahren |
|
Thavus
|
612340e778
updating hypno stuff
|
vor 3 Jahren |
|
Kevin_Smarts
|
a9715197b7
[fixed] Missed a couple of $
|
vor 3 Jahren |
|
Kevin_Smarts
|
74ee157743
[fixed] Missing commas
|
vor 3 Jahren |
 n075l4y3r
|
9a6234b6c1
added darkmode syntax highlighting files for notepad++
|
vor 3 Jahren |
|
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
|
vor 3 Jahren |
|
Kevin_Smarts
|
9327f1d573
Merge remote-tracking branch 'Gwen/master'
|
vor 3 Jahren |
|
Kevin_Smarts
|
298bf0a661
[fixed] Missed the end off these variable names
|
vor 3 Jahren |
 rachels
|
37f70ed2d1
update notepad++ file according to current project structure (done by haariger_haru)
|
vor 3 Jahren |
|
Kevin_Smarts
|
258276bc5f
[changed] The remaining files updated to new masturbation arousal code
|
vor 3 Jahren |
 Gwen
|
46a61a3cd5
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
vor 3 Jahren |
|
Kevin_Smarts
|
caf1332037
Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master'
|
vor 3 Jahren |
 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.
|
vor 3 Jahren |
|
Kevin_Smarts
|
f695e954f4
Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master'
|
vor 3 Jahren |
|
bgkjdgbizgblzdgbr
|
c02d8ebb04
[Changed] You will now also be able to lear the teachers pet trait in university.
|
vor 3 Jahren |
|
Kevin_Smarts
|
b0120800bf
Merge remote-tracking branch 'Anya/master'
|
vor 3 Jahren |
|
Kevin_Smarts
|
e25e897b2a
[changed] Butt slut changes in trait but exp no in stat yet so it will not work
|
vor 3 Jahren |
|
Kevin_Smarts
|
26620fe40f
[changed] Masturbation in arousal counting seperately and split anal, clitorial and vaginal orgasms for better tracking and more accuracy
|
vor 3 Jahren |
 Anya
|
2fc22a4311
[added] Kendra stuff for nutluck
|
vor 3 Jahren |
|
bgkjdgbizgblzdgbr
|
c3a3241cd2
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
vor 3 Jahren |
|
Anya
|
0c74be47b2
[changed] all lake and pool images not event-specific to use a single folder
|
vor 3 Jahren |
|
Anya
|
021ee83a95
[changed] tweaked some lake images
|
vor 3 Jahren |
|
Anya
|
3e6538d2e3
[Changed] You now get a choice to pop your cherry or not with Lariska
|
vor 3 Jahren |
|
Anya
|
2029765d06
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
vor 3 Jahren |
|
rachels
|
b0d6dcd72b
delete the merged file and modify the project file
|
vor 3 Jahren |
