andres.delikat
|
ce3bb25409
|
Movie object cleanup, movie savestate handling cleanup, save GUID into movie savestates
|
2011-07-31 01:15:14 +00:00 |
|
andres.delikat
|
60a4ea4426
|
Refactor movie code - a Loaded property, removed a lot of code that was a work around for this needed feature, movie can not write to disk unless this property is true
|
2011-07-30 23:59:31 +00:00 |
|
andres.delikat
|
ccae3cc1c9
|
Add NullGame as an inherited class of RomGame and assign Global.Game to this instead of null whenever a ROM is not loaded. This fixes using the record dialog with no game loaded and lots of other situations during Null Emulator. Also cleaned up the record dialog a bit
|
2011-07-30 23:20:49 +00:00 |
|
andres.delikat
|
2e68314e01
|
Movies that start from savestate now supported. Record Movie dialog "Record from Now" option implemented. ResetFrameCounter() added to IEmulator and implemented in all existing cores
|
2011-07-30 20:49:36 +00:00 |
|
andres.delikat
|
6dc3c25a8d
|
TAStudio - don't attempt to do winform things in Restart() if window is not open
|
2011-07-30 18:54:49 +00:00 |
|
andres.delikat
|
ab97cb04a9
|
Remove TI83's Disable Slot Hotkeys option (now that the numpad is properly used)
|
2011-07-30 18:39:33 +00:00 |
|
andres.delikat
|
e121498c4c
|
TAStudio - fix updating of nes control pad, add menu item "Update Pads on Movie Playback", different color for control pad button background when pressed
|
2011-07-30 17:59:18 +00:00 |
|
andres.delikat
|
e4ba668d31
|
NES & SMS controls VirtualPads (Reset/Pause/Power/Etc)
|
2011-07-30 13:48:13 +00:00 |
|
andres.delikat
|
1cef6ac3be
|
fix build error in last commit, oops
|
2011-07-30 12:22:33 +00:00 |
|
andres.delikat
|
6af8649e84
|
TAStudio - virtualpads update on movie playback, used monospace font for listview
|
2011-07-30 03:00:18 +00:00 |
|
andres.delikat
|
672b8455fd
|
TAStudio - use saved window position, save window size, slight GUI tweaks
|
2011-07-30 01:26:13 +00:00 |
|
andres.delikat
|
d6897ad328
|
Tastudio - PCE virtualpad done, 4 pce controllers added to controller box
|
2011-07-30 01:09:44 +00:00 |
|
beirich
|
564f829fd7
|
[PCE] PSG volumes are less wrong. Still poking.
[Client] improved some config defaults
|
2011-07-28 05:28:03 +00:00 |
|
zeromus
|
85419ab656
|
fix recently crashing archive file loading
|
2011-07-28 05:24:33 +00:00 |
|
zeromus
|
4d648e13b1
|
fix rewind better maybe this time.
|
2011-07-26 06:34:45 +00:00 |
|
beirich
|
956fb42191
|
Fix unmanaged/VRAM memory leak causing eventual crashes once VRAM is exhausted
|
2011-07-26 04:26:20 +00:00 |
|
andres.delikat
|
81fe6e200c
|
TAStudio - Fix SMS virtualpad so that it controls input
|
2011-07-26 02:47:21 +00:00 |
|
andres.delikat
|
ef33763383
|
TAStudio - fix rewind
|
2011-07-26 01:08:38 +00:00 |
|
andres.delikat
|
de0e7770fc
|
TAStudio - implement ClearPads() and Restart() and hook them up to the stop movie button. Fix Virtualpad objects so they don't crash on the Clear() function
|
2011-07-26 00:26:05 +00:00 |
|
andres.delikat
|
ac032d1b92
|
Refix rewinding in movie finished mode. It now properly restores the movie to playback mode.
|
2011-07-26 00:11:23 +00:00 |
|
zeromus
|
63e4eaef79
|
handle user input vs MovieMode.FINISHED better
|
2011-07-25 01:47:02 +00:00 |
|
andres.delikat
|
503ecac44c
|
Path Config for PCE Bios
|
2011-07-25 01:30:18 +00:00 |
|
zeromus
|
08903b8985
|
fix rewind speed
|
2011-07-25 00:08:04 +00:00 |
|
zeromus
|
5580295085
|
movie input refactoring
|
2011-07-24 23:14:16 +00:00 |
|
zeromus
|
695625d63b
|
warnings begone
|
2011-07-24 21:29:17 +00:00 |
|
zeromus
|
29b2e30c36
|
cleanup Controller class (remove old sticky and forcing code)
|
2011-07-24 20:37:10 +00:00 |
|
zeromus
|
e4f9f76198
|
fix ti-83 virtual keypad
|
2011-07-24 20:23:27 +00:00 |
|
andres.delikat
|
ea472ee043
|
Clean up virtualpads to use StickyXORAdapter, have a Clear() function, and to be aware of what controller they are using
|
2011-07-24 20:17:21 +00:00 |
|
beirich
|
06d8792830
|
[PCE] fix Youkai Douchuuki, Yo Bro, and Order of the Griffon
|
2011-07-24 19:52:20 +00:00 |
|
zeromus
|
198431b8a2
|
add StickyXORAdapter
|
2011-07-24 19:52:13 +00:00 |
|
andres.delikat
|
813e0d0d97
|
SMS virtual pad, but pressing the buttons crashes currently
|
2011-07-24 19:31:58 +00:00 |
|
andres.delikat
|
58e2e65c7f
|
TAStudio - refix frame advance
|
2011-07-24 17:35:53 +00:00 |
|
andres.delikat
|
45414435b4
|
TAStudio - make virtualpads load dynamically, load 2 nes pads if an nes controller
|
2011-07-24 17:29:09 +00:00 |
|
zeromus
|
15d7148926
|
forgot an add
|
2011-07-24 07:00:54 +00:00 |
|
zeromus
|
8a1e0c2b09
|
unmanaged core experiment
|
2011-07-24 06:45:05 +00:00 |
|
beirich
|
c30529685d
|
[PCE] regretfully implement sprite limit, fixing some anomalies
|
2011-07-24 03:32:39 +00:00 |
|
andres.delikat
|
206329a7c8
|
Add Restart Movie to context menu
|
2011-07-24 00:58:48 +00:00 |
|
andres.delikat
|
a7bf8362cc
|
Play Movie - scroll to highlighted index when index changes, fix tab orders
|
2011-07-24 00:21:58 +00:00 |
|
andres.delikat
|
36eef14f60
|
Play Movie - add .state to browse dialog and do logic to check if it has an inputlog, if not then show a message and don't load, else load it as a movie. Also dialog cleanups
|
2011-07-23 22:30:51 +00:00 |
|
andres.delikat
|
c383319082
|
Play Movie - rescan button
|
2011-07-23 21:14:20 +00:00 |
|
andres.delikat
|
c73112cdf6
|
Play Movie Dialog - add a "include .state" checkbox. If checked it will show .state files that have input data
|
2011-07-23 20:52:47 +00:00 |
|
beirich
|
8295e6d65b
|
PCE GameDB overhaul
|
2011-07-23 20:22:32 +00:00 |
|
andres.delikat
|
b78202a4c6
|
Fix input widget so that when auto-tab is off, escape still immediately updates the text
|
2011-07-23 19:43:08 +00:00 |
|
zeromus
|
33dc19ded2
|
change console window title format
|
2011-07-23 09:18:18 +00:00 |
|
zeromus
|
fa179198a0
|
superior win32 console support: capture output during debug mode, dont interfere with stdout redirect
|
2011-07-23 08:17:09 +00:00 |
|
andres.delikat
|
eda56bac8c
|
Mainform cleanup - move all menu/event handling functions to Mainform.MenuItems.cs, move some more code to Mainform.Movie.cs, minor code cleanup
|
2011-07-22 01:34:21 +00:00 |
|
andres.delikat
|
f4d02ff49e
|
Some code cleanup on Mainform, also moved all the mainform movie functions to their own file
|
2011-07-22 01:14:13 +00:00 |
|
andres.delikat
|
bc2293a482
|
Ripped out inputlog, for now
|
2011-07-22 00:19:25 +00:00 |
|
andres.delikat
|
66a854d75b
|
Main Form - opening log window from status bar Rom icon - StopSound & StartSound() should always be run before and after modal dialog calls to avoid annoying stuttering while window is open
|
2011-07-21 22:51:32 +00:00 |
|
beirich
|
3bedad1e95
|
Update SGX with new timing & support frameskip... huge success!
100% SGX compatibility (not that this is difficult)
|
2011-07-20 03:57:41 +00:00 |
|
beirich
|
47def064fa
|
significant PCE timing/compat improvements, still poking at a few things
|
2011-07-19 03:53:07 +00:00 |
|
zeromus
|
2f27bf783e
|
gamedb updater script tech. rearrange to suit your tastes.
|
2011-07-18 23:10:25 +00:00 |
|
zeromus
|
1ed8315b7a
|
optionally restore win32 console window for now, until the windows one is fast enough to replace it
|
2011-07-18 02:41:57 +00:00 |
|
beirich
|
cc9cf04a57
|
"Fix" PCE Paranoia by marking bad roms
|
2011-07-18 00:11:16 +00:00 |
|
zeromus
|
1634a6c042
|
crude log console
|
2011-07-17 22:42:52 +00:00 |
|
andres.delikat
|
72699b4ad7
|
another round of refactoring the Movie object
|
2011-07-17 17:52:39 +00:00 |
|
andres.delikat
|
e6b2c794d4
|
Refactor the movie object, replacing Getfunctions with public properties, renaming of some functions, removing a duplicate function, other misc things
|
2011-07-17 14:39:15 +00:00 |
|
andres.delikat
|
bc31a49c4a
|
Fix prev/next slot functions to that they navigate to slot 0
|
2011-07-17 13:59:41 +00:00 |
|
andres.delikat
|
1ee864666b
|
update status bar saveslots on NextSlot() and PreviousSlot()
|
2011-07-17 13:33:09 +00:00 |
|
andres.delikat
|
7445ff887c
|
small amount of work on NES Sprite viewer, added nesasm.pdf to NES docs
|
2011-07-16 18:16:21 +00:00 |
|
andres.delikat
|
b1abe27bfc
|
a couple of icons
|
2011-07-16 13:48:05 +00:00 |
|
andres.delikat
|
ee713acded
|
Edit Subtitles Form - minor tweaks
|
2011-07-16 13:31:36 +00:00 |
|
andres.delikat
|
5ccf27eb4a
|
Don't show Add Subtitle in context menu when no movie is loaded
|
2011-07-16 02:22:15 +00:00 |
|
andres.delikat
|
b551d9dbdd
|
Movie Subtitles - in Edit Subtitle dialog, parse color value as hex, in render panel read the subtitle color
|
2011-07-16 02:11:51 +00:00 |
|
andres.delikat
|
211889c73d
|
Restore Inputlog recording
|
2011-07-15 03:25:32 +00:00 |
|
beirich
|
3f27ac0b2a
|
Fix PCE Populous by supporting its custom SaveRAM.
+ Unsubstantial TurboCD progress.
|
2011-07-15 02:08:18 +00:00 |
|
andres.delikat
|
7293cd05cc
|
Add error messages to movie convert functions, and other small cleanups, refactor calls to them to handle error messages
|
2011-07-14 01:12:18 +00:00 |
|
zeromus
|
2f050d5751
|
avi size segmentation
|
2011-07-13 04:24:55 +00:00 |
|
zeromus
|
bff3957c7e
|
avi rez-change segmentation
|
2011-07-13 04:04:58 +00:00 |
|
andres.delikat
|
a8c66418e7
|
Movie Convert - started implementing an error message system, did FCM and MMV
|
2011-07-13 02:11:20 +00:00 |
|
zeromus
|
2c683dc90a
|
dont crash on exit while writing inputlog
|
2011-07-13 01:45:40 +00:00 |
|
andres.delikat
|
a228e05f38
|
Lots of little fixups to movie code, disable Disable Message config in Message Config as I won't be implmenting that before release
|
2011-07-13 01:29:13 +00:00 |
|
andres.delikat
|
4c5b48fd7c
|
Hacky fix for loading PCE movies that are less than 5 players. It will read 1-4, but will output 5 once the movie is saved again by the emulator. At some point we should probably support < 5 players for saving to disk, given that 4 players worth of text is a drain.
|
2011-07-13 00:18:47 +00:00 |
|
andres.delikat
|
1b4258947b
|
AVI - status bar icon when avi is capturing
|
2011-07-12 00:37:24 +00:00 |
|
andres.delikat
|
bf8799c66c
|
oh, and display hotkey mapping on menu items
|
2011-07-12 00:10:02 +00:00 |
|
andres.delikat
|
06fd837cbd
|
Hotkeys for Record/Stop AVI
|
2011-07-12 00:05:14 +00:00 |
|
andres.delikat
|
bd71909f38
|
AVI cleanup - gray of menu items when appropriate, use default filename, and AVI Path config, add on screen messages, fix crash on Null emulator capture (snow is awesome yo), other misc things
|
2011-07-11 23:26:20 +00:00 |
|
zeromus
|
e6202bdea1
|
avi: improve codec compatibility and error handling
|
2011-07-11 07:53:48 +00:00 |
|
zeromus
|
52f27634eb
|
first draft of avi-writing: it works, unless you abuse it.
|
2011-07-11 07:35:14 +00:00 |
|
beirich
|
911b11a340
|
fix new crash in dump icon code when you close the open ROM
|
2011-07-11 03:12:20 +00:00 |
|
andres.delikat
|
0dc3d914b6
|
Better recent icon, add some icons to menu items
|
2011-07-11 00:55:55 +00:00 |
|
andres.delikat
|
9927334632
|
More pleasing Play & Stop icons
|
2011-07-11 00:16:05 +00:00 |
|
zeromus
|
9628ab3506
|
hook up nes dump status stuff, and also add a log window that we could use for console output in the near future but for now is just used to show you a detailed rom analysis report
|
2011-07-10 21:00:28 +00:00 |
|
andres.delikat
|
b832d0f331
|
Hack icon for status bar
|
2011-07-10 20:48:07 +00:00 |
|
beirich
|
56538894c6
|
Add Hack rom status
|
2011-07-10 20:35:52 +00:00 |
|
andres.delikat
|
e6b6cce7ad
|
Uncomment some movie code
|
2011-07-10 20:01:27 +00:00 |
|
zeromus
|
f8f1906a3c
|
make alt hotkeys more useful by preventing interference from windows menu system
|
2011-07-10 19:50:59 +00:00 |
|
andres.delikat
|
8e3302860f
|
PCEjin movies = .MC2 not .pCE!
|
2011-07-10 19:46:54 +00:00 |
|
andres.delikat
|
93fcd7d94f
|
Edit Comments/Subtitles dialogs - limit max height of auto-height adjustment
|
2011-07-10 18:36:10 +00:00 |
|
beirich
|
732bd982af
|
Update to GameDB and update PCE compat.txt
|
2011-07-10 18:26:55 +00:00 |
|
andres.delikat
|
be20aa3af8
|
Play Movie - include subdirectories option, fix a crash bug
|
2011-07-10 18:21:43 +00:00 |
|
andres.delikat
|
58ac4b176f
|
remove corphawk.ico from svn, remove lost logo.ico from csproj file list
|
2011-07-10 18:13:02 +00:00 |
|
zeromus
|
c25caa4c8e
|
is this better?
|
2011-07-10 18:08:06 +00:00 |
|
andres.delikat
|
6e59917c81
|
ugh, logo needs to be in the output directory, lame
|
2011-07-10 18:04:13 +00:00 |
|
andres.delikat
|
26724604da
|
Play Movie - highlight matching movie on Load. Look for movies that have the game name header that matches the rom, tiebreakers are .tas, and last access date
|
2011-07-10 17:51:32 +00:00 |
|
andres.delikat
|
a3fd68ac35
|
Play Movie Dialog - various cleanups
|
2011-07-10 17:04:24 +00:00 |
|
andres.delikat
|
4ba6fb4122
|
Load up Rom dump status icon with various ROM statuses
|
2011-07-10 16:34:35 +00:00 |
|
beirich
|
6fc8d16e42
|
Wire up known bad/good rom status from GameDB
|
2011-07-10 16:06:12 +00:00 |
|
andres.delikat
|
74c8e09892
|
Add Record icon for when movie is in record movie, add green check for good rom dumps, add function for checking rom dumps (currently blank and always shows good)
|
2011-07-10 15:36:41 +00:00 |
|
andres.delikat
|
4b03660092
|
Better corphawk icon
|
2011-07-10 13:46:10 +00:00 |
|
andres.delikat
|
3a9acac5a4
|
Input config - fix height resizing of TI83, fix ordering of controllers in combo box. Remove calls to hardcoded indexes of the comboboxes (use the string names instead!)
|
2011-07-10 13:16:24 +00:00 |
|
zeromus
|
61f466ca8e
|
fix more input stuff better
|
2011-07-10 07:39:40 +00:00 |
|
zeromus
|
2425b3c87a
|
fix some input things
|
2011-07-10 06:24:04 +00:00 |
|
beirich
|
c8727ae01f
|
fix some gamedb stuff, add some genesis games to db, get genesis back to a state where it at least loads roms correctly
|
2011-07-10 04:54:18 +00:00 |
|
andres.delikat
|
fac0143fe4
|
Message Config - Multitrack message position
|
2011-07-10 03:38:46 +00:00 |
|
andres.delikat
|
9ea996b0fe
|
Message config - add movie input color
|
2011-07-10 03:13:07 +00:00 |
|
zeromus
|
4991b95def
|
refine input stuff
|
2011-07-10 02:14:58 +00:00 |
|
andres.delikat
|
de1a3fdc50
|
Fix TI83 screenshots. Fix screenshot naming code to use the filesystemsafe name, fix bug in screenshotas function
|
2011-07-10 01:55:37 +00:00 |
|
andres.delikat
|
f89070f6ad
|
Display subtitles option
|
2011-07-10 00:04:33 +00:00 |
|
andres.delikat
|
f3e4cdcd16
|
Rip out "wasPressed" code, remove debug code left in by accident from inputwidget
|
2011-07-09 23:35:26 +00:00 |
|
zeromus
|
4ac74a20b3
|
fix obvious bug in last checkin
|
2011-07-09 23:18:13 +00:00 |
|
andres.delikat
|
1e59c2f530
|
Input Widget - add in FlagDuplicate() and UnflagDuplicate() in preparations for a "Show duplicates" option in input config & map hotkeys
|
2011-07-09 23:03:42 +00:00 |
|
andres.delikat
|
521b2ccfd6
|
InputWidget - MouseWheel increment/decrements
|
2011-07-09 22:22:45 +00:00 |
|
zeromus
|
9355bc0f2e
|
redo some of client input and hotkey handling
|
2011-07-09 22:09:39 +00:00 |
|
andres.delikat
|
003b7ebebf
|
Input Widget - left click = focus() only, disable all other mouse events
|
2011-07-09 22:07:13 +00:00 |
|
andres.delikat
|
9419e02091
|
InputWidget - hide caret, increment even on duplicate (just don't overwrite anything), don't highlight text on focus
|
2011-07-09 21:55:14 +00:00 |
|
andres.delikat
|
43c9cd8047
|
Clicking statusbar pause button = toggle pause state
|
2011-07-09 21:13:18 +00:00 |
|
andres.delikat
|
3e87c297fc
|
Input widget - fix behavior of TAB key
|
2011-07-09 21:10:40 +00:00 |
|
beirich
|
1496c9eb1d
|
Switch Bizhawk Client from console to winforms application; make "Show Log Window" a user-togglable option
|
2011-07-09 19:54:24 +00:00 |
|
andres.delikat
|
b25193ef84
|
Use blank image in the pause icon of the statusbar so that the icon size doesn't change
|
2011-07-09 18:39:48 +00:00 |
|
andres.delikat
|
0407bb2e86
|
Input widget - Check for duplicates in binding array before committing a mapping
|
2011-07-09 18:24:53 +00:00 |
|
beirich
|
7c9d170248
|
fix input save crash
|
2011-07-09 18:08:10 +00:00 |
|
andres.delikat
|
7f2079beed
|
Input config - autotab toggle
|
2011-07-09 18:01:46 +00:00 |
|
andres.delikat
|
b1e1fa498c
|
Input Widget - when autotab is off, cycle through the key mappings instead
|
2011-07-09 17:50:52 +00:00 |
|
andres.delikat
|
7dbe4472d9
|
Default key mappings - switch so keyboard bindings are first, joypads 2nd
|
2011-07-09 17:40:26 +00:00 |
|
andres.delikat
|
6949a8dd59
|
InputWidget overhaul to use the new GetPressedKeys() function. InputWidget no longer wipes all mappings. In autotab mode it replaces the first key mapping instead of all. There is now a max number of bindings of 4 (but changeable). Still has some quirks to work out like Alt+F4 no longer closes the dialog, and TAB has weird behavior. Also, need to implement non-autotab handling. Reworked Hotkey config to use this inputwidget, but not inputconfig yet
|
2011-07-09 16:12:56 +00:00 |
|
andres.delikat
|
16e332a72d
|
Fix so that tool dialogs such as Ram watch update on loadstate, Ram Watch - AddWatch() triggers Changes() function, Separator no longer shows Change Count = 0
|
2011-07-09 00:26:23 +00:00 |
|
beirich
|
2cbc50143f
|
Input update... always run directinput in background input mode, we take care of ignoring input when application isn't focused ourselves
|
2011-07-08 05:15:28 +00:00 |
|
andres.delikat
|
a22cade8df
|
Frame Counter Display - remove debug movie length counters, they have served their purpose
|
2011-07-08 03:04:36 +00:00 |
|
andres.delikat
|
1056dbe9b1
|
Input Widget - proof of concept of using a Timer inside the widget to call GetPressedKeys(). Currently this function is always returning null, however.
|
2011-07-07 16:48:29 +00:00 |
|
andres.delikat
|
ec2969cc73
|
Input Widget - Do "Ctrl+X" not "Ctrl + X"
|
2011-07-06 23:15:58 +00:00 |
|
andres.delikat
|
a0dddc1e5a
|
in Movie finished mode, save slots should still be bound to the movie (if the bind option is selected of course)
|
2011-07-06 22:37:41 +00:00 |
|
beirich
|
0b09825218
|
show config crashes so we can debug them
|
2011-07-06 02:16:44 +00:00 |
|
andres.delikat
|
29510ddd58
|
Fix saving of header data from record movie dialog, small fix for inputlog header data
|
2011-07-06 01:53:15 +00:00 |
|
andres.delikat
|
945577dadd
|
Movie code clean up - document PreLoadText(), put movie truncation in LoadLogFromSavestateText() since it was rudely removed from what is now CommitFrame()
|
2011-07-05 23:33:13 +00:00 |
|
andres.delikat
|
68d0ff94eb
|
Refactor movie writing code. MovieHeader, MovieLog, and SubtitleList all have their own write methods now instead of the Movie object doing all of the work. Conceptually these 3 objects should be autonomous and the Movie object is simply an object that manages a collection of these objects.
|
2011-07-05 23:16:54 +00:00 |
|
beirich
|
10faa8a55f
|
Fix issues with modifier keys. If you bind "Tab", it wont be triggered by pressing "Shift+Tab".
|
2011-07-05 05:41:59 +00:00 |
|
andres.delikat
|
3669155329
|
rename "unthrottle" to turbo, Hotkey Dialog - reorder some things and fix positioning
|
2011-07-05 02:36:46 +00:00 |
|
andres.delikat
|
1ac29f3c5d
|
Input Widget - prevent mapping to Alt+F4 and allow parent dialog to be closed by it
|
2011-07-05 01:48:48 +00:00 |
|
beirich
|
a3df5345f6
|
GetPressedKey() progress, returns keyboard with desired modifier-key properties
|
2011-07-04 23:36:06 +00:00 |
|
andres.delikat
|
02e562825e
|
Input Widget - auto tab parameter, hotkey config - a auto-tab setting (on by default). If off, the focused widget will stay focused after a binding, another key pressed will rebind the same key
|
2011-07-04 23:02:37 +00:00 |
|
kylethomson
|
0934b35a1e
|
Slight error with multi-track - it is during recording, not during playback.
Otherwise, nice work zeromus, we have multitrack.
|
2011-07-04 22:24:48 +00:00 |
|
beirich
|
9bd1d75ba1
|
Implement GetPressedKey for joysticks, untested; keyboard polling is in progress
|
2011-07-04 20:45:05 +00:00 |
|
andres.delikat
|
fed74b17b2
|
Subtitle editor touchups - Make color cells the color they are representing, display color in hex, put try/catches + error messages if trying to parse erroneous data, tooltips for columns
|
2011-07-04 20:34:53 +00:00 |
|
andres.delikat
|
26569dab58
|
More work on subtitle maker, implmeent context menu "Add Subtitle" which will open subtitle maker and set frame to the current frame
|
2011-07-04 19:20:11 +00:00 |
|
andres.delikat
|
8d333fc04c
|
Start subtitle maker form
|
2011-07-04 18:32:57 +00:00 |
|
andres.delikat
|
505a8baab4
|
Subtitles - finish parsing all parameters, make render panel use all parameters but color (for now)
|
2011-07-04 18:04:56 +00:00 |
|
andres.delikat
|
7c09ca4ae3
|
improvements to subtitle parsing
|
2011-07-04 17:01:17 +00:00 |
|
andrewjpritchard
|
968c07e7d3
|
Preliminary VBM conversion.
|
2011-07-04 13:54:17 +00:00 |
|
andres.delikat
|
b6bd94242f
|
Subtitle & Comment editors - clear out old comments & subs before saving the new list
|
2011-07-04 13:37:51 +00:00 |
|
andres.delikat
|
88f14d07d8
|
Fixes to comment loading/editing/saving
|
2011-07-04 13:31:34 +00:00 |
|
andres.delikat
|
a95ffcf2f9
|
Hooked up comment editor/viewer to play movie and context menu, various tweaks to movie code, more progress implemented comment loading/editing/saving
|
2011-07-04 02:50:38 +00:00 |
|
andres.delikat
|
384a4a61b6
|
Start movie comments editor
|
2011-07-04 01:57:18 +00:00 |
|
andres.delikat
|
bf5fa3356a
|
Edit Subtitles form - Save subtitles on exit
|
2011-07-04 01:23:32 +00:00 |
|
andres.delikat
|
f886b65015
|
Write subtitles to movie files
|
2011-07-04 00:49:37 +00:00 |
|
andres.delikat
|
945cb9c693
|
More menu icons
|
2011-07-03 02:32:29 +00:00 |
|
andres.delikat
|
4ff95ffc3c
|
Message config - less cluttered color config, add movie messages to color config
|
2011-07-01 02:43:08 +00:00 |
|
andres.delikat
|
8075d4453d
|
Message Config - add rerecord counter
|
2011-07-01 02:00:11 +00:00 |
|
andres.delikat
|
2b661b52ba
|
Save slot system in status bar, shows which slots have a file associated with them, which slot is currently selected, and clicking loads the state
|
2011-07-01 01:28:25 +00:00 |
|
andres.delikat
|
b5ecda4f3e
|
if commandline or autoload movie and no game, do openfile dialog, if still not game, don't attempt to load movie
|
2011-06-30 02:30:06 +00:00 |
|
andres.delikat
|
33cf3412de
|
oops, config file change not checked in
|
2011-06-30 02:25:32 +00:00 |
|
andres.delikat
|
3c378bc312
|
Add soft reset hotkey, remove hard coded nes reset hotkey, fix small errors on TI83 hotkey mapping
|
2011-06-30 02:22:12 +00:00 |
|
andres.delikat
|
2a1788d067
|
Path config - make browse buttons use image instead
|
2011-06-30 02:00:01 +00:00 |
|
andres.delikat
|
9a80fb206c
|
Save a default user setting and allow the user to set this in the record movie dialog
|
2011-06-30 01:37:54 +00:00 |
|
andres.delikat
|
889d997a32
|
More images for menu items
|
2011-06-30 01:27:46 +00:00 |
|
andres.delikat
|
a47f7e0550
|
Fix crash when no game loads on startup
|
2011-06-28 23:43:13 +00:00 |
|
andres.delikat
|
2b677d3245
|
Change ToolStrip widgets to ToolStripEx so that they can focus+click
|
2011-06-28 23:32:55 +00:00 |
|
zeromus
|
0aa234282e
|
phase 1 of fixing up controller logic. tell me how terribly ive broken the movie code. might want to fix it before moving on to phase 2 or decide to revert.
|
2011-06-27 05:31:46 +00:00 |
|
zeromus
|
71a8705d81
|
fix tab order in RecordMovie dialog
|
2011-06-27 01:34:23 +00:00 |
|
andres.delikat
|
52215061aa
|
some implementations necessary for the gameboy controller
|
2011-06-27 01:24:26 +00:00 |
|
andres.delikat
|
6c6929b625
|
Gameboy - implement memory domains (system bus only for now) and other small things
|
2011-06-27 01:05:30 +00:00 |
|
andres.delikat
|
4b417ec898
|
oops
|
2011-06-27 00:22:25 +00:00 |
|
andres.delikat
|
8096316981
|
Make GB debugger not load by default when a gb game is loaded, misc cleanups gb related
|
2011-06-27 00:15:47 +00:00 |
|
andres.delikat
|
d3f4da39a3
|
Subtitle viewer implemented for play movie dialog, context menu for edit/viewing subtitles (depending on read only status). Still TODO: save changes when in edit mode
|
2011-06-26 21:11:12 +00:00 |
|
andres.delikat
|
3235fc1618
|
Start a subtitle viewer/editor form and hook to the subtitle button on the play movie dialog
|
2011-06-26 20:26:37 +00:00 |
|
zeromus
|
33c5182296
|
fix annoying toolstrip/menustrip non-clickthrough behaviour
|
2011-06-26 20:10:05 +00:00 |
|
andres.delikat
|
5fa8ae99fe
|
Map hokeys - fix default focused widget when clicking the tabs
|
2011-06-26 20:06:27 +00:00 |
|
andres.delikat
|
87fb448cc0
|
Set FullRowSelect on a bajillion listview objects
|
2011-06-26 19:50:15 +00:00 |
|
andres.delikat
|
ed529b9322
|
Ram Watch - don't start a new watch file when restarting the dialog, at least for now until I find a happy compromise
|
2011-06-26 19:35:13 +00:00 |
|
andres.delikat
|
98988e4b49
|
RamWatch - save window position menu item
|
2011-06-26 19:13:52 +00:00 |
|
andres.delikat
|
4bc5ee663c
|
Cheats & Ram Search - ditto
|
2011-06-26 19:03:16 +00:00 |
|
andres.delikat
|
c8e8cee822
|
Ram Watch - when saving a new watch, add it to the recent menu
|
2011-06-26 19:01:06 +00:00 |
|
andres.delikat
|
ec7e4123fd
|
Ram Watch - show "saved" message when doing Save, not just SaveAs
|
2011-06-26 18:56:56 +00:00 |
|
andres.delikat
|
685a500cc5
|
movie - Reset recording for the NES core
|
2011-06-26 18:08:27 +00:00 |
|
andres.delikat
|
3a15dd6bb9
|
Basic subtitle loading and rendering. Still lots of todos but basic functionality now exists
|
2011-06-26 16:39:48 +00:00 |
|
andres.delikat
|
61e82793e9
|
Start movie subtitle system
|
2011-06-26 14:36:41 +00:00 |
|
andres.delikat
|
70dc87a971
|
Lua Console - Move Up/Down, Insert Seperator, other small things
|
2011-06-26 03:03:15 +00:00 |
|
andres.delikat
|
3569f3cd0a
|
Remove bmp images in favor of png, small implementations to Lua Console
|
2011-06-26 02:09:06 +00:00 |
|
andres.delikat
|
58a0a77ae5
|
More images and small gui tweaks
|
2011-06-26 01:22:52 +00:00 |
|
andres.delikat
|
12027d4da9
|
Close icon
|
2011-06-26 00:42:12 +00:00 |
|
andres.delikat
|
7663a53824
|
Some more images
|
2011-06-26 00:17:42 +00:00 |
|
andres.delikat
|
b40c861ee7
|
Images for all kinds of menu items
|
2011-06-26 00:06:50 +00:00 |
|
andres.delikat
|
4247b43b07
|
shut up some warnings
|
2011-06-22 17:41:59 +00:00 |
|
andres.delikat
|
8d856ccd53
|
Input Config - remove now obsolete TruncateButtonMapping function
|
2011-06-22 17:35:19 +00:00 |
|
zeromus
|
316720baf4
|
boot up without crashing on systems without HWTransformAndLight
|
2011-06-22 01:57:37 +00:00 |
|
zeromus
|
453b02a7ff
|
fix occasional crash in throttle due to a funky order of operations
|
2011-06-21 08:36:49 +00:00 |
|
andres.delikat
|
6cca2a666a
|
Context menu - disable "Load Last" menu items if no items in recent menus
|
2011-06-21 02:09:53 +00:00 |
|
beirich
|
dfda7d909b
|
Don't die when D3D9 device is lost
|
2011-06-21 02:01:51 +00:00 |
|
andres.delikat
|
e4a112c220
|
Hotkeys/Input - Use Ctrl for display instead of Control
|
2011-06-21 01:22:27 +00:00 |
|
andres.delikat
|
7332bccd62
|
expunge Left/Right Ctrl/Alt/Shift from default mappings
|
2011-06-21 00:36:31 +00:00 |
|
zeromus
|
35f2691666
|
some work on the disc system
|
2011-06-20 09:09:21 +00:00 |
|
zeromus
|
ca628e6278
|
rename GetExePathAbsolute to GetExeDirectoryAbsolute so it doesnt confuse me
|
2011-06-20 09:08:04 +00:00 |
|
andres.delikat
|
30296e4f5b
|
Don't distinguish between left & right shift/alt/control!
|
2011-06-20 02:24:41 +00:00 |
|
andres.delikat
|
e6af827d7c
|
...and remove some debug code I left in
|
2011-06-19 23:40:20 +00:00 |
|
andres.delikat
|
5bda595ee7
|
fixs spaces into tabs in a bunch of files because I'm tired of fixing it gradually
|
2011-06-19 23:39:25 +00:00 |
|
andres.delikat
|
38422fda10
|
Numpad 2,4,6,8 != Arrow keys!
|
2011-06-19 23:31:58 +00:00 |
|
andres.delikat
|
f5014946db
|
status strip - pause icon implemented, movie icon put in but hidden and unimplmeented. Dump Error warning icon put in and disabled, needs to be implemented
|
2011-06-19 20:50:46 +00:00 |
|
andres.delikat
|
50727e79ed
|
Add Stop Movie to context menu
|
2011-06-19 20:13:54 +00:00 |
|
andres.delikat
|
8bdd5d58aa
|
Anchor Play/Record messages to right edge of screen
|
2011-06-19 20:08:27 +00:00 |
|
andres.delikat
|
42e22b63be
|
Oops - reverse sorting for Ram Watch
|
2011-06-19 19:20:43 +00:00 |
|
andres.delikat
|
5e27953db0
|
Column sorting (and reverse sorting) for Ram Search & Ram Watch
|
2011-06-19 19:10:01 +00:00 |
|
andres.delikat
|
fc48e0e4f7
|
Record Movie Dialog - add header info on record, add author box and hook it up, dialog fix ups
|
2011-06-19 14:28:13 +00:00 |
|
andres.delikat
|
0e36c7d401
|
Input Widget - allow mapping to just ctrl, alt, or shift
|
2011-06-19 03:35:57 +00:00 |
|
beirich
|
a659c05b21
|
TurboCD progress
|
2011-06-19 03:27:18 +00:00 |
|
andres.delikat
|
3a8721f600
|
Input Config - fix so that multiple mappings are at least displayed again
|
2011-06-19 02:55:15 +00:00 |
|
andres.delikat
|
47ebedb40c
|
Input Config - fix anchoring of L+R checkbox, Input Widget - fix ToString method so things like Ctrl+UpArrow doesn't break
|
2011-06-19 02:17:27 +00:00 |
|
andres.delikat
|
f23c5f8382
|
Pause emulation when context menu is activated
|
2011-06-19 01:39:36 +00:00 |
|
andres.delikat
|
e250355024
|
NES controller 2 implemented with some bugs
|
2011-06-19 00:18:02 +00:00 |
|
andres.delikat
|
c6a5c7e9b6
|
change references of Global.Game.Name to Global.Game.FileSystemSafeName for situations that use it to build paths
|
2011-06-18 21:39:53 +00:00 |
|
andres.delikat
|
c5b2fa8431
|
Make Global.Game.Name use file name no Emulator GameName for NES games
|
2011-06-18 19:59:25 +00:00 |
|
andres.delikat
|
23613ffa27
|
Make Fullscreen only happen on Double Left Click
|
2011-06-18 19:25:41 +00:00 |
|
andres.delikat
|
e4168d609e
|
Refix drag & drop for movie files
|
2011-06-18 19:19:12 +00:00 |
|
andres.delikat
|
b95264e9bf
|
Make movie class handle automatically backing up a movie before the first time it alters it, add flag to MultiClient to toggle the movie backup feature
|
2011-06-18 19:16:05 +00:00 |
|
andres.delikat
|
67f726eae6
|
Movie backup function added to movie class, currently only hooked to a context menu item of main form
|
2011-06-18 18:27:51 +00:00 |
|
andres.delikat
|
4a60a4928a
|
Lots of context menu items and logic for hiding/showing them
|
2011-06-18 17:45:18 +00:00 |
|
andres.delikat
|
1260182445
|
squash playback bug that was causing "1" to be added to playback mnemonic
|
2011-06-18 17:09:58 +00:00 |
|
andres.delikat
|
b725394603
|
Context menu for main form, and toggle to disable it
|
2011-06-18 17:01:57 +00:00 |
|
andres.delikat
|
e14a3c70ad
|
Fix bugs in message config dialog, implement message anchoring (mostly)
|
2011-06-18 16:22:26 +00:00 |
|
beirich
|
468fd8bb74
|
fix crash-at-start bug if FPS is shown and 'Start Paused' is selected
|
2011-06-18 06:27:55 +00:00 |
|
kylethomson
|
c228699255
|
Getting closer.
|
2011-06-17 02:43:22 +00:00 |
|
andres.delikat
|
9e7510894e
|
Don't reference usermovie in the movie class
|
2011-06-17 01:50:51 +00:00 |
|
kylethomson
|
e9942dc101
|
Multitrack overwrite works. Now to fix playback.
|
2011-06-16 03:56:40 +00:00 |
|
kylethomson
|
dbd932bb5a
|
Had to add them to the dictionary.
|
2011-06-16 02:55:06 +00:00 |
|
kylethomson
|
0256569297
|
Hooked up multitrack hotkeys (I hope)
|
2011-06-16 02:52:23 +00:00 |
|
andres.delikat
|
1db89f5c1f
|
Message config - ability to set anchoring of on screen messages. TODO: hook up anchoring to display system
|
2011-06-16 02:39:35 +00:00 |
|
kylethomson
|
882562c452
|
Multitrack for PCE done, if my idea works. Now to hook up hotkeys.
|
2011-06-16 02:29:45 +00:00 |
|
kylethomson
|
b5b853196e
|
|
2011-06-16 01:49:12 +00:00 |
|
kylethomson
|
a4fe9754c0
|
Look at where the error is - This is what I need to access.
|
2011-06-16 01:35:42 +00:00 |
|
kylethomson
|
445be7ca24
|
Oopps, forgot to add multitrack file
|
2011-06-16 01:20:19 +00:00 |
|
kylethomson
|
18fe637193
|
Start of MultiTrack.
|
2011-06-16 01:18:16 +00:00 |
|
zeromus
|
2d20ab84ca
|
[NES] assorted mapper cleanup and add MMC2
|
2011-06-13 09:55:25 +00:00 |
|
zeromus
|
7705e3f6f1
|
[NES] clean up mapper 107
|
2011-06-13 08:58:38 +00:00 |
|
zeromus
|
db2ba34c01
|
[NES] work on some mappers, make a mapper compatibility list
|
2011-06-13 08:38:10 +00:00 |
|
zeromus
|
1b16d640bf
|
dont pop open the archive chooser when power cycling a rom from an archive
|
2011-06-12 22:55:34 +00:00 |
|
andres.delikat
|
c767018bcf
|
fix typo that broke wasPressed on input display
|
2011-06-12 22:29:04 +00:00 |
|
andres.delikat
|
0894a20e4c
|
Fix alert font so it doesn't clash with displays around it, fix crash on tastudio close, fix play movie from beginning function
|
2011-06-12 21:36:03 +00:00 |
|
andres.delikat
|
bda7db5633
|
TAStudio - misc small things
|
2011-06-12 20:33:42 +00:00 |
|
andres.delikat
|
cbd292366d
|
NES virtual pad hooked up (behaves as graphical autohold)
|
2011-06-12 19:31:06 +00:00 |
|
andres.delikat
|
80d4017a7f
|
VirtualPadNES added
|
2011-06-12 18:58:30 +00:00 |
|
andres.delikat
|
f36da18f97
|
Small fixups to movie & tastudio code
|
2011-06-12 18:31:42 +00:00 |
|
andres.delikat
|
59173e4e44
|
Some virtual pad progress, virtual pad dumps input into movie file when recording, currently doesn't feed it to the core though (lol). Virtualpad object set up for a nes controller
|
2011-06-12 14:42:50 +00:00 |
|
andres.delikat
|
368faf64f4
|
VirtualPad object, added to TAStudio
|
2011-06-12 01:50:08 +00:00 |
|
zeromus
|
9ee66226df
|
[NES] add SuROM (dragon quest 4) and SoROM/SxROM (other games that are not dragon quest 4)
|
2011-06-12 00:53:14 +00:00 |
|
andres.delikat
|
38ca651aab
|
TAStudio - more misc stuff
|
2011-06-12 00:14:19 +00:00 |
|
andres.delikat
|
cd849d9614
|
TAStudio - more fixups, current frame always in view, better images for tool buttons, fix read-only toggle, Gui cleanups
|
2011-06-11 23:54:35 +00:00 |
|
andres.delikat
|
b527b91252
|
TAStudio - show input log of movie, very buggy atm
|
2011-06-11 22:59:21 +00:00 |
|
andres.delikat
|
bb0897b3ed
|
Some work on TAStudio, read-only toggle, play movie from beginning, autoload, misc clean up
|
2011-06-11 22:32:12 +00:00 |
|
zeromus
|
c0988feaa3
|
add CoreInputComm/CoreOutputComm, remove Query system, hook up nes video config options
|
2011-06-11 22:15:08 +00:00 |
|
andres.delikat
|
11b33fcc33
|
Fix MakeRelease, SlimDx.dll must be in the zip!
|
2011-06-11 20:01:36 +00:00 |
|
andres.delikat
|
895915cd9f
|
Made public flags in main form so that dialogs can control frame advance & rewind. Hooked to TAStudio
|
2011-06-11 19:39:34 +00:00 |
|
andres.delikat
|
e9381dc06e
|
Sound Volume - better algorithm for a smoother sound up/down
|
2011-06-11 17:42:16 +00:00 |
|
andres.delikat
|
f52c4610e8
|
NES config - Fix crash when palette path is null, hook up NES palette path config in path config dialog, dialog fix ups
|
2011-06-11 16:22:48 +00:00 |
|
andres.delikat
|
f052b0bd71
|
Add palette files to MakeRelease.bat
|
2011-06-11 16:02:28 +00:00 |
|
andres.delikat
|
448458f0e5
|
oops, add Movie Convert to project
|
2011-06-11 15:58:22 +00:00 |
|
andres.delikat
|
5f3cfb46da
|
NES Game Genie Encoder/Decoder - fix button order to match game genie (oops), fix tab stops, fix add cheat button from crashing
|
2011-06-11 15:55:06 +00:00 |
|
andres.delikat
|
d70121bc04
|
NES Graphics config - hook up sprite, background toggling, and background color selection. Fix up bugs. Also add the files to SVN, since I always forget that the first time!
|
2011-06-11 14:40:00 +00:00 |
|
andres.delikat
|
ef4b30cbd2
|
NES graphics config - checkboxes & config for Allow > 8 sprites per scanline, and clip left & right sides. Hook up palette file selection, and autoload palette toggling. Checking in NES .palette files
|
2011-06-11 12:54:26 +00:00 |
|
andres.delikat
|
2f2a09f2f9
|
Start NES graphics settings dialog
|
2011-06-10 23:09:10 +00:00 |
|
andres.delikat
|
42354a2c77
|
remove status message, TODO: put useful things in this bar
|
2011-06-10 22:58:48 +00:00 |
|
zeromus
|
4bf905c055
|
[NES] ntview: add ability to view individual nametables zoomed in
|
2011-06-10 08:10:16 +00:00 |
|
zeromus
|
51367f58c7
|
[NES] specify scanlines in PPU/NT viewers
|
2011-06-10 07:43:48 +00:00 |
|
zeromus
|
40b7827798
|
improve fastforward system: add >> to fps display, add an 'alternate speed' selection (hold ctrl while choosing a speed from the config>speed/skip menu) which is used by holding FF key, add separate unthrottle toggle, clarify throttle control logic.
|
2011-06-10 07:12:57 +00:00 |
|
beirich
|
93b8bb291b
|
update controller binding defaults to map well to xbox360 gamepads; corrected PCE keyboard bindings also
|
2011-06-10 05:52:01 +00:00 |
|
zeromus
|
368c5266e5
|
[NES] add loader for FCEUX format palettes and an example of how to set it
|
2011-06-10 05:31:46 +00:00 |
|
zeromus
|
7f4e4916dd
|
[NES] fix triangle channel sound bug and add sound savestates
|
2011-06-10 05:02:06 +00:00 |
|
beirich
|
a219e4fb64
|
made the status bar toggleable
|
2011-06-10 04:41:33 +00:00 |
|
beirich
|
5a73fc03ad
|
u+d/l+r toggle implemented
|
2011-06-10 04:14:21 +00:00 |
|
andres.delikat
|
2fcb35a4e4
|
Input Config - Fix NES select & start (I had the saving of the key mappings flip flopped)
|
2011-06-09 00:58:09 +00:00 |
|
zeromus
|
bb4499a41f
|
[NES] rewrite core mmc3 mapping logic to be more clear, handle some assorted mislabeled games, and fix a bug with mmc3+vram+chrmode=1
|
2011-06-08 09:28:38 +00:00 |
|
zeromus
|
0015cada91
|
[NES] fix bug in deemph palette that made airwolf invisible and add better tracking and reporting of bad roms (there are bad dumps of airwolf in addition to the game itself being bad)
|
2011-06-08 06:53:11 +00:00 |
|
zeromus
|
81b30501a5
|
[NES] improve board detection diagnostics logging messages, and add board: IREM-G101 (mapper 032)
|
2011-06-08 06:17:41 +00:00 |
|
zeromus
|
969341f691
|
[NES] add board: sunsoft-4 (mapper 068)
|
2011-06-08 02:42:36 +00:00 |
|
zeromus
|
8247fca267
|
[NES] game recognition tweaks and additions
|
2011-06-08 01:03:32 +00:00 |
|
andres.delikat
|
c6ddf5fd68
|
new Movie creates a GUID
|
2011-06-08 00:42:51 +00:00 |
|
andres.delikat
|
a9c8756bd1
|
Some work on Movie object and convertSMV started
|
2011-06-08 00:25:16 +00:00 |
|
zeromus
|
9ea6a0b7a8
|
fix various poorly constructed auxfile paths and paths with invalid characters
|
2011-06-07 21:10:30 +00:00 |
|
zeromus
|
232d8c91f6
|
fix saveram path creation
|
2011-06-07 20:52:45 +00:00 |
|
zeromus
|
d05b81238e
|
[NES] general ppu timing, mmc3, and nt view fixups.
|
2011-06-07 07:14:34 +00:00 |
|
zeromus
|
a849a2b9ca
|
fix debug stdout redirection with a hack. which visual studio doesnt support in c# ????
|
2011-06-06 21:08:38 +00:00 |
|
zeromus
|
51dbef0fd2
|
[NES] fix nt viewer
|
2011-06-06 18:19:24 +00:00 |
|
andres.delikat
|
542d54a9d2
|
Movie Convert - make compile
|
2011-06-06 10:41:24 +00:00 |
|
andres.delikat
|
89ff0c8927
|
ConvertFCM - remove some erroneous code
|
2011-06-06 02:07:53 +00:00 |
|
andres.delikat
|
8d1a2cb2cd
|
Fix bugs in MMV convert
|
2011-06-06 01:08:29 +00:00 |
|
andres.delikat
|
4c36d1abda
|
basic mmv conversion done. Still a lot of little todos with header info & error checking
|
2011-06-06 00:18:42 +00:00 |
|
andres.delikat
|
a189411d26
|
Progress on convertFCM and beginning of convertMMV
|
2011-06-05 16:29:09 +00:00 |
|
andres.delikat
|
5ad6e0b602
|
Begin Convert FCM tool. Reads most header stuff, no input log yet. Only hooked up to Drag & Drop atm
|
2011-06-05 02:50:50 +00:00 |
|
andres.delikat
|
0224eebbf1
|
Allow L+R/U+D toggle (just the GUI & config work, not hooked up yet)
|
2011-06-04 23:17:59 +00:00 |
|
andres.delikat
|
2a7996c228
|
Input Config - NES controls - swap Select & Start
|
2011-06-04 14:07:55 +00:00 |
|
andres.delikat
|
56cce7ab2b
|
Rip out sample rate config
|
2011-06-04 01:03:13 +00:00 |
|
beirich
|
566ec51a8a
|
restore SMS movie playback
|
2011-06-03 03:25:04 +00:00 |