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

4319 Commits (de46a6e51919c1a65397070041dfd72b54cde6b8)

Author SHA1 Message Date
Outrun Colors 90507fc8e5 Merge branch 'frost' of github.com:Aevann1/rDrama into frost 2022-09-05 15:59:48 -05:00
Outrun Colors 3509d6a8b1 Implement a function to fix bad blackjack games 2022-09-05 15:59:42 -05:00
Aevann1 7404d94610 fix issues for new instances 2022-09-05 22:37:38 +02:00
Aevann1 e793a1ab3a show a list of blockers 2022-09-05 22:23:35 +02:00
Aevann1 0f232b264c refactor torture_ap 2022-09-05 22:05:04 +02:00
Outrun Colors b1674355c0
Restructure blackjack to only use a single endpoint and better handle "game end" logic 2022-09-05 13:27:00 -05:00
Aevann1 959e08bb83 make marsify not count towards /marseys 2022-09-05 10:49:34 +02:00
Aevann1 e2c7e2939f fix leaderboard 2022-09-05 10:42:04 +02:00
Aevann1 93d7c91ce7 add the ability to order hats by author username 2022-09-05 10:27:37 +02:00
Aevann1 b166fdcaf3 make hat designers gets their own hat for free 2022-09-05 09:59:24 +02:00
Aevann1 64f95f1fca sneed 2022-09-05 09:48:54 +02:00
Aevann1 e9f9756f16 leaderboard shit 2022-09-05 09:26:12 +02:00
Aevann1 6f9265a711 Revert "testing on prod" 
This reverts commit e1a71486f7.
 2022-09-05 09:01:04 +02:00
Aevann1 e1a71486f7 testing on prod 2022-09-05 08:57:56 +02:00
Aevann1 225e64b91e add marsify toggle in settings 2022-09-05 06:50:27 +02:00
Aevann1 b3a56ca168 more hat shit 2022-09-05 06:33:08 +02:00
Aevann1 15732114d9 try making hats work in popover 2022-09-05 06:21:06 +02:00
Aevann1 1816ce09f7 make it possible to equip multiple hats 2022-09-05 05:44:24 +02:00
Aevann1 49bcd0543d add hats to chat, part I 2022-09-05 05:04:48 +02:00
Aevann1 11b391c437 fix blackjack when hitting blackjack 2022-09-05 04:34:30 +02:00
Aevann1 6727d4005c better stripping syntax 2022-09-05 03:44:38 +02:00
Aevann1 fb4f43d2fb increase gambling ratelimit 2022-09-05 02:01:16 +02:00
Aevann1 842300ac6e remove code irrelevant now (not broken this time I hope) 2022-09-05 01:21:48 +02:00
Aevann1 0c32d56cd6 casino + style shit 2022-09-05 01:15:37 +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
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 88e96988a9 more marsify/owoify shit 2022-09-04 21:43:02 +02:00
Aevann1 38036cf9ec fix incorrect calculated cut in hat notifs 2022-09-04 00:33:25 +02:00
Aevann1 038452f9a6 display total hat sales in /hats 2022-09-04 00:32:46 +02:00
Aevann1 90d32b1381 fix marseybux gift reasons not appearing in /transfers 2022-09-03 23:45:32 +02:00
Aevann1 91d8c709cb increase hat artist cut by 10% 2022-09-03 21:53:38 +02:00
Aevann1 865723470b show owners of hats 2022-09-03 21:36:50 +02:00
Aevann1 5d704a2cb2 make /hats more intuitive 2022-09-03 21:11:02 +02:00
Aevann1 256b384e69 add 2 leaderboard tables for hats 2022-09-03 20:50:20 +02:00
Aevann1 82282cc8a4 check if user owns the hat alrdy or not 2022-09-03 05:58:43 +02:00
Aevann1 91d7e4fcd3 fix hats being lowecase in admiggers thread 2022-09-03 04:15:03 +02:00
Aevann1 01dc4db96b %5 -> 5% 2022-09-03 03:44:04 +02:00
Aevann1 8975f0e4f2 fix bug 2022-09-03 03:27:46 +02:00
Aevann1 6022129f99 fix whoopsie lol 2022-09-03 03:19:47 +02:00
Aevann1 29f09634fd more hat shit 2022-09-03 03:13:23 +02:00
Aevann1 db9a995032 more hats 2022-09-03 03:11:10 +02:00
Aevann1 697a722c6e fix stupidity 2022-09-03 02:54:17 +02:00
Aevann1 bfdb7a87d7 fix missing import 2022-09-03 02:52:59 +02:00
Aevann1 09d1e4d887 more hats 2022-09-03 02:48:01 +02:00
Aevann1 f92a33fb04 sort hats by price then alphabetically 2022-09-03 02:29:54 +02:00
Aevann1 de9f9ab11c display owned hats at the top 2022-09-03 02:27:19 +02:00
Aevann1 28bbdccdeb add hat badges 2022-09-03 02:18:10 +02:00
Aevann1 88a2c69659
Hats (#348) 
* hat

* hats

* hats 2

* hats

* hats 4

* hats 5

* hats
 2022-09-03 01:58:55 +02:00
Aevann1 2201745c93 add owoify and marsify to offsites 2022-09-02 20:10:35 +02:00