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

1213 Commits (3f5ab7315f545397cf2909527889821cee2fb31a)

Author SHA1 Message Date
Aevann1 3b8d025f57 fix kofi 2022-09-18 02:28:09 +02:00
Aevann1 dc6f4f8e10 do this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2723089?context=8#context 2022-09-17 23:45:17 +02:00
Aevann1 a186064465 fix 2022-09-17 14:15:22 +02:00
Snakes fdc8a78472
Fix leaderboard for winnings change. 2022-09-16 15:28:24 -04:00
outruncolors 7dbbb27228
Remove winnings column from user and replace with a calculated value (#356) 
* Remove winnings column from user and replace with a calculated value

* Handle case for no games played

* Idiomatic
 2022-09-16 14:10:45 -05:00
outruncolors a0c75ab677
Introduce user payment methods (#355) 
* Add pay and charge methods into user class

* Replace casino charges/payments with new user methods

* Also refund wager on winning slots bets

* Unblock casino routes
 2022-09-15 17:16:35 -05:00
Aevann1 42f0ce8844 make jl3 mod holes again 2022-09-14 16:11:55 +02:00
Aevann1 73ae8f6e65 give a badge to permenantly marsified users 2022-09-13 20:02:08 +02:00
Aevann1 2fa71a252b kofi integration 2022-09-13 18:53:19 +02:00
Aevann1 e69827e6e0 kofi integration (testing on devrama) 2022-09-13 17:22:18 +02:00
Aevann1 7c1b6eac77 same as last commit 2022-09-12 13:51:56 +02:00
Aevann1 a4f2260787 fix "until" missing from badge description 2022-09-12 13:51:26 +02:00
Aevann1 d7c3ddf474 add created_utc column to all tables 2022-09-12 12:19:35 +02:00
Aevann1 4fd3ebc967 useless commit 2022-09-11 16:32:04 +02:00
Aevann1 ae90eb1cf2 simplify house checking logic 2022-09-11 03:53:16 +02:00
outruncolors d57a569125
[DO NOT MERGE] Casino changes (#350) 
* Merge up

* Create composable template for casino games

* Big changerinos

* Only allow double down sometimes

* Add drawing capability

* Make everything pretty

* Add leaderboard

* Update files/routes/casino.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Update files/helpers/casino.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Update files/helpers/twentyone.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Update files/helpers/twentyone.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Update files/helpers/twentyone.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Add some stuff

* Rehab screen

* Default sets for no games

* Stupid revert

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>
 2022-09-10 16:01:34 -05:00
Snakes 1b3c042552
Change notification bell colors for messages. 
Messages bell is now an orange-ish gold. To avoid confusion with the
yellowish-goldish modactions bell, modactions are now green.
 2022-09-10 03:56:37 -04:00
Aevann1 c1aae95d16 restore "notify followers" checkbox 2022-09-10 09:00:45 +02:00
Aevann1 1a64ba3db8 hat submission UI 2022-09-10 07:37:11 +02:00
Aevann1 e058643f01 remove unnecessary import, thx @everyone 2022-09-10 02:34:15 +02:00
Snakes ad31fe854b
DMs: add unread indicator, sort by recent reply. 2022-09-09 20:30:56 -04:00
Aevann1 47890d771d add Marsey Submission UI 2022-09-09 11:13:50 +02:00
Aevann1 ff575c9eea JL3 no longer mod holes 2022-09-09 08:37:25 +02:00
Aevann1 66bf74b444 fix whoopsie 2022-09-08 21:16:57 +02:00
Aevann1 6077f09ca9 make bets better 2022-09-08 20:25:45 +02:00
Aevann1 9475aa27e4 award badges shit 2022-09-07 05:31:55 +02:00
Aevann1 66d3e18263 do this https://rdrama.org/h/femboy/post/101152/re-marsify-award/2670658?context=8#context 2022-09-07 00:39:34 +02:00
Aevann1 d0cfd8a8c1 change house femboy award 2022-09-06 06:16:41 +02:00
Aevann1 f8cd1bea03 make the poll code much worse 2022-09-06 01:33:58 +02:00
Aevann1 ed60cafb24 make the poll code make a little more sense 2022-09-06 00:56:21 +02:00
Aevann1 da52d00ad3 fix 500 errors 2022-09-06 00:55:26 +02:00
Aevann1 ef5c3c89ee deduplicate polls 2022-09-06 00:55:01 +02:00
Aevann1 62d077576f change poll- and choice- and -bet to -option 2022-09-06 00:54:05 +02:00
Aevann1 73dbb2dd7e change t2_ and t3_ to p_ and c_ 2022-09-06 00:52:22 +02:00
Aevann1 8085de14e4 make only house members able to vote on polls in their house hole 2022-09-06 00:30:44 +02:00
Aevann1 6d37838f45 fix 500 error 2022-09-05 10:57:21 +02:00
Aevann1 7785f049ec fix 500 error 2022-09-05 10:00:12 +02:00
Aevann1 8fb22a397c dont use g.db.execute 2022-09-05 09:37:20 +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 34c6842018 make the tooltip be "hat - description" 2022-09-05 05:55:41 +02:00
Aevann1 1816ce09f7 make it possible to equip multiple hats 2022-09-05 05:44:24 +02:00
Aevann1 0c32d56cd6 casino + style shit 2022-09-05 01:15:37 +02: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 10efc700d1 make chadmins have access to /h/chudrama 2022-09-04 22:27:37 +02:00
Aevann1 1acfb0a2cd fix 500 error 2022-09-04 20:50:59 +02:00
Aevann1 865723470b show owners of hats 2022-09-03 21:36:50 +02:00
Aevann1 b295af02f4 mute SQLalchemy warnings 2022-09-03 21:28:49 +02:00
Aevann1 9381763753 fix 500 errors 2022-09-03 21:27:17 +02:00
Aevann1 5feb479cd2 apply slur filter to hat descriptions 2022-09-03 20:55:03 +02:00