Duncan Ogilvie
18686e710c
Implement Randomize SI/PI interrupts setting
...
closes #1656
2019-10-03 11:39:46 +02:00
oddMLan
25fe58bfb9
Actually fix Zip file name
...
Get the correct version string from SetGitProperties.cmd
2019-10-02 23:32:16 -07:00
oddMLan
ac0a9258bd
Pass Platform solution parameter to UpdateVersion.cmd and package_zip.cmd
...
This adds the ability to package x64 builds if requested.
2019-09-29 19:20:42 -07:00
oddMLan
b323e9cf2f
[build] Try to find 7z.exe on PATH first
...
This ensures compatibility with AppVeyor without breaking the Jenkins buildbot
2019-09-29 19:20:42 -07:00
shygoo
1ede902abb
[Debugger] Fix register UI problems
2019-09-26 11:07:28 -05:00
zilmar
a7710229be
Fix up cheat menu language strings
2019-09-20 04:19:13 +09:30
LuigiBlood
f43201fdea
[App] Add "Open Combo" File Menu for Combo N64 + 64DD Loading.
...
Also added seperate functions for generic game loading, N64 ROM loading, and 64DD Disk loading.
2019-08-22 13:44:30 +02:00
LuigiBlood
3cca0e5549
[App] Add Command Line Combo N64 + 64DD Image Loading
...
With --combo <Disk Image> <ROM Image>
2019-08-22 13:16:58 +02:00
zilmar
c78260ce54
Fix some warnings/errors in android build
2019-08-21 18:57:50 +09:30
LuigiBlood
01ae9450fc
[Disk] Undo changes to compile 64DD Settings Page
2019-08-21 09:25:16 +02:00
zilmar
3079edfd95
Merge pull request #1644 from LuigiBlood/ddrevamp
...
[Disk] Add Disk Drive Settings file
2019-08-21 16:46:24 +09:30
LuigiBlood
5eb8c8715f
[Disk] Add Disk Drive Settings file
2019-08-21 08:50:47 +02:00
zilmar
95a0659e8d
Merge pull request #1643 from shygoo/exc-bp-intr-float
...
[Debugger] Add breakpoints for specific interrupts and FP exceptions
2019-08-21 09:28:48 +09:30
zilmar
081541cf64
Fix compile error
2019-08-21 09:28:19 +09:30
shygoo
2137b365bb
[Debugger] Add breakpoints for specific interrupts and FP exceptions
2019-08-20 17:20:49 -05:00
zilmar
b57250427b
Merge pull request #1641 from LuigiBlood/ddrevamp
...
[64DD] Updated 64DD emulation
2019-08-21 07:08:37 +09:30
Julio C. Rocha
05c2b59c3a
Use _Pairib in VC versions below 14.2.
2019-08-17 00:59:45 -07:00
Julio C. Rocha
1ad1f71d2f
Make code base compatible with Visual Studio 2019.
...
- Allow building with the MSVC 14.2 toolset.
- Removed explicit reference to deprecated typedef std::map::_Pairib.
2019-08-16 20:46:11 -07:00
LuigiBlood
ddaff077b2
[Disk] Add more failsafe in case of invalid offsets
2019-08-14 16:32:13 +02:00
LuigiBlood
3951fbe828
[Disk] Perform Filesize check for D64 files, remove useless check
2019-08-14 16:18:31 +02:00
LuigiBlood
0587f06317
[Disk] Handle D64 RAM Save (expand RAM Area internally)
2019-08-14 00:04:20 +02:00
LuigiBlood
97be800889
[RomList] Properly Byteswap a Development Disk
2019-08-13 22:08:38 +02:00
LuigiBlood
239c8f1128
[Rom] Use Base Game Save File if loaded both a disk and cart
2019-08-13 21:34:55 +02:00
LuigiBlood
c7bbd12b41
[Rom] Do not load ROM settings if a disk is loaded
...
It will prioritize the settings from disk if one is loaded.
2019-08-13 20:26:23 +02:00
LuigiBlood
63d0410d79
[Disk] Make sure to avoid Saving RAM file if there's no RAM Area available + fix D64 Save Area
2019-08-12 23:50:02 +02:00
LuigiBlood
affc694149
[Core & UI] Add RAM Area Only (*.ram) Disk Save Type
...
- It's a bit hacky but it works for *.ndd files.
- For *.d64 files, it might be more problematic for now
2019-08-12 23:07:33 +02:00
LuigiBlood
bfd793c184
[UI] Add 64DD Tab in Options
2019-08-12 19:55:10 +02:00
LuigiBlood
bbabf5d98d
[RomBrowserClass] Fix "Play Game with Disk" to stop appearing for Disk games.
2019-08-12 18:13:34 +02:00
LuigiBlood
0c6936d67e
[Core] Perform more thorough disk validity checks & change DiskIdent for Config/RDB
...
- It didn't detect NUD-4567-JPN dump.
2019-08-12 17:50:04 +02:00
LuigiBlood
0cee922767
[Disk & N64Class] Handle Combo Loading with development disks without TOOL IPL
...
- You don't actually need the Development IPL for that purpose as games will never actually check.
2019-08-12 14:16:16 +02:00
LuigiBlood
cf576246e1
[Core & UI] Handle and Select IPLs depending on Disk Country Code
...
- Removes 64DD IPL loading when not found, so the user has to either load the IPL ROMs once or set them in the settings
2019-08-12 13:39:56 +02:00
LuigiBlood
53da2eca49
[Disk] Fix Loading Disks without Disk ID
2019-08-12 13:35:30 +02:00
LuigiBlood
c8947e93ea
[Disk] Perform heuristics to find System Data and Disk ID for *.ndd
2019-08-12 11:40:44 +02:00
LuigiBlood
075c82a3e3
[Disk] Support D64 Master Disk Format
2019-08-11 18:13:52 +02:00
LuigiBlood
ce868c57f8
[Rom] Enable 64DD hardware when using 64DD IPL standalone
2019-08-11 18:12:41 +02:00
LuigiBlood
b2f0623746
[Rom] Use IsLoadedRomDDIPL
2019-08-11 13:35:49 +02:00
LuigiBlood
3bd5595e77
[Rom] Support CRC calculation for 64DD IPLs
2019-08-11 13:30:51 +02:00
LuigiBlood
053ef11c5a
[Disk] Treat 64DD TOOL IPL as seperate
2019-08-11 11:45:52 +02:00
LuigiBlood
db35bd6518
[Disk] Handle Sector & Sector Size in AddressBlock function (for future D64 support)
2019-08-11 11:45:05 +02:00
LuigiBlood
444a8a6d1a
[Disk] Fix Disk Header Allocation
2019-08-11 11:31:39 +02:00
LuigiBlood
90d4bf0df8
[Disk] Remove MAME Format Conversion Code, support SDK format on its own
...
Use LBAToByte & LBAToPhys for SDK addressing
2019-08-10 21:18:17 +02:00
shygoo
e7e91b878f
[Debugger] Add copy buttons to memviewer popup menu
2019-08-04 17:50:52 -05:00
Azimer
84c164ff66
Fix for Windows XP compatibility
...
I neglected FreeLibrary and have multiple calls to LoadLibrary without freeing. This is fixed by moving it to the class member level and allocating and deallocating through the class constructor/destructor.
2019-08-01 09:39:39 -05:00
Azimer
a972773b6a
Windows XP Fixes?
...
Does this actually work?
2019-07-31 23:28:49 -05:00
zilmar
cabef36f91
[Project64] Do not load cheat enhancements if not enabled.
2019-06-26 21:46:12 +09:30
zilmar
eace1a7ba1
Merge pull request #1627 from shygoo/fix-regtabs
...
[Debugger] Make register tabs stable
2019-06-15 20:50:11 +09:30
shygoo
946284a09a
[Debugger] Make register tabs stable
2019-06-15 06:04:37 -05:00
Kimberly J Ortega
9315c31fb2
Fix C-buttons and DPad button bindings
2019-06-08 07:19:35 -07:00
oddMLan
3b9cafc058
[Debugger UI] Try to handle spaces in Mem Viewer address editbox
...
FormatClipboard() doesn't seem to be doing anything for some reason.
2019-05-13 01:32:00 -07:00
oddMLan
2bbd724b91
[Debugger UI] Fix address text box size
...
It was 2 pixels too small to hold 10 characters (head + address)
Also added ES_AUTOHSCROLL just to be extra careful in case the user has custom UX Style with a different font.
2019-05-13 00:31:54 -07:00
oddMLan
82df61d9ce
[Debugger UI] Tweak Commands window size
...
Avoids the registers from being cut off in HIDPI
2019-05-10 10:17:42 -07:00
oddMLan
06d0e27af6
[Debugger UI] Fix TLB window in HDPI configs
2019-05-10 09:23:41 -07:00
zilmar
9c68405238
Merge pull request #1622 from shygoo/nrage-improve-bginput
...
[N-Rage] Make background input stable
2019-05-05 17:03:00 +09:30
shygoo
c8ab33eb3c
[N-Rage] Make background input stable
2019-05-05 00:10:57 -05:00
Joe Eagar
9c7f58d476
Merge branch 'master' of https://github.com/project64/project64
2019-04-28 23:29:29 -07:00
Joe Eagar
82463fbdd8
Fixed a few bugs with the scripts system. I suspect there are more; the
...
threading code needs some refactoring. List of changes:
* Script threads no longer call the debugger UI (e.g. refresh) nor do
they call the script system's cleanup function
(deleteStoppedInstances).
* Changed API.js Server.on method to queue calls to nativeAccept if .listen()
hasn't been called yet (otherwise winsock gives errors).
* Added various paranoia thread locks.
* Forced termination of script threads now works. The (commented) call
to TerminateThread didn't work because getCurrentThread() doesn't return
a "real" HANDLE. The solution is to pass the result of getCurrentThread
to DuplicateHandle to get a "real" handle.
2019-04-28 23:28:12 -07:00
zilmar
7a964b058e
Check for recompiler in SysEvent_ResetRecompilerCode
2019-04-29 06:26:07 +09:30
Joe Eagar
83f445f050
Fixed heap overrun error
2019-04-28 00:38:35 -07:00
zilmar
352dcff301
Have cheats to record in project64.cfg
2019-04-24 15:17:09 +09:30
zilmar
bf269454dd
Automatically combine cheat files on build
2019-04-23 14:46:36 +09:30
zilmar
a3d9249fdb
Merge pull request #1613 from oddMLan/restore-oc-gamesettings
...
Restore Overclock modifier in Game Settings panel
2019-04-23 13:30:53 +09:30
zilmar
ffc24d4e7d
Fix up DisplayMessage for android
2019-04-23 07:01:10 +09:30
oddMLan
cfbc2ee75e
[Status Bar] Tweak duration of some messages
...
Makes debugging with CPU profiling much more pleasant
2019-04-20 13:35:05 -07:00
oddMLan
61465ce2a5
[Frame Rate Counter] Shrink it a little bit
...
Prevents "Show CPU Usage" from cutting off in HIDPI configurations
2019-04-20 13:17:42 -07:00
oddMLan
ead4d9311e
[Game Settings] Restore Overclock Modifier
2019-04-20 11:57:33 -07:00
zilmar
cad17b23a0
Merge pull request #1614 from shygoo/nrage-bginput
...
[N-Rage] Add background input option
2019-04-20 16:27:39 +09:30
shygoo
abbfb0361f
[Debugger] Adjust font/size of some controls
2019-04-20 00:39:14 -05:00
shygoo
1b53acad89
[N-Rage] Add background input option
2019-04-19 23:44:04 -05:00
zilmar
34aeb0ab8f
Merge pull request #1607 from oddMLan/ux-improvements
...
Minor UI improvements
2019-04-20 10:07:30 +09:30
oddMLan
c7a6e51d62
Make Rom Browser DPI Aware
2019-04-19 17:08:24 -07:00
oddMLan
b1e950be20
Move CListViewCtrlVarDPI class code into ATL
2019-04-19 16:48:53 -07:00
oddMLan
de29d0c157
[Icon] Add 256x256 size
...
It should be XP-compatible. XP is just going to take the 48x48 and ignore this one.
2019-04-19 14:41:13 -07:00
oddMLan
05f98f8c09
Make Status Bar, About Dialog and Language Selector DPI Aware
2019-04-19 13:51:42 -07:00
oddMLan
2f9529a2cf
[Cheats] Improved UI layout
2019-04-18 22:41:49 -07:00
oddMLan
b9025667f8
[Debugger UI] Save window size only when the window is resizable.
...
Prevents some dialogs from becoming clipped at high DPI
2019-04-18 18:18:55 -07:00
oddMLan
df9967b782
[Debugger] Change Commands and Registers font to Lucida Console
2019-04-18 16:29:07 -07:00
oddMLan
d21e7c8684
Fix warning
2019-04-18 15:35:54 -07:00
oddMLan
d83c8597b6
[Debugger] Make Debugger DPI-Aware
...
Thanks @Shygoo for the class code
2019-04-18 14:10:04 -07:00
zilmar
57a0ddcef4
Add project to join multiple cheats together
2019-04-18 16:57:20 +09:30
oddMLan
b42e61f505
Remove black border around Cheat separator button
2019-04-15 20:55:49 -07:00
oddMLan
a27b3440e0
Get rid of ugly WS_EX_CLIENTEDGE
2019-04-15 20:48:33 -07:00
oddMLan
b377f48440
Use Per monitor scaling where supported
...
Fixes blurriness in higher DPI systems
2019-04-15 10:33:54 -07:00
oddMLan
564ac883a4
Revert "Delete Project64.exe.manifest"
...
This reverts commit 3a7de99930
.
2019-04-15 09:35:46 -07:00
oddMLan
2555485eb9
[Debugger UI] Center CPU Exception Breakpoints dialog
...
Also fix capitalization in menu
2019-04-15 08:58:22 -07:00
oddMLan
01d4ed0bc3
Change some error message boxes to warnings
2019-04-15 08:58:22 -07:00
zilmar
ff8d6f2462
try to update build.cmd
2019-04-15 08:02:24 +09:30
shygoo
346d21cd56
[Debugger] Improve the search tool
2019-04-03 13:56:45 -05:00
shygoo
22b4a3e94f
[Debugger] Make DMA log stable
2019-04-02 14:16:39 -05:00
shygoo
27bc76d089
[Debugger] Make DMA log stable
2019-04-02 13:28:46 -05:00
Francois Berder
da37c46cbc
Project64-core: Fix undefined behavior in CPifRam::LogControllerPakData
...
Signed-off-by: Francois Berder <fberder@outlook.fr>
2019-03-27 09:40:37 +00:00
Francois Berder
f2e6199fcb
RSP: Fix undefined behavior in RDP_LogDlist
...
When calling sprintf, source and destination must not overlap
otherwise it is undefined behavior as specified by
C99 standard, 7.19.6.6.
Signed-off-by: Francois Berder <fberder@outlook.fr>
2019-03-27 09:38:44 +00:00
zilmar
eb2b1f0a2c
[Android] Add review menu
2019-02-20 11:48:28 +10:30
zilmar
f6d4290992
[Android] Missed some patreon settings
2019-02-13 15:52:21 +10:30
zilmar
19328cc7ef
[Adnroid] Remove all mentions of patreon
2019-02-13 15:39:47 +10:30
zilmar
9902b542c3
[Android] Turn ABL off by default in android
2019-02-13 15:12:35 +10:30
zilmar
be2ee76e79
Start to add in support menu item
2019-02-13 15:11:35 +10:30
zilmar
92d22a014b
[Android] Change forum menu link to discord
2019-02-13 11:55:58 +10:30
zilmar
03700db740
[Project64] Add checks around g_Debugger->FrameDrawn
2019-02-10 09:14:51 +10:30
zilmar
cfc510880c
[Android] Put android settings under settings
2019-02-09 06:31:17 +10:30
zilmar
aca70f317c
[Project64] Fix CPath::IsRelative for non WIN32
2019-02-09 05:02:02 +10:30
zilmar
23f040c0dd
Merge pull request #1585 from Frank-74/master
...
[Project64-Audio] Remove FAT from audio plugin.
2019-02-03 05:51:24 +10:30
zilmar
eaab627f64
[Project64] change memcpy_s to memcpy
2019-01-31 18:41:24 +10:30
zilmar
eef2ed27aa
Merge pull request #1586 from shygoo/debugger-cleanup
...
[Debugger] Clean up compiler warnings
2019-01-28 17:53:24 +10:30
shygoo
03ba3640b5
[Debugger] Clean up compiler warnings
2019-01-27 16:40:23 -06:00
Frank-74
a5e6f55a47
[Project64-Audio] Remove FAT from audio plugin.
...
Fixes main.cpp error.
2019-01-27 21:59:42 +00:00
LuigiBlood
29a97e6c8b
Handle m_RomName for disks that don't have any disk ID (use CRC instead) and also forge disk header differently for plugins.
2019-01-27 22:03:52 +01:00
LuigiBlood
b8c47d0087
Alternate calculation of "CRC" for disks that don't have IDs
2019-01-27 21:21:25 +01:00
zilmar
e286d90dab
Merge pull request #1576 from LuigiBlood/64dd_load
...
64DD support overhaul
2019-01-28 06:01:48 +10:30
Frank-74
cbb973a824
Move Fixed Audio setting back to Project64.rdb
2019-01-27 19:14:27 +00:00
LuigiBlood
0870ecbc0d
Handle case where IPL ROM is not found (or not yet set up) to display an error message
2019-01-27 13:17:31 +01:00
LuigiBlood
0a347f59f1
DD IPL ROM check in CN64Rom instead
2019-01-27 13:06:36 +01:00
LuigiBlood
3e52ff7b48
Manage 64DD IPL loading errors
2019-01-27 12:52:22 +01:00
zilmar
c85054f0c0
Merge pull request #1577 from shygoo/input-require-focus
...
[N-Rage] Ignore input if main window isn't focused
2019-01-27 16:27:21 +10:30
LuigiBlood
0233d848c2
Forge 64DD Disk Header for plugins
...
(For some reason, no idea how common that gets, but CMainGui::ProcessAllMessages can crash the entire emulator with some kind of access violation error...)
2019-01-26 16:58:41 +01:00
LuigiBlood
f312476b8b
Handle Disk "Header" for Plugins (not forged, may be unreliable)
2019-01-26 14:31:24 +01:00
LuigiBlood
48ce8fbee7
Enable Disk based on what is loaded instead (fix Combo loading)
2019-01-26 09:40:58 +01:00
LuigiBlood
b1a2fcfddd
Fix Memory leak when switching back and forth from 64DD to N64
2019-01-25 23:12:01 +01:00
LuigiBlood
c0b3246a2e
Set up EnableDisk when anything 64DD is being loaded
2019-01-25 23:11:33 +01:00
LuigiBlood
f300fd9cb5
Uninitialize g_Disk and g_DDRom to prevent exception when ending emulation of a regular ROM after playing 64DD content previously.
2019-01-25 22:53:50 +01:00
LuigiBlood
40841f0d71
Handle Loading in Progress properly (fix Main Menu refresh)
2019-01-25 22:39:05 +01:00
LuigiBlood
047f611c81
Replace tabs with spaces
2019-01-25 21:32:26 +01:00
LuigiBlood
95e31542cf
Refactor 64DD game loading (supports custom settings and RDB)
...
(Nothing done for plugins yet)
2019-01-25 20:20:59 +01:00
LuigiBlood
cd80e4f0a4
Handle 64DD loading from ROM Browser, Recent Games, RomInfo
...
Partially handles settings (loads from RDB and CFG, but unused as emulation starts)
2019-01-25 08:11:40 +01:00
shygoo
c51232bc37
[N-Rage] Ignore input if main window isn't focused
2019-01-24 13:50:22 -06:00
zilmar
1789dccda2
Merge pull request #1574 from LuigiBlood/cause_reg_pull
...
COP0 Cause register access for Scripts
2019-01-25 06:16:51 +10:30
zilmar
e720f3688c
Merge pull request #1573 from LuigiBlood/NRagePlugintest
...
[N-Rage] Mouse Lock Up fix when ending emulation when it's locked?
2019-01-25 06:16:11 +10:30
LuigiBlood
c714584fac
Cause register access for scripts
2019-01-24 19:48:26 +01:00
Frank-74
3ba775ba53
[Project64-Audio] Remove test writetraces
2019-01-21 08:41:50 +00:00
Frank-74
47c37e7398
[Project64-Audio] Fix some games running slow
2019-01-21 08:37:17 +00:00
Frank-74
473fea7e4a
[Project64-Audio] Remove round frequencies
2019-01-21 08:35:42 +00:00
Frank-74
21c73a5ee3
fix resource
2019-01-21 05:56:01 +00:00
Frank-74
5d80fdaaa4
Update Project64-Audio
2019-01-21 05:45:52 +00:00
shygoo
62baab2877
[Debugger] JS: Make debug.breakhere stable
2019-01-20 17:38:34 -06:00
shygoo
7a1dd3835b
[Debugger] Add GPR read/write breakpoints
2019-01-20 02:52:49 -06:00
zilmar
9a80a4970a
Merge pull request #1564 from shygoo2/cpu-log-improvements
...
[Debugger] CPU Log: More UI behavior improvements
2019-01-20 09:53:52 +10:30
zilmar
e974576c00
Merge branch 'master' of https://github.com/project64/project64
...
# Conflicts:
# Source/Project64/UserInterface/UIResources.rc
# Source/Project64/UserInterface/resource.h
2019-01-20 09:02:18 +10:30
zilmar
ce03386007
[Project64] Add gamesharks to enhancements
2019-01-20 08:51:38 +10:30
shygoo
98e933be1b
[Debugger] CPU Log: More UI behavior improvements
2019-01-19 14:14:26 -06:00
zilmar
557892e47e
Merge pull request #1556 from shygoo2/cmds-fix-addr-textbox
...
[Debugger] Commands: Update address textbox when address is changed
2019-01-18 15:29:30 +10:30
zilmar
afa4619bc0
[Project64] Add enhancements right click edit
2019-01-18 12:30:19 +10:30
shygoo
6b34e8f77c
[Debugger] Add CPU exception breakpoint window
2019-01-17 03:34:24 -06:00
Frank-74
52aaf57097
remove unreferenced SyncAudio from ReadSettings
2019-01-17 04:40:28 +00:00
Frank-74
e4c85c5cb7
Fix typo, extra bracket
...
I did the PR on the website instead of through Github Desktop. Made a typo.
2019-01-17 04:33:06 +00:00
Frank-74
57884f1091
[Project64-Audio] Fix sync using audio toggle
...
Fixes running unlimited if turning sync using audio off while a game is running.
2019-01-16 22:57:35 +00:00
Frank-74
6d7c2e09a8
[Project64-Audio] Fix clicks with Sync using audio OFF
2019-01-16 22:53:49 +00:00
shygoo
26151f1d9e
[Debugger] Commands: Update address textbox when address is changed
2019-01-16 14:06:33 -06:00
zilmar
52c62e5707
Merge pull request #1554 from oddMLan/misc-bugfixes
...
Misc bugfixes
2019-01-16 16:59:13 +10:30
oddMLan
2f868d5e4c
Fix #1524 : Broken speed display
...
Before updating the status bar ensure that the user enabled speed display in the UI
2019-01-15 22:31:44 -07:00
zilmar
9a914a7ff4
Merge pull request #1555 from Frank-74/master
...
Fix x64 compile error
2019-01-16 07:04:10 +10:30
Frank-74
fe7dd71d53
Fix x64 compile error
...
I don't know why this is needed, as x86 build works fine without it. x64 build fails with Project64-core/N64System/Recompiler/CodeSection.h(19): error C2504: 'CDebugSettings': base class undefined
2019-01-15 19:45:54 +00:00
oddMLan
fff7bb5793
[RSP] Restore window if minimized when invoked from the context menu
...
Similar fix to 798e19b2a6
2019-01-15 01:58:25 -07:00
oddMLan
ad31492585
[RSP] Update resource file
...
RSP Command showed a maximize button that when used would glitch the RSP window. Now the RSP Command and RSP Register window both use WS_MINIMIZEBOX.
2019-01-15 01:58:24 -07:00
oddMLan
46ddb42017
[Debugger] Fix DList/Alist and Recompiler Code Buffer Size status bar clear
...
Before they wouldn't clear the status bar message properly when toggling them off
2019-01-15 01:58:24 -07:00
oddMLan
3a7de99930
Delete Project64.exe.manifest
...
It is no longer necessary, Visual Studio will generate and embed an intermediate on compilation time.
2019-01-15 01:58:23 -07:00
shygoo
42613f96e1
[Debugger] CPU Log: fix mousewheel scrolling
2019-01-14 23:19:28 -06:00
shygoo
12b97b83d8
[Debugger] CPU Log: fix wrong indeces after scrolling
2019-01-14 05:11:15 -06:00
shygoo
4d322191c2
[Debugger] Add CPU Log, break and show log/commands window on CPU errors
2019-01-14 03:18:43 -06:00
zilmar
3eaf7334dd
Merge pull request #1551 from oddMLan/master
...
[Debugger] Clean and refactor Window position retrieving & saving code
2019-01-14 17:48:58 +10:30
oddMLan
2b96fdaa94
[Debugger] Clean and refactor Window position retrieving & saving code
...
Many thanks to Shygoo for the general template of the code
2019-01-14 00:08:00 -07:00
zilmar
e881eae26e
Merge pull request #1550 from oddMLan/master
...
[Debugger] Remember window positions
2019-01-14 16:41:21 +10:30
zilmar
f193d258e2
Merge pull request #1549 from Frank-74/master
...
[Project64-Video] Fix desktop brightness
2019-01-14 16:38:30 +10:30
oddMLan
786a519433
[Debugger] Stack Trace: Remember window position
2019-01-13 23:02:05 -07:00
oddMLan
c949b8e107
[Debugger] Stack View: Remember window position
2019-01-13 22:59:24 -07:00
oddMLan
d60558dacb
[Debugger] Symbols: Remember window position
2019-01-13 22:55:19 -07:00
oddMLan
fc6ef16cb3
[Debugger] Scripts: Remember window position
2019-01-13 22:52:11 -07:00
oddMLan
ad7df17b96
[Debugger] DMALog: Remember window position
2019-01-13 22:43:14 -07:00
oddMLan
cd0d067982
[Debugger] Fix DMA Window load position
2019-01-13 22:37:51 -07:00
oddMLan
a1726ba51f
[Debugger] Commands: Save position OnExitSizeMove
2019-01-13 22:29:11 -07:00
oddMLan
7ed3c9b0ba
Fix compilation
2019-01-13 22:19:53 -07:00
zilmar
b3ed03c2b0
Merge branch 'master' of https://github.com/project64/project64
2019-01-14 14:33:24 +10:30
zilmar
82ff21f255
Clean up some of the debugger code
2019-01-14 14:33:02 +10:30
zilmar
ee8a17b378
[Project64] check if enhancement exists
2019-01-14 14:01:36 +10:30
Frank-74
79dbd32546
[Project64-Video] Fix desktop brightness
...
It should only work in fullscreen.
2019-01-14 03:29:17 +00:00
zilmar
1e8cef4823
Merge pull request #1548 from Frank-74/master
...
Use Interpreter's for x64.
2019-01-14 14:19:36 +11:00
Frank-74
8b0a51c066
Update Settings.cpp
2019-01-14 02:36:28 +00:00
Frank-74
fb5bdf36ba
[Project64] Use CPU_Interpreter if x64
...
Recompiler doesn't work in x64
2019-01-14 02:02:34 +00:00
Frank-74
a50f21b175
[RSP] Use InterpreterCPU if x64
...
Recompiler doesn't work in x64.
2019-01-14 02:01:17 +00:00
zilmar
31c2c16f52
Merge pull request #1547 from oddMLan/debugger-ux-improvements
...
Debugger ux improvements
2019-01-14 08:11:20 +11:00
Frank-74
47d55f3028
[Project64-Audio] Add x64 build
2019-01-13 18:49:14 +00:00
oddMLan
12351337d1
[Debugger] UI: Get window position and size from cfg
2019-01-13 01:13:59 -07:00
oddMLan
f1927648ac
[Debugger] DebugDialog.h: Implement functions to manipulate window position and size
2019-01-13 01:12:00 -07:00
oddMLan
7206c28348
[Project64] UISettings: Add Debugger UI window position and size entries
2019-01-13 01:09:37 -07:00
zilmar
ff8bb9d3fa
[Project64] Fix up CSettingTypeApplication::Save for index based setting
2019-01-13 09:42:58 +11:00
zilmar
05ae250a01
[Project] Fix up showing/hiding advanced tab
2019-01-13 09:21:10 +11:00
zilmar
f8e49ae37d
Merge branch 'master' of https://github.com/project64/project64
2019-01-12 09:50:51 +11:00
zilmar
ed079e4b16
[Project64] Start to add code for enhancements
2019-01-12 09:50:25 +11:00
oddMLan
798e19b2a6
[Debugger] ShowWindow(): Restore window if minimized
2019-01-10 21:05:21 -07:00
zilmar
e163ecd2f8
[Projext64] Add check around duplicate name
2019-01-10 19:14:18 +10:30
zilmar
590119f414
[Project64] Update names for lle hle settings
2019-01-09 16:39:04 +10:30
shygoo
7ef9b19dc9
[Debugger] Improve OpInfo::ReadsGPR/WritesGPR
2019-01-05 19:55:26 -06:00
shygoo
707e4a5fdd
[Debugger] Add step-over button to dlg resize map and fix tooltip ( fix #1541 )
2019-01-03 15:21:03 -06:00
oddMLan
dfc6d46e4a
Add Unaligned DMA options to Defaults and Game Settings
...
This allows some romhacks to run
2018-12-29 00:42:44 -07:00
oddMLan
578aa012d1
[Rom Browser] Add Show File extensions option and disable it by default
2018-12-28 20:57:01 -07:00
oddMLan
12c2bd54fc
[Rom Browser] Show Filename instead of Internal Name when there is no Good Name
2018-12-28 04:26:23 -07:00
shygoo
f669447039
Merge https://github.com/project64/project64 into wine-fix-settings
2018-12-28 00:33:43 -06:00
shygoo
943f2d109b
Hack to get settings window working in wine
2018-12-28 00:32:56 -06:00
shygoo
75cc059501
[Debugger] Fix issue with the address field ignoring first input
2018-12-27 16:08:14 -06:00
shygoo
2408fa0f08
[Debugger] Fix opcode editor in the commands window
2018-12-27 15:57:18 -06:00
zilmar
eddd90bbeb
[Project64] Try to fix sync to audio
2018-12-20 20:49:14 +10:30
zilmar
9ab7a83c26
[Project64] Remove FR_None option
2018-12-20 16:08:26 +10:30
Frank-74
4f4ebfb855
Fix #1510
2018-12-17 23:51:28 +00:00
shygoo
d3aadf75cc
[Debugger] Make AddressRange inclusive in the JS API
2018-12-09 18:44:30 -06:00
shygoo
1b34937307
[Debugger] Add events.ongprvalue to JS API
2018-12-09 15:24:11 -06:00
oddMLan
57ef4bf026
[Rom Browser] Supplant "Good Name" with "Name" column
...
"Good Name" can still be added under Settings > ROM Selection
2018-12-09 03:27:53 -07:00
oddMLan
28bd4ab983
[Rom Browser] Add "Name" column
...
Do not renumber items in the language file
2018-12-09 03:27:53 -07:00
shygoo
d7ad7be6cb
[Debugger] Improve address checks ( fix #1515 )
2018-12-08 22:26:11 -06:00
zilmar
be73dcd459
Merge pull request #1511 from shygoo2/onexecopcode
...
[Debugger] Add events.onopcode to JS API
2018-12-09 05:01:10 +10:30
shygoo
9c2c716355
Merge https://github.com/project64/project64 into memview-autorefresh-option
2018-12-08 06:47:00 -06:00
shygoo
a2808d94ce
[Debugger] Make auto-refresh optional in memory viewer
2018-12-08 06:45:52 -06:00
zilmar
88386600ed
[Audio] Have sync audio only if plugin enables it
2018-12-08 21:23:06 +10:30
zilmar
0e2e8eef10
Merge branch 'master' of https://github.com/project64/project64
2018-12-08 20:22:37 +10:30
shygoo
98c6b5f336
whitespace
2018-12-06 23:56:46 -06:00
shygoo
4b87f25f5f
Merge https://github.com/project64/project64 into onexecopcode
2018-12-06 23:52:29 -06:00
shygoo
d7e02760b8
update api doc
2018-12-06 23:47:56 -06:00
shygoo
91ec99bd52
rename
2018-12-06 22:19:28 -06:00
shygoo
9f4323c06b
add events.onexecvalue
2018-12-06 22:10:55 -06:00
Frank-74
9936933f68
[Audio] Fix typo in buffersize
...
It caused clicks in goldeneye / pd without +1.
2018-12-04 06:32:31 +00:00
Frank-74
af6c354efc
[Audio] 30 / 1.001 is the exact NTSC fps
...
30 / 1.001 = 29.97002997002997002997002997003
2018-12-04 05:14:35 +00:00
Frank-74
0e24ea1ca9
[Audio] Code cleanup and slightly smaller buffer.
2018-12-04 03:54:44 +00:00
Frank-74
1acf641010
[Audio] Fix Body Harvest audio and framerate
...
More precise framerate fixes Body Harvest (U) audio clicks and slow framerate, with Sync using audio OFF or ON.
2018-12-02 22:08:44 +00:00
zilmar
2ca97f0b37
[Audio] Change timer resolution to 1ms
2018-12-03 05:23:45 +10:30
zilmar
6a8405f7ed
[Project64]Add option to not show VI/s and make it default
2018-12-02 16:00:56 +10:30
zilmar
bb5f8ea4f0
[Project64] Make Project64-Video default plugin
2018-12-02 15:11:27 +10:30
zilmar
9e35a1afc3
[Audio] Set timer resolution to 0.5ms
2018-12-02 15:06:37 +10:30
zilmar
b957cac73d
[Project64] Remove parameter to CSettingTypeApplication::Initialize
2018-12-02 15:01:54 +10:30
Frank-74
6a12fe96e4
Fixed Audio from Audio.rdb
2018-11-26 22:53:55 +00:00
Frank-74
4d88a0d9b5
Fixed Audio from Audio.rdb
2018-11-26 22:51:47 +00:00
Frank-74
9535641b7a
Get Fixed Audio from audio rdb
2018-11-26 22:39:56 +00:00
zilmar
5f39f3d122
[Project64] Fix bug in CSettingTypeRomDatabase::Load and some code clean up
2018-11-26 23:03:27 +10:30
zilmar
bac6023a5c
[Project64] Use Settings instead of default in config file
2018-11-26 11:26:08 +10:30
zilmar
75b78e02a7
[Project64] Renumber IDC_ROM_FIXEDAUDIO
2018-11-26 11:25:26 +10:30
zilmar
6c2c0d5dd6
[Project64] Make sure closeDll is set before calling it
2018-11-26 11:23:39 +10:30
zilmar
529b162656
[Audio] Make sure freeing g_SoundDriver on closing
2018-11-26 08:02:41 +10:30
zilmar
bb29e78806
[Project64] Disable memory test in release
2018-11-26 07:30:50 +10:30
zilmar
d531abc885
[Project64] Add ability to change defaults
2018-11-25 20:14:15 +10:30
zilmar
a22512c9ca
[Project64] Always close plugins
2018-11-24 13:22:35 +10:30
zilmar
58305edc8b
[Video] Make sure to close trace
2018-11-24 13:17:37 +10:30
zilmar
f76769622c
[Audio] Make sure trace is stopped
2018-11-24 13:11:50 +10:30
zilmar
6a65305e74
[Project64] More fixing for android
2018-11-20 14:11:32 +10:30
zilmar
d9fae50e16
[Project64] Try to fix android build
2018-11-20 13:20:20 +10:30
zilmar
dc299faebc
[Project64] Fix compile bug
2018-11-20 12:17:22 +10:30
zilmar
b93736414f
[Project64] Normalize paths
2018-11-19 21:16:58 +10:30
zilmar
485339300d
[Project64] Make mem test more header friendly
2018-11-18 12:26:00 +10:30
zilmar
3b0e7a8527
[Project64] Clean up some code and warnings in Common code
2018-11-18 11:36:02 +10:30
zilmar
e7f93f2def
[Project64] Remove #include <objbase.h> from Common/Trace.h
2018-11-18 11:12:49 +10:30
zilmar
63b4a4c003
[Project64] Make Project project LargeAddressAware
2018-11-15 21:28:51 +11:00
oddMLan
8475fa9c14
Use 8MB RDRAM if ROM is not in RDB
2018-08-18 23:13:47 -07:00
zilmar
c1200514c6
Make sure PC is updated on BP
2018-07-31 07:02:02 +10:00
zilmar
9cb3ed48e2
Try to make debugger more stable
2018-07-30 23:45:23 +10:00
zilmar
ba0124efa8
[Project64] Handle break point in delay slot
2018-07-30 06:07:45 +10:00
zilmar
f20dca31fd
[Build] Have UpdateVersion be able to handle linux line endings
2018-05-23 02:38:15 +10:00
zilmar
0f41a6459c
[Project64] update Game Settings to use uint32_t index
2018-04-23 17:32:49 +10:00
zilmar
83b280f761
[Project64] when changing BP's, on the pause make sure the emulator is paused
2018-04-15 05:31:19 +10:00
zilmar
d2e67dc1d9
[Projecy64] Pause emulation during changing breakpoints
2018-04-14 22:23:28 +10:00
zilmar
fafb7c207a
[Project64] Make sure memory_breakpoint_found is cleared in CX86RecompilerOps::FoundMemoryBreakpoint
2018-04-14 20:11:02 +10:00
zilmar
f48995a1e1
[Project64] CDebuggerUI::CPUStepStarted should not be testing read memory Breakpoints
2018-04-14 11:49:06 +10:00
zilmar
bab9d93ebb
[Project64] Make sure CSettingTypeApplicationIndex use uint32_t
2018-04-09 18:03:38 +10:00
zilmar
1a6c579d3e
Merge pull request #1438 from pj64d-merge/memlocks
...
[Debugger] Add memory locks feature (interpreter)
2018-04-04 06:16:12 +10:00
zilmar
d9aedd84eb
[Debugger] When changing memory in viewer, clear memory based of physical address
2018-04-04 03:28:46 +10:00
zilmar
7e4c9a8b84
Rename and move Settings files
2018-04-03 04:30:50 +10:00
zilmar
88a824be60
[Project64] Some code refactoring to CSettingTypeApplication
2018-03-28 19:36:10 +11:00
zilmar
9e92381a2d
[Project64] Have temp bool setting record if it has changed
2018-03-28 19:35:20 +11:00
zilmar
403f003372
[Project64] Make sure index for settings are uint32_t
2018-03-28 19:28:02 +11:00
zilmar
6fe37a2c0e
[Script] Fix date time in upload_beta.vbs
2018-03-27 17:57:29 +11:00
zilmar
4967242a11
[Common] Get ini handling to use std::string instead of stdstr
2018-03-27 06:39:34 +11:00
zilmar
93ab869c3e
[Script] Try to get time added to beta upload
2018-03-26 21:53:29 +11:00
zilmar
fb8f5557a9
[Project64] Fix android build issue
2018-03-26 21:53:00 +11:00
zilmar
86b1e25ddd
[Common] code clean up in path.h
2018-03-26 21:45:34 +11:00
shygoo
77daf1bad4
[Debugger] Add memory locks feature (interpreter)
2018-03-17 20:14:52 -05:00
zilmar
4a5a69253b
[3rd Party] Remove WTL.dsp
2018-03-05 17:40:09 +11:00
zilmar
c506db57f3
Merge branch 'master' of https://github.com/project64/project64
2018-03-02 22:05:46 +11:00
zilmar
6bc5ce0439
[Debugger] Handle breakpoint in delay slot of recompiler
2018-03-02 19:02:23 +11:00
zilmar
e1c464e309
[Debugger] If stepping ops already, ignore finding a memory BreakPoint
2018-03-02 18:23:47 +11:00
zilmar
5434f57f3f
[Project64] Be able to handle memory breakpoints that are detected at compile time
2018-03-02 17:48:15 +11:00
zilmar
cfbd181ff9
[Debugger] Do not update register if have not finished attaching
2018-03-02 17:34:27 +11:00
zilmar
be9b0e6bc5
[Debugger] Some clean up of Debugger-RegisterTabs.h header
2018-03-01 18:12:16 +11:00
zilmar
151c435b97
[Debugger] Disable ABL when a memory BP set
2018-03-01 08:13:17 +11:00
zilmar
f0c9ea887e
[Project64] Make sure PI_DMA_WRITE are 16 byte aligned
2018-02-27 17:27:17 +11:00
LuigiBlood
674afb454b
[N-Rage] Mouse Lock Up fix when ending emulation when it's locked?
2018-02-26 02:12:06 +01:00
shygoo
b682fc4c89
[Debugger] Refresh commands window on click
...
WA_ACTIVE and WA_CLICKACTIVE
2018-02-19 12:16:56 -06:00
zilmar
29dcf75b49
[Debugger] Flush recompiler code on memory viewer changes
2018-02-19 18:17:35 +11:00
zilmar
f5debf8304
[Common] Some code cleanup
2018-02-19 17:43:42 +11:00
shygoo
d409dbc86e
[Debugger] Add file system interface to the JS API
2018-02-18 15:37:03 -06:00
zilmar
3388a053f3
[Debugger] Make eeprom alerts to be able to turn on or off
2018-02-16 16:38:00 +11:00
zilmar
3fb6710bb3
[Debugger] Add read memory breakpoints to recompiler
2018-02-15 18:28:08 +11:00
zilmar
36c070f746
[Debuggger] Rename x86WriteBreakpoint to x86MemoryBreakpoint
2018-02-15 18:21:03 +11:00
zilmar
879783692b
[Debugfer] Rename memory_write_address to memory_access_address
2018-02-15 18:09:14 +11:00
zilmar
9729fad9da
[Debugger] Add store breakpoints to recompiler
2018-02-13 18:16:53 +11:00
zilmar
22ea56721e
[Project64] Fix recompiler log output
2018-02-13 17:38:33 +11:00
zilmar
f28823ec50
[Debugger] Fix CBreakpoints::WriteBPExists32
2018-02-13 17:37:27 +11:00
zilmar
91999a1eba
[Debugger] add missing code
2018-02-06 07:25:53 +11:00
zilmar
2fdf8e5a09
Merge branch 'master' of https://github.com/project64/project64
2018-02-06 07:05:11 +11:00
zilmar
d7708b6952
[Debugger] Refresh breakpoints display on activate
2018-02-06 07:04:20 +11:00
zilmar
94c7a51b48
[Debugger] Fix a few breakpoint issues
2018-02-05 18:11:39 +11:00
zilmar
622d5d5d3f
[Debugger] Fix Read break points
2018-02-05 17:43:46 +11:00
zilmar
076280b9ba
[Debugger] Add unaligned write breakpoints
2018-02-02 04:28:08 +11:00
shygoo
4bd9611986
[Debugger] Add step over button to commands window
2018-01-25 00:07:51 -06:00
zilmar
deada521bb
[Debugger] Remove temporary out of read/write Breakpoints
2018-01-24 21:51:04 +11:00
shygoo
86d309afc8
[Debugger] Support all commands in code editor
2018-01-21 03:36:20 -06:00
zilmar
95358b1ac1
[Debugger] Have memory viewer to be able to write to rom
2018-01-21 12:51:36 +11:00
zilmar
0ffb6bb159
[Proeject64] Add execution break point in recompiler
2018-01-21 10:18:52 +11:00
zilmar
2c802bd638
[Project64] Make sure Recompiler_Log_Message can not buffer overflow
2018-01-21 09:10:45 +11:00
zilmar
f036c7825c
[Project64] Make sure cycles are updated before calling CDMA::PI_DMA_WRITE
2018-01-21 08:51:49 +11:00
zilmar
f445483f9c
[Debugger] Show commands on stepping
2018-01-18 23:25:36 +11:00
zilmar
73944b2636
[Debugger] clean up warnings and code
2018-01-18 17:53:07 +11:00
zilmar
3d7e9b40b0
[Debugger] Make skip a setting
2018-01-17 22:36:28 +11:00
zilmar
8a85f1e6a4
[Debugger] Make waiting for step a setting
2018-01-17 08:26:54 +11:00
zilmar
7d9d54aaa8
[Debugger] re-add some code accidentally commented out
2018-01-16 08:28:54 +11:00
zilmar
7e1e7bf39b
[Debugger] Change bHaveDebugger to HaveDebugger
2018-01-16 08:23:21 +11:00
zilmar
8a668c4025
[Debugger] Change CBreakpoints::isDebugging() to a debug setting
2018-01-16 08:14:15 +11:00
zilmar
ea1e0efbef
[Debugger] Detach Debugger from UI class
2018-01-10 18:05:57 +11:00
zilmar
57ac4c0607
[User Interface] Clean up Debugger/Debugger-AddBreakpoint.cpp
2018-01-08 18:20:56 +11:00
zilmar
af174e730f
[User Interface] Rename NotifctionClass to Notification
2018-01-08 18:09:40 +11:00
zilmar
d47ed45005
[User Interface] Rename MainWindow.cpp to GuiGlass.cpp
2018-01-08 17:56:10 +11:00
zilmar
7a9b1f32d4
[USer Interface] Rename MainMenuClass.cpp to MainMenu.cpp
2018-01-08 17:45:38 +11:00
zilmar
19a827d1f7
Merge branch 'master' of https://github.com/project64/project64
2018-01-05 21:40:39 +11:00
zilmar
fd3f37971c
[Build] Change dependency to reference for UpdateVersion
2018-01-05 21:38:48 +11:00
zilmar
4b7fafbded
Make sure R0 is 0 in Interpreter
2018-01-03 19:16:01 +11:00
zilmar
def0550ded
[Script] Update to use https
2017-12-12 21:51:24 +11:00
zilmar
b4c1a687e2
[Debugger] Add Debugger_HaveExecutionBP
2017-12-12 21:15:34 +11:00
zilmar
f6dc66ce69
[Deugger] Remove CDebugCommandsView::OnClicked
2017-12-12 21:14:49 +11:00
zilmar
44172b5936
[UserInterface] Rename some execution beakpoint functions
2017-12-04 17:41:27 +11:00
zilmar
52693ae92d
[User Interface] Make breakpoints use std::map
2017-11-24 08:15:06 +11:00
zilmar
4fe7d938bb
[User Interface] More cleanup of Debugger-Commands.cpp
2017-11-22 08:13:11 +11:00
zilmar
30e180104a
[User Interface] Clean up Debugger-Commands.h
2017-11-22 07:47:11 +11:00
zilmar
188d6ae6d1
[User Interface] Rename CEditNumber to CEditNumber32
2017-11-22 07:37:45 +11:00
zilmar
6fa3be42cd
[User Interface] Move code for EditNumber32 code to in to cpp file
2017-11-21 18:09:50 +11:00
zilmar
9267d1311d
[User Interface] Rename numberctrl.h to EditNumber32.h
2017-11-21 17:53:34 +11:00
zilmar
951f6e2ea4
[Build] Update RSP project
2017-11-16 06:27:29 +11:00
zilmar
425a1649e0
[Build] Use version.h.in for SetGitProperties.cmd
2017-11-16 06:20:17 +11:00
zilmar
e4823ef52a
[Build] Update project settings for release
2017-11-16 06:12:45 +11:00
zilmar
973f44cd94
[build] Update dependency on UpdateVersion and remove Version.h
2017-11-16 05:59:37 +11:00
zilmar
1178b5c73f
Set build number on build
2017-11-15 20:04:09 +11:00
zilmar
2d7524ae2f
[Common] Update stdstr::Tokenize to handle empty items
2017-11-15 20:02:44 +11:00
zilmar
169f9d92bf
Merge branch 'master' of https://github.com/project64/project64
2017-11-10 19:42:25 +11:00
zilmar
0730582085
[Project64] Clean up some warnings in List Control
2017-11-10 16:52:10 +11:00
zilmar
bf5ec6dfc5
[Debugger] Use sizeof instead of checking for null
2017-11-10 16:46:03 +11:00
zilmar
a5d5adfa26
[Project64] Fix up the move of debugger UI code
2017-11-09 18:06:52 +11:00
zilmar
f41b3b7263
[Project64] Move debugger UI in to UserInterface folder
2017-11-09 17:32:40 +11:00
Cat vs. Internet
d63f974aa1
added Random.cpp for Windows and non-Android Linux
2017-11-05 18:59:25 -05:00
zilmar
415c97080a
[Debugger] Move CCommandList::Attach in to Debugger-Commands.cpp
2017-11-03 17:34:43 +11:00
zilmar
769b279537
fix build compile issue
2017-10-28 13:19:18 +11:00
zilmar
455b83677b
Fix up version number in resouce fils
2017-10-28 11:41:08 +11:00
zilmar
28d84e5ae7
[Audio] Update version Number
2017-10-24 22:02:05 +11:00
zilmar
2e3200803f
[Audio] Update AI_SetFrequency for android
2017-10-24 21:53:34 +11:00
zilmar
2a41a10479
Merge branch 'master' into AudioSync
2017-10-21 16:03:15 +11:00
zilmar
e97764a2c4
Merge branch 'master' of https://github.com/project64/project64
2017-10-20 20:01:25 +11:00
zilmar
a47d5c3298
[Debugger] Change how font work
2017-10-20 19:57:21 +11:00
zilmar
4091a4699c
[Audio] Make fixed audio on by default
2017-10-19 21:56:59 +11:00
Azimer
44f8a82c87
Prefix m_ in CRandom class
2017-10-18 00:16:30 -05:00