ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,885 Commits 3 Branches 7 Tags 87 MiB
Commit Graph

4107 Commits

Author SHA1 Message Date
shyguyhex 6225654b46
Fix #2188 (#2189) 2022-02-08 07:47:56 +10:30
zilmar f7618f29c0 Core: Move SP_DMA_READ into SPRegistersHandler 2022-02-01 13:24:25 +10:30
Anders 4a3aab54d3
Graceful label truncation (#2179) 
* Graceful label truncation

* Undo UTF-8 GitHub conversion
 2022-01-28 08:57:37 +10:30
Anders 5c8f87d4f8
Don't use PROCESS_ALL_ACCESS when it is not required (#2181) 
* Request SDK neutral PROCESS_ALL_ACCESS

* Use basic version test

* Just ask for the access required
 2022-01-28 07:04:24 +10:30
zilmar 05bf0f9fb4 Project64: Fix deleting an enhancement 2022-01-27 14:02:32 +10:30
shyguyhex b26de13d64
[Debugger] Start commands window at PC address (#2178) 2022-01-27 10:03:22 +10:30
zilmar 2b008cc278 Core: Create Memory handler for SP Registers 2022-01-24 23:13:10 +10:30
LuigiBlood e60f7ec648
Change CRC for 64DD Disks + better ROM Browser support for 64DD (#2164) 
* Change CRC for 64DD Disks + Properly provide Disk Info for ROM Browser/Info

* Change CRCs for 64DD Titles + Rename RDB as needed
(And add English Mario no Photopi to RDB and english cheats for english Polygon Studio)

* [RDB] Add Extra Dezaemon 3D Expansion
 2022-01-21 09:54:39 +10:30
shyguyhex 9e99ef1855
[Debugger] Alphabetize script lists (#2174) 2022-01-21 09:53:21 +10:30
shyguyhex 93740c612f
[Debugger] JS API: Fix socket closing itself (#2173) 2022-01-21 09:52:44 +10:30
zilmar 7fd239cf82 Core: Change NextInstruction to PipelineStage 2022-01-18 18:17:21 +10:30
shyguyhex de0a59ac54
[Debugger] JS API: Add script.abort() (#2170) 2022-01-14 07:09:21 +10:30
shyguyhex 8559be556b
[Debugger] JS API: Expand AddressRange class, misc fixes (#2168) 2022-01-13 07:06:30 +10:30
LuigiBlood 16667ec4f9
[Core] Proper Dezaemon 3D SRAM 96KB save support (#2165) 2022-01-12 07:33:56 +10:30
zilmar 7452dd44db Core: Removed CRecompiler::RecompilerMain_Lookup_validate when I should not have, putting it back in 2022-01-10 19:28:38 +10:30
zilmar 30a40ea0a8 Core: Remove the option to turn off tlb 2022-01-10 17:46:01 +10:30
LuigiBlood 5d82837984
[Project64-input] N64 Mouse Support (#2160) 
* [Project64-input] Unpolished Mouse Support
(Use Present value as Device Type)

* [Project64-input] Use Forced N64 Mouse config (using System Mouse)

* [Project64-input] Disable Mouse Scanning

* [Project64-input] Polish UI by adding Mouse image + Prevent Controller setup when using N64 Mouse

* [Project64-input] Revert Controller Save/Load changes

* [Project64-input] Seperate N64 Mouse into its own configuration

* [Project64-input] Add Mouse Locking + Shortcut System

* [Project64-input] Make Cursor invisible when locked

* [Project64-input] Make sure to unlock mouse when opening config

* [Project64-input] Working Lock/Unlock Shortcut + Only emulate mouse when locked

* [Project64-input] Use ClipCursor instead of DirectInput Exclusive Level

* [Project64-input] Add Mouse Sensitivity option + Change to SetCursorPos

* [Project64-input] Add WM_KillFocus and EmulationPaused functions

* [Project64-core] Move EmulationPaused call to really make sure it is called in all cases
 2022-01-09 21:43:12 +10:30
zilmar 40683ecf79 Core: Remove legacy code 2022-01-05 08:59:12 +10:30
zilmar 226ebe68d9 Core: Remove ROM_IN_MAPSPACE 2022-01-05 08:31:27 +10:30
zilmar beb4c4378f Core: Remove Old CFB_READ code 2022-01-05 08:24:58 +10:30
zilmar 79b03c9ee0 Core: Move Peripheral Interface handling in to handler file 2022-01-05 08:14:03 +10:30
zilmar eafcb96c01 Project64-core: Move handling of RDRam Interface Register handling to its own file 2022-01-04 16:11:52 +10:30
zilmar 7e80d952cb Project64-core: General Code clean up 2022-01-04 10:26:14 +10:30
zilmar d88ea539b1 Project64: Have DebugMMU directly access imem/dmem, not through rdram 2022-01-04 10:13:03 +10:30
zilmar 09f90d9b53 Project64-core: Make Setting_EnableDisk be a setting in GameSettings 2022-01-04 10:07:52 +10:30
shyguyhex 219b9149d6
[Debugger] JS API: add fs.exists (#2158) 2022-01-01 14:26:03 +10:30
shyguyhex 9b5f45ea23
[Debugger] Fix nested JS callback registration (fix #2147) (#2157) 
* [Debugger] Fix nested JS callback registration (fix #2147)

* [Debugger] Handle JS socket ungraceful disconnect
 2021-12-28 18:01:19 +10:30
Andrew 6d2e6774fa
Add missing argument to mem.setblock (#2154) 2021-12-26 09:26:46 +10:30
zilmar ce6042fe9d [Android] Fix up accessing settings in bridge 2021-10-18 05:14:07 +10:30
zilmar 0423ceb72b [Android] Some tweaks to jni bridge 2021-10-14 16:56:42 +10:30
shyguyhex 9a287a53ee
[Debugger] JS API: Improve callback checks (fix #2123) (#2125) 
* [Debugger] JS API: Fix project64#2122

* [Debugger] JS API: Improve callback checks (fix #2123)

* [Debugger] JS API: Improve callback checks (fix #2123)
 2021-10-11 13:38:48 +10:30
shyguyhex 921c12e4d0
[Debugger] JS API: Fix project64#2122 (#2124) 2021-10-08 08:11:54 +10:30
LuigiBlood 8b90894d0f
Add Aleck64 CIC, rename 64DD IPL Dev CIC (#2120) 
* Add CIC-NUS-5101 support (Aleck64)

* Rename CIC_NUS_DDTL (64DD IPL Dev) to CIC_NUS_8401 (actual chip ID)
And properly support it in the Rom Browser

* Forgot to check nullptr before putting Aleck64 CRC info
 2021-10-05 09:54:36 +10:30
shyguyhex 1606b23ef9
[Debugger] JS API: Add PJ64_JSAPI_VERSION constant (#2119) 2021-09-29 08:22:19 +09:30
shyguyhex ac94f2505e
[Debugger] Rewrite script API (#2110) 
* [Debugger] Rewrite script API

* Update js api paths in installer script
 2021-09-03 14:41:04 +09:30
shyguyhex 56911cef58
[Debugger] Symbols: improve performance, implement filter textbox (#2102) 2021-08-26 12:28:34 +09:30
shyguyhex 29a40ba57b
[Core] Set GameRunning_InReset=false after reset (#2098) 2021-08-13 06:55:24 +09:30
shyguyhex 5c085db70b
[Debugger] Fix script directory bugs (fix #2094) (#2095) 2021-08-08 20:28:54 +09:30
zilmar b0c5bbe0ae [Android] Be able to create version.gradle 2021-07-20 11:33:40 +09:30
Rosalie e55cec5ea6
[Project64] Fix hidden statusbar (#2086) 2021-07-18 08:08:12 +09:30
zilmar fc996df8ec Add Author to enhancement file 2021-07-13 08:17:16 +09:30
Kimberly J Ortega 416205ed5f
Enhancements: Add spaces to tags (#2079) 
- Matching RDB format.
- Keep checks for old version to avoid breaking user enhancements, due to lack of a fixed control mechanism for upgrading
 2021-07-12 13:30:28 +09:30
Kaja, Kyle 6d9c88f1e2 Fix controller settings not saving the Controller Pak plugin 
This fixes issue #2019
 2021-07-09 13:01:36 -05:00
zilmar 9ad8d49d0e Some code clean up to help build android 2021-06-28 11:27:35 +09:30
Squall Leonhart 8907a47a00
the n64 analog stick cannot ever hit 127 
only making it to between 93 and 95 on a brand new pad

most games stop scaling beyond 83, but buck bumble appears to develop negative returns when the control is allowed to go too far resulting in barely any movement.
 2021-06-24 18:21:47 +10:00
zilmar bfd206e0a7 Get Controller plugin to update at request 2021-06-15 14:30:38 +09:30
zilmar 2850cc78c8 Make showing nag window a temp setting 2021-06-14 16:55:37 +09:30
oddMLan bad103568a Enhancement -> Enhancements (Updated package scripts as well) 
Enhancement-User -> Enhancements-User
 2021-06-13 14:55:36 +09:30
zilmar 542aec05f0 change version number for develop to 4.x 2021-06-13 13:07:20 +09:30
zilmar cc1344733b Copy Project64.cfg.development if Project64.cfg does not exist 2021-06-11 22:32:29 +09:30
zilmar 9ea640f44a Remove calling git describe from UpdateVersion.cmd 2021-06-11 21:19:28 +09:30
zilmar fa6d14c029 Disable menu if showing nag window 2021-05-30 20:41:45 +09:30
oddMLan 48259a191b Localize unstranslated strings 
-'Always use interpreter core' & 'Enable Discord Rich Presence'
 2021-05-27 22:32:56 -07:00
oddMLan 1830b93bc5 Since 8MB is default now, remove hardcoded check in SettingsType-RDBRamSize.cpp and redundant note in the UI 
This reverts commits 8475fa9c14 4020735b26
 2021-05-27 22:32:55 -07:00
oddMLan 3aca31e758 Beautify Welcome Screen 
Simplify wording, tweak the element alignments, and the plugin choice works like a button now (looks less confusing)
 2021-05-27 22:32:49 -07:00
oddMLan 55808ff4f5 English.pj.Lang: Simplify wording & fix formatting 2021-05-27 22:32:26 -07:00
oddMLan 3d29b94457 Don't ask for advanced mode to let user pick enhancements 2021-05-26 11:59:31 -07:00
oddMLan 4caadeb431 Fix ROM browser default column size 2021-05-26 11:59:30 -07:00
oddMLan cdbe507437 Minor layout fixes 
- Fixed Notes in Enhancements window
- Fix Add Cheat to accommodate for cheat disable value feature
- Center about window header
 2021-05-26 11:59:29 -07:00
zilmar bbdbaff60e
Merge pull request #2052 from shygoo/fix-memview-paste 
[Debugger] Fix memory viewer paste crash
 2021-05-26 16:56:05 +09:30
shygoo 9c3edcb8c0 [Debugger] Fix memory viewer paste crash 2021-05-25 23:20:22 -05:00
shygoo 96b9ac0c45 [Debugger] Fix memory dump 2021-05-24 21:41:22 -05:00
shygoo d1ea9a6225 [Debugger] Fix search 2021-05-19 19:05:55 -05:00
zilmar 24fe16e9cf Merge branch 'develop' of https://github.com/project64/project64 into develop 2021-05-18 21:22:12 +09:30
zilmar ee864797ab vgturtle127's Beautification 14 - Source\Project64-video directory and final cleanup 2021-05-18 21:21:36 +09:30
pcca-matrix 7616a26160 Fix Random input in N-Rage Plugin (https://github.com/project64/project64/issues/1876) 
This should fix the issue.
 2021-04-29 15:21:06 +02:00
zilmar d4ec1f7f37 Reload short cuts on change 2021-04-26 20:18:20 +09:30
zilmar 11813ff5f2 Update version number 2021-04-25 20:18:30 +09:30
zilmar b0b6c03eea Do not exit full screen by default on lose focus 2021-04-22 16:18:38 +09:30
zilmar b15613acea remove #pragma GCC 2021-04-22 09:47:17 +09:30
zilmar a2934abf73 Remove usage of malloc 2021-04-22 09:30:27 +09:30
zilmar 3a038b2eb3 Move Dynamic library code out of util in to dynamic library file 2021-04-21 10:03:04 +09:30
zilmar cdb7cdcfd5 Replace getwindow text with GetCWindowText 2021-04-20 12:26:16 +09:30
zilmar 8ae92893cb Update missing changes 2021-04-14 15:52:34 +09:30
zilmar 2b6e70cde0 Merge branch 'master' of https://github.com/project64/project64 2021-04-14 15:51:41 +09:30
zilmar c512a592a7 Move class out of file names 2021-04-14 15:04:15 +09:30
zilmar 662637460e Remove Disable copy constructor comments 2021-04-13 09:37:11 +09:30
zilmar cf58754414 Change NULL to nullptr 2021-04-12 21:05:39 +09:30
zilmar a48f8d1a62 Remove PreCompiled header from Common 2021-04-12 19:11:28 +09:30
zilmar 3482e0a3fa Remove dsp and plg files 2021-04-12 16:09:27 +09:30
zilmar 62d2755300 Remove Common/stdtypes.h 2021-04-12 16:04:26 +09:30
zilmar 63a5b5c431 Remove SmartPointer.h 2021-04-12 15:34:59 +09:30
zilmar e330c26918
Merge pull request #2031 from vgturtle127/beautification-13 
Beautification 13 - Source\Project64-core directory
 2021-04-12 13:30:22 +09:30
zilmar fe6bd038f0
Merge pull request #2030 from vgturtle127/beautification-12 
Beautification 12 - Source/Project64-audio directory
 2021-04-12 13:27:47 +09:30
Derek "Turtle" Roe 06a174d969 Update LanguageClass.h 
Fix comments
 2021-04-02 03:15:45 -05:00
Derek "Turtle" Roe 536ccbc894 Update LanguageClass.cpp 
Fix comments, add a TODO, fix and update a ton of the UI text, add newline
 2021-04-02 03:15:37 -05:00
Derek "Turtle" Roe 3c650bdde7 Update 7zip.h 
Fix comments
 2021-04-02 03:14:15 -05:00
Derek "Turtle" Roe 821766666e Update 7zip.cpp 
Fix comments, add newline
 2021-04-02 03:12:48 -05:00
Derek "Turtle" Roe 8942ae2b47 Update RomList.cpp 
Fix comments, and fix some log and trace typos
 2021-04-02 02:43:33 -05:00
Derek "Turtle" Roe c30f1c6397 Update MemoryExceptionFilter.cpp 
Fix comments, fix some UI and log typos, add newline
 2021-04-02 02:35:51 -05:00
Derek "Turtle" Roe 3d036a4aa8 Update TraceModulesProject64.h 
Add newline
 2021-04-02 02:35:13 -05:00
Derek "Turtle" Roe 95e0fed45c Update stdafx.cpp 
Add newline
 2021-04-02 02:35:07 -05:00
Derek "Turtle" Roe df6768b579 Update Settings.h 
Fix comments
 2021-04-02 02:35:01 -05:00
Derek "Turtle" Roe 6aff37327a Update Settings.cpp 
Fix comments
 2021-04-02 02:34:50 -05:00
Derek "Turtle" Roe 0a18fb5c1f Update Plugin.h 
Fix comments
 2021-04-02 02:34:35 -05:00
Derek "Turtle" Roe 4458dc3375 Update Notification.h 
Fix comments
 2021-04-02 02:34:27 -05:00
Derek "Turtle" Roe 679b0d111e Update Multilanguage.h 
Fix comments
 2021-04-02 02:34:18 -05:00
Derek "Turtle" Roe a40dac71dd Update Logging.h 
Add newline
 2021-04-02 02:33:54 -05:00
Derek "Turtle" Roe bfb49fd93a Update Logging.cpp 
Fix comments, fix some log typos, and add newline
 2021-04-02 02:33:39 -05:00
Derek "Turtle" Roe e6a55d4c99 Update SoundBase.h 
Add a line, fix comments
 2021-03-27 04:10:33 -05:00
Derek "Turtle" Roe e3e99d0af0 Update SoundBase.cpp 
Add a line, fix a trace log output
 2021-03-27 04:10:14 -05:00
Derek "Turtle" Roe a7a30d2a1e Update OpenSLES.h 
Add a line and add newline
 2021-03-27 04:09:55 -05:00
Derek "Turtle" Roe 4ee49ce0fc Update OpenSLES.cpp 
Fix comments, add newline
 2021-03-27 04:09:45 -05:00
Derek "Turtle" Roe eecb5350dd Update DirectSound.h 
Fix comments
 2021-03-27 04:09:07 -05:00
Derek "Turtle" Roe 5c6f56d89e Update DirectSound.cpp 
Fix comments, trace log, and some UI typos
 2021-03-27 04:09:00 -05:00
Derek "Turtle" Roe 5574829977 Update ConfigUI.h 
Add newline
 2021-03-27 03:49:05 -05:00
Derek "Turtle" Roe da6b8c3c30 Update AudioMain.cpp 
Fix comments, title case, and some UI and trace log typos
 2021-03-27 03:48:59 -05:00
Derek "Turtle" Roe 4ee3ab59da Update Audio_1.1.h 
Fix comments
 2021-03-27 03:48:29 -05:00
Derek "Turtle" Roe 7c9b7d4eb1 Update InputMain.cpp 
Fix comments, fix some UI consistency issues and other errors
 2021-03-27 00:43:03 -05:00
Derek "Turtle" Roe e459802d90 Update ControllerSpec1.1.h 
Fix comments
 2021-03-27 00:42:35 -05:00
Derek "Turtle" Roe 4de969c032 Update wtl.h 
Add newline
 2021-03-27 00:37:35 -05:00
Derek "Turtle" Roe 7d92830910 Update wtl-ScanButton.h 
Add newline
 2021-03-27 00:37:28 -05:00
Derek "Turtle" Roe e75452dab8 Update wtl-ScanButton.cpp 
Fix title case
 2021-03-27 00:37:21 -05:00
Derek "Turtle" Roe 6f7e198327 Update wtl-BitmapPicture.h 
Add newline
 2021-03-27 00:36:53 -05:00
Derek "Turtle" Roe 1bbc070e4b Update OptionsUI.h 
Add newline
 2021-03-27 00:36:44 -05:00
Derek "Turtle" Roe a6693b25ef Update InputConfigUI.cpp 
Fix capitalization
 2021-03-27 00:36:32 -05:00
Derek "Turtle" Roe c820c1cdf0 Update DirectInput.h 
Add newline
 2021-03-27 00:36:16 -05:00
Derek "Turtle" Roe 10140900fa Update DirectInput.cpp 
Fix capitalization
 2021-03-27 00:36:03 -05:00
Derek "Turtle" Roe a4b351bec5 Update DeviceNotification.h 
Add newline
 2021-03-27 00:35:51 -05:00
Derek "Turtle" Roe a070c047e7 Update CProject64Input.h 
Remove extra line
 2021-03-27 00:35:42 -05:00
zilmar d8503d659a
Merge pull request #2025 from vgturtle127/beautification-10 
Beautification 10 - Source\RSP directory
 2021-03-23 12:52:08 +10:30
zilmar f2afda0e5e
Merge pull request #2024 from vgturtle127/beautification-9 
Beautification 9 - Source\Project64\UserInterface\Debugger directory
 2021-03-23 12:48:32 +10:30
zilmar b4c64ef734
Merge pull request #2023 from vgturtle127/beautification-8 
Beautification 8 - Source\Project64\UserInterface\Settings directory
 2021-03-23 12:46:38 +10:30
zilmar 04e2263354
Merge pull request #2022 from vgturtle127/beautification-7 
Beautification 7 - Source/Project64/UserInterface/WTLControls
 2021-03-23 12:45:29 +10:30
zilmar 2ed2205db2 Reload Enhancements on edit dialog 2021-03-23 12:41:18 +10:30
zilmar 133170c1a2 Add option to not exit fullscreen on lose focus 2021-03-23 11:46:11 +10:30
Derek "Turtle" Roe 3f630eaab0 Update Recompiler Ops.c 
Fix typos, capitalization, punctuation, title case, change multi line comments to single line comments where appropriate, fix abbreviations, add some TODOs, remove some lines, fix spacing, adjust some wording
 2021-03-19 02:13:35 -05:00
Derek "Turtle" Roe 4e7dc1b6f6 Update Recompiler Analysis.c 
Fix typos, capitalization, punctuation, title case, change multi line comments to single line comments where appropriate, fix abbreviations, add some TODOs, remove some lines, fix spacing, adjust some wording
 2021-03-19 02:12:55 -05:00
Derek "Turtle" Roe a3e301c022 Update Recompiler CPU.c 
Fix capitalization, punctuation, typos, and some comments. Change from multi line comments to single line comments where appropriate, fix title case, add and remove some lines, fix abbreviations, fix some UI typos, and clean up some text
 2021-03-19 01:44:51 -05:00
Derek "Turtle" Roe 2d257deecf Update Main.cpp 
Fix spacing, title case, abbreviations, change multi line comments into single line comments, fix some typos, add and remove some lines, and add a TODO
 2021-03-19 01:41:58 -05:00
Derek "Turtle" Roe 3a7fcc49cb Update Interpreter Ops.c 
Fix several typos and change some wording, change multi line comments into single line comments, fix title case, punctuation, add a line, and add a TODO
 2021-03-19 01:38:30 -05:00
Derek "Turtle" Roe e26876ba33 Update RSP Command.c 
Fix abbreviations, capitalization, changed some multi line comments to single line comments,
 2021-03-19 01:27:20 -05:00
Derek "Turtle" Roe efd8a3721d Update X86.c 
Fix typos, capitalization, punctuation, add TODO, fix abbreviations, and change multi line comments into single line comments
 2021-03-19 01:23:11 -05:00
Derek "Turtle" Roe 0ed9f0b5f7 Update X86.h 
Fixed typo and removed a space
 2021-03-19 01:20:59 -05:00
Derek "Turtle" Roe e2c6cfad75 Update Version.h.in 
Fix title case
 2021-03-19 01:17:44 -05:00
Derek "Turtle" Roe e00db193d3 Update Types.h 
Convert multi line comments into single line comments, add a TODO, and arrange lines a bit
 2021-03-19 01:17:32 -05:00
Derek "Turtle" Roe fcc45c4f09 Update Rsp.h 
Fix multi line comments to be single line, fix some typos, abbreviations, and capitalization, and fix some punctuation
 2021-03-19 01:13:56 -05:00
Derek "Turtle" Roe 8efe8cc800 Update RSP Registers.h 
Change multi line comments into single line comments, fix some typos and capitalization errors, and fix abbreviations
 2021-03-19 01:10:20 -05:00
Derek "Turtle" Roe bfceec349e Update RSP Register.c 
Change multi line comment into single line comment
 2021-03-19 01:07:35 -05:00
Derek "Turtle" Roe e3009170c6 Update Recompiler Sections.c 
Fix typos, punctuation, abbreviations, convert multi line comments into single line comments, fix some formatting
 2021-03-19 01:05:57 -05:00
Derek "Turtle" Roe 77e502b99d Update Recompiler Ops.h 
Fix capitalization, abbreviations, and convert multi line comments into single comments
 2021-03-19 00:58:23 -05:00
Derek "Turtle" Roe 7dff587d0b Update Recompiler CPU.h 
Fix spacing, typos, and capitalization, and fix title case. Also convert multi line comments into single line comments.
 2021-03-19 00:56:56 -05:00
Derek "Turtle" Roe ea0f2a65c1 Update Profiling.cpp 
Fix spacing, capitalization, typos, and title case
 2021-03-19 00:53:09 -05:00
Derek "Turtle" Roe 790e73a80b Update OpCode.h 
Change multi line comments into single comments, fix spacing, fix some typos
 2021-03-19 00:52:31 -05:00
Derek "Turtle" Roe 5c4f865145 Update memory.c 
Fix title case and change some wording
 2021-03-19 00:48:05 -05:00
Derek "Turtle" Roe fc67ba51e8 Update log.cpp 
Fix typo
 2021-03-19 00:46:08 -05:00
Derek "Turtle" Roe 8a8fdac484 Update Interpreter Ops.h 
Change multi line comments into single line comments, fix title case, and fix abbreviations
 2021-03-19 00:45:59 -05:00
Derek "Turtle" Roe 969345d58f Update Interpreter CPU.h 
Change multi line comment to single line and fix capitalization
 2021-03-19 00:43:56 -05:00
Derek "Turtle" Roe 7100399f3c Update Interpreter CPU.c 
Fix typos and errors, and change a multi line comment into a single line comment
 2021-03-19 00:42:08 -05:00
Derek "Turtle" Roe 6ab7ddb08b Update dma.c 
Fix typos, capitalization, punctuation, added a TODO, and changed RDRam . RDRAM
 2021-03-19 00:39:54 -05:00