carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity
18,114 Commits
1 Branch
0 Tags
2.3 GiB
Commit Graph

14430 Commits (554c53633c84e6371245322718e08a5556b9912b)

Author SHA1 Message Date
Aevann1 554c53633c fix again 2022-09-05 00:32:17 +02:00
Aevann1 1a5647d44b fix again 2022-09-05 00:30:32 +02:00
Aevann1 881dc51a44 fix again 2022-09-05 00:29:26 +02:00
Aevann1 b29f456242 fix again 2022-09-05 00:27:23 +02:00
Aevann1 9d57ce9b6b fix pfps not working in /leaderboard 2022-09-05 00:25:22 +02:00
Aevann1 57dcd0ddef remove snappy gambling 2022-09-05 00:13:23 +02:00
Aevann1 1470b2c8cc Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-05 00:07:22 +02:00
Aevann1 63b48e0687 cachebust 2022-09-05 00:07:20 +02:00
Outrun Colors 1a8c811faa
Re-enable wager after finishing up 2022-09-04 17:04:46 -05:00
Outrun Colors e2ad3e6ca3 Merge branch 'frost' of github.com:Aevann1/rDrama into frost 2022-09-04 16:58:26 -05:00
Outrun Colors 8e7c4563c0
Temporarily disable blackjack 2022-09-04 16:58:19 -05:00
Aevann1 75a362bf63 reduce lottery top margin 2022-09-04 23:58:19 +02:00
Aevann1 27ef2d14cc Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-04 23:58:03 +02:00
Aevann1 4995a69ace convert to tabs 2022-09-04 23:58:01 +02:00
Aevann1 41f9a128ac Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-04 21:53:07 +00:00
Aevann1 38031b627e cachebust 2022-09-04 23:38:13 +02:00
Aevann1 eec0a6a436 casino shit 2022-09-04 23:35:18 +02:00
Outrun Colors cfa4231f7d
Fix issue with slots not reducing value / center casino games / update user currency without refresh 2022-09-04 16:17:44 -05:00
Aevann1 19e9db0865 sneed 2022-09-04 21:00:04 +00:00
outruncolors 5e1d98a3bf
WIP: Add Casino (Do Not Merge) (#341) 
* Add new /casino route and template

* Consolidate lottery into casino and add initial template for slots

* Change /lottery route to /casino and replace icon with usd symbol and change sitewide const to reflect change

* Hook up new slots method to casino

* Enable Marseybux spending in casino slots

* Add UI for playing blackjack in casino

* First connection of blackjack UI to backend

* Add protective clause thanks to help from carpathianflorist.

* Create new Casino_Game relation and persist inside of blackjack

* Connect new slots behavior to Casino_Game table

* Create UI action management logic

* Add blackjack game status checker which adds persistence for blackjack

* Gonna handle this better, hold on

* Reorganize blackjack helper methods

* Reorganize casino.js to account for new changes

* Connect up to frontend

* Little changes ya know

* Display a message when winning in Blackjack

* Fix some issues with double down and insure

* Revert "remove owoify-py from requirements"

This reverts commit 4454648ea2.

* A little casino styling change

* Reorganize into a casino block

* Smallenize the card'

* Remove references to old game data on comments

* Add sql migration file

* Remove logic to drop old columns

* Fix two forgotten conflicts
 2022-09-04 22:53:34 +02:00
Aevann1 bfaedc99fc restore bottom border 2022-09-04 22:31:50 +02:00
Aevann1 10efc700d1 make chadmins have access to /h/chudrama 2022-09-04 22:27:37 +02:00
Aevann1 9d101e7841 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-04 20:02:51 +00:00
Aevann1 f5b157707c sneed 2022-09-04 20:00:04 +00:00
Aevann1 88e96988a9 more marsify/owoify shit 2022-09-04 21:43:02 +02:00
Aevann1 d88d5ad453 add logic for permarsify 2022-09-04 21:06:26 +02:00
Aevann1 7a3a1a883c update nervous sweating hat 2022-09-04 20:59:50 +02:00
Aevann1 c41d6bc646 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-04 18:51:50 +00:00
Aevann1 1acfb0a2cd fix 500 error 2022-09-04 20:50:59 +02:00
Aevann1 7a536f87a6 sneed 2022-09-04 16:00:02 +00:00
Aevann1 8bd0ef9251 sneed 2022-09-04 15:00:02 +00:00
Aevann1 39e76a4cf3 sneed 2022-09-04 06:00:02 +00:00
Aevann1 9692a716c6 sneed 2022-09-04 05:00:02 +00:00
Aevann1 a827f41592 sneed 2022-09-04 04:00:02 +00:00
Aevann1 3ba56fcb62 sneed 2022-09-04 03:00:02 +00:00
Aevann1 d45d2b3e07 sneed 2022-09-04 02:00:01 +00:00
gooseman 862b9ebad9 popover hats? 2022-09-03 17:25:00 -07:00
gooseman e0262930ef pp20 hats 2022-09-03 16:53:45 -07:00
Aevann1 0bb45b4367 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-04 01:43:01 +02:00
Aevann1 027bad8aeb dudup popover 2022-09-04 01:42:59 +02:00
Aevann1 b6758de7e5 sneed 2022-09-03 23:00:04 +00:00
Aevann1 38036cf9ec fix incorrect calculated cut in hat notifs 2022-09-04 00:33:25 +02:00
Aevann1 e2744d9330 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-04 00:32:48 +02:00
Aevann1 038452f9a6 display total hat sales in /hats 2022-09-04 00:32:46 +02:00
gooseman f727ab4a2e Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-09-03 15:08:04 -07:00
gooseman 1afba98cec hopeless attempt at "fixing" hats page 2022-09-03 15:07:59 -07:00
Aevann1 90d32b1381 fix marseybux gift reasons not appearing in /transfers 2022-09-03 23:45:32 +02:00
Aevann1 57b999385b remove hats not made on the template 2022-09-03 23:33:00 +02:00
Aevann1 d9a9d6bd0e /hats never reloads now, don't read code if u value ur sanity 2022-09-03 22:45:06 +02:00
Aevann1 91d8c709cb increase hat artist cut by 10% 2022-09-03 21:53:38 +02:00