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

8897 Commits (fe7f0316f75c90054258ef1721cdade0fce31c07)

Author SHA1 Message Date
Aevann1 970cf6dccd update Sparkles and Emo Hair II 2022-09-05 03:58:05 +02:00
Aevann1 b0010a455d highlight mobile nav bar icons on click 2022-09-05 03:51:29 +02:00
Aevann1 531525a254 Revert "set height and width for hats" 
This reverts commit c53418d50a.
 2022-09-05 02:57:24 +02:00
Aevann1 c53418d50a set height and width for hats 2022-09-05 02:55:03 +02:00
Aevann1 cade131aa6 cachebust hats 2022-09-05 02:52:52 +02:00
Aevann1 1242a2d009 change casino icon and more cachebusting 2022-09-05 02:10:44 +02:00
Aevann1 71b5367874 cachebust all css and js 2022-09-05 01:50:43 +02:00
Aevann1 0c32d56cd6 casino + style shit 2022-09-05 01:15:37 +02:00
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 63b48e0687 cachebust 2022-09-05 00:07:20 +02: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 4995a69ace convert to tabs 2022-09-04 23:58:01 +02:00
Aevann1 38031b627e cachebust 2022-09-04 23:38:13 +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 bfaedc99fc restore bottom border 2022-09-04 22:31:50 +02:00
Aevann1 7a3a1a883c update nervous sweating hat 2022-09-04 20:59:50 +02: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 027bad8aeb dudup popover 2022-09-04 01:42:59 +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 d9a9d6bd0e /hats never reloads now, don't read code if u value ur sanity 2022-09-03 22:45:06 +02:00
Aevann1 393fbf075d decrease padding-top by 0.1px 2022-09-03 21:52:46 +02:00
Aevann1 865723470b show owners of hats 2022-09-03 21:36:50 +02:00
Aevann1 8f4236a294 fix samsung browser 2022-09-03 21:19:18 +02:00
Aevann1 5d704a2cb2 make /hats more intuitive 2022-09-03 21:11:02 +02:00
Aevann1 5feb479cd2 apply slur filter to hat descriptions 2022-09-03 20:55:03 +02:00
Aevann1 256b384e69 add 2 leaderboard tables for hats 2022-09-03 20:50:20 +02:00
Aevann1 3e75309821 rewrite sort_table.js, credit to htbz 2022-09-03 20:24:26 +02:00
Aevann1 5aaeb93b35 fix colors on most blocked table 2022-09-03 20:17:51 +02:00
Aevann1 a763646ea4 display /h/sub as tab name 2022-09-03 20:03:14 +02:00
Aevann1 a0579b40e0 restore metadata for audio 2022-09-03 05:39:35 +02:00
Aevann1 28dbe0d6ab fix WPD slowness 2022-09-03 05:34:06 +02:00
Aevann1 48affb53e6 more hat shit 2022-09-03 05:04:51 +02:00
Aevann1 0839077838 fix pup mask 2022-09-03 04:48:27 +02:00
Aevann1 8f5e4c3ec6 add .hat class for easier blocking 2022-09-03 03:52:54 +02:00
Aevann1 399518fed9 reduce the margin under the text 2022-09-03 03:18:48 +02:00
Aevann1 2d972eee41 same as last commit 2022-09-03 03:18:06 +02:00
Aevann1 39c5fa39c1 make the hats link look better 2022-09-03 03:17:41 +02:00
Aevann1 3b5aed864d add a link to /hats in /shop 2022-09-03 03:15:29 +02:00
Aevann1 db9a995032 more hats 2022-09-03 03:11:10 +02:00
Aevann1 de9f9ab11c display owned hats at the top 2022-09-03 02:27:19 +02:00