 Alaratt
|
1e90fb09f6
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
4 years ago |
 KevinSmarts
|
efc82f0f02
[fixed] image links for moncheri updated prematurely
|
4 years ago |
|
KevinSmarts
|
976a941105
[fixed] Wrong sign
|
4 years ago |
|
Alaratt
|
80c5dbd421
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
4 years ago |
|
Alaratt
|
3a029b1310
[Fixed] timing of work outs
|
4 years ago |
|
KevinSmarts
|
da06933bd2
Merge remote-tracking branch 'Gwen/master'
|
4 years ago |
|
KevinSmarts
|
ddabf0b555
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
4 years ago |
|
KevinSmarts
|
e3fa1f55c4
[added] Missing file for misc clothing attributes
|
4 years ago |
|
Gwen
|
9277a6c23a
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
4 years ago |
 rachels
|
ec2da39f9b
change name of the location
|
4 years ago |
|
rachels
|
7e02983c21
fix missing ss
|
4 years ago |
|
Gwen
|
8766cf29cb
[Added] one additional picture for when makeup witth compact mirror
|
4 years ago |
|
KevinSmarts
|
44b427acae
Merge remote-tracking branch 'Alaratt/master'
|
4 years ago |
|
Alaratt
|
586255e52f
[Added] Major Apartment revamp for Lariska - too many changes to name all of them
|
4 years ago |
|
Gwen
|
e075c4f177
[Changed] the image directory path and the image called
|
4 years ago |
|
rachels
|
fd4248b697
Add new style mirror coded by Good Raptor (once more)
|
4 years ago |
|
rachels
|
3f554e6f4a
fix typo in name
|
4 years ago |
|
Gwen
|
274f0462a1
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
4 years ago |
|
KevinSmarts
|
0d5fd17d16
[added] New attribute files for G&M outfits/dresses, new misc category for outfits that are not from any existing shops
|
4 years ago |
|
KevinSmarts
|
396d0b8cd7
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
4 years ago |
|
KevinSmarts
|
44c8e7940d
Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes'
|
4 years ago |
|
Gwen
|
8c0b25a0d4
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
4 years ago |
|
rachels
|
5c40e37f28
Add new style mirror coded by Good Raptor
|
4 years ago |
|
Gwen
|
4457f131af
[Added] more images to differentiate between checking yourself, makeup and brush hair
|
4 years ago |
 Spackled Lanturn
|
91d93380a0
[fixed] updated condition when enable_tablemap is false to match condition when enable_tablemap is true after confirming with Kevin_Smarts and Rachels that this is the correct condition. also removed "relationship above 30 and hour between 14 and 23 on a weekday" condition because there is also a "hour between 14 and 23 on a weekday" condition that it is OR'd with so it is redundant
|
4 years ago |
|
Spackled Lanturn
|
c67716313f
[fixed] resolved most inconsistencies where logic was different depending on whether enable_tablemap is true (exception is the different access conditions in pav_complex for accessing the Shulgin families apartment as still need to determine which condition is correct), fixed a line where the variable for the number of columns to pass to show_table wasn't populated in city_residential, and fixed some spelling/grammar issues in the various enable_tablemap code blocks
|
4 years ago |
|
KevinSmarts
|
ff6f9d2f69
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
4 years ago |
 Kevin_Smarts
|
d260894805
Merge branch 'master' of alisolarflare/glife into master
|
4 years ago |
|
Spackled Lanturn
|
95ce74d1a0
[fixed] correct trigger in tablemap version. non tablemap version was fixed in https://git.catrenelle.com/Kevin_Smarts/glife/commit/8053d945618ab826598ce6cca5c03bb9013c3b5a
|
4 years ago |
|
rachels
|
7604cae035
remove first part of unused npc attributes
|
4 years ago |
