Compare commits

..

No commits in common. "923f3d36966f0b84d983405167544ae2fb0825a6" and "c58018dd51c0d63db33fe36606e63598eef706c6" have entirely different histories.

4 changed files with 9 additions and 14 deletions

View File

@ -1,4 +1,4 @@
Copyright (c) 2018-2021 Joe Zeng, Ishaan Bhardwaj Copyright (c) 2018-2019 Joe Zeng
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

View File

@ -105,7 +105,6 @@ Other Notable Games
- [TETR.IO](https://tetr.io) by osk - [TETR.IO](https://tetr.io) by osk
- [Master of Blocks](https://discord.gg/72FZ49mjWh) by Phoenix Flare - [Master of Blocks](https://discord.gg/72FZ49mjWh) by Phoenix Flare
- [Spirit Drop](https://rayblastgames.com/spiritdrop.php) by RayRay26 - [Spirit Drop](https://rayblastgames.com/spiritdrop.php) by RayRay26
- [Puzzle Trial](https://kagamine-rin.itch.io/puzzle-trial) by Rin
- [stackfuse](https://github.com/sinefuse/stackfuse) by sinefuse - [stackfuse](https://github.com/sinefuse/stackfuse) by sinefuse
![Cambridge Logo](https://cdn.discordapp.com/attachments/625496179433668635/763363717730664458/Icon_2.png) ![Cambridge Logo](https://cdn.discordapp.com/attachments/625496179433668635/763363717730664458/Icon_2.png)

View File

@ -5,7 +5,7 @@ CreditsScene.title = "Credits"
function CreditsScene:new() function CreditsScene:new()
self.frames = 0 self.frames = 0
-- higher = slower -- higher = slower
self.scroll_speed = 1.85 self.scroll_speed = 1.9
switchBGM("credit_roll", "gm3") switchBGM("credit_roll", "gm3")
end end
@ -34,14 +34,14 @@ function CreditsScene:render()
love.graphics.setFont(font_3x5_4) love.graphics.setFont(font_3x5_4)
love.graphics.print("Cambridge Credits", 320, 500 - offset) love.graphics.print("Cambridge Credits", 320, 500 - offset)
love.graphics.print("THANK YOU\nFOR PLAYING!", 320, math.max(2030 - offset, 240)) love.graphics.print("THANK YOU\nFOR PLAYING!", 320, math.max(2010 - offset, 240))
love.graphics.setFont(font_3x5_3) love.graphics.setFont(font_3x5_3)
love.graphics.print("Game Developers", 320, 550 - offset) love.graphics.print("Game Developers", 320, 550 - offset)
love.graphics.print("Project Heads", 320, 640 - offset) love.graphics.print("Project Heads", 320, 640 - offset)
love.graphics.print("Notable Game Developers", 320, 730 - offset) love.graphics.print("Notable Game Developers", 320, 730 - offset)
love.graphics.print("Special Thanks", 320, 1000 - offset) love.graphics.print("Special Thanks", 320, 980 - offset)
love.graphics.print("- Milla", 320, math.max(2110 - offset, 320)) love.graphics.print("- Milla", 320, math.max(2090 - offset, 320))
love.graphics.setFont(font_3x5_2) love.graphics.setFont(font_3x5_2)
love.graphics.print("Oshisaure\nJoe Zeng", 320, 590 - offset) love.graphics.print("Oshisaure\nJoe Zeng", 320, 590 - offset)
@ -51,7 +51,7 @@ function CreditsScene:render()
"Electra - ZTrix\nFelicity/nightmareci/kdex - Shiromino\n" .. "Electra - ZTrix\nFelicity/nightmareci/kdex - Shiromino\n" ..
"Mine - Tetra Online\nMrZ - Techmino\nosk - TETR.IO\n" .. "Mine - Tetra Online\nMrZ - Techmino\nosk - TETR.IO\n" ..
"Phoenix Flare - Master of Blocks\nRayRay26 - Spirit Drop\n" .. "Phoenix Flare - Master of Blocks\nRayRay26 - Spirit Drop\n" ..
"Rin - Puzzle Trial\nsinefuse - stackfuse", "sinefuse - stackfuse",
320, 770 - offset 320, 770 - offset
) )
love.graphics.print( love.graphics.print(
@ -69,7 +69,7 @@ function CreditsScene:render()
"Tetra Legends Discord\nTetra Online Discord\nMultimino Discord\n" .. "Tetra Legends Discord\nTetra Online Discord\nMultimino Discord\n" ..
"Hard Drop Discord\nRusty's Systemspace\nCambridge Discord\n" .. "Hard Drop Discord\nRusty's Systemspace\nCambridge Discord\n" ..
"And to you, the player!", "And to you, the player!",
320, 1040 - offset 320, 1020 - offset
) )
end end

View File

@ -900,11 +900,6 @@ end
function GameMode:drawCustom() end function GameMode:drawCustom() end
function GameMode:drawIfPaused()
love.graphics.setFont(font_3x5_3)
love.graphics.printf("GAME PAUSED!", 64, 160, 160, "center")
end
-- transforms specified in here will transform the whole screen -- transforms specified in here will transform the whole screen
-- if you want a transform for a particular component, push the -- if you want a transform for a particular component, push the
-- default transform by using love.graphics.push(), do your -- default transform by using love.graphics.push(), do your
@ -935,8 +930,9 @@ function GameMode:draw(paused)
) )
end end
love.graphics.setFont(font_3x5_3)
if paused then if paused then
self:drawIfPaused() love.graphics.printf("GAME PAUSED!", 64, 160, 160, "center")
end end
if self.completed then if self.completed then