 rachels
|
86959aad7c
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife.git
|
2 gadi atpakaļ |
|
rachels
|
18ced3eed4
add nerd game chat and more like sms invitation
|
2 gadi atpakaļ |
 Kevin_Smarts
|
e84d3798e7
[fixes] A few more fixes and tweaks. Should all be working now
|
2 gadi atpakaļ |
|
Kevin_Smarts
|
71d6be9964
[fixed] Body_shape rename updated in city initialization
|
2 gadi atpakaļ |
|
Kevin_Smarts
|
1afe6db43c
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
2 gadi atpakaļ |
|
Kevin_Smarts
|
bad08589d5
[added] New begin selector and various changes but need to commit them first so I can pull rachels fixes so I can test it further
|
2 gadi atpakaļ |
|
rachels
|
d4d5a6cc83
fix typos and simplify the elseif conditions
|
2 gadi atpakaļ |
|
rachels
|
176bbfc233
fix typos
|
2 gadi atpakaļ |
|
Kevin_Smarts
|
a711cd7ffe
Merge remote-tracking branch 'ADCSux/master'
|
2 gadi atpakaļ |
 ADCSux
|
a628f6dc23
[Fixed] Fixed Niko dates in table view
|
2 gadi atpakaļ |
 bgkjdgbizgblzdgbr
|
8ef90debbe
Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife
|
2 gadi atpakaļ |
|
bgkjdgbizgblzdgbr
|
8ebddc49ff
[changed] The gossip in the school halway will now use the gossip pictures instead of the hallway picture for the morning gossip. Also fixed it such that you will only hear each dyle rumor once.
|
2 gadi atpakaļ |
|
ADCSux
|
bdad598487
Merge branch 'working'
|
2 gadi atpakaļ |
|
ADCSux
|
68fe7fbaad
[Fixed] Fixed city hotel pictures
|
2 gadi atpakaļ |
|
ADCSux
|
0ea00cb8ea
[Fixed] Fixed room description at Pav hotel
|
2 gadi atpakaļ |
|
ADCSux
|
52cf553815
[Added] Added a feature to rent a room at the hotel in city center
|
2 gadi atpakaļ |
|
ADCSux
|
097c679a17
[Refactored] Refactored renting a room feature at pav hotel so it can be reused
|
2 gadi atpakaļ |
|
ADCSux
|
3dfb1f771f
[Renamed] Renamed Pav hotel file names to make it more clear
|
2 gadi atpakaļ |
|
ADCSux
|
1fc02d70f4
[Renamed] Renamed hotel.qsrc to city_hotel.qsrc to avoid confusion with pav hotel
|
2 gadi atpakaļ |
|
Kevin_Smarts
|
abe2e52852
Merge remote-tracking branch 'ADCSux/master'
|
2 gadi atpakaļ |
|
Kevin_Smarts
|
be158dcd72
Merge remote-tracking branch 'Gwen/master'
|
2 gadi atpakaļ |
|
Kevin_Smarts
|
003828128e
Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master'
|
2 gadi atpakaļ |
|
Kevin_Smarts
|
df0e716dc7
Merge remote-tracking branch 'Anya/master'
|
2 gadi atpakaļ |
|
Kevin_Smarts
|
b2e1fbbdcb
[added] More intros and several changes. Got to fix some links and check some stuff before I can replace the begin file.
|
2 gadi atpakaļ |
|
ADCSux
|
1af039a071
Merge branch 'working'
|
2 gadi atpakaļ |
|
ADCSux
|
7029f184ee
[Renamed] Renamed body_shape.qsrc to body to now reflect all updates regarding body now happen in body.qsrc
|
2 gadi atpakaļ |
|
ADCSux
|
839b73a270
[Renamed] Renamed body.qsrc to AppearanceSystem.qsrc to reflect on what the file does
|
2 gadi atpakaļ |
|
rachels
|
7a0d4c2e8f
fix typos
|
2 gadi atpakaļ |
|
rachels
|
2cba65c541
no changes, just cleaning (extra spaces,tabs)
|
2 gadi atpakaļ |
|
rachels
|
806cf8fc86
fix if elseif section
|
2 gadi atpakaļ |
