 KevinSmarts
|
0f419973f7
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
vor 5 Jahren |
|
KevinSmarts
|
b408abd6d5
[fixed] Auto-introductions removed as not wanted
|
vor 5 Jahren |
 3xpurt
|
da39ede60f
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
vor 5 Jahren |
|
3xpurt
|
35896bad7f
[fixed] pcs_willpwr typo in voltrener
|
vor 5 Jahren |
|
3xpurt
|
4236902a34
Merge branch 'bugfix/abduction' of chopeks/glife into master
|
vor 5 Jahren |
|
3xpurt
|
926b38bd27
Merge branch 'master' of chopeks/glife into master
|
vor 5 Jahren |
|
KevinSmarts
|
d14261deed
Merge remote-tracking branch 'julzor/master'
|
vor 5 Jahren |
|
KevinSmarts
|
10c0517d5d
[fixes] name change for basketball skill as it looked like baseball
|
vor 5 Jahren |
 chopeks
|
b7485dca71
time same as stated in action
|
vor 5 Jahren |
|
KevinSmarts
|
4280eedb0e
[added] New skill for basketball 'pcs_bsbll'
|
vor 5 Jahren |
 julzor
|
fb31a672e1
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
vor 5 Jahren |
|
julzor
|
839355522a
[fixed] removed old willpower gains, limited willpower gains for certain activities to 1/day
|
vor 5 Jahren |
|
3xpurt
|
b2fc667993
Merge branch 'master' of https://git.catrenelle.com/julzor/glife
|
vor 5 Jahren |
|
3xpurt
|
aa067ff5d2
[fixed] missing set_imgh in gschool_lessonsev2
|
vor 5 Jahren |
|
3xpurt
|
6f63e08f63
[fixed] miroslavaHome in glife.qproj
|
vor 5 Jahren |
|
julzor
|
b6226cc35a
[fixed] removed doubled willpower regen in stat
|
vor 5 Jahren |
|
KevinSmarts
|
b2866bdeca
[changed] Adjustment to willpower regen to make it more at at sleepy times and less during wakey times.
|
vor 5 Jahren |
|
KevinSmarts
|
9ab549c8da
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
vor 5 Jahren |
|
KevinSmarts
|
66892ee0dd
[fixes] Seemed to be mis-calculating if car available. Think this fixes it
|
vor 5 Jahren |
|
KevinSmarts
|
587c0fe540
Merge remote-tracking branch 'CroWke/master'
|
vor 5 Jahren |
|
3xpurt
|
c397e0527c
[changed] forgot gadgarden capitalization fix.
|
vor 5 Jahren |
|
3xpurt
|
b77c8aecae
[fxied] git config core.ignorecase false
|
vor 5 Jahren |
|
3xpurt
|
71042cf37d
[changed] village mixed case locations to lowercase.
|
vor 5 Jahren |
|
sovietmercader
|
1733d8b100
[changed] only display boletus and bilberry basket amounts when inside gadyukino
|
vor 5 Jahren |
|
sovietmercader
|
971cb04857
[fixed] Gadhouse is now capitalized again since making it lowercase broke it on linux users systems since now the source file did not agree with the qproj for the python merge
|
vor 5 Jahren |
|
3xpurt
|
87026fb640
Merge branch 'master' of https://git.catrenelle.com/Jefke11/glife
|
vor 5 Jahren |
|
3xpurt
|
19ee0c78e0
Merge branch 'master' of https://git.catrenelle.com/julzor/glife
|
vor 5 Jahren |
|
sovietmercader
|
1fbfca981d
[fixed] Meadow capitalization in Miroslava
|
vor 5 Jahren |
|
sovietmercader
|
bbab75aa4b
[fixed] fix unfinished mira father quest and missing parentheses in swamp yard
|
vor 5 Jahren |
 CroWke
|
be54d2b6fd
[edit] cleaned up some of the code. There's more in there that needs a look but that some of it will probably be best done when we do the family rework.
|
vor 5 Jahren |
