SashLilac
/
cambridge
mirror of https://github.com/SashLilac/cambridge.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
633 Commits
4 Branches
44 Tags
161 MiB
Commit Graph

633 Commits (c1693524d797ac0a02b2e9564c10e98d2aa24833)

Author SHA1 Message Date
Ishaan Bhardwaj c1693524d7 Credits change 2021-11-30 20:08:52 -05:00
Ishaan Bhardwaj a063f10d33 Merge branch 'master' of https://github.com/MillaBasset/cambridge 2021-11-23 22:56:19 -05:00
Ishaan Bhardwaj 6e0b5e27c1 Rearranged the spawn SE actions 2021-11-23 22:56:11 -05:00
Joe Zeng 18e0e02c76
Removed a stupid exception to the mixing-tabs-and-spaces rule. 
I apologize that it took me 2 years to think of this workaround.
 2021-11-09 14:48:05 -05:00
Ishaan Bhardwaj 9381091110 Updated 3694 -> 3701 in other places 2021-11-03 17:34:34 -04:00
Ishaan Bhardwaj deb69fe28d
Merge pull request #43 from Kirby703/patch-5 
tap roll 3694 -> 3701 frames
 2021-11-03 17:32:43 -04:00
Kirby703 3085b765e5
fix roll 3694 -> 3701 frames 2021-11-03 17:31:04 -04:00
hailey 412405c1a1 celebrate!!! 2021-10-22 15:04:28 +10:00
Ishaan Bhardwaj 7495c4ad04 Revert "Separate in-game bindings from menu bindings" 
This reverts commit 0fce4b632f.
This commit caused issue #41. Will resolve ASAP.
 2021-10-21 20:52:42 -04:00
Ishaan Bhardwaj 0fce4b632f Separate in-game bindings from menu bindings 
Also preemptive version bump
 2021-10-19 18:35:32 -04:00
Ishaan Bhardwaj aa56248e34 Add an FPS counter 2021-10-18 23:27:54 -04:00
nightmareci 0a2e16ab2c Merge branch 'master' of https://github.com/SashLilac/cambridge 2021-10-17 08:52:15 -07:00
nightmareci 34d53c82cb Preliminary work to change from DiscordRPC to Discord GameSDK 2021-10-17 08:51:34 -07:00
Ishaan Bhardwaj 75ee07a04d
Merge pull request #35 from MarkGamed7794/origin/sound-effect-rework 
Add some new behavior to sound effects
 2021-10-17 11:42:45 -04:00
Ishaan Bhardwaj d2d710ead6 Bump version to v0.3 + title screen change!!! 2021-10-17 00:34:30 -04:00
Ishaan Bhardwaj 6f4adf5aad Refactored component API for rulesets with an arbitary... 
...number of pieces (fixes #31)
 2021-10-16 20:35:47 -04:00
Ishaan Bhardwaj 42f872a557 Oops, indenting fix in main.lua 2021-10-16 19:10:33 -04:00
Ishaan Bhardwaj a30791afc3 Fixed F2 shortcut not resetting changed settings 2021-10-16 19:08:01 -04:00
Ishaan Bhardwaj 8bd8c0eede Relocated call of `love.graphics.setDefaultFilter` to `love.load` 2021-10-16 15:15:44 -04:00
Ishaan Bhardwaj f52a5eaee5 Fixes an issue where IHS ignores buffer lock setting 2021-10-12 22:46:50 -04:00
Ishaan Bhardwaj e68a9b6f07
Merge pull request #38 from Kirby703/patch-4 
removes green/orange line to match tap death
 2021-10-09 21:27:07 -04:00
Kirby703 ff5b04bb97
removes green/orange line to match tap death 2021-10-09 16:52:26 -04:00
Ishaan Bhardwaj 8dbb75cbef Basic SOCD handling 2021-10-08 20:07:28 -04:00
Ishaan Bhardwaj bc54bc57b6 Changed Display Gamemode to Debug Info 
Cambridge version will display at all times if on
 2021-10-08 20:06:36 -04:00
Ishaan Bhardwaj 9611fc31bf update version to wip 2021-10-08 19:07:06 -04:00
Ishaan Bhardwaj a5fed31f4e Moved the LCA draw call to after the piece draw call 2021-10-02 20:14:03 -04:00
Ishaan Bhardwaj 625d4f80af Fixed an obscure bug with the menu DAS 2021-09-30 23:07:03 -04:00
Ishaan Bhardwaj 173b3ddbc9
Merge pull request #37 from terpyderp/master 
fixed version color change bug
 2021-09-29 19:43:49 -04:00
terpyderp 0f96bf7db0 fixed version color change bug 
The version number will no longer change color on game over. ( Or whenever you use love.graphics.setColor(). )
 2021-09-29 18:22:56 -05:00
Ishaan Bhardwaj 3770deca55 Fixed version number drawing in the wrong place 2021-09-29 18:12:02 -04:00
Ishaan Bhardwaj 4e297a8030 Version number now displays at bottom right always 2021-09-28 19:13:16 -04:00
Ishaan Bhardwaj 1336ea00e4 Snow RPC now used 2021-09-26 23:12:05 -04:00
hailey b8d43e38b7 2 cool rpc changes! 2021-09-27 12:26:52 +10:00
hailey 6b595d2146 Merge branch 'master' of https://github.com/MillaBasset/cambridge 2021-09-27 12:18:31 +10:00
hailey 1082a2903a small image text now shows version! 2021-09-27 12:09:03 +10:00
hailey 3480734a44 just a few more rpc strings 2021-09-27 11:55:42 +10:00
Ishaan Bhardwaj 82966e99c3 Added two more utility functions 2021-09-26 20:12:38 -04:00
Ishaan Bhardwaj d558faeef0 Fixed RPC details for some scenes 2021-09-26 15:30:37 -04:00
Ishaan Bhardwaj 8dc59a562e Revert "new easter egg, why not" 
This easter egg doesn't really have a place within the game,
and is better left as a community goodie.
 2021-09-26 10:38:48 -04:00
Ishaan Bhardwaj 2fa9ba40fa hey hailey don't do that please 2021-09-26 10:26:35 -04:00
hailey a7ee1d7861 new easter egg, why not 2021-09-26 14:30:12 +10:00
hailey bf6c61927e Removed print() that occured every game scene update 2021-09-26 14:09:43 +10:00
hailey 817ffd5c13 RPC image updates depending on ingame background now! 2021-09-26 14:02:35 +10:00
Ishaan Bhardwaj 50f6010ed1 Credits scene now has its own special RPC 2021-09-25 22:46:48 -04:00
Ishaan Bhardwaj ef966d8190 Merge branch 'master' of https://github.com/MillaBasset/cambridge 2021-09-25 22:40:18 -04:00
Ishaan Bhardwaj faef1ddc8f Added a long lost name to the credits scene 2021-09-25 22:38:00 -04:00
hailey ea38ebb89d more rpc stuff! 2021-09-26 09:51:43 +10:00
hailey b28759e0c8 hi again 2021-09-26 09:33:04 +10:00
Ishaan Bhardwaj 2fc763ae5d
Bump version to v0.3-beta7 2021-09-21 23:44:37 -04:00
Ishaan Bhardwaj ffd808e6a0 Added white and black as their own separate colors... 
... instead of borrowing from the lock flash / garbage colors
 2021-09-21 23:30:51 -04:00