Commit Graph

2294 Commits

Author SHA1 Message Date
Asnivor e2eac983a1
Merge pull request #1149 from TASVideos/master
Bringing ZXSpectrum branch up to date with master
2018-03-19 15:52:55 +00:00
Isotarge b28d159023 Hex Editor: Speedup FindPrev/FindNext 2018-03-19 00:56:36 +10:30
alyosha-tas 519e14aa1a RamWatch: Fix column settings fixes #1137 2018-03-15 19:27:24 -04:00
zeromus 0a18040aff remove pointless redundant function name from LuaMethodExampleAttributes 2018-03-13 21:05:30 -04:00
zeromus 205714df95 cleanup #1122 -related lua examples documentation stuff 2018-03-13 21:04:34 -04:00
zeromus 65bc534395 Merge remote-tracking branch 'remotes/azreally/Xadrophonix' 2018-03-13 20:39:42 -04:00
zeromus 2203270868 Merge remote-tracking branch 'remotes/origin/pr/1131'' 2018-03-13 20:37:48 -04:00
zeromus b179a30d99 Merge remote-tracking branch 'remotes/origin/pr/1080'
# Conflicts:
#	BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj

merges PR #1080
closes PR #1080
(let's see if either of these can do it)
2018-03-13 16:33:53 -04:00
Asnivor 5a2b0ae6a6 Added joysticks 2 & 3 and removed TapeControls from VirtualPad schema (they are not needed there) 2018-03-13 19:16:12 +00:00
feos a751131787 tastudio: disable shift+up/down, it breaks float editing mode 2018-03-12 21:41:11 +03:00
feos 61bf9b67a8 tastudio: a whole bunch of actions shouldn't be possible with no selection 2018-03-12 21:41:11 +03:00
alyosha-tas c839bffc33 A2600: Add Driving controller and fix coleco Super Action Controller 2018-03-12 09:12:41 -04:00
feos 560092ffae tastudio: allow scrolling/jumping to marker 0 2018-03-11 20:05:33 +03:00
feos 661a15dc2c tsm decay: remove states within internal state gap
states settings: clamp things harder
2018-03-11 17:57:30 +03:00
feos 7162de1d3c tastudio: let's just report state count
will help to sort out possible decay bugs
2018-03-11 14:59:58 +03:00
Azreal 6032063518 Now looks good :) 2018-03-10 03:00:44 -08:00
Azreal 26c0b1fff2 Continuing... 2018-03-10 02:49:39 -08:00
Azreal 96a35fe71b My first commit - add file "EmuLuaLibrary.Tastudio.cs" to examples (not all have a examples yet)" 2018-03-10 02:33:41 -08:00
feos 7fedbac9c3 lua: fix #1119 2018-03-09 13:35:42 +03:00
feos e8103a1c53 tastudio macros: don't die from colons in paths when saving to file
disable macros menu items when there's no selection
2018-03-08 22:58:18 +03:00
TASeditor 6580c2abef Tastudio: drawing stuff, selection, patterns, add column lua function (#1125)
* alt+columnclick draws pattern
* selection: taseditor logic
* shift/ctrl keys restructure to taseditor
shift + up/down: move frame courser up/down by one
shift + pageup/pagedown: move frame courser to next/prev marker
ctrl + left/right: add/remove selection at last selected row
ctrl + shift + left/right: add/remove selection at first selected row
* Alt+drawing pattern
still not working with drawing upwards
* pattern drawing
upwards drawing working except it doesn't update last row.
TODO: Disallow Alt click to focus on menu.
* pattern: last input ignoring fixed
* Lua columnms
TODO: Don't save them into tasproj
* no need to update float edit stuff or cell changes when its not needed
* Shift+clicking draws input from first selected row to clicked cell
* fixed pattern drawing on empty cells
2018-03-08 22:15:47 +03:00
feos 40e28f2f98 tastudio: enable paste menu items when clipboard is available 2018-03-08 19:23:26 +03:00
feos b2642cd0d9 tastudio: let's try this super annoying method to introduce *intended* control scheme to users 2018-03-08 15:31:07 +03:00
feos f81f41f6f7 tastudio: fix #916 2018-03-08 14:44:09 +03:00
feos bf8c21663d
State manager decay (#1128)
* Finally use exponential decay algorithm for greenzone
  * Works in both directions (unlike fceux taseditor)
* Stop using last accesses states for anything
* When dropping states per project save, account for state gap better
* Use _states.Keys[i] instead of _states.ElementAt{i).Key in speedy parts, because it's apparently tons faster
* Use StateIsMarker() where it's supposed to be used
* Markers are still left untouched
* Branch states are still dead (probably forever)
2018-03-08 12:24:35 +03:00
Asnivor 90c1e293bf Implemented multi bundler functionlity and multiple tape controls 2018-03-05 11:17:22 +00:00
Xadrophonix d91bd35a95 Second pool of examples. 2018-03-04 14:07:06 -08:00
Xadrophonix 4bcd69924b All required contents for: https://github.com/TASVideos/BizHawk/issues/1122 2018-03-02 12:06:01 -08:00
Masterjun 605ca5816a Lua: fix client.openrom 2018-03-01 01:06:15 +01:00
feos 0fe703c9b7 tsm: redo the algo from scratch, probably not last time 2018-02-27 01:28:24 +03:00
frequem d0d73766bd Fixed some filenames causing problems on case-sensitive systems 2018-02-21 20:19:33 -05:00
feos 7ae374df01 tastudio: fuck this 2018-02-21 02:06:25 +03:00
TASeditor 36900b15d4 tastudio lua: setinput functions, onbranch callbacks (#1098) 2018-02-10 14:58:46 +03:00
Asnivor 7c82d6d526
Merge pull request #1106 from TASVideos/master
Bring ZXSpectrum branch up to date with master
2018-02-06 08:45:48 +00:00
vadosnaprimer fb692806c3 tastudio: supposedly fix #1090 question mark 2018-01-10 22:32:22 +03:00
vadosnaprimer d074880242 tastudio: MarkerView.ShrinkSelection() 2018-01-10 22:06:43 +03:00
vadosnaprimer 5bff769fe9 tastudio:
- scroll to new marker and new branch
- don't kill selection per marker removal
2018-01-10 22:06:41 +03:00
zeromus c17f793733 in 1809d19ecb @vadosnaprimer made the disk capacity for greenzone disabled, but for some reason old settings files may still be setting a value into it, or maybe old tasprojs or something, so I just put a big limit on it so things dont crash. /shrugs 2018-01-09 14:21:58 -06:00
vadosnaprimer eea6740722 lua: client.isturbo() and client.isseeking() 2018-01-06 13:30:47 +03:00
Ashafix 07da0170fa unified camelCase for Lua functions, changed Lua test script 2017-12-24 11:42:51 +01:00
Ashafix 4d063f6061 new library for communicating with other programs via Lua 2017-12-24 00:24:22 +01:00
Asnivor 6d22b06c21 Added virtual pad to UI 2017-12-04 14:05:04 +00:00
vadosnaprimer fcb7588724 use actual Clamp() 2017-12-01 18:19:29 +03:00
vadosnaprimer cea50c1ab1 fix #1072
thanks for helping, .net
2017-11-30 19:53:52 +03:00
alyosha-tas 0cfd2c59d0 Gameboy GPU Viewer: Always set upper byte of palette 2017-11-26 15:46:21 -05:00
alyosha-tas 13ec13a556 GBHawk : Initial support for GPU Viewer 2017-11-25 21:16:14 -05:00
alyosha-tas 76dca1147d
Merge pull request #1052 from YoshiRulz/ramwatch-displaycol
Add display type column (resolves #683)
2017-11-14 09:51:05 -05:00
YoshiRulz f983c91eb0 Add display type column (resolves #683) 2017-11-10 14:32:30 +11:00
alyosha-tas 40658e99cf Hex Editor: Update Big Endian Effect 2017-11-09 08:41:35 -05:00
vadosnaprimer 1809d19ecb smart state gap for greenzone. fix #915
disable disk capacity setting
2017-11-05 22:34:58 +03:00
vadosnaprimer fbbe42d7fa tastudio: drop logic that shrinks branch screenshot popup
the fact that it was screwing up osd text (that's not pixel based by design) causes more problems than smaller popup was ever intended to solve. and it's not branch or tasproject size, because screenshots are stored in the same resolution as your emulator screen. so I don't even know which problems it was solving. if it was made to shrink because originally it couldn't expand outside tastudio, this has been resolved a while ago, and we can afford covering as much user screen as they already cover with emuhawk. unless they complain, then it can return as an option.
2017-11-05 17:33:12 +03:00
adelikat ebcd237858 Merge branch 'master' into domainedmemoryhooks 2017-10-29 12:38:29 -05:00
alyosha-tas 0fd046de0d Update HexEditor.cs 2017-10-21 09:55:03 -04:00
alyosha-tas 745e42a753 Hex Editor: Fix Cheat display
Fixes #1026
2017-10-21 09:52:07 -04:00
feos 1bd535c31f tastudio: don't trigger right button up events if left button is still held down 2017-10-07 23:40:54 +03:00
feos 7529570ab8 tastudio: unbreak things if user cancels movie conversion on file open 2017-10-07 23:17:02 +03:00
feos 84412eafd9 tastudio: do normal seeking while recording too. needs testing
if you go to a frame while recording and unpaused, it will seek to that frame (not touching input since rec mode is suspended), and after it reaches it, it will unpause and restore rec mode
2017-10-07 15:20:30 +03:00
Tastyfish 200ab8f8d8 GB Printer support for Gambatte, output color improvements 2017-08-29 18:16:02 -04:00
Tastyfish e780e74f45 A frontend for the GB printer 2017-08-29 18:16:02 -04:00
alyosha-tas b5b2e442c8 Schema: Remove EMU7800 2017-08-25 09:39:40 -04:00
adelikat 3f8aa0e018 Lua - implement tastudio.getbranches() and tastudio.getbranchinput(), fixes #843 2017-08-05 11:04:00 -05:00
adelikat cd5f6e66e1 Atari 7800 - sort out system id stuff 2017-08-04 17:17:14 -05:00
adelikat 56859e9581 MemoryCallbacks - Change "domain" to "scope" 2017-08-03 20:03:40 -05:00
adelikat 04ce66c397 phase 1 of changing memory callback api to specify domain - require cores to specify which domains are available and have the domain passed in when creating callbacks. Still todo - cores need to pass in domain name on CallReads/Writes/Executes methods 2017-08-01 22:05:17 -05:00
adelikat 62c2e0fc6a TAStudio - remove ability to edit the platform id when editing the header 2017-07-30 14:21:40 -05:00
alyosha-tas 61b300b65a Update EMU7800 schema
Facilitate testing between cores
2017-07-29 20:22:44 -04:00
alyosha-tas d0c658b380 Update A7800Hawk schema with BW 2017-07-29 19:22:11 -04:00
adelikat 89b57288e7 Cheat Code Converter - when creating NES game genie codes with a compare value, set comparison type to Equals, instead of relying on "None" to default to Equals 2017-07-28 18:13:32 -05:00
adelikat 51eed83cce lua - tastudio.getselection() - make key of the lua table an index 2017-07-24 08:44:15 -05:00
nattthebear 4a2618470e saturnus: three dee virtual pad fix axis 2017-07-23 19:40:20 -04:00
zeromus d5770fb8a3 re-apply "keepalive" GC fixes to luainterface mode in emuhawk; maybe it will actually work now and not result in crashes. at least we should check it. 2017-07-22 23:41:30 -05:00
adelikat 8ea7993e04 Multidisk bundler - Remove GEN as an option for now 2017-07-22 16:39:21 -05:00
alyosha-tas 7a0295e48f Update A7800 Hawk Schema 2017-07-21 19:28:44 -04:00
adelikat db6858f2fe Merge branch 'pceperipherals' 2017-07-20 08:11:51 -05:00
nattthebear cf8013af4a sameboy: Add more features for the merciless slave driver 2017-07-19 18:48:11 -04:00
adelikat eaaf424a2c PCE - refactor virtual pad logic to use the controller deck 2017-07-18 11:16:42 -05:00
adelikat f60a4a07e7 UI for multi-disc Sega-CD support. Note that the ui will technically allow you to bundle a mix of dics and carts, but tom loading for now will only take multiple discs. 2017-07-17 20:36:04 -05:00
adelikat f424a22033 Tastudio - fix recent menu - fixes #920 2017-07-17 11:20:59 -05:00
zeromus afda5dbb62 set a value in the switchable lua library to indicate whether it's NLua or LuaInterface; effectively undo 8bc067cbbe for LuaInterface 2017-07-15 16:36:18 -05:00
adelikat af653725bb PCFX - multi-disc support 2017-07-14 19:46:05 -05:00
adelikat b67c104de7 Saturn - multi-disc support 2017-07-14 19:40:27 -05:00
adelikat 3f16f8bd79 pc-fx - virtualpads 2017-07-14 14:21:50 -05:00
zeromus d271fe6542 Merge pull request #885 from Trivial-Man/master
Create LuaPictureBox class and implement it
2017-07-14 12:21:54 -05:00
Trivial-Man 8e0926449f Fix LuaPictureBox
Got left out when fixing other files. Sorry.
2017-07-13 22:48:37 -06:00
Trivial-Man 7b8818c35b Resolve issues with Master
- Uses NLua instead of LuaInterface
- Uses LuaMethod instead of LuaMethodAttribute
- All LuaCanvas Lua calls now begin with lowercase

- Also allows LuaPictureBoxes added through forms to be compatible with addClick
2017-07-13 22:32:27 -06:00
adelikat b968dbf81b pizza boy sgb - virtualpad support for the other controllers 2017-07-13 20:45:54 -05:00
zeromus d54fee4d91 Merge branch 'master' into master 2017-07-13 19:17:09 -05:00
adelikat 367b243990 Pizza Boy - preliminary SGB virtualpad support 2017-07-13 12:22:58 -05:00
adelikat 6d77f5a3c0 virtual pads for picoDrive 2017-07-13 12:02:08 -05:00
adelikat 9cb44cad03 Fix some filenames from previous renames, and more attribute renames 2017-07-12 14:48:27 -05:00
adelikat 6e06947a33 rename ToolAttributes 2017-07-12 14:44:14 -05:00
adelikat 5d855ef60b more attribute renaming 2017-07-12 14:40:10 -05:00
adelikat 5978db7036 Lua - forms.setsize() - add a description instead of just TODO 2017-07-11 08:17:49 -05:00
adelikat 597708765a Lua canvas - use LuaMethodAttribute (if available) when registering canvas methods, also fix casing of a few methods for consistency, fixes #908 2017-07-10 14:59:05 -05:00
adelikat 9581ce6a93 rename LuaMethodAttributes to LuaMethodAttribute so as not to be a bad person 2017-07-10 14:02:08 -05:00
zeromus 0f686a0de1 * revert strict string checking behaviour from nlua Revision 10f4d0ce78a2a3cb9b727ac55c8705385f0ded7e (we dont want it, probably)
* do a better job porting old commits from bizhawk (should fix memory leaks, optional arguments)
2017-07-10 12:59:06 -05:00
adelikat 5781746251 Lua - use the proper Log method in some lua libraries 2017-07-10 11:24:32 -05:00
zeromus 3417453b43 use NLua+KopiLua instead of LuaInterface 2017-07-09 23:51:02 -05:00
adelikat af3ab7c208 TraceLogger - Turn off core tracing when closing, TooManager - check for disposed tools before running NewUpdate(), fixes #911 2017-07-09 13:19:09 -05:00
zeromus cc33617f74 fix crash in snes virtualpad when mouse is used 2017-07-09 11:40:55 -05:00
adelikat f53624f336 tastudio greenzone settings - don't check for if 64 bit process 2017-07-09 09:39:36 -05:00
adelikat 9a5ae16c7d remove the 32bit gpgx, and refactor things to only use the 64 bit version. keep 64bit stuff in a gpgx64 folder to avoid git auto-rename detection shenanigans 2017-07-09 09:21:03 -05:00
adelikat a2a27fb634 Merge branch 'a26peripherals' 2017-06-30 08:36:49 -05:00
Trivial-Man 8a2056193d LuaCanvas: Add SetLocation function
Allows the user to reset the location of the canvas window at will while a script is running
2017-06-29 20:16:02 -06:00
Trivial-Man 22200171e7 LuaCanvas: Include GetMouseX & Y functions
Gets the X and Y coordinates for the mouse cursor relative to the canvas
2017-06-29 20:07:21 -06:00
Trivial-Man 1a1ae98a2e EmuLuaLibrary.Gui: update createcanvas
createcanvas now takes additional parameters that specify where the canvas window should be created
2017-06-29 20:03:18 -06:00
Trivial-Man 5900f9b1ec LuaCanvas: add parameters for specifying location
Constructor now takes in arguments for setting the x and y coordinates of the canvas window
2017-06-29 20:01:31 -06:00
Trivial-Man eb6676e0ba EmuLuaLibrary.Forms: add more PictureBox functions
Adds the functions for getting the mouse x and y coordinates from PictureBox components.
2017-06-29 19:59:27 -06:00
Trivial-Man fdc30ccd12 LuaPictureBox: Add GetMouse
A simple function that gets the point the mouse cursor is at relative to the LuaPictureBox's upper left corner
2017-06-29 19:52:40 -06:00
adelikat aaaeb95a05 Atari 2600 - update paddle virtualpads with the new float ranges 2017-06-29 13:46:17 -05:00
adelikat f5cb35a862 Atari 2600 - vritual pad and mnemonics for paddles 2017-06-28 14:27:15 -05:00
adelikat d862ad8232 Atari 2600 - Virtual support for new controller configurations (Paddles just stubbed out), add Left and Rigth Difficulty toggle buttons to the console buttons section 2017-06-28 07:23:36 -05:00
adelikat 3d443b3e2f Cheats - change button name from Game Genie to Code Converter. Cheat Code Converter - show a not supported message if user tries to enter a Game Genie code for SNES since we do not currently support that scenario 2017-06-27 21:06:36 -05:00
Trivial-Man d3834fff49 Merge branch 'master' into master 2017-06-25 18:45:41 -06:00
Trivial-Man 2ddadeae24 Add PictureBox component and methods for drawing on it 2017-06-20 01:20:27 -06:00
Trivial-Man b0e39406a6 Use LuaPictureBox functions in LuaCanvas
Also add in the missing error logs and correct some typos in LuaMethodAttributes.
2017-06-20 01:18:35 -06:00
Trivial-Man 089c487f26 Use LuaPictureBox for the LuaCanvas 2017-06-20 01:16:57 -06:00
Trivial-Man 28acb602ae Create LuaPictureBox component 2017-06-20 01:12:13 -06:00
adelikat 4982af7521 Merge branch 'master' into waterbox2
# Conflicts:
#	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.ISaveRam.cs
2017-06-19 10:04:46 -05:00
adelikat 162e851468 Saturn - virtualpad support for Mission and Dual Mission 2017-06-18 16:05:46 -05:00
adelikat 5c71fc2e34 Saturn - Wheel - virtual pad support 2017-06-18 15:03:51 -05:00
adelikat 7e98cd6ec9 Saturn - mouse - make button names consistent with other cores, virtual pad support 2017-06-18 15:03:50 -05:00
adelikat b22787fc44 Saturn - 3d pad - set mids for analog ranges, finish virtualpad support 2017-06-18 15:03:49 -05:00
zeromus 4e1decfa21 add LuaCanvas DrawArc missing from last luacanvas PR merge 2017-06-15 15:01:50 -05:00
Trivial-Man eff9308bbf Add drawing features
Brings canvas up to feature parity with LuaLibraryBase
2017-06-15 11:41:27 -06:00
nattthebear 1314912cf8 libsnes: Hack about a bit to make the graphics debugger function again. It probably crashes somewhere... 2017-06-13 17:55:07 -04:00
adelikat 97d7dd7f42 merging master into waterbox2 this one was messy may be regressions 2017-06-13 08:16:25 -05:00
adelikat ac6b18c137 tastudio - change performance profile nag to a snes9x nag 2017-06-12 20:56:32 -05:00
alyosha-tas 3c46604f28 Add files via upload 2017-06-11 18:15:11 -04:00
adelikat d18a512db8 Saturn - virtualpad support for 3d controller, however, analog stick needs some fixes to support the large analog range of the stick 2017-06-11 14:45:18 -05:00
adelikat 5406da7406 Saturn - start virtualpad support - multitap logic in place, only standard controllers currently 2017-06-11 09:36:01 -05:00
nattthebear 36be9e9fc7 snes: waterboxification phase 2 2017-06-10 14:16:25 -04:00
adelikat e298863b3d VB - virtual pad support, slight fix to button order on controller config 2017-06-06 11:38:43 -05:00
adelikat b39c2dccf0 NGP - mnemonic for Option button, Virtualpad support 2017-06-06 11:07:16 -05:00
adelikat 87ce1086cb snes9x - virtualpads 2017-06-04 19:44:25 -05:00
adelikat 95353188c7 Merge branch 'master' into waterbox2 2017-05-31 13:38:01 -05:00
adelikat 1164868063 GB config dialogs cleanup 2017-05-31 08:52:55 -05:00
nattthebear f99a080e60 Merge remote-tracking branch 'origin/master' into waterbox2
# Conflicts:
#	BizHawk.Client.EmuHawk/MainForm.Designer.cs
#	BizHawk.Client.EmuHawk/MainForm.cs
2017-05-29 14:35:30 -04:00
feos 3ba4adb6bc tastudio: finish moving column click edits to taseditor logic 2017-05-29 20:20:44 +03:00
adelikat 3c7707a6a0 lua - add gui.clearImageCache, also add a param to drawImage that can force it to not be cached if desired 2017-05-29 11:09:19 -05:00
nattthebear 7f2e06b0b5 clean things up and make gpgx fully (?) multi-instance correct 2017-05-28 13:46:08 -04:00
adelikat 4db328f7ad Hex Editor - Find box - remember Hex vs Text radio selection 2017-05-28 10:13:34 -05:00
adelikat f81f745fcc Some luaconsole refactoring and moving more logic into LuaImp 2017-05-24 15:59:05 -05:00
adelikat 19dde8018a InputRoll cleanups 2017-05-24 11:45:57 -05:00
adelikat 74b2cca967 more tastudio cleanups 2017-05-24 10:50:25 -05:00
adelikat b03e224c5e TAStudio cleanup 2017-05-24 10:49:35 -05:00
adelikat 50b5f4a1a9 Virtualpad misc cleanups 2017-05-24 09:07:03 -05:00
adelikat 47f2371953 Misc cleanups 2017-05-24 09:06:31 -05:00
adelikat 4d1dd215e6 Lua Console - temp fix to fix recent regression of lua scripts disappearing on reboot core 2017-05-24 08:30:30 -05:00
adelikat 770f27dfd4 Console lua library functions - check if LuaConsole is loaded on these calls. Currently the console should always be open if a script is being called but this is a preparation commit to eventually support running lua scripts without the lua console loaded 2017-05-23 13:05:36 -05:00