114 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Damon Murdoch	241f5db0f6	Fixed schema.prisma spacing	2022-07-23 02:17:08 +10:00
Damon Murdoch	c8b2d057c0	Merge branch 'ProjectAsakura-master'	2022-07-23 02:14:06 +10:00
Damon Murdoch	91422282ef	Resolved merge conflict	2022-07-23 02:13:57 +10:00
Damon Murdoch	0a46d28d8c	Cleaned up scratch sheet code, should be ready for live now. Have tested in-game, story mode, ghost mode, time attack with no issues.	2022-07-23 02:10:56 +10:00
Luna	a41688e8c0	Merge pull request #10 from ghkkk090/master ... add back what was deleted (windowsticker toogle save)	2022-07-22 12:59:56 +01:00
ghkkk090	5a48e90169	add back what was deleted (windowsticker toogle save)	2022-07-22 18:57:41 +07:00
Luna	09d24e0acc	Merge pull request #9 from ghkkk090/master ... revert window sticker change	2022-07-22 12:18:06 +01:00
ghkkk090	fa5ae14104	revert window sticker change	2022-07-22 18:09:18 +07:00
Damon Murdoch	da1bf27c9d	Merge branch 'ProjectAsakura-master'	2022-07-22 20:15:07 +10:00
Damon Murdoch	be657ad64b	Resolved merge conflicts, pre-rebase testing	2022-07-22 20:14:11 +10:00
Damon Murdoch	ebacd3b24b	99% working terminal scratch, car sorting, discarded vehicle cards, and more :)	2022-07-22 20:02:51 +10:00
Luna	ceb4be109e	Merge pull request #8 from ghkkk090/master ... Update changing dress up and window sticker from terminal	2022-07-22 09:38:14 +01:00
ghkkk090	0d0b0f0edc	Update window sticker toggle save	2022-07-22 15:36:21 +07:00
ghkkk090	d7e9057659	Update changing dress up and window sticker from terminal	2022-07-22 10:08:20 +07:00
Rin	e323f64dee	Add a migration	2022-07-21 09:48:09 +01:00
Luna	2975bdd727	Merge pull request #7 from ghkkk090/master ... some ghost battle feature fixed but still bugged	2022-07-21 09:46:53 +01:00
ghkkk090	9fedca9828	edit gitignore	2022-07-21 14:55:51 +07:00
ghkkk090	d12282ac9b	add win count	2022-07-21 12:47:15 +07:00
ghkkk090	2bac27996d	fix rgWinCount	2022-07-21 12:24:43 +07:00
ghkkk090	c585661c02	fix branch conflict ... unrecieved and unreceived bruh	2022-07-21 09:08:16 +07:00
ghkkk090	ff5774b6a2	some ghost battle feature fixed but still bugged ... -Ghost Battle no longer disconnected but still bugged -Crown Ghost Battle not working (disconnected) -Dress Up Working and saved -Ghost Region Map Score Working and Saved -Search Ghost by Level Working -Search Ghost by Name not Working (disconnected) -Change Full Tune Ticket (now default ghostLevel is 10) -No Ghost Movement Saving -Add rgRegionMapScore to Car table	2022-07-21 09:06:18 +07:00
Rin	2f48bdb7f9	Fix a typo in unreceived user items	2022-07-20 20:24:27 +01:00
Rin	3f52b31936	Add a note to README	2022-07-20 20:09:36 +01:00
Rin	29429d3837	Add a license change.	2022-07-20 20:00:58 +01:00
Rin	abce28d50e	Fix prisma schema	2022-07-20 16:52:11 +01:00
Rin	078e8df619	Fix spacing in prisma schema	2022-07-20 16:50:46 +01:00
Luna	a2460fcb5d	Merge pull request #6 from damon-murdoch/master ... Terminal Mode Features	2022-07-20 16:44:34 +01:00
Damon Murdoch	a006449c5d	Removed mostly broken terminal scratch stuff, comments left for other users who want to work on it	2022-07-21 01:40:45 +10:00
Damon Murdoch	621bdb0ac5	Removed mostly broken scratch sheet stuff	2022-07-21 01:33:44 +10:00
Damon Murdoch	c5d41df574	Gift cars accept working, optional server settings for granting all scratch gifts by default, secret cars as scratch gifts, and full tuning gift cars by default. Other misc. callbacks added.	2022-07-21 01:18:11 +10:00
Damon Murdoch	c8a192e2fd	Fixed merge conflicts in schema.prisma	2022-07-20 17:30:58 +10:00
Damon Murdoch	ba619c1975	Committing changes pre-merge	2022-07-20 17:29:28 +10:00
Damon Murdoch	7f9ad527c7	Merge pull request #2 from ProjectAsakura/master ... Updating story	2022-07-20 17:28:57 +10:00
Luna	ad4baa15a8	Merge pull request #4 from ghkkk090/master ... fix story nuke	2022-07-20 07:17:19 +01:00
ghkkk090	4fe646f9a5	fix story reward (meter and bgm) and change carItem db structure ... carId shouldn't be unique	2022-07-20 12:27:37 +07:00
Damon Murdoch	368f700d9f	Merge pull request #1 from ProjectAsakura/master ... Merge pull request #3 from damon-murdoch/master	2022-07-20 12:33:51 +10:00
ghkkk090	83756b2f81	fix nuke story	2022-07-20 08:47:54 +07:00
ghkkk090	5c32b127d5	fix story nuke	2022-07-20 00:23:50 +07:00
Damon Murdoch	70c396ea18	Added some missing terminal callbacks (save_terminal_result, added load_bookmarks, car_summary	2022-07-20 02:02:19 +10:00
Luna	e58215d782	Merge pull request #3 from damon-murdoch/master ... Added dotenv to the requirements, fixed bug with time attack saving	2022-07-19 14:34:27 +01:00
Damon Murdoch	69b1c898bb	Added dotenv to the requirements, fixed bug with time attack saving	2022-07-19 23:12:59 +10:00
Rin	3f01261828	UGH	2022-07-18 14:56:25 +01:00
Rin	a0d918483e	FUCK	2022-07-18 14:51:56 +01:00
Rin	728482a99f	this makes no fucking sense	2022-07-18 14:49:00 +01:00
Rin	82bfe05827	TYPESCRIPT	2022-07-18 14:41:22 +01:00
Rin	cf3607470f	Fuck you typescript	2022-07-18 14:30:47 +01:00
Rin	e99849b03f	ADD MORE DEBUGGING STUFF	2022-07-18 14:23:58 +01:00
Rin	a8fd52836e	please work please work please work	2022-07-18 13:19:06 +01:00
Rin	add15d4394	HOPEFULLY...	2022-07-18 13:15:57 +01:00
Rin	86f3f94be1	maybe???	2022-07-18 13:04:13 +01:00