Commit Graph

625 Commits

Author SHA1 Message Date
059a1381bb Remove the Nth times the style was redefined
DO NOT REDEFINE STYLES MULTIPLE TIMES
DO NOT REDEFINE STYLES MULTIPLE TIMES
DO NOT REDEFINE STYLES MULTIPLE TIMES
DO NOT REDEFINE STYLES MULTIPLE TIMES
DO NOT REDEFINE STYLES MULTIPLE TIMES
2021-07-11 11:12:11 +10:00
30df22db5d merge 2021-07-11 10:53:54 +10:00
fce061e138 Merge remote-tracking branch 'origin/Monster-Update-6' into lazysnake/feature/ISSUE-3_CG_Gallery 2021-07-11 10:51:29 +10:00
87c6665084 Remove unused CG 2021-07-11 10:42:16 +10:00
8117fa1981 loadGallery SDK Fix & seen_image 2021-07-11 10:40:15 +10:00
d2ecb69f1c finish ch2 first pass, add SFX from gdrive 2021-07-10 19:29:47 +01:00
cc86a7e3f0 Fix indentation 2021-07-10 09:12:11 +10:00
fbd3eacc33 add yet another missing sound effect 2021-07-09 21:04:13 +01:00
daef7af4e6 HOTFIX: ignore remote update is versname is "TEST", less naggy autoup 2021-07-09 01:42:04 -05:00
c619a98e7a Merge branch 'Patchy-Patch5' into updates 2021-07-09 04:27:31 +00:00
6f75382f66 add missing ambient track 2021-07-08 23:46:53 +01:00
9e19298144 stash ch2 changes 2021-07-08 23:10:54 +01:00
9fa26bc67b Misc template fix 2021-07-06 14:25:16 +10:00
0c4aab6858 Namebox is default long 2021-07-05 10:14:46 +10:00
0959d0f275 Documentation for modders & empty create directory 2021-07-05 10:06:55 +10:00
cd780dfa36 Clean up Mod Menu and other details 2021-07-05 09:35:56 +10:00
400d305f23 Change Mods folder struct, everything is contained 2021-07-05 04:37:26 +10:00
528be7f2c8 clean up 2021-07-04 19:06:52 +01:00
d439bfc005 move CTC indicator to end of text 2021-07-04 16:49:16 +01:00
3a41a71118 Merge branch 'Monster-Update-6' into chapter-1-choreo
# Conflicts:
#	game/script.rpy
2021-07-04 16:37:03 +01:00
8b980c00c0 make CTC indicator less intrusive 2021-07-04 16:33:50 +01:00
19bad8b682 mix up slapstick SFX 2021-07-04 16:18:46 +01:00
1c49e00b94 replace classroom anxiety SFX 2021-07-04 16:00:51 +01:00
76e3212bf1 Remove trailing backspaces & vbox instead of grid 2021-07-04 19:51:24 +10:00
c1e7fd2bbf Add Error Message for not having Mods 2021-07-04 19:00:39 +10:00
f9edccabd4 Add Mod Support 2021-07-04 16:21:04 +10:00
409a84d1b7 Change yoffset magic number to variable 2021-07-04 10:28:52 +10:00
981b7df998 crunch some sounds 2021-07-03 20:41:06 +01:00
5335540d0b remove unused effect 2021-07-03 18:39:32 +01:00
c3c7b3b753 add missing punch to Naser's outburst 2021-07-03 17:08:48 +01:00
f7db5fb407 Merge branch 'Monster-Update-6' into chapter-1-choreo
# Conflicts:
#	game/script.rpy
2021-07-03 15:52:39 +01:00
0df8dd9f94 fix line in canteen scene 2021-07-03 15:44:06 +01:00
7832a18822 more ch1 tweaks before looking at ch2 2021-07-03 15:34:06 +01:00
9290b34829 add missing scene after bench scene, SFX uplift 2021-07-03 14:02:55 +01:00
f332a988c2 minor fixes 2021-07-03 14:33:50 +02:00
2cba3b2be1 added cg unlocks 2021-07-03 14:29:38 +02:00
81cd41ac9a slightly better panning for gallery items 2021-07-03 13:57:10 +02:00
dfc3a2263e gallery opened cg panning vol1, code cleanup 2021-07-03 13:40:34 +02:00
3441dbdbf5 cg button scaling, code cleanup 2021-07-03 12:42:12 +02:00
e19566dfa8 replace bell sound 2021-07-03 10:12:53 +01:00
d44edb546e Delete unused assets 2021-07-03 17:08:50 +10:00
c84be31c37 conflict resolution 2021-07-03 09:03:47 +02:00
4f707ff8f4 Merge remote-tracking branch 'staging/Patchy-Patch5' into feature/ISSUE-3_CG_Gallery
# Conflicts:
#	game/screens.rpy
#	game/script.rpy
2021-07-03 09:03:33 +02:00
385b25c7d7 Merge remote-tracking branch 'staging/master' into feature/ISSUE-3_CG_Gallery 2021-07-03 09:01:27 +02:00
a8da4e16d2 Merge remote-tracking branch 'origin/Patchy-Patch5' into feature/ISSUE-3_CG_Gallery 2021-07-03 09:01:07 +02:00
40686cf245 Adjust Input prompt around OSK 2021-07-03 16:51:13 +10:00
6ac6fb8b44 Dialogue uses more width and slightly large font size 2021-07-03 12:12:11 +10:00
b774c119f8 Disable editing page values 2021-07-03 09:23:18 +10:00
586f446408 Delete Save System 2021-07-03 09:18:22 +10:00
f789c784d8 Replace Menu Button Asset 2021-07-03 09:18:05 +10:00