Commit Graph

749 Commits (master)

Author SHA1 Message Date
Oshisaure 8e77407ff2 Merge branch 'master' of https://github.com/SashLilac/cambridge 2020-10-17 03:38:07 +01:00
Oshisaure 92c852d178 Renamed ACE-ARS to ACE-ARS2 and added ACE-ARS that guideline piece lock and colours 2020-10-17 03:37:44 +01:00
Ishaan Bhardwaj f658ed63f2 apparently I made ti-srs too strict 2020-10-16 22:20:18 -04:00
Oshisaure c2d1c1183c Survival A3 torikan now switches to 03:03:00 when playing with World-type rulesets 2020-10-17 02:51:29 +01:00
Ishaan Bhardwaj 36c568feaf demon mode grade display fixed 2020-10-16 21:35:30 -04:00
Ishaan Bhardwaj bf30fcefbd Add Sega randomizer 2020-10-14 15:00:17 -04:00
Oshisaure d9f5bd16d7 Disabled BGM for now since the only music is the pacer test (not selectable in game) and the credit roll 2020-10-14 19:30:37 +01:00
Ishaan Bhardwaj d978ff8d87 fixed a thing 2020-10-14 13:45:56 -04:00
Ishaan Bhardwaj b47d0f36b9 oshi forced me to add bags 2020-10-14 13:43:28 -04:00
Ishaan Bhardwaj abc210c69c made our debug randomizer not bad 2020-10-13 22:10:27 -04:00
Ishaan Bhardwaj 436e4ac861
Update README.md 2020-10-13 15:56:11 -04:00
Oshisaure a48d7c67b5 Merge branch 'HEAD' of https://github.com/SashLilac/cambridge.git 2020-10-13 20:26:33 +01:00
Oshisaure f6ca79ff91 Fixed big mode spawn positions 2020-10-13 20:26:07 +01:00
Ishaan Bhardwaj 4eb3901610 Some big mode fixes 2020-10-13 14:16:23 -04:00
Ishaan Bhardwaj 3f7fc4b622 Rename Mac RPC lib 2020-10-13 11:20:46 -04:00
Ishaan Bhardwaj ac7ae91c39 Small RPC change 2020-10-12 22:44:47 -04:00
Oshisaure 0c8e910245 Linux RPC maybe? 2020-10-13 01:23:24 +01:00
Oshisaure 6233ffb12d Fixed RPC icon and included RPC lib for mac 2020-10-13 00:39:13 +01:00
Oshisaure 1f78bb9e99 Merge branch 'HEAD' of https://github.com/SashLilac/cambridge.git 2020-10-12 21:22:15 +01:00
Oshisaure a125c09106 Fixed crash on loading the game with no save 2020-10-12 21:21:10 +01:00
Ishaan Bhardwaj 090ffa5126
Update README.md 2020-10-12 14:48:00 -04:00
Ishaan Bhardwaj 12a6f42198 Revert "Fixing step reset" - didn't realize infinite floorkicks
This reverts commit 0c317d9ce1.
2020-10-11 15:46:34 -04:00
Ishaan Bhardwaj 0c317d9ce1 Fixing step reset 2020-10-11 15:41:56 -04:00
Ishaan Bhardwaj eddfee566d Grade display changed for TA Death modes 2020-10-11 15:34:10 -04:00
Ishaan Bhardwaj 7fe366a8de Bravo score update 2020-10-11 14:17:18 -04:00
Ishaan Bhardwaj 55be30c99f experimental bravo formula for tgm1 2020-10-11 13:21:03 -04:00
Ishaan Bhardwaj 36ceef8488 experimental bravo formula for tgm1 2020-10-11 12:57:57 -04:00
Oshisaure b59edb5e8e Accidentally swapped blue and orange in the colour scheme update, changing it back with this commit 2020-10-11 03:12:22 +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
Oshisaure f28dc08ae2 Updated Race 40 randomiser to use 7-bag no SZO start 2020-10-10 23:07:12 +01:00
Ishaan Bhardwaj ecd958bdc5
Update README.md 2020-10-10 10:30:31 -04:00
Ishaan Bhardwaj 43f59cfde8
Merge pull request #1 from haileylgbt/master
Added fitting menu sfx + RPC
2020-10-09 21:37:45 -04:00
Ishaan Bhardwaj 00c46961f9
Bug. 2020-10-09 21:31:49 -04:00
Ishaan Bhardwaj 0a0053276b
SG!!!! 2020-10-09 21:14:20 -04:00
Hailey d0f1d869a8 RP Icon 2020-10-10 09:47:33 +10: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
Hailey 67abf35a28
Merge pull request #1 from SashLilac/master
Removed the BG limit, because someone is a madman
2020-10-10 08:02:00 +10:00
Ishaan Bhardwaj 9982613e26
Removed the BG limit, because someone is a madman 2020-10-09 17:55:22 -04:00
Hailey 629beb7240 Added fitting menu sfx 2020-10-10 07:50:05 +10:00
Oshisaure 4cb20101b0 Added background for options screen 2020-10-09 18:44:48 +01:00
Ishaan Bhardwaj 63c0721978 Slight cosmetic change concerning the bonus timer 2020-10-09 13:37:39 -04:00
Oshisaure 1366451a3d Fixed randomisers in A1-A4 modes:
- History 4-rolls, history 6-rolls and history 6-rolls 35-bag no longer deal S, Z or O as their first piece
- Added a 7-bag randomiser with the same behaviour (bag7noSZOstart)
- Tweaked the "35-bag" part of the history 6-rolls 35-bag randomiser to work closer to what it's supposed to be
- Switched Marathon AX4's randomiser from history 6-rolls to 7-bag no SZO start
2020-10-09 04:34:11 +01:00
Ishaan Bhardwaj 6b624b9853 Ti-World placeholder 2020-10-08 22:20:37 -04:00
Ishaan Bhardwaj b0bda25466 Cool Regret System TM 2020-10-08 22:13:35 -04:00
Oshisaure 2bde9d1378 Added secret grade detection for Marathon A1-A3 and Survival A1-A3 2020-10-09 02:00:42 +01:00
Ishaan Bhardwaj 6178b2cee9 Proper bravo detection! 2020-10-08 20:44:06 -04:00
Ishaan Bhardwaj 4e8a237de3
TA GM requirements updated 2020-10-08 20:35:40 -04:00
Oshisaure 5606251ea7 Added extra buttons:
- Implemented retry button*
- Escape on mode select sends you to title screen
- Escape on title screen closes the game
- Added "Exit Game" entry on title screen, closes the game when selected

*Pardon my angry comment in `scene/game.lua`.
2020-10-08 04:56:46 +01:00