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

18739 Commits (3f5ab7315f545397cf2909527889821cee2fb31a)

Author SHA1 Message Date
Aevann1 55029de8b1 sneed 2022-09-13 13:00:02 +00:00
Aevann1 eb50e7a791 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-13 13:05:15 +02:00
Aevann1 9f6ec11cd4 remove unnecessaryu block from bootstrap.js 2022-09-13 13:05:13 +02:00
Aevann1 429cf81c71 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-13 11:00:56 +00:00
Aevann1 d3e8a7f86c perserve asset_submission fields on error 2022-09-13 13:00:47 +02:00
Aevann1 cfc7570143 sneed 2022-09-13 11:00:04 +00:00
Aevann1 0e198ffcdb remove unused var 2022-09-13 12:52:32 +02:00
Aevann1 cda73fe9d4 fix this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2709344?context=8#context 2022-09-13 12:47:50 +02:00
Aevann1 f88aa5de14 cosmetic change 2022-09-13 12:44:21 +02:00
Aevann1 39dfd05a27 move "donate" up 2022-09-13 12:31:26 +02:00
Aevann1 94ed6a2d38 blocking adjustments 2022-09-13 12:27:28 +02:00
Aevann1 f11dcf031b give notif on bagde removal 2022-09-13 12:27:09 +02:00
Aevann1 7edc44ff6f fix https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2713626?context=8#context 2022-09-13 11:59:40 +02:00
Aevann1 0c3cf0128a "That" -> "This" 2022-09-13 11:59:29 +02:00
Aevann1 71f4e511d6 sneed 2022-09-13 11:42:53 +02:00
Aevann1 799f8a465b delete duplicate sidebar images 2022-09-13 11:28:38 +02:00
Aevann1 0302270e16 more detailed pin/unpin messages 2022-09-13 11:01:30 +02:00
Aevann1 cc5b476f3c Revert "wtf?" 
This reverts commit 8ff5edc8e9.
 2022-09-13 09:23:23 +02:00
Aevann1 8ff5edc8e9 wtf? 2022-09-13 09:19:54 +02:00
Aevann1 3db7be4d61 casino constitency 2022-09-13 08:59:39 +02:00
Aevann1 5b7dc29445 sneed 2022-09-13 06:00:02 +00:00
Aevann1 53ba5e0a12 sneed 2022-09-13 04:00:04 +00:00
Outrun Colors fec1ba8438
Use correct number and not index for color 2022-09-12 22:29:19 -05:00
Outrun Colors a7ab4523de
Skip winners on 0 and 00 2022-09-12 22:14:55 -05:00
Outrun Colors 947d097087
Make poker chips a circle 2022-09-12 21:04:32 -05:00
Aevann1 da5db208f6 sneed 2022-09-13 02:00:02 +00:00
Aevann1 c86cf0881b sneed 2022-09-13 01:22:57 +00:00
Aevann1 84d76187c9 sneed 2022-09-13 01:19:26 +00:00
Aevann1 76aaca0039 sneed 2022-09-13 01:19:22 +00:00
outruncolors 7d8cfe5576
Add Roulette (#351) 
* Add roulette file

* Rename variable to avoid name collission

* Add basic route and create new template for game

* More work on the roulette template

* Initial connection of front-end roulette to back-end roulette

* Add to cron job

* Pass bets to the front end

* Update front-end looks

* Add stackable poker chips for bets

* Minor last changes

* Handle minimum bets

* Add bet table
 2022-09-12 20:07:39 -05:00
Aevann1 e0d32c7105 dont send me a notif 2022-09-12 19:52:07 +02:00
Aevann1 94c69dc137 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-12 19:40:55 +02:00
Aevann1 8ca494f7c2 add limits in oauth apps page 2022-09-12 19:40:53 +02:00
Aevann1 8613b867a5 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-12 17:34:26 +00:00
Aevann1 192e79f359 add grillcastyes 2022-09-12 19:34:12 +02:00
Aevann1 da98858e24 sneed 2022-09-12 17:00:03 +00:00
Aevann1 8299c48464 sneed 2022-09-12 15:00:02 +00:00
Aevann1 b3d2fca506 remove kf replacing 2022-09-12 13:59:49 +02:00
Aevann1 3425da05e3 remove marsey.cat from trusted domains 2022-09-12 13:59:11 +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 916d94580d Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-12 13:12:05 +02:00
Aevann1 c96d6097b1 Revert "mass trim emojis" 
This reverts commit 706f3e9440.
 2022-09-12 13:12:01 +02:00
Aevann1 3ce8df6264 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-12 11:07:03 +00:00
Aevann1 784e96fc1c ping chiobu whenever some1 mentions his name 2022-09-12 13:06:46 +02:00
Aevann1 5b736da19c change marseyemperor 2022-09-12 13:05:20 +02:00
Aevann1 b7013698c2 change resize for marseys from 300px to 250px 2022-09-12 13:05:16 +02:00
Aevann1 5fbab96e8e sneed 2022-09-12 11:00:01 +00:00
Aevann1 d7c3ddf474 add created_utc column to all tables 2022-09-12 12:19:35 +02:00
Aevann1 4abf75edc0 add error codes 2022-09-12 11:52:07 +02:00