066b072627
Some more moving code around related to multitrack
2014-08-17 15:22:02 +00:00
71a564b1cf
Movie MultitrackRewiringControlllerAdapter to a property in the Multitrack object
2014-08-17 15:11:04 +00:00
0a608edd07
some renaming and cleanup of the Multitrack object
2014-08-17 15:04:23 +00:00
0f1ead706b
Refactored srt exporting to have less logic client side and implemented color.
2014-08-17 11:36:37 +00:00
b91180d6a0
2014-08-17 00:13:00 +00:00
64206efe82
Simplify some code in MovieSession.cs
2014-08-16 21:45:36 +00:00
d53afd2d2a
This seems to improve the ram usage in bkm to bk2 conversions, it at least keeps the 75mb n64 movie I have from crashing during the convert.
2014-08-16 20:32:59 +00:00
20f78a579f
"fix" issue 246 by causing an absolute termination earlier in the process that makes it clear what happened
2014-08-15 17:50:43 +00:00
29f34ed79a
clearsaveram() internal infrastructure changes
2014-08-13 19:16:48 +00:00
4afc5c4ec6
Fix multitrack movie recording
2014-08-10 02:21:08 +00:00
2a7d4025cf
Multitracking - restart when stopping or starting a movie, I busted this when refactoring to the Queued movie concept, also simplify some code in the multitrack object
2014-08-03 20:34:45 +00:00
8799f27f60
Rip out the sync settings hack
2014-08-02 17:49:10 +00:00
bcd78cc4b8
Round 1 of Movie loading system overhaul, this fixes the problem of loading sram when a movie is loaded. Still todo: some cleanup of some hacks that are no longer needed, and restoring the ability to open the play movie dialog and other things, while a movie is active
2014-08-02 15:32:48 +00:00
157897ff55
Fix PCE virtualpad I, II, and Run buttons, also fix the mnemonic display for the Run button
2014-08-01 01:39:07 +00:00
7ac1d58a51
fix zipstate internals that caused movies that started from savestate to explode
2014-07-25 16:51:27 +00:00
0326c9812e
revert last commit
2014-07-24 23:39:11 +00:00
1d45a6f379
When importing GMV, the system id should be Genesis, not GEN
2014-07-24 23:29:31 +00:00
1a64af9bc5
Fixes to bkm for supporting 3 button controllers, this is needed since bkm is still used for the import process. Also, don't save 2 copies of the bk2 after importing a movie, one is sufficient
2014-07-24 23:22:26 +00:00
36fe0473f5
TAStudio - keep markers sorted by frame
2014-07-23 01:52:12 +00:00
7cd831c0e4
Add a GBC flag to movie files
2014-07-19 23:24:43 +00:00
89a8241b8e
possibly fix GBC movies
2014-07-19 21:41:47 +00:00
0a227060b7
Set the mainform movie statusbar icon more often
2014-07-19 16:03:12 +00:00
a010a2919b
correct systemID in converted gmvs
2014-07-19 04:11:12 +00:00
2ebba5ab07
Tastudio - implement playback controls
2014-07-17 19:00:28 +00:00
816fac55fa
Tastudio - implement the Select Between Markers menu item
2014-07-17 18:38:30 +00:00
103de3d34f
TAStudio - when creating a power-on movie make a savestate on frame 0, if starting from savestate, use the savestate from the movie as frame 0 in the greenzone
2014-07-17 18:21:12 +00:00
c571d07069
Fix mnemonic constants for TI-83, super important changeset!
2014-07-17 02:06:51 +00:00
93e10b4330
Support bkm conversion in movie import
2014-07-17 00:07:24 +00:00
ad6c614665
Fix Bkm to Bk2 conversion
2014-07-16 23:22:30 +00:00
b63a34249f
TAStudio - add the notion of the "pending" frame, the frame about to be emulated, for which you can click to add input that will be captured into the movie the next frame. Logic is still wonky when switching from play to record at the end of a movie, and frame 0 is still messed up but that's a different problem
2014-07-16 23:04:56 +00:00
d8216ae0fc
Tastudio - remove marker button
2014-07-16 02:17:19 +00:00
f286d07a9d
TAStudio - background color logic
2014-07-16 00:10:37 +00:00
8c064875c2
TAStudio - ability to add markers, very crude implementation for now
2014-07-15 23:43:17 +00:00
0b35490b16
Profile Config - don't show custom profile in non-developer builds, put saving logic in the ok button click event instead of drop down change event. Remove a warning in TasMovie.cs
2014-07-15 00:05:18 +00:00
b53cc908b8
Add options to how to handle the ending of movie playback, in addition to finished mode, it can now pause, stop, or switch to record. TAStudio - automatically override user's preference with switch to record (and restore their setting when disengaging tastudio
2014-07-14 00:35:33 +00:00
02a5337cd6
Movies - rework some things so that MovieSession is in charge of sending a movie into finished mode, as opposed to GetInutState() having the side effect of MovieFInished
2014-07-13 22:36:37 +00:00
f79a674219
Remove GetInput() from IMovie
2014-07-13 22:17:31 +00:00
57c86f7491
TAStudio - capture lag log during playback
2014-07-13 20:51:19 +00:00
eae94f9184
TAStudio - stuff
2014-07-13 15:26:50 +00:00
43a687060c
oops
2014-07-13 14:26:40 +00:00
6b1bfc2d4a
TAStudio - stuff
2014-07-13 14:13:20 +00:00
3f461990c4
TAStudio - insert num frames implemented
2014-07-13 12:44:31 +00:00
43415044e7
Tastudio - implement truncate movie
2014-07-12 01:23:38 +00:00
e49754b705
TAStudio - implement paste and paste insert
2014-07-11 23:54:18 +00:00
e8f821117b
TAStudio - implement the Insert menu item
2014-07-11 21:05:16 +00:00
40912a3c2b
TAStuduio - implement Clear menu item and hotkey, properly invalidate greenzone on input painting and other already implemented editing events
2014-07-11 19:58:24 +00:00
76fc763715
TAStudio - implement the Cut menu item
2014-07-11 19:11:30 +00:00
2072eac45f
Some Changes flag management in movie objects
2014-07-11 18:06:18 +00:00
f8ee569bbb
TAStudio - float painting
2014-07-11 16:26:19 +00:00
2e508c1468
TAStudio - greenzone settings dialog
2014-07-11 15:43:47 +00:00
ee7831178a
TAStudio - header editor
2014-07-11 02:31:43 +00:00
9f94ee1e33
TAStudio - add capacity and SaveGreenzone settings to the greenzone and make greenzone respect the capacity. When adding a new state that exceeds capacity, the first one added will be removed (more intelligent logic will be done later). Respect the SaveGreenzone flag when saving and loading. Save and load greenzone settings to tasproj file, still todo: UI to let user manage greenzone settings
2014-07-10 22:44:44 +00:00
4c9c8e3cb1
TAStudio - saving/loading of greenzone
2014-07-10 22:07:50 +00:00
f3af2821bb
TAStudio - populate greenzone during playback
2014-07-10 20:48:43 +00:00
f0425f3cc5
TAStudio - input painting for boolean input
2014-07-10 20:40:50 +00:00
5681368e13
TAStudio - background coloring based on lag log and greenzone
2014-07-10 19:24:21 +00:00
80d5e8a7be
TAStudio - input display
2014-07-10 02:45:56 +00:00
537d8c5cac
TAStudio - misc stuff
2014-07-09 21:56:27 +00:00
786b0238ba
Move Markers from TAStudio to TasMovie, and implement saving and loading of markers
2014-07-09 16:35:39 +00:00
cb3e340a1a
Movie stuff
2014-07-08 15:15:35 +00:00
7e39e67b1f
tastudio - more fixes to startup logic, still convolted, buggy and wrong, but better!
2014-07-08 13:46:59 +00:00
863d6f09ee
small tastudio progress
2014-07-08 13:33:01 +00:00
84b8fa36f2
TAStudio - more stuff
2014-07-07 19:48:58 +00:00
96b36cc230
TasMovie - save and load lag log to file
2014-07-07 19:32:37 +00:00
6d61db045f
TasMovie - more reorg and restore state and lag capturing
2014-07-07 18:40:42 +00:00
c019ec3bf0
More reorg
2014-07-07 18:03:02 +00:00
7173447e8a
TasMovie - some reorg in preparation for actual progress
2014-07-07 18:00:25 +00:00
f875792c74
TAStudio - column names for float values
2014-07-07 16:03:22 +00:00
46d6279f1b
TAStudio - some progress on dynamically displaying columns, and some fixups in movie code in general
2014-07-06 22:13:12 +00:00
a02888344b
Change the ToBk2() method to receive an IMovie instead of Bkm, and write a ToTasMovie() method similarly. Tastudio - remove code that warns the user if they open it with a movie already active, instead ask and autoconvert the current movie to a tasproj file
2014-07-06 21:20:43 +00:00
00f33d2ae9
Bk2 - implement the PokeFrame() method
2014-07-04 00:24:41 +00:00
686610b047
Support analog range up to 9999, this is bad code but I hope to not have to do anything more clever anytime soon
2014-07-04 00:15:33 +00:00
bf88be8c72
Convert some more util methods to extension methods
2014-07-03 19:05:56 +00:00
a9aa65397c
Convert a Util method to an extension method
2014-07-03 18:29:51 +00:00
a5fadb8e0b
Some useless cleanup
2014-07-03 18:17:09 +00:00
2bd52403a7
Bk2 movies - remove auto input log conversion on load, since load is too soon to do this as it will not use the controller definition of the new core instance that hasn't been loaded yet. As of this commit, it doesn't use the log key when reading input either, so log entry logic is dependent on mnemonic orders and such things from the controller definition. Will need to ponder a way to put this back in.
2014-06-30 12:50:46 +00:00
5262bed608
make bk2 the default even in non-developer builds
2014-06-30 12:03:10 +00:00
3a011ad788
Refactor to put multitrack logic into the multitrack object itself instead of in the OSD manager and hotkey logic
2014-06-29 23:13:44 +00:00
893a8b16e5
Record Dialog - Fix crash when movie folder does not already exist
2014-06-29 20:07:21 +00:00
6e7fefb7b4
Fix mnemonic lookups for C64 keyboard
2014-06-29 16:25:29 +00:00
27fb2ce9a0
Virtualpad Analog sticks - in record mode show the previous frame's input in gray
2014-06-29 14:42:20 +00:00
38b76ea5d9
fix N64 dpad mnemonics and virtualpad buttons, fix pce and snes virtualpad buttons
2014-06-29 13:05:10 +00:00
01ba63dd09
Coleco/Intellivision - Replace patterns like "Key0" with "Key 0" in button names for consistency and remove a hack in bk2 code that accounts for it
2014-06-29 12:32:36 +00:00
9e73db3daa
A round of code cleanup on movie code
2014-06-29 03:03:27 +00:00
6fce0bcad6
remove Time from IMovie and instead implement the logic in PlatformFrameRates
2014-06-29 00:57:33 +00:00
055e88fea3
Remove Fps from IMovie
2014-06-29 00:48:36 +00:00
90e95752e4
Wonderswan - Mnemonics and Virtualpads, virtualpads are a bit clunky with Standard and Rotated showing at all times, perhaps at some point we should be smart about knowing the rotated state
2014-06-28 19:07:18 +00:00
88d4a2a5a8
Genesis mouse - mnemonics, default buttons and virtual pad
2014-06-28 12:45:12 +00:00
1361e2ff23
Genesis - default controls for lightgun, mnemonics lightgun buttons, support lightgun and console buttons on the virtual pad
2014-06-28 12:31:28 +00:00
3dfb65ee4b
remove some debugging code and remove a warning as a result
2014-06-28 02:11:19 +00:00
721dbe8d3b
Input adpaters - some reorg and add extensions for create And and Or adapters and simplify some calling code
2014-06-26 19:07:17 +00:00
fbb14175f9
Support Oeka Kids Tablet in virtualpads and bk2 mnemonics, oh yeah
2014-06-25 00:44:22 +00:00
9045f8402c
Virtual Pads - hook up Nes Power Pad and also hook it up to bk2 mnemonics
2014-06-25 00:11:59 +00:00
7fa551708f
Virtual Pad - get analog button working on movie replay
2014-06-24 17:12:20 +00:00
8001a49afd
Bk2 - tweaks to input log and input diplay logic
2014-06-21 18:25:16 +00:00
5e14df9f30
BK2 - auto convert input log to the system's log key on load, using the input log's key as reference to do so, don't use the file's input log key on the fly
2014-06-21 17:27:35 +00:00
10c48bb3f8
Bk2 - take the log key into account when replaying a movie input log
2014-06-21 14:33:33 +00:00
0b21085a98
Bk2 - Rework how input logs are generated and read
2014-06-21 11:56:30 +00:00
71ddbde18d
bk2 savestate anchor stuff
2014-06-20 00:39:46 +00:00
f561528846
More input display fixes
2014-06-19 21:55:15 +00:00
031eb5a282
Some input display fixes for bk2 format
2014-06-19 21:29:57 +00:00
5145ef3f97
Movie imports now import to .bk2
2014-06-19 02:30:22 +00:00
31c219d44b
when loading a .bkm movie, automatically convert it to .bk2
2014-06-19 02:05:38 +00:00
ac2ea9f6e0
Fix non-bk2 movie loading
2014-06-19 01:47:22 +00:00
9a16540e14
Movie 2.0 - simplify some code
2014-06-18 19:34:27 +00:00
451049fee8
Fix some bk2 crash bugs
2014-06-18 19:18:35 +00:00
6133164a7f
Add GetInputState() to IMovie that returns an IController representing a frame of input and replace a lua method to use this instead of getting the inputlog as a string and processing it, still todo: obsolete the GetInput() method
2014-06-18 02:26:22 +00:00
5cda104ea5
Start ToBk2() conversion method for BkmMovie
2014-06-17 01:24:44 +00:00
6c2ba47522
a movies 2.0 cleanup
2014-06-17 01:13:20 +00:00
fcd4a4eb65
Bk2 - basic movie playback now works. You can now record shooting ducks
2014-06-17 00:33:33 +00:00
37d6e0b8de
Finish up Bk2 Mnemonic lookup
2014-06-16 16:56:09 +00:00
6953f3d6be
oops, forgot to add these files?
2014-06-16 11:40:57 +00:00
1a4e6efcb4
bk2 progress - proof of concept for new mnemonics system
2014-06-16 01:39:36 +00:00
6b73891a91
More bk2 progress
2014-06-15 14:44:26 +00:00
c807e27496
Some movie code reorg and cleanup
2014-06-15 13:03:24 +00:00
1768350d65
Start Bk2LogEntryGenerator
2014-06-15 12:43:32 +00:00
28dcf5c3a1
remove a reference to BkmLogEntryGenerator() I missed in last commit
2014-06-15 12:17:28 +00:00
9ac32a688a
Remove BkmLog.cs
2014-06-15 02:23:28 +00:00
f5f832180d
Some movie code reorg and remove some outdated stuff
2014-06-15 01:55:35 +00:00
6ec1a45b70
Major cleanup of MnemonicsGenerator - change it to a LogEntryGenerator notion, and only expose it through a movie implementation, via an ILogEntryGenerator interface
2014-06-14 22:36:32 +00:00
1cefb2dd95
Simplify log class even more
2014-06-14 21:41:11 +00:00
70baceb6c8
Fix Bk2 playback, also rip out a bunch of junk from the Old Movie Log class from the first attempt at TAStudio and some half-baked notion of an input log class
2014-06-14 21:37:51 +00:00
d27df7816d
Rip out a bunch of stuff from my previous attempt at a mnemonics overhaul and from TasMovie
2014-06-14 21:09:14 +00:00
1fcc105293
more 2.0 work
2014-06-14 20:17:07 +00:00
c08e6bbf93
Some more bk2 and movies 2.0 stuff
2014-06-14 19:13:21 +00:00
edacc9b8c8
BK2 - support loop offset
2014-06-14 18:52:00 +00:00
fed401164f
Bk2 - savestate anchored movies
2014-06-14 18:33:22 +00:00
edf3d7ef10
BK2 - wire up to developer builds, implement saving and loading except for loop offset and savestate on savestate-anchored movies
2014-06-14 18:13:14 +00:00
18d0a59869
another small Movies 2.0 todo
2014-06-14 14:09:55 +00:00
d816b1ed20
Bk2 progress
2014-06-14 14:04:54 +00:00
01fd28f4b0
Some bk2 progress
2014-06-14 00:42:45 +00:00
032f8a9b21
bk2 progress
2014-06-13 11:30:25 +00:00
398577245e
Progress on Bk2 implementation
2014-06-13 00:43:55 +00:00
1ab1538f8b
More movie code reorg
2014-06-13 00:15:55 +00:00
898155f5be
Some Movie code reorg
2014-06-12 23:57:23 +00:00
3ea79c720b
More movies 2.0 stuff
2014-06-12 21:45:47 +00:00
05b3f369eb
Now that SGB is the BoardName, don't save a SGB row in the movie header
2014-06-12 21:27:49 +00:00
b26b26efbe
More movies 2.0 work
2014-06-12 20:42:46 +00:00
3dce396261
More movie 2.0 stuff
2014-06-12 11:53:25 +00:00
373231379c
Movies 2.0 work - play movie dialog is now complete IMovie based and no specific implementation
2014-06-11 21:20:23 +00:00
54c9c2c0a0
Some more Movies 2.0 work
2014-06-11 21:14:13 +00:00
e0a9fcd650
More movie 2.0 stuff
2014-06-11 02:56:57 +00:00
5d31fb2b3c
Some more movie 2.0 progress
2014-06-11 02:33:57 +00:00
a682c667dd
Nuke IMovieHeader, put necessary methods into IMovie instead, and some todos on trouble spots for movie 2.0
2014-06-11 01:41:41 +00:00
47d5b1e2e2
Movie Savestate blob from IMovieHeader to IMovie, Movie and TasMovie just use the MovieHeader object as usual, but at least the calling code no longer expects that
2014-06-11 00:41:20 +00:00
229a6f6ac9
Oops
2014-06-11 00:27:19 +00:00
e07c7a776f
Some simplifying of IMovieHeader
2014-06-11 00:21:14 +00:00
5177051d08
Movie files - some more reorg - renaming and putting into new folders
2014-06-08 22:24:38 +00:00
6b2889957a
Some refactoring of movie code to make the Header less implementation specific, and start Movie2.cs which will be a Movie 2.0 implementation
2014-06-08 22:12:15 +00:00
7e9b13f5c3
Some movie refactoring - moving a function into the importer class, remove MovieExtension from the config file and instead add it as a movie property, add some todo comments in places regarding movie 2.0
2014-06-08 19:36:33 +00:00
b0c7ba5f77
remove info about sram from IMovie documentation, as the details of the implementation don't necessitate any particular way of handling sram handling
2014-06-08 18:31:09 +00:00
11af441464
wonderswan: change pad names for fun and profit. breaks controller config. does not break existing mooovies
2014-06-07 01:26:16 +00:00
5bb38cb1c2
wonderswan: rework how controls are handled for rotated situation. all savestates are invalid. you should probably delete the wonderswan portion of your control configuration.
2014-06-04 23:26:57 +00:00
019ab3efe0
bizswan: support rotating the screen at playtime
2014-06-04 02:03:40 +00:00
239eb5b268
saveram stuff
2014-06-02 16:33:08 +00:00
d4c0c64402
hacks
2014-06-01 16:53:34 +00:00
2d6e526073
Wonderswan - add Start to mnemonics
2014-06-01 16:49:40 +00:00
37d0510444
add PAL A2600 framerate to movie check code
2014-05-31 16:28:31 +00:00
866f98c6ce
bleh
2014-05-30 21:06:52 +00:00
fd6a1fdac8
6-Button controller support for ImportGMV.
2014-05-28 05:47:10 +00:00
961897a91b
-Added .YMV importer.
...
--Might actually have a chance of syncing if it weren't for all of the frames that are added from the BIOS. Should I make the importer add extra frames to compensate for this?
-Fixed some typos.
2014-05-28 04:41:12 +00:00
be82821b7d
ImportVBM now supports L and R.
2014-05-26 05:02:46 +00:00
6f296a5773
Lua - joypad.setfrommnemonicstr() - support the notion of pressing the analog stick for 1 frame, rather than sticky behavior
2014-05-21 03:25:41 +00:00
32a1fba5c0
rip out legacy board properties stuff
2014-05-18 16:47:19 +00:00
20ed09e86c
Rip out more obsolete setting stuff
2014-05-18 16:35:23 +00:00
5634b085cf
Store sync settings into the movie file, note: this does not include logic for deserializing sync settings and passing them to the core when loading a movie
2014-05-18 15:07:50 +00:00
558fb67984
Fix "starts from now" on SMB3 in quicknes, and who knows what other scenarios for savestate anchored movies
2014-05-18 01:00:35 +00:00
e4bf12ddf9
faster movie preloading
2014-05-16 00:12:08 +00:00
0fa33c7ca8
Fix N64 movie playback by removing a bogus defensive validation check that had bogus logic of ignoring input that didn't match the check. Bogus logic was bogus.
2014-05-15 18:48:41 +00:00
63430bb039
Fix movie loop offset feature
2014-05-05 01:12:15 +00:00
f976c2e27b
another fix to dual gameboy mnemonics, the method can correctly accept an empty string, so check for it before indexing
2014-05-03 17:48:49 +00:00
de53d1d810
Fix crash on input display for dual gameboy
2014-05-03 12:58:34 +00:00
c863d57113
Better color coding of input display, auto-holds show red, previous frame shows orange, restore ability to show immediate input, also fix but in autofire-autohold
2014-04-28 00:39:40 +00:00
c47a0c7426
make movie header savestates be binary, have their own key, and be stored in base64 form (actually, natt was right, they were stored as text, it's just that the "text" savestates from some cores are a ToHex'd byte array)
2014-04-25 02:19:46 +00:00
c74019a54d
Add a CoreAttributes class with a CoreName field, and apply it to all cores, when recording a new movie, add a core header line that captures this name
2014-04-22 00:38:59 +00:00
09daa3f939
fix read+write mode binary loadstate exception bug?
2014-04-18 17:41:14 +00:00
a6944c47d8
Play Movie - don't crash on headers with duplicate keys, don't throw an exception when movie files to parse
2014-04-13 23:18:45 +00:00
eac51f7c66
Movies.cs - simplify some code
2014-04-06 19:01:00 +00:00
770ddc26db
Add some more documentation to IMovie.cs
2014-04-06 16:49:05 +00:00
42ff4c072c
Lua - Fix joypad.set()
2014-03-29 21:12:04 +00:00
b93c1414c1
A fix to joypad.set() - passing null will clear a button
2014-03-27 01:21:05 +00:00
f714093b23
Movies 2.0 - some progress towards supporting floats
2014-02-25 02:56:32 +00:00
2555f5f5e0
calculate out platform framerates, for convenience
2014-02-18 04:02:35 +00:00
f80ac18e1f
maybe fix GMV movie imports. i have no time to test this
2014-02-10 01:29:31 +00:00
41faaedc18
TAStudio / Movies 2.0 - rip out a bunch of boolean input assumptions, in favor of..nothing for right now this breaks most all of the functionality of TAStudio, will replace with something that accounts for float input as well
2014-02-08 22:41:47 +00:00
0da1e900df
slight cleanup of some Linq logic in HeaderKeys.cs, a tiny bit less memory usage as a bonus
2014-02-08 16:29:57 +00:00
e71d729626
some minor code cleanups in BizHawk.Common
2014-02-04 21:15:33 +00:00
993845fe72
some mostly useless code reformatting in client.common
2014-02-04 03:08:20 +00:00
3dfcd8b22a
drastically cleanup the InputValidate class
2014-02-03 19:37:43 +00:00
864d3ede2f
Nitpicky cleanups on movie 2.0 code
2014-01-11 15:05:41 +00:00
7394cfd33f
More reorg
2014-01-10 23:14:36 +00:00
c0295316f5
Some Movie 2.0 reorg
2014-01-10 23:08:56 +00:00
0164db5532
Remove a no longer needed file
2014-01-10 22:56:59 +00:00
34fd1ec10a
Movies 2.0 - fix some stuff
2014-01-10 02:01:57 +00:00
128f81bbb0
oops
2014-01-10 01:18:19 +00:00
15d0e1adb6
TasMovie - round 1 of replacing mnemonic system with an IMnemonicGenerator system, this breaks stuff, but nothing anyone should have been using.
2014-01-09 02:17:59 +00:00
86024d2347
new movie mnemonic generators - some more baking of ideas, a basic mockup of NES done. Note: none of this is hooked up to anything yet
2014-01-06 22:28:53 +00:00
ef79734170
movies - start another rewrite of mnemonic generation
2014-01-06 03:59:00 +00:00
0997e80017
boop
2014-01-03 02:40:17 +00:00
a519ae025f
This should have fixed genesis mnemonics to be 2 player
2014-01-03 02:29:42 +00:00
adelikat