mirror of
https://github.com/FunkinCrew/Funkin.git
synced 2025-04-11 22:47:59 -04:00
Commit graph
Select branches
Hide pull requests
EliteMasterEric-patch-1
bugfix/appdomain-blacklist
bugfix/appdomain-blacklist-2
bugfix/chart-editor-duplicate-hitsounds
bugfix/chart-editor-notification-crash
bugfix/chart-editor-variation-bpms
bugfix/git-submodule-url
bugfix/more-community-fixes
bugfix/no-traces-on-release
bugfix/persistent-screenshot-preview
bugfix/save-data-fixes
bugfix/two-unrelated-bugfixes
chart-edit-polish
chart-edit-scroll-tweaks
debug-menu-cam-fix
develop
develop3
docs/changelog-0.5.1
docs/compiling-guide
docs/remove-potential-duplicates
docs/troubleshooting-update
feature/automatic-offset-flipping
flixel-bump
git-cliff-template
hundrec/combo-counter-rebase
label-test-docs
language-labels
legacy/0.2.x
main
main2
ninjamuffin99/funk-1023
pico-menu-fix
release/v0.6.2
use-public-submodules
vscode-compilation-server
#1
#1006
#1011
#1019
#1020
#1039
#1040
#1052
#1073
#1082
#1083
#11
#1113
#1116
#1150
#1158
#1166
#1175
#1180
#1188
#1204
#1225
#1227
#1240
#1241
#1242
#1255
#1267
#1275
#1276
#1277
#1278
#1279
#1287
#131
#1317
#132
#1324
#1331
#1334
#134
#1347
#1348
#1350
#1370
#1376
#138
#1400
#1408
#1409
#1411
#1413
#1420
#1421
#1422
#1424
#1425
#1426
#1428
#1440
#1449
#1460
#1461
#1465
#1467
#1474
#1475
#1476
#148
#155
#159
#161
#1683
#169
#1690
#1696
#1711
#1717
#1718
#172
#1724
#1733
#1744
#1749
#1754
#1758
#176
#1760
#1763
#1764
#1765
#1766
#1771
#1772
#1779
#1783
#1784
#179
#1791
#1815
#1822
#1823
#1824
#1825
#1827
#1831
#1836
#1848
#1859
#1866
#1869
#1874
#1879
#1880
#1883
#1886
#1887
#19
#1901
#1902
#1906
#1907
#1913
#1917
#192
#1922
#193
#1930
#1933
#1935
#1940
#1941
#1941
#1945
#1945
#195
#1952
#1964
#1965
#1970
#1970
#1993
#2
#2003
#2005
#2008
#201
#2020
#2022
#2026
#2026
#2028
#2029
#2039
#2040
#2046
#2048
#2054
#2056
#2057
#2059
#2059
#206
#2063
#2064
#2065
#207
#208
#21
#2101
#2102
#2103
#2103
#2111
#2118
#2122
#2124
#2130
#2131
#2132
#2137
#214
#2147
#2152
#2157
#2158
#2183
#2189
#2198
#2234
#2297
#2300
#2302
#2303
#2306
#2307
#2308
#2309
#2310
#2311
#2312
#2313
#2314
#2315
#2316
#2322
#2323
#2324
#2325
#2328
#2329
#2330
#2331
#2332
#2335
#2339
#2348
#235
#2353
#2355
#2356
#2357
#2368
#2368
#237
#2370
#2380
#2381
#2383
#2387
#2388
#239
#2390
#2391
#2391
#2396
#24
#2405
#2407
#2409
#2451
#2452
#2453
#2456
#2457
#2464
#2465
#2466
#2469
#2470
#2472
#2473
#2473
#2481
#2481
#2488
#249
#2490
#2493
#2494
#2499
#2500
#2503
#2508
#2517
#2518
#2522
#2522
#2523
#253
#2531
#2533
#2537
#2537
#2539
#254
#2540
#2542
#2544
#2545
#2551
#2552
#2553
#2560
#2563
#2564
#2565
#2567
#2573
#2576
#2581
#2584
#2585
#2593
#2594
#2595
#2596
#260
#2602
#2603
#2604
#2609
#2610
#2624
#2626
#2629
#2631
#2633
#2635
#2635
#2638
#2638
#2639
#2645
#2655
#2655
#266
#2661
#2662
#2666
#268
#2681
#2683
#2684
#269
#2690
#2701
#2706
#2709
#2712
#2713
#2717
#2718
#2720
#2724
#2727
#2729
#2730
#2734
#2738
#2738
#2739
#2740
#2740
#2741
#2742
#2749
#2767
#277
#2773
#2773
#2775
#2775
#2785
#2785
#2793
#2793
#2799
#2804
#2813
#2814
#2820
#283
#2850
#2853
#2857
#2858
#286
#2860
#2863
#2864
#2864
#2869
#287
#2873
#288
#2880
#2880
#2885
#2885
#289
#2890
#2891
#2893
#2894
#2895
#2895
#2902
#2903
#2905
#2905
#2912
#2913
#2914
#2919
#2924
#2924
#2925
#2926
#2927
#2929
#2942
#2949
#2961
#2962
#2966
#2967
#2972
#2976
#2977
#2981
#2984
#2986
#2987
#2990
#2991
#2991
#2992
#2994
#2994
#2996
#2998
#300
#3003
#3004
#3004
#3005
#3007
#301
#3012
#3012
#3013
#3014
#3014
#3018
#3019
#3020
#3027
#3028
#3029
#3032
#3032
#3033
#3035
#3036
#3037
#3042
#3042
#3053
#3058
#3060
#3067
#3067
#3077
#3081
#3082
#3087
#3087
#3090
#3090
#3092
#3092
#3093
#3098
#3106
#3112
#3113
#3114
#3118
#3119
#3119
#3131
#3138
#3139
#314
#3234
#3234
#325
#327
#3282
#3318
#3318
#3328
#3329
#3331
#3337
#3339
#3342
#335
#3351
#3353
#3353
#3355
#3356
#3357
#336
#3364
#3368
#337
#3371
#3371
#3384
#3397
#3398
#3414
#342
#3420
#3424
#343
#343
#3433
#3433
#3435
#3437
#3438
#3439
#3440
#3447
#3447
#3449
#3454
#3457
#3458
#3465
#3469
#3473
#3473
#3474
#3475
#3475
#3477
#3482
#3493
#35
#350
#3503
#3506
#3507
#3508
#3509
#3511
#3512
#3513
#3519
#3522
#3527
#3530
#3537
#3538
#3539
#3539
#354
#3542
#3543
#3543
#3544
#3544
#3546
#3552
#3553
#3554
#3555
#3556
#3558
#3567
#357
#3574
#3574
#3575
#3575
#3577
#3581
#3581
#3585
#3587
#359
#3606
#3606
#3607
#3609
#3609
#3615
#3615
#3617
#3617
#3618
#3619
#3619
#362
#3622
#3629
#3634
#3634
#3643
#3646
#3650
#3650
#3651
#3652
#3654
#3655
#366
#3671
#3680
#3685
#369
#3691
#3694
#3694
#3707
#3708
#3708
#3711
#372
#3720
#3721
#3727
#3728
#3729
#373
#3732
#3732
#3735
#3736
#3738
#3741
#3748
#3752
#3768
#3769
#3770
#3770
#3771
#3775
#3776
#3777
#3778
#3778
#3779
#3779
#3798
#3799
#3801
#3805
#3806
#3809
#382
#3820
#3826
#3826
#3831
#3832
#3832
#3834
#3835
#3838
#3838
#384
#3843
#3848
#3853
#3861
#3866
#3869
#387
#3872
#3881
#3882
#3882
#3897
#3897
#3902
#3903
#3903
#3907
#3910
#3913
#3913
#3918
#3919
#392
#3927
#3927
#3934
#3935
#3935
#3936
#3944
#3955
#3959
#396
#3961
#3961
#3965
#3968
#3968
#3970
#3974
#3974
#3978
#3979
#3985
#3985
#3987
#3987
#3993
#4003
#4003
#4006
#4008
#4009
#4010
#4013
#4013
#4017
#4019
#402
#4021
#4023
#4026
#4029
#4029
#4031
#4031
#4033
#4034
#4035
#4036
#4036
#405
#4051
#4051
#4052
#4053
#4056
#4057
#4058
#4058
#4059
#4059
#4063
#4063
#4064
#4065
#4065
#4067
#4067
#4068
#4072
#4072
#4074
#4081
#4081
#4082
#4082
#4085
#4087
#4087
#4088
#4088
#4092
#4092
#4094
#4095
#4096
#4097
#4098
#4099
#4099
#4100
#4102
#4103
#4105
#4105
#4106
#4107
#4109
#4110
#4110
#4112
#4112
#4113
#4114
#4114
#4115
#4116
#4116
#4118
#4118
#412
#4127
#4127
#4128
#4128
#4130
#4130
#4131
#4131
#4132
#4133
#4134
#4134
#4136
#4137
#4139
#4139
#4140
#4140
#4143
#4145
#4145
#4148
#4148
#4149
#4149
#415
#4151
#4157
#4157
#4160
#4161
#4162
#4162
#4163
#4163
#4166
#4168
#4168
#4171
#4172
#4172
#4177
#4182
#4182
#4183
#4185
#4185
#4189
#4189
#419
#4195
#4195
#42
#4200
#4200
#4203
#4203
#4207
#4207
#4208
#4209
#4209
#4210
#4210
#4211
#4211
#4212
#4212
#4213
#4214
#4214
#4216
#4216
#4219
#4219
#4220
#4220
#4223
#4223
#4224
#4224
#4226
#4227
#4227
#4229
#4229
#4230
#4230
#4231
#4231
#4233
#4233
#4236
#4237
#4237
#4239
#4239
#4246
#4247
#4247
#4248
#4248
#4249
#4249
#4254
#4254
#4255
#4255
#4257
#4257
#4264
#4264
#4265
#4265
#4266
#4266
#4267
#4267
#427
#4270
#4270
#4272
#4272
#4275
#4275
#4278
#4278
#4279
#4279
#4282
#4285
#4285
#4286
#4286
#4287
#4291
#4291
#4294
#4294
#4296
#4297
#4298
#43
#4302
#4302
#4306
#4306
#4308
#4308
#4309
#4314
#4314
#4315
#4316
#4318
#4318
#4319
#4319
#4321
#4321
#4323
#4323
#4324
#4325
#4327
#4330
#4331
#4331
#4333
#4333
#4334
#4334
#4335
#4335
#4337
#4337
#4341
#4344
#4345
#4346
#4346
#4347
#4348
#4348
#4349
#4349
#4350
#4350
#4351
#4352
#4352
#4355
#4355
#4356
#4356
#4358
#4358
#4359
#4359
#4360
#4360
#4361
#4361
#4367
#4367
#4368
#4368
#4369
#4369
#4370
#4370
#4372
#4372
#4379
#4379
#4381
#4382
#4382
#4386
#4386
#4388
#4388
#4389
#4389
#4391
#4391
#4396
#4396
#4399
#4399
#441
#4411
#442
#444
#4444
#4445
#4448
#4448
#4449
#4449
#4456
#4456
#447
#4496
#4496
#4497
#4497
#4507
#4507
#4516
#4516
#4520
#4520
#4528
#4528
#4533
#4533
#4544
#4546
#4551
#4551
#4553
#4553
#4554
#4555
#4556
#4556
#4557
#4558
#4558
#4559
#4559
#4560
#4560
#4563
#4564
#4564
#4566
#4567
#4568
#4568
#4570
#4570
#4572
#4572
#4573
#4573
#4574
#4574
#4577
#4577
#4579
#4579
#458
#4580
#4580
#4582
#4582
#4583
#4583
#4584
#4589
#4589
#4590
#4591
#4591
#4594
#4608
#4608
#4609
#4609
#4615
#4617
#4617
#4620
#4620
#4621
#4621
#4624
#4624
#4625
#4625
#4628
#4628
#463
#4632
#4632
#4634
#4634
#4635
#4635
#464
#4642
#4642
#4649
#4649
#4653
#4653
#4663
#4663
#4665
#4665
#4666
#4666
#467
#4670
#4670
#4671
#4671
#4676
#4676
#4677
#4677
#468
#4680
#4680
#4689
#4689
#4691
#4694
#4694
#4696
#48
#485
#496
#499
#500
#513
#514
#518
#52
#521
#527
#528
#532
#536
#537
#540
#542
#543
#553
#558
#567
#571
#578
#578
#586
#587
#588
#589
#590
#600
#608
#610
#614
#615
#616
#622
#623
#626
#627
#628
#629
#633
#634
#635
#637
#639
#640
#641
#644
#666
#668
#669
#677
#681
#681
#684
#685
#691
#694
#695
#697
#698
#701
#702
#703
#710
#714
#715
#716
#717
#723
#726
#726
#733
#733
#735
#735
#741
#745
#747
#750
#752
#758
#767
#771
#776
#779
#78
#782
#791
#793
#80
#822
#827
#860
#874
#897
#92
#928
#940
#941
#949
#954
#959
#970
#979
1.0.0
1.1.0
v0.1.0
v0.2.0
v0.2.1
v0.2.1.1
v0.2.2
v0.2.4
v0.2.4.1
v0.2.5
v0.2.6
v0.2.7
v0.2.7.1
v0.3.2
v0.3.3
v0.4.0
v0.4.1
v0.5.0
v0.5.1
v0.5.2
v0.5.3
v0.6.0
v0.6.1
v0.6.2
-
178f9268ae
3ede7955eb
intod31ef12363
Lasercar
2025-04-05 05:53:58 +00:00 -
3ede7955eb
Results screen now plays it's music again
Lasercar
2025-02-12 20:44:39 +10:00 -
a6e5984d18
whoops, how did that bug test sneak into this branch?
Lasercar
2025-02-08 02:30:26 +10:00 -
d8980d7143
Results screen now accounts for the starting timestamp
Lasercar
2025-02-08 01:36:46 +10:00 -
780a9daccc
Show results option
Lasercar
2025-02-07 23:56:10 +10:00 -
ab40b6f19e
No more issues (hopefully)
Lasercar
2025-02-07 23:20:21 +10:00 -
be057c6167
Thi doesn't fix the issue?
Lasercar
2025-02-07 22:04:12 +10:00 -
9374b5f16a
missed/forgot this
Lasercar
2025-02-07 20:32:47 +10:00 -
3b3a30aef5
Resetting the instrument music track?
Lasercar
2025-02-07 20:27:58 +10:00 -
0badf7e979
idk
Lasercar
2025-02-07 18:01:01 +10:00 -
4c6ff82399
Only open Results screen above 30% song completion Bonus feature - debug chart button opens current selected freeplay song
Lasercar
2025-02-07 17:46:59 +10:00 -
4c97d710d7
missed one
Lasercar
2025-02-07 01:17:50 +10:00 -
e2f47d4693
Removed my comments
Lasercar
2025-02-07 01:17:15 +10:00 -
69e49480ab
Results screen no longer results (ha) in a crash when you close it too fast
Lasercar
2025-02-03 20:14:30 +10:00 -
63de65967f
chart editor playtest results screen hack very buggy and risky to use - moving your mouse over the chart before it's finished clearing up the textures will cause it to crash
Lasercar
2025-02-01 23:36:29 +10:00 -
33233b5dd3
f6c02cc194
intod31ef12363
Lasercar
2025-04-05 15:47:35 +10:00 -
f6c02cc194
Load a random song when opened on random
Lasercar
2025-02-22 19:32:47 +10:00 -
80e8e99e48
idk
Lasercar
2025-02-07 20:33:20 +10:00 -
42fbfb56b7
Open chart editor in freeplay
Lasercar
2025-02-07 20:29:23 +10:00 -
c7834ee129
Playback speed not being used fix
Lasercar
2025-02-19 20:52:43 +10:00 -
7739953b7c
Ohh Snap! Setting the time or length of a note in steps now accounts for your current step snap.
Lasercar
2025-03-03 23:17:58 +10:00 -
78302e46c7
Selection offset
Lasercar
2025-02-26 21:48:11 +10:00 -
9efa5754cc
Improved context menus Directly set the item's position and for hold notes, it's length as well Values can be shown and set in milliseconds or steptime
Lasercar
2025-02-22 18:22:56 +10:00 -
c72bd3fd00
fix capsule jumpin and random capsule starting x position
Lasercar
2025-03-24 19:24:45 +10:00 -
f7cac0a035
capsule jump in
Lasercar
2025-03-10 09:25:08 +10:00 -
5c577a7fdd
capsule options menu null reference fix
Lasercar
2025-03-06 12:02:57 +10:00 -
fc8a08f587
First rank overrides itself fix
Lasercar
2025-02-26 00:39:03 +10:00 -
bc5770365b
This should fix the squashed capsule text, right?
Lasercar
2025-02-24 23:25:30 +10:00 -
e2e585ffd6
Fixed letter sort animation
Lasercar
2025-02-24 22:25:10 +10:00 -
dabd46eb3f
Freeplay UI fixes Input is disabled as soon as possible when a capsule is open Input re-enables after capsule errors instrument selector uses the capsule's target position as it's position, rather than the capsule's position
Lasercar
2025-02-23 19:18:24 +10:00 -
a67a7cad39
61ca17b06d
intod31ef12363
Lasercar
2025-04-05 15:25:29 +10:00 -
61ca17b06d
A big commit for a small fix Cursor in chart editor breaks in square after placing and removing note
Lasercar
2025-03-01 12:17:30 +10:00 -
d528dd6464
CrusherNotDrip
2025-04-05 01:24:01 -04:00 -
f7a17e1bdc
TechnikTil
2025-04-02 13:43:24 -06:00 -
885bd49ecd
TechnikTil
2025-04-02 10:41:17 -06:00 -
abdf7dfa89
TechnikTil
2025-04-01 12:26:51 -06:00 -
f378ca25eb
Axuko
2024-06-08 23:07:12 -07:00 -
831491ebc4
Axuko
2024-06-08 22:28:50 -07:00 -
7feaaa7dbe
Axuko
2024-06-08 23:13:09 -07:00 -
cf5c805df0
667b0f3f3c
into158c015682
Til
2025-04-04 21:36:16 -07:00 -
667b0f3f3c
Til Tjardes
2025-03-31 19:36:07 -06:00 -
2ba213398f
Merge branch 'develop' into sustain-release-indicator
GitRan
2025-04-05 12:26:00 +08:00 -
7005d7e054
use 'songScoreInt' instead
GitRan
2025-04-05 12:22:09 +08:00 -
efddf06265
19aa713cb2
intod31ef12363
bctix
2025-04-04 21:47:44 -06:00 -
feafb1095c
d26cf14497
intod31ef12363
Burgerballs
2025-04-04 21:46:42 -06:00 -
789389ae7c
amyspark-ng
2025-04-04 22:46:11 -05:00 -
c58b891b2f
3c25c7c6a9
intod31ef12363
Kolo
2025-04-04 21:37:49 -06:00 -
6aecb15189
fba258f1af
intod31ef12363
Kolo
2025-04-04 21:37:43 -06:00 -
fc373c24ac
e4564e0d26
intod31ef12363
Kolo
2025-04-04 21:34:49 -06:00 -
63aaa3ffa5
c4ebfbe8e2
intod31ef12363
Kolo
2025-04-04 21:26:08 -06:00 -
fcedf4e516
1755a39ddf
intod31ef12363
Kolo
2025-04-04 21:19:03 -06:00 -
f7e3bda81a
fix: Chart loading fixes
Hyper_
2025-03-28 13:39:37 -03:00 -
23c062c839
1dd51fcf19
intod31ef12363
7oltan
2025-04-04 20:42:24 -06:00 -
d8f9d4788b
62da0c3e60
intod31ef12363
Kolo
2025-04-04 20:35:34 -06:00 -
d8aeec84cd
72a5713a56
intod31ef12363
amyspark-ng
2025-04-04 20:33:49 -06:00 -
495ec2a0c9
Merge branch 'develop' into consistent-sustains
GitRan
2025-04-05 10:28:18 +08:00 -
1fe6c913c6
f847870bb3
intod31ef12363
Hundrec
2025-04-04 19:52:40 -06:00 -
f847870bb3
Finish Eric's sentences in PlayState.hx
Hundrec
2025-03-19 00:30:18 -06:00 -
f292f97098
Fix two more misspellings in PlayState
Hundrec
2025-03-18 12:47:55 -06:00 -
78d203c719
Remove extra "lose"
Hundrec
2025-03-17 20:48:22 -06:00 -
0bbbd44c99
change -> chance
Hundrec
2025-03-16 05:09:08 -06:00 -
dc967a55ca
Grammatical fix in style-guide.md
Hundrec
2025-03-18 04:01:58 -06:00 -
e15e686752
Consistent hyphens in CODESTYLE.md
Hundrec
2025-03-18 04:00:18 -06:00 -
61e680176b
4a41ca5c46
intod31ef12363
Hundrec
2025-04-05 01:51:31 +00:00 -
4a41ca5c46
Hundrec
2025-04-04 19:51:28 -06:00 -
95c9b84d0e
4806ee7a60
intod31ef12363
Keoiki
2025-04-05 04:42:23 +03:00 -
670ac75a5d
Hundrec
2025-04-04 19:26:33 -06:00 -
0ac1a706da
Hundrec
2025-04-04 19:02:47 -06:00 -
daf4b298a8
Hundrec
2025-04-04 18:32:03 -06:00 -
609262859f
feat: Re-add the swapping of the backing image in freeplay
Abnormal
2025-04-04 19:11:43 -05:00 -
5241145a7a
rework note params
lemz
2024-05-31 14:02:28 +02:00 -
ba458d3b6a
chore: update submodules
Abnormal
2025-04-04 18:47:07 -05:00 -
b17cf35a20
Hundrec
2025-04-04 17:42:35 -06:00 -
16ea4f9586
966fbea9a9
intod31ef12363
Hundrec
2025-04-04 17:42:03 -06:00 -
966fbea9a9
Hundrec
2025-04-04 17:42:01 -06:00 -
c0f0bf324e
Pixel icons defined by song metadata
Abnormal
2025-03-21 20:55:44 -05:00 -
b7d132151f
FunkinSprite
overhaulAbnormal
2025-03-04 12:39:11 -06:00 -
6e38dc4eba
17a553f75a
intod31ef12363
Hyper_
2025-04-04 19:52:36 -03:00 -
17a553f75a
Hyper_
2025-04-04 19:52:33 -03:00 -
7b2fcdc8f2
replace the huge if/else block with a switch statement
Abnormal
2025-01-27 12:01:38 -06:00 -
fa323b67cb
i'd assume this is what it does based on the code
Abnormal
2025-02-13 18:13:19 -06:00 -
b67af7ebe2
simple helper functions to allow mods to add their own sprites to exit movers
Abnormal
2025-02-12 13:40:57 -06:00 -
ef7c9afd14
fix: Fix texture atlases looping indefinitely
Abnormal
2025-04-04 17:30:17 -05:00 -
9d7dd6b227
c5d73de24a
intod31ef12363
Jade
2025-04-04 17:30:09 -05:00 -
ddffe3541e
cyn0x8
2025-03-26 02:02:39 -07:00 -
71dacfcc8d
cyn0x8
2025-03-26 19:43:14 -07:00 -
180643036f
peak coding ik
anysad
2025-04-05 01:04:57 +03:00 -
d2443dd3c4
7aa29bbcf7
intod31ef12363
PurSnake
2025-04-04 21:24:18 +00:00 -
2db1060f37
4588be8157
intod31ef12363
PurSnake
2025-04-05 00:22:21 +03:00 -
4588be8157
Stages postConstruct
PurSnake
2025-04-05 00:14:16 +03:00 -
b97cf1b76a
does this fix something?
MrMadera
2025-04-04 22:14:03 +01:00 -
4d1c8ed5a3
new default gamepad binds
MrMadera
2025-04-04 21:58:01 +01:00 -
069c15c31e
Load meta/chartdata fix Deletes the song serialiser class, it has no use anymore Also fixes the BPM changes Note style is properly set when metadata toolbox is refreshed Add variation dialog now fills note style dropdown with note styles and sets it properly afterwards Also makes a few optimisations for the chart editor
Lasercar
2025-03-09 11:44:12 +10:00 -
2c5c196cdc
oops remove trace
anysad
2025-04-04 23:47:19 +03:00 -
286e657472
please bro gosh why is it like that
anysad
2025-04-04 23:46:39 +03:00 -
b36e085af5
030e33202f
intod31ef12363
Lasercar
2025-04-05 06:32:10 +10:00 -
0aed162cd6
tallieslevel and conductor reset
Lasercar
2025-03-12 12:25:53 +10:00 -
8a426e9234
Restart from results state
Lasercar
2025-03-11 20:26:40 +10:00 -
3b3031a181
42be9e9d8f
intod31ef12363
Lasercar
2025-04-05 06:28:40 +10:00 -
6555cc2c1b
ea93ec90cb
intod31ef12363
Lasercar
2025-04-05 06:28:33 +10:00