Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
87a02cc
renpy is up
fayefzhang Oct 29, 2022
078f3ce
Create bg crime scene.png
cyu2019 Oct 29, 2022
a7d5ddb
Create bg courtroom.png
cyu2019 Oct 29, 2022
264cb0b
more bgs
cyu2019 Oct 29, 2022
f7e7499
some bgms
cyu2019 Oct 29, 2022
2354329
guard char assets
cyu2019 Oct 29, 2022
25960f9
yoink this is like part 1 and 2 of the story
fayefzhang Oct 29, 2022
2fe5c5f
Merge branch 'master' of https://github.com/cyu2019/UpgradeGameJam
fayefzhang Oct 29, 2022
91abba7
removed backgoroudns on guard
cyu2019 Oct 29, 2022
f3b029a
Merge branch 'master' of https://github.com/cyu2019/UpgradeGameJam
cyu2019 Oct 29, 2022
c44b25b
Update script.rpy
fayefzhang Oct 29, 2022
5215688
Merge branch 'master' of https://github.com/cyu2019/UpgradeGameJam
fayefzhang Oct 29, 2022
aa9a0a8
Add Day2
zedward23 Oct 30, 2022
434de22
day1c
cyu2019 Oct 30, 2022
f5dcab7
day 1
fayefzhang Oct 30, 2022
64c6bfc
Merge branch 'master' of https://github.com/cyu2019/UpgradeGameJam
fayefzhang Oct 30, 2022
8a5a939
adding names
fayefzhang Oct 30, 2022
beba2c3
day 2b
cyu2019 Oct 30, 2022
3fc13dc
Merge branch 'master' of https://github.com/cyu2019/UpgradeGameJam
cyu2019 Oct 30, 2022
7613892
finished day1b
fayefzhang Oct 30, 2022
907948f
Merge branch 'master' of https://github.com/cyu2019/UpgradeGameJam
fayefzhang Oct 30, 2022
15c83b9
fixes for compilation
fayefzhang Oct 30, 2022
a4ea5cf
Update script.rpy
fayefzhang Oct 30, 2022
95ee949
update logic
fayefzhang Oct 30, 2022
d1ad839
Day2 branches
zedward23 Oct 30, 2022
deb3d3a
Revisions
cyu2019 Oct 30, 2022
7afdec7
more stuff for day 3b & logic
fayefzhang Oct 30, 2022
e845476
Merge branch 'master' of https://github.com/cyu2019/UpgradeGameJam
fayefzhang Oct 30, 2022
1e069e4
gUARD EVIL
cyu2019 Oct 30, 2022
9c078a7
Merge branch 'master' of https://github.com/cyu2019/UpgradeGameJam
cyu2019 Oct 30, 2022
fe88ce4
Update guard EVIL.png
cyu2019 Oct 30, 2022
0d48faf
easy jump
fayefzhang Oct 30, 2022
44661e6
Merge branch 'master' of https://github.com/cyu2019/UpgradeGameJam
fayefzhang Oct 30, 2022
7e70c76
compilation fix update
fayefzhang Oct 30, 2022
988f883
Day3 changes
zedward23 Oct 30, 2022
6ee5aeb
more conditionals
fayefzhang Oct 30, 2022
ad6e4f1
woops
fayefzhang Oct 30, 2022
1dd1ff9
effort to restore
fayefzhang Oct 30, 2022
dd793a7
zuru
fayefzhang Oct 30, 2022
edfaac6
fix character pos
fayefzhang Oct 30, 2022
dcc7576
option update
fayefzhang Oct 30, 2022
1cfd749
gui update
fayefzhang Oct 30, 2022
21f45ab
more stuff!! LETS GOOOO
fayefzhang Oct 30, 2022
000abe4
adding emotion to edward's passages, thanks zedward
fayefzhang Oct 30, 2022
6ac6396
lil edit
fayefzhang Oct 30, 2022
246118f
cleanup + adding effects :)
fayefzhang Oct 30, 2022
7d0da7b
:')
fayefzhang Oct 30, 2022
fdca1c9
cleanup
fayefzhang Oct 30, 2022
c93f310
added different main menu graphics
fayefzhang Oct 30, 2022
a37ebe3
some sounds for now
cyu2019 Oct 30, 2022
77abc05
cropping + zuru sprites
fayefzhang Oct 30, 2022
6e470d5
soudsn
cyu2019 Oct 30, 2022
71e217e
Merge branch 'master' of https://github.com/cyu2019/UpgradeGameJam
cyu2019 Oct 30, 2022
9f08e69
some sounds added
cyu2019 Oct 30, 2022
0b649cf
sfx
fayefzhang Oct 30, 2022
7283931
Merge branch 'master' of https://github.com/cyu2019/UpgradeGameJam
fayefzhang Oct 30, 2022
2814911
compilation fix + naming edits
fayefzhang Oct 30, 2022
2d359b3
efawfvwaoijw
cyu2019 Oct 30, 2022
a2e96ac
Merge branch 'master' of https://github.com/cyu2019/UpgradeGameJam
cyu2019 Oct 30, 2022
76db16b
Audio Credits
cyu2019 Oct 30, 2022
75b281c
man
fayefzhang Oct 30, 2022
8caec72
Merge branch 'master' of https://github.com/cyu2019/UpgradeGameJam
fayefzhang Oct 30, 2022
b4cf5c0
builded
fayefzhang Oct 30, 2022
4f30d20
adding build zip
fayefzhang Oct 30, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
/[Ll]ogs/
/[Uu]ser[Ss]ettings/

