EliteMasterEric
|
13d6ba378e
|
Work in progress on fixing Week 6
|
2024-02-28 00:19:08 -05:00 |
|
EliteMasterEric
|
66c91d8b3e
|
Sort the chart editor note kind dropdown.
|
2024-02-23 03:23:00 -05:00 |
|
EliteMasterEric
|
11bb69002b
|
Merge remote-tracking branch 'origin/rewrite/master' into feature/2hot-death-animation
|
2024-02-22 21:01:07 -05:00 |
|
EliteMasterEric
|
572ecc8aa8
|
Merge remote-tracking branch 'origin/rewrite/master' into anim-editor-stuffs
|
2024-02-22 19:05:20 -05:00 |
|
EliteMasterEric
|
0b49a88cdd
|
Move the crash keybind into a global plugin.
|
2024-02-22 01:47:35 -05:00 |
|
EliteMasterEric
|
744e2f95bd
|
Add additional memory utilities and logging.
|
2024-02-22 00:06:02 -05:00 |
|
EliteMasterEric
|
907d9150c0
|
Add additional memory utilities and logging.
|
2024-02-21 17:10:18 -05:00 |
|
EliteMasterEric
|
36c0c61946
|
Merge remote-tracking branch 'origin/rewrite/master' into feature/2hot-death-animation
|
2024-02-20 18:44:51 -05:00 |
|
EliteMasterEric
|
d888fb860d
|
Remove support for >100% audio since it didn't actually boost the gain.
|
2024-02-20 13:37:53 -05:00 |
|
Cameron Taylor
|
2cfeb2c94d
|
anim editor dropdown fix
|
2024-02-20 00:29:11 -05:00 |
|
Cameron Taylor
|
63a49010ba
|
positioning and average reset
|
2024-02-19 20:56:57 -05:00 |
|
Cameron Taylor
|
6e691c66c3
|
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into input-offsets
|
2024-02-19 20:33:36 -05:00 |
|
Jenny Crowe
|
7d7cf32f44
|
Chart editor grid now updates when changing the song BPM. HItsound volumes converted to two separate sliders.
|
2024-02-19 18:18:32 -07:00 |
|
EliteMasterEric
|
44623071cd
|
Redo event stuff for abot and game over audio logic
|
2024-02-18 03:02:36 -05:00 |
|
EliteMasterEric
|
8a9a7f3b97
|
Additional chart editor fixes.
|
2024-02-17 02:13:11 -05:00 |
|
EliteMasterEric
|
98e6d4091e
|
Revamp note kind handling in the chart editor.
|
2024-02-16 22:01:47 -05:00 |
|
Cameron Taylor
|
94938313dd
|
click preview to open screenshots folder (and moved openFolder to FileUtil
|
2024-02-16 05:24:43 -05:00 |
|
Cameron Taylor
|
638c166663
|
optimization when opening from pause menu
|
2024-02-15 04:10:48 -05:00 |
|
Cameron Taylor
|
96d27c271a
|
avg offset better calc
|
2024-02-14 08:29:38 -05:00 |
|
Cameron Taylor
|
c3d03011cc
|
Merge branch 'rewrite/master' into input-offsets
|
2024-02-13 03:34:41 -05:00 |
|
EliteMasterEric
|
2dbc0cda6e
|
Fix a missing import.
|
2024-02-13 03:18:51 -05:00 |
|
EliteMasterEric
|
c901763ad8
|
Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-gamepad-support
|
2024-02-13 03:12:57 -05:00 |
|
EliteMasterEric
|
bd4103fd11
|
Merge remote-tracking branch 'origin/rewrite/master' into feature/hashlink-hot-reload
|
2024-02-13 03:06:20 -05:00 |
|
EliteMasterEric
|
e37fc09e89
|
Hashlink actually working!
|
2024-02-13 03:03:11 -05:00 |
|
Cameron Taylor
|
6b80e292e5
|
Merge branch 'rewrite/master' into input-offsets
|
2024-02-13 03:02:33 -05:00 |
|
EliteMasterEric
|
fa4b896d9a
|
Merge branch 'rewrite/master' into feature/hashlink-hot-reload
|
2024-02-13 02:23:14 -05:00 |
|
EliteMasterEric
|
c4522fe177
|
Merge branch 'rewrite/master' into rewrite/weekend-1-gameplay-shaderdev
|
2024-02-13 02:17:06 -05:00 |
|
EliteMasterEric
|
f0b5ef4491
|
Rest in peace, SwagCamera.
|
2024-02-13 01:38:11 -05:00 |
|
Cameron Taylor
|
681cfa0883
|
chart editor waveform fixes for single vocal audio files
|
2024-02-13 01:16:09 -05:00 |
|
Cameron Taylor
|
41e94f951e
|
Merge branch 'rewrite/master' of https://github.com/funkincrew/funkin-secret into feature/freeplay-pico-character
|
2024-02-13 00:48:26 -05:00 |
|
Cameron Taylor
|
8c54a62ed6
|
Merge branch 'rewrite/master' into feature/freeplay-pico-character
|
2024-02-13 00:41:03 -05:00 |
|
Cameron Taylor
|
6e0f577d54
|
debugger fixes
|
2024-02-13 00:29:46 -05:00 |
|
Cameron Taylor
|
58077b4505
|
more working audio offset in progress
|
2024-02-12 22:44:59 -05:00 |
|
Cameron Taylor
|
e759f90147
|
audioVisualOffset numbers
|
2024-02-12 22:14:35 -05:00 |
|
Cameron Taylor
|
25766dbde9
|
decoupling some stuff from Conductor.instance
|
2024-02-12 21:41:16 -05:00 |
|
Cameron Taylor
|
43ec35f5fd
|
derp .position -> .time fix
|
2024-02-12 21:00:40 -05:00 |
|
Cameron Taylor
|
0145d7ed2d
|
input offset edits in progress
|
2024-02-12 20:06:43 -05:00 |
|
EliteMasterEric
|
f4d4d6a194
|
Fix deprecation issue with FlxTweenType.
|
2024-02-12 16:49:56 -05:00 |
|
Cameron Taylor
|
d903edcb59
|
Merge branch 'rewrite/master' into input-offsets
|
2024-02-10 15:43:27 -05:00 |
|
Cameron Taylor
|
aeddcee983
|
tweaks in progress
|
2024-02-10 15:42:29 -05:00 |
|
EliteMasterEric
|
d0b3842d44
|
Merge branch 'feature/freeplay-pico-character' into rewrite/weekend-1-gameplay-shaderdev
|
2024-02-10 02:38:23 -05:00 |
|
Cameron Taylor
|
66188fbd52
|
Merge branch 'rewrite/master' into feature/chart-editor-freeplay-difficulty
|
2024-02-10 02:32:23 -05:00 |
|
Cameron Taylor
|
4bfab35b29
|
Merge branch 'rewrite/master' into feature/dialogue-data-refactor
|
2024-02-10 02:25:06 -05:00 |
|
EliteMasterEric
|
091f8eb724
|
Merge branch 'rewrite/master' into feature/freeplay-pico-character
|
2024-02-09 23:13:40 -05:00 |
|
EliteMasterEric
|
4bf9f68658
|
Finalize freeplay preview toolbox
|
2024-02-09 14:58:57 -05:00 |
|
EliteMasterEric
|
4491465bf9
|
Implement difficulty rank into Metadata toolbox.
|
2024-02-08 19:22:28 -05:00 |
|
EliteMasterEric
|
31cd5b3414
|
Rework Conversation data parsing
|
2024-02-07 18:45:13 -05:00 |
|
EliteMasterEric
|
82b63c02e1
|
Reworks to make Pico mode actually work.
|
2024-02-05 21:35:58 -05:00 |
|
EliteMasterEric
|
e5fb1de4ba
|
Fix a boatload of deprecation warnings and upgrade a few libraries.
|
2024-02-05 19:46:11 -05:00 |
|
Cameron Taylor
|
984c26c0e5
|
Merge branch 'rewrite/master' into feature/chart-editor-offset-toolbox
|
2024-02-05 13:06:25 -05:00 |
|
Cameron Taylor
|
201e109d64
|
Merge branch 'rewrite/master' into bugfix/copy-prompt-fixes
|
2024-02-05 13:03:32 -05:00 |
|
Cameron Taylor
|
cc8b2b2d20
|
Merge branch 'rewrite/master' into feature/units
|
2024-02-05 11:55:52 -05:00 |
|
EliteMasterEric
|
de1ddcbf4d
|
Merge branch 'rewrite/master' into feature/chart-editor-gamepad-support
|
2024-02-02 23:15:48 -05:00 |
|
EliteMasterEric
|
f6f9ad3985
|
Completed functionality for offset window.
|
2024-02-02 21:53:45 -05:00 |
|
Jenny Crowe
|
fe7ffecc0d
|
Chart editor: Tweaked FlxCamera management when entering and exiting playtest mode to fix UI-related crashes.
|
2024-02-01 13:52:50 -07:00 |
|
Cameron Taylor
|
3621f17bd0
|
maybe acurate?
|
2024-01-31 03:24:00 -05:00 |
|
Cameron Taylor
|
0f29f2f7a6
|
Merge branch 'rewrite/master' into input-offsets
|
2024-01-31 00:39:35 -05:00 |
|
EliteMasterEric
|
f74604c48e
|
Feature changes to Offsets window
|
2024-01-30 21:50:25 -05:00 |
|
Cameron Taylor
|
c44e33c556
|
derp
|
2024-01-27 06:16:46 -05:00 |
|
EliteMasterEric
|
f6e4bc863d
|
Work in progress on offsets toolbox (working dragging!)
|
2024-01-27 03:24:49 -05:00 |
|
EliteMasterEric
|
8085b20a67
|
Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offset-toolbox
|
2024-01-27 00:56:13 -05:00 |
|
Jenny Crowe
|
7137c13382
|
Copy command now pulses events in selection even if no notes are in the selection. "Copied" prompt now includes events in the text.
|
2024-01-26 19:36:10 -07:00 |
|
Jenny Crowe
|
4f7c2cd511
|
Now using hbox to more easily append unit label
|
2024-01-26 18:30:41 -07:00 |
|
Jenny Crowe
|
8b19a7511c
|
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/units
|
2024-01-26 18:20:04 -07:00 |
|
Cameron Taylor
|
ca739cee45
|
event.value -> event.value.toFloat() fix
|
2024-01-25 23:05:54 -05:00 |
|
Cameron Taylor
|
72fe05ddf5
|
Merge branch 'rewrite/master' into feature/audio-tab-upgrade
|
2024-01-25 22:52:31 -05:00 |
|
Cameron Taylor
|
a0b855c8bb
|
Merge pull request #300 from FunkinCrew/bugfix/vocal-offset-loading
Fixed bugs related to instrumental/vocal offsets not loading or being taken into account properly
|
2024-01-25 22:32:08 -05:00 |
|
EliteMasterEric
|
c9163986d5
|
Initial attempt at rendering the waveform inside the offsets toolbox.
|
2024-01-25 20:23:18 -05:00 |
|
EliteMasterEric
|
25aff02784
|
Added options for waveform amplitude and minimum size.
|
2024-01-25 19:10:33 -05:00 |
|
Jenny Crowe
|
e111e91a9c
|
Editor: Added ability to set units for event properties. Fixed bug where event icon tooltip wouldn't show an enum text value correctly.
|
2024-01-24 20:31:25 -07:00 |
|
EliteMasterEric
|
ba674b1f92
|
Added support for clipRects to WaveformSprite.
|
2024-01-24 14:35:50 -05:00 |
|
EliteMasterEric
|
a1cff6be50
|
Replace waveform renderer with the newer, more performant version.
|
2024-01-23 23:24:05 -05:00 |
|
EliteMasterEric
|
e8fa7f9c70
|
Performant audio waveforms generated directly from provided FlxSound elements.
|
2024-01-23 22:47:27 -05:00 |
|
Jenny Crowe
|
dfe4ff614c
|
Editor: Removed side sliders. Split vocal volume into two sliders. Removed vocal volume from the savefile.
|
2024-01-22 23:51:13 -07:00 |
|
EliteMasterEric
|
c3d2582252
|
Work in progress on new Waveform renderer
|
2024-01-20 14:07:48 -05:00 |
|
EliteMasterEric
|
608d9b6968
|
Add new Offsets window, work in progress
|
2024-01-20 14:07:31 -05:00 |
|
Jenny Crowe
|
a7e9f08e26
|
Editor now loads saved inst/vocal offset properly.
|
2024-01-19 21:24:18 -07:00 |
|
Jenny Crowe
|
9adfd0b6f1
|
Vocal offset is now properly taken into account when playing a song
|
2024-01-19 21:02:43 -07:00 |
|
EliteMasterEric
|
d215152aaf
|
Fix a bug where removing audio tracks wouldn't remove their visualizers.
|
2024-01-18 22:28:25 -05:00 |
|
Cameron Taylor
|
969626c8f8
|
Merge pull request #296 from FunkinCrew/bugfix/play-pause-button
Stop audio playback when starting playtest, fixing the button icon.
|
2024-01-18 07:18:10 -05:00 |
|
Cameron Taylor
|
f13772da67
|
Merge branch 'rewrite/master' into bugfix/chart-editor-upload-vocals-rewrite
|
2024-01-18 07:13:57 -05:00 |
|
Cameron Taylor
|
210088a25d
|
Merge branch 'rewrite/master' into feature/chart-editor-event-tooltips
|
2024-01-18 04:25:04 -05:00 |
|
EliteMasterEric
|
3ef7a03094
|
Add "Remove Difficulty" button to the Difficulty toolbox.
|
2024-01-18 01:08:38 -05:00 |
|
Cameron Taylor
|
ab9b6d6c47
|
Merge pull request #292 from FunkinCrew/bugfix/chart-editor-selection-box
Fix a bug where the drag-to-select box in the chart editor is not visible
|
2024-01-18 00:40:05 -05:00 |
|
Cameron Taylor
|
ef11f89632
|
Merge branch 'rewrite/master' into feature/separate-character-vocal-volumes
|
2024-01-18 00:24:47 -05:00 |
|
EliteMasterEric
|
8c770e6c62
|
Stop audio playback when starting playtest, fixing the button icon.
|
2024-01-18 00:00:57 -05:00 |
|
EliteMasterEric
|
25fe2c0d39
|
Rewrite Upload Vocals dialog.
|
2024-01-17 23:53:23 -05:00 |
|
EliteMasterEric
|
027c2843f4
|
This bug took me like 4-5 hours of staring at code to fix i am going crazy graaaa
|
2024-01-17 22:19:40 -05:00 |
|
Cameron Taylor
|
96d02261c5
|
Merge branch 'rewrite/master' into feature/stage-solids
|
2024-01-17 21:40:26 -05:00 |
|
Jenny Crowe
|
e44b028946
|
Added side sliders that alter the volume of vocals and hitsounds on player/opponent sides.
|
2024-01-17 16:24:03 -07:00 |
|
EliteMasterEric
|
80c7bcdfdf
|
Rewrite Stage data handling to use the Registry pattern, and add support for solid colors.
|
2024-01-16 17:08:25 -05:00 |
|
Cameron Taylor
|
1dcd0debc7
|
conductor stuff
|
2024-01-16 05:37:06 -05:00 |
|
Cameron Taylor
|
3b078ee42c
|
Merge pull request #284 from FunkinCrew/bugfix/chart-editor-edit-context
Fix "Edit Event" menu item when right clicking chart events
|
2024-01-15 21:30:22 -05:00 |
|
EliteMasterEric
|
3366240eb5
|
Fix "Edit Event" menu item when right clicking chart events
|
2024-01-15 18:21:49 -05:00 |
|
EliteMasterEric
|
6f0f5ea610
|
Fix a crash when closing chart editor with no music playing
|
2024-01-15 15:33:28 -05:00 |
|
EliteMasterEric
|
3e8200ee9d
|
Allow builds without hxCodec if using hashlink
|
2024-01-12 21:52:28 -05:00 |
|
Cameron Taylor
|
75dfed8229
|
-release fix
|
2024-01-12 19:50:13 -05:00 |
|
EliteMasterEric
|
9fe0c68256
|
Add theme music toggle and extend fade in
|
2024-01-12 18:29:02 -05:00 |
|
Cameron Taylor
|
99b7a8a75d
|
Merge branch 'rewrite/master' into bugfix/chart-editor-positioning-fixes
|
2024-01-12 08:19:26 -05:00 |
|
Cameron Taylor
|
e87c895131
|
Merge branch 'rewrite/master' into feature/chart-editor-drag-edit-holds
|
2024-01-12 08:13:30 -05:00 |
|
EliteMasterEric
|
25c10d205d
|
Some positioning fixes
|
2024-01-12 06:35:41 -05:00 |
|
Cameron Taylor
|
fad569519d
|
Merge branch 'rewrite/master' into bugfix/freeplay-icon-offsets
|
2024-01-12 06:15:15 -05:00 |
|
EliteMasterEric
|
025fd326bd
|
Click and drag on a sustain to edit it.
|
2024-01-12 06:13:34 -05:00 |
|
Cameron Taylor
|
2539b90ab8
|
Merge branch 'rewrite/master' into feature/chart-editor-selection-tweak
|
2024-01-12 04:43:17 -05:00 |
|
EliteMasterEric
|
06964ce1e3
|
Fix HTML5 build issue
|
2024-01-10 20:58:06 -05:00 |
|
Cameron Taylor
|
b11bf09687
|
save/load for inputOffsets
|
2024-01-09 19:57:33 -05:00 |
|
Cameron Taylor
|
5d0c1521d5
|
strumline refactor stuffy
|
2024-01-09 13:16:00 -05:00 |
|
EliteMasterEric
|
c6b3499897
|
Finished up hold note placement on gamepad, implemented note preview playhead
|
2024-01-08 21:26:24 -05:00 |
|
Cameron Taylor
|
e323f46569
|
conductor.instance fixes
|
2024-01-08 15:46:16 -05:00 |
|
Cameron Taylor
|
7058d9baa7
|
stuf in progres
|
2024-01-08 15:39:44 -05:00 |
|
Cameron Taylor
|
d62042a99a
|
skip transition into debug substate
|
2024-01-08 15:39:44 -05:00 |
|
EliteMasterEric
|
4804b9ae22
|
Work in progress for Chart Editor gamepad support (navigation implemented, note placement WIP)
|
2024-01-06 01:06:10 -05:00 |
|
Cameron Taylor
|
ac902c19c5
|
beats per measure conductor instance fix
|
2024-01-05 20:38:46 -05:00 |
|
Cameron Taylor
|
ff88c53f7c
|
steps per measure instance conductor fix
|
2024-01-05 20:38:20 -05:00 |
|
Cameron Taylor
|
350ce19783
|
conductor instnace small fix lol!
|
2024-01-05 20:37:13 -05:00 |
|
Cameron Taylor
|
8f7c449194
|
Merge branch 'rewrite/master' into feature/chart-editor-measure-numbers
|
2024-01-05 20:35:15 -05:00 |
|
Cameron Taylor
|
da4e77bf44
|
Merge branch 'rewrite/master' into feature/chart-editor-context-menus
|
2024-01-05 20:11:38 -05:00 |
|
Cameron Taylor
|
1e07b6ae22
|
Merge branch 'rewrite/master' into bugfix/chart-editor-modifies-freeplay
|
2024-01-05 17:41:07 -05:00 |
|
Cameron Taylor
|
65aee1dd13
|
Merge branch 'rewrite/master' into bugfix/conductor-rewrite
|
2024-01-05 15:32:42 -05:00 |
|
EliteMasterEric
|
a3123cd64c
|
Measure numbers next to ticks and support for initial time signature.
|
2024-01-05 02:35:41 -05:00 |
|
EliteMasterEric
|
336810b628
|
Tooltips when hovering over chart events
|
2024-01-04 10:00:39 -05:00 |
|
EliteMasterEric
|
4a0a330eb4
|
Redo logic around note selection, add new buttons for selecting individual sides.
|
2024-01-04 08:20:34 -05:00 |
|
EliteMasterEric
|
4c353101ae
|
Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-context-menus
|
2024-01-04 01:55:00 -05:00 |
|
EliteMasterEric
|
edc6f85e21
|
Finish up event editing (selecting an existing event now shows its data in the event data toolbox)
|
2024-01-03 21:10:14 -05:00 |
|
EliteMasterEric
|
7684757dbb
|
Merge remote-tracking branch 'origin/rewrite/master' into no-debugger
|
2024-01-03 19:54:41 -05:00 |
|
EliteMasterEric
|
bbaa9aa4af
|
Work in progress on context menus and song event editing.
|
2024-01-03 19:53:17 -05:00 |
|
EliteMasterEric
|
a1002c4756
|
Merge remote-tracking branch 'origin/rewrite/master' into bugfix/conductor-rewrite
|
2024-01-02 14:14:26 -05:00 |
|
EliteMasterEric
|
ddfecf2cfc
|
Clean up difficulty label behavior
|
2024-01-02 14:07:07 -05:00 |
|
Eric
|
edd8bdc014
|
Merge branch 'rewrite/master' into bugfix/chart-editor-monday-fixes
|
2023-12-19 19:04:40 -05:00 |
|
EliteMasterEric
|
70b7de94aa
|
Fix to Metadata toolbox causing crash when no GF :(
|
2023-12-19 01:28:13 -05:00 |
|
EliteMasterEric
|
bb0fb02813
|
Fix to launching directly into Chart Editor
|
2023-12-19 01:26:43 -05:00 |
|
EliteMasterEric
|
3e65e7ecc5
|
Fix for vocals not loading properly and not getting cleared properly.
|
2023-12-19 01:26:26 -05:00 |
|
EliteMasterEric
|
328bb7b938
|
Fixes to Erect/Nightmare only
|
2023-12-19 01:25:15 -05:00 |
|
Cameron Taylor
|
41ad47db52
|
Merge branch 'rewrite/master' into bugfix/selection-highlight
|
2023-12-19 01:18:49 -05:00 |
|
Cameron Taylor
|
4fc56a2280
|
small fix to backups folder not existing
|
2023-12-15 21:46:09 -05:00 |
|
EliteMasterEric
|
88ca58f9e2
|
Fixes for updated HaxeUI and Flixel.
|
2023-12-15 21:09:01 -05:00 |
|
Cameron Taylor
|
e9ed7223b6
|
no debugger
|
2023-12-15 02:29:32 -05:00 |
|
Cameron Taylor
|
15f72adeed
|
Merge branch 'rewrite/master' into bugfix/selection-highlight
|
2023-12-14 18:41:23 -05:00 |
|
EliteMasterEric
|
ca489b5609
|
Rewrite the Conductor to be a singleton instance.
|
2023-12-14 16:56:20 -05:00 |
|
EliteMasterEric
|
b3236e6134
|
Fix a bug where modifying a copied template song's BPM in the chart editor would modify BPM in Freeplay.
|
2023-12-14 00:47:04 -05:00 |
|
Cameron Taylor
|
4ea04a9a2e
|
Merge branch 'icon-charswitcher' into rewrite/master
|
2023-12-13 23:11:51 -05:00 |
|
EliteMasterEric
|
e2b0ed98dd
|
Fix a bug where making one selection and then making a different one would leave the original highlighted
|
2023-12-13 23:11:19 -05:00 |
|
Cameron Taylor
|
0a47689eaa
|
ease
|
2023-12-13 23:11:12 -05:00 |
|
EliteMasterEric
|
aeb2cf24ad
|
Fix a rebase issue
|
2023-12-13 22:42:09 -05:00 |
|
EliteMasterEric
|
b740fbf028
|
Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-waveform
|
2023-12-13 22:36:08 -05:00 |
|
Cameron Taylor
|
4193cd4ee2
|
proper dialog fading
|
2023-12-13 18:24:55 -05:00 |
|
Cameron Taylor
|
028e90474c
|
Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into icon-charswitcher
|
2023-12-13 17:26:46 -05:00 |
|
Cameron Taylor
|
db76a0dd1d
|
Merge pull request #244 from FunkinCrew/chart-edit-playtest
Enabling / Disabling "playtest" mode from chart editor
|
2023-12-13 17:19:02 -05:00 |
|
Cameron Taylor
|
b09ed369e8
|
f
|
2023-12-13 09:20:15 -05:00 |
|
Cameron Taylor
|
6ca0e32391
|
Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into icon-charswitcher
|
2023-12-13 09:20:11 -05:00 |
|