SashLilac/cambridge
1
0
Fork 0
mirror of https://github.com/SashLilac/cambridge.git synced 2024-11-22 08:39:03 -06:00
Code Issues Projects Releases Wiki Activity
723 Commits 4 Branches 44 Tags 161 MiB
c693871621
Commit Graph

158 Commits

Author SHA1 Message Date
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
42375cb2b8 Changed mode select DAS to 15/4 (old 24/6) 2021-09-16 18:05:38 -04:00
Ishaan Bhardwaj
fe162ed215 Mode select changes (read below) 
Added DAS to the up/down actions (24F start-up, 6F period)
Added wheel scroll to the up/down/left/right actions
Added a warning in case somehow the player has no modes or rulesets
Mode select will load new modules every time you access it
However, this does not reload changes to existing modules
 2021-09-16 14:54:49 -04:00
Ishaan Bhardwaj
db4132bf31 License update, added more credits 2021-08-19 14:15:57 -04:00
Ishaan Bhardwaj
40cba83003 Fixed a bug with the volume sliders... 
...where the SFX that played upon changing the slider's value...
...reflected the old value instead of the new one.
 2021-08-04 16:46:41 -04:00
Ishaan Bhardwaj
9fbfbd5cda Refined and cleaned up buffer drop input functionality 2021-07-11 17:10:51 -04:00
Ishaan Bhardwaj
7dbfe23059 Bump version to beta6 (also closes #19) 2021-07-11 14:04:22 -04:00
Ishaan Bhardwaj
61d5410f22 Prevent mapping the same key to two controls (fixes #20) 2021-07-11 13:53:27 -04:00
Ishaan Bhardwaj
8fb01dc9a8 Another credits update 2021-07-05 22:09:06 -04:00
Ishaan Bhardwaj
61de3c6dbf Miscellaneous fixes to piece behavior in addition to fixing prev. commit 2021-06-26 16:27:33 -04:00
Ishaan Bhardwaj
a8ac8f5966 Whoops forgot a contributor, fixed 2021-06-15 21:47:38 -04:00
Ishaan Bhardwaj
a5032386e6 Small update to a contributor's name 2021-06-14 23:55:36 -04:00
Ishaan Bhardwaj
264255290d Credit bump! 2021-06-14 23:53:14 -04:00
Ishaan Bhardwaj
f2acab4496 A few minor changes, read below 
Clean up big pieces for a temporary hotfix, an overhaul soon to come
Refactored BGM and SE playing
Moved draw code completely into gamemode - mod makers can now control everything on screen
 2021-06-09 20:15:37 -04:00
Ishaan Bhardwaj
366ac1d552 Update credits.lua 2021-05-23 17:37:38 -04:00
Ishaan Bhardwaj
62f9475fa9 Small cosmetic change to input config menus 2021-05-21 15:32:28 -04:00
Ishaan Bhardwaj
99d3732d00 Bump to v0.3-beta5.1, release tomorrow 2021-05-20 23:25:24 -04:00
Ishaan Bhardwaj
449ca16bc4 Updated to be on rebrand 2021-04-01 14:11:38 -04:00
Ishaan Bhardwaj
d9b6c85704 Fix up credits a bit, add new people 2021-03-28 10:03:27 -04:00
Ishaan Bhardwaj
6ecea7edb1 Fixed an issue where axes would not detect left or up 2021-03-07 16:03:02 -05:00
Ishaan Bhardwaj
163b8f6cc5 Added a version display 2021-03-03 10:33:10 -05:00
Ishaan Bhardwaj
ba235c8a41 Credits update <3 2021-02-28 18:40:53 -05:00
Ishaan Bhardwaj
ca18d090c9 Split keyboard and joystick input config screens 2021-02-25 14:41:13 -05:00
Ishaan Bhardwaj
a3a27d2566 Refactored joystick input handling 2021-02-24 16:58:42 -05:00
Ishaan Bhardwaj
b15cd9802f Updated DAS last key setting to not use hacky workaround 
DAS last key is off by default
 2021-02-22 21:43:01 -05:00
Ishaan Bhardwaj
1dfe68ccff onExit call for exiting prematurely 2021-02-19 15:58:00 -05:00
Ishaan Bhardwaj
8a459b68ba Allowed gamemode and ruleset objects to control each other 
Also added GameMode:onExit(), which triggers on game exit or retry
 2021-02-19 11:01:18 -05:00
Ishaan Bhardwaj
8f19c73e2a Simultaneous keyboard and joystick inputs implemented! 
Implements #9!!!
 2021-02-18 12:00:57 -05:00
Ishaan Bhardwaj
cdd846c3e6 Made the volume sliders scroll more consistently 2021-02-13 22:00:45 -05:00
Ishaan Bhardwaj
a047e51681 Framework for custom line clear animations added 
Colored fadeout is the default
 2021-02-10 18:35:51 -05:00
Ishaan Bhardwaj
d0505251b3 Spawn positions now ruleset dependent 
Is configurable in options
 2021-02-08 23:23:50 -05:00
Ishaan Bhardwaj
086f327371 Large commit, read below 
DAS Cut Delay added and configurable (like ARR and DAS)
BigInt lib added
IRS / IHS do not take effect when ARE = 0
Game now saves highscore correctly on game over
 2021-01-24 14:55:35 -05:00
Ishaan Bhardwaj
01e91fbd93 Fixes issues with retrying modes with BGM 2021-01-16 09:34:41 -05:00
Ishaan Bhardwaj
e20eb048c8 Game over animation (customizable per mode) 2021-01-14 21:51:47 -05:00
Ishaan Bhardwaj
3f8d68cc9d Small game / settings fix 2021-01-12 14:32:10 -05:00
Ishaan Bhardwaj
6639d73c1c Spawn positions are now configurable 2021-01-12 13:47:03 -05:00
Ishaan Bhardwaj
668f061077 Fixed drawing frame on non-standard grids 2021-01-11 22:40:48 -05:00
Ishaan Bhardwaj
cb70967b82 Default field graphic fix 2021-01-11 15:52:11 -05:00
Ishaan Bhardwaj
0c2ba5f0cc Custom field heights implemented 2021-01-11 15:46:43 -05:00
Ishaan Bhardwaj
2de13a97f0 10-wide graphic restored 2021-01-11 15:17:32 -05:00
Ishaan Bhardwaj
0f09d47e60 Init arbitrary widths 2021-01-10 22:40:13 -05:00
Ishaan Bhardwaj
c0888c484f Fixed the first easter egg 2021-01-08 20:33:44 -05:00
Ishaan Bhardwaj
5076adf022 Secret inputs fix 2021-01-08 13:59:42 -05:00
Ishaan Bhardwaj
b732ebb213 Credits scene no longer plays while not focused 2021-01-06 16:10:01 -05:00
Ishaan Bhardwaj
84634d6933 Added an option to control buffer locking. 
You can now choose if you want a drop input
during ARE to lock the piece on the first frame it is active.
 2021-01-06 16:06:17 -05:00
Ishaan Bhardwaj
0d13a9f236 Can send inputs from mode select to game 
Warning: this may break some things
 2021-01-05 21:59:50 -05:00
Ishaan Bhardwaj
a89bf05cab Fixed an issue with controllers on the menu 2020-12-29 22:55:51 -05:00
Ishaan Bhardwaj
e3b038b5a7 A festive easter egg has arrived! (v0.2.6.1) 
Good luck hunting for the egg!
 2020-12-24 22:58:06 -05:00
Ishaan Bhardwaj
ba576dfc77 Allow sliders to be controlled with keyboard 
Credits to Phoenix Flare
 2020-12-22 14:43:59 -05:00
Ishaan Bhardwaj
70f703eb2f Fixed piece fade out when paused 2020-12-21 16:20:25 -05:00
Ishaan Bhardwaj
dc4d4a8259 Credits now stops music when you exit the screen 2020-12-21 16:00:03 -05:00
Ishaan Bhardwaj
565510c7b2 Credits and credit roll music updated 2020-12-21 15:48:34 -05:00
Ishaan Bhardwaj
f14ab2a328 BGM focus fix 2020-12-20 16:55:34 -05:00
Ishaan Bhardwaj
042dbd220b text was slightly off-center 2020-12-20 15:31:42 -05:00
Ishaan Bhardwaj
548612123a SFX and BGM are now separate sliders 2020-12-20 15:26:32 -05:00
Ishaan Bhardwaj
f4675da0b0 Unlock and fix BGM, add pause button 2020-12-20 15:08:53 -05:00
Ishaan Bhardwaj
5f3990ff58 Small credits update 2020-12-20 10:35:05 -05:00
Ishaan Bhardwaj
50ff4adf27 Credits scene <3 2020-12-20 10:28:34 -05:00
Ishaan Bhardwaj
87b88f4b42 Refactored settings menus 2020-12-20 09:45:49 -05:00
Ishaan Bhardwaj
130c2ea403 Easier easter egg #2 2020-12-19 20:44:24 -05:00
Ishaan Bhardwaj
e26b094830 A little easter egg... 2020-12-19 20:31:14 -05:00
Ishaan Bhardwaj
2990844c52 Adjusted tuning scene 2020-12-18 23:17:53 -05:00
Ishaan Bhardwaj
c343014d6f Tuning scene 2020-12-18 21:28:30 -05:00
Ishaan Bhardwaj
605add7e94 Added customizable DAS and ARR! (read comments) 
This only applies to modes that allow it.
This feature does not apply to main modes (yet)
 2020-12-18 21:25:09 -05:00
Ishaan Bhardwaj
1101aa467d Smooth piece drop 2020-12-17 18:00:07 -05:00
Boshi
1bf8f91ef2 Displays current gamemode in game (toggle) 2020-12-16 22:21:26 -05:00
Ishaan Bhardwaj
f7c4908062 Added an option to disable diagonal input 2020-12-14 22:43:50 -05:00
Ishaan Bhardwaj
f4779c9847 Added the ability to toggle next piece SFX 2020-12-05 17:32:15 -05:00
Ishaan Bhardwaj
668564ffb0 Revert "big a3! (but its buggy??)" 
This reverts commit 513cd6ba90.
Hailey, please do not add modes.
 2020-12-05 16:56:12 -05:00
Hailey
513cd6ba90 big a3! (but its buggy??) 2020-12-05 12:49:57 +10:00
Ishaan Bhardwaj
3d5b33f41a Added ability to enable/disable synchroes 
On by default in anything but world rulesets.
Gamemodes / rulesets can override this setting.
 2020-12-04 10:57:43 -05:00
Ishaan Bhardwaj
01b0f9f618 DAS switch behavior implemented 2020-12-02 21:09:52 -05:00
Ishaan Bhardwaj
acaa6bdbbf whoops forgot to not require socket 2020-12-01 11:58:29 -05:00
Ishaan Bhardwaj
c37757f592 Implement an axis timer (fixes #12) 2020-12-01 11:57:09 -05:00
Ishaan Bhardwaj
869a0f7ec5 Added more input failsafes 2020-11-10 21:26:19 -05:00
Ishaan Bhardwaj
a470b40def Refactored input handling, so that arrow keys will always work on menus. 2020-11-10 20:08:34 -05:00
nightmareci
fd739dcfdf Changed reserved keys (arrows are no longer reserved) and now F2 always gets to the input config except when in-game. 2020-11-10 14:37:59 -08:00
Ishaan Bhardwaj
e1dc01d0d0 Changed the rotation game setting to be less ambiguous 2020-11-10 16:10:10 -05:00
Joe Zeng
6b77ad8547
Merge pull request #8 from nightmareci/master 
Implemented joystick input.
 2020-11-08 17:17:30 -05:00
nightmareci
6834e92674 Changed indentation to hard tabs. 2020-11-08 13:19:01 -08:00
nightmareci
3479374686 Forgot that the code used "enter" instead of "return" in the input config scene before, so changed it back. 2020-11-08 13:06:29 -08:00
nightmareci
863c614a4c Implemented joystick input. 
I had to redo how input is done entirely, so more than one source of input can be used for game inputs.

I added new inputs, menu_decide and menu_back. Return and escape still have their reserved status, sending menu_decide and menu_back, respectively. Other keys are reserved too, like arrows, to ensure users can always reconfigure input.
 2020-11-08 12:55:06 -08:00
Joe Zeng
49e52c6a39
Merge pull request #4 from Rexxt/master 
Small updates to visuals and sound
 2020-11-07 14:31:17 -05:00
Joe Zeng
2e3eff025f Replaced spaces with tabs. 
Check CONTRIBUTING.md, guys!
 2020-11-06 20:54:14 -05:00
Joe Zeng
9b04e14388 Added "Always reverse" option for rotation reversal. 2020-11-06 19:17:32 -05:00
Ishaan Bhardwaj
3641d85fcb Major changes, including modpack support 2020-11-02 22:47:58 -05:00
Ishaan Bhardwaj
6f39b591d3 Hotfix for TGM+ 2020-11-01 13:28:13 -05:00
Ishaan Bhardwaj
129237f0b0 TGM+ 2020-11-01 13:24:52 -05:00
Mizu
a324e0015a Replace SFX and add hold 2020-10-27 12:17:00 +01:00
Mizu
b0ce0f17f5 Add new sound effects to the game 2020-10-26 14:21:49 +01:00
Ishaan Bhardwaj
8810f24e7a v0.1.8, SHIRASE-CK ADDEDgit add scene/mode_select.lua tetris/modes/ck.lua ! 2020-10-23 21:02:27 -04:00
Ishaan Bhardwaj
e221a91d73 Swapped some settings around 2020-10-18 23:32:57 -04:00
Oshisaure
fdffd2cd9a Actually made ACE-ARS2 selectable 2020-10-17 04:17:25 +01:00
Oshisaure
5d32b6a3e7 Discord RPC cleanup 
- Loading Discord RPC is now handled by `load/rpc.lua`
- Removed `presence` global, call `DiscordRPC:update()` directly with what needs updating
- Game doesn't crash anymore if the Discord RPC fails to load
- Added RPC variables in the gamemode superclass to let each gamemode handle its special case
 2020-10-11 02:17:48 +01:00
Oshisaure
05230ac046 Game settings screen, and minor fix on discordRPC 
- Uses BG previously from the input config screen, which has gotten a new BG
- Minor tweak on the input config screen to display all inputs names regardless of if they are bound or not
- Added Mod1 function to `funcs.lua`, may be useful again sometime
- Added game settings
  * Manual locking (per gamemode, per ruleset, on harddrop or on softdrop)
  * Piece colours (per ruleset, TTC or Arika)
  * World Reverse toggle
- Moved the discordRPC `libs/` directory, as it's a third party library
- Edited the `discordRPC.lua` file to look for the dll at the right place regardless of how you run the game (until we fuse it that is)

This should have probably been done in several commits, sorry about that
 2020-10-11 00:42:56 +01:00
Hailey
29ee000998 Minor Rich Presence adjustments 2020-10-10 09:05:59 +10:00
Hailey
995fd7fee9 rich presence!! 2020-10-10 08:43:22 +10:00