/renpy/Mansplain_Manipulate_Manslaughter-1.0-dists/Mansplain_Manipulate_Manslaughter-1.0-win

# MemoryCaptures can get excessive in size.
# They also could contain extremely sensitive data
/[Mm]emoryCaptures/
Expand Down
Binary file not shown.
8 changes: 8 additions & 0 deletions renpy/Trick/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"files.exclude": {
"**/*.rpyc": true,
"**/*.rpa": true,
"**/*.rpymc": true,
"**/cache/": true
}
}
10 changes: 10 additions & 0 deletions renpy/Trick/errors.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
I'm sorry, but errors were detected in your script. Please correct the
errors listed below, and try again.


File "game/script.rpy", line 467: Line is indented, but the preceding say statement statement does not expect a block. Please check this line's indentation.
"{i}(...and my will to live to be honest.){/i}"
^

Ren'Py Version: Ren'Py 8.0.3.22090809
Sun Oct 30 02:36:22 2022
Binary file added renpy/Trick/game/audio/bird.ogg
Binary file not shown.
Binary file added renpy/Trick/game/audio/bird_crowd.mp3
Binary file not shown.
Binary file added renpy/Trick/game/audio/caw.mp3
Binary file not shown.
Binary file added renpy/Trick/game/audio/cover.mp3
Binary file not shown.
Binary file added renpy/Trick/game/audio/flapping.mp3
Binary file not shown.
Binary file added renpy/Trick/game/audio/gong.mp3
Binary file not shown.
Binary file added renpy/Trick/game/audio/gulp.mp3
Binary file not shown.
Binary file added renpy/Trick/game/audio/hiss.mp3
Binary file not shown.
Binary file added renpy/Trick/game/audio/light_thump.mp3
Binary file not shown.
Binary file added renpy/Trick/game/audio/loud_thump.mp3
Binary file not shown.
Binary file added renpy/Trick/game/audio/rattle.mp3
Binary file not shown.
Binary file added renpy/Trick/game/audio/snake.ogg
Binary file not shown.
Binary file added renpy/Trick/game/audio/squeak.mp3
Binary file not shown.
Binary file added renpy/Trick/game/audio/struggling.mp3
Binary file not shown.
Binary file added renpy/Trick/game/cache/bytecode.rpyb
Binary file not shown.
Binary file added renpy/Trick/game/cache/py3analysis.rpyb
Binary file not shown.
Binary file added renpy/Trick/game/cache/screens.rpyb
Binary file not shown.
9 changes: 9 additions & 0 deletions renpy/Trick/game/cache/shaders.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
renpy.solid
renpy.alpha renpy.geometry renpy.texture
renpy.ftl
renpy.geometry renpy.texture
renpy.dissolve renpy.dissolve
renpy.dissolve renpy.geometry
renpy.geometry renpy.solid
renpy.alpha renpy.texture
renpy.texture
Expand Down
Loading