Skip to content

Commit

Permalink
Better paste behavior for multiple items in timeline mode
Browse files Browse the repository at this point in the history
  • Loading branch information
Grix committed Oct 4, 2020
1 parent 96b462c commit 982a9df
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 29 deletions.
3 changes: 0 additions & 3 deletions src/gms2/notes/documentation/documentation.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
TODO
- undo marker creation/movement and adding envelopes
- mouse dragging prioritizes objects in timeline instead of markers and end/begin
- save default filename add date
- quicksave in editor mode
- arbitrary animation easing function
- investigate and fix problem of dac (laserdock?) falling out and having to rescan. Automatic rescan on failure?
Expand Down
8 changes: 4 additions & 4 deletions src/gms2/objects/controller/Create_0.gml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version = "1.8.7";
versiondate = "2020-09-27";
version = "1.8.8";
versiondate = "2020-10-04";

if (debug_mode)
{
Expand Down Expand Up @@ -395,7 +395,7 @@ telem();

ex_patch_window_close_capture(1);

/*exception_unhandled_handler(function(ex)
exception_unhandled_handler(function(ex)
{
var _f = file_text_open_append("crash.txt");
file_text_write_string(_f, string(ex));
Expand All @@ -414,4 +414,4 @@ ex_patch_window_close_capture(1);
save_frames();
});

*/

2 changes: 1 addition & 1 deletion src/gms2/options/linux/options_linux.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/gms2/options/mac/options_mac.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/gms2/options/windows/options_windows.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 17 additions & 7 deletions src/gms2/scripts/seq_paste_object/seq_paste_object.gml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,26 @@ function seq_paste_object() {
if (ds_list_size(copy_list) != 0)
{
ds_list_clear(somaster_list);

if (selectedx > endframe)
endframe = selectedx;
pos_ref = endframe+500;
layer_ref = ds_list_size(layer_list)-1;
for (i = 0; i < ds_list_size(copy_list); i++)
{
var t_pos_ref = copy_list[| i][| ds_list_size(copy_list[| i])-1];
var t_layer_ref = copy_list[| i][| ds_list_size(copy_list[| i])-2];

if (t_pos_ref < pos_ref)
pos_ref = t_pos_ref;
if (t_layer_ref < layer_ref)
layer_ref = t_layer_ref;
}

for (i = 0; i < ds_list_size(copy_list); i++)
{
copy_list_new = ds_list_create();
ds_list_copy(copy_list_new,ds_list_find_value(copy_list,i));
if (i == 0)
{
pos_ref = copy_list_new[| ds_list_size(copy_list_new)-1];
layer_ref = copy_list_new[| ds_list_size(copy_list_new)-2];
}
ds_list_copy(copy_list_new,ds_list_find_value(copy_list,i));
postemp = copy_list_new[| ds_list_size(copy_list_new)-1];
ds_list_delete(copy_list_new,ds_list_size(copy_list_new)-1);
layertemp = copy_list_new[| ds_list_size(copy_list_new)-1];
Expand Down Expand Up @@ -50,6 +60,6 @@ function seq_paste_object() {
timeline_surf_length = 0;
}


// todo check for collisions and reposition

}
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.8.7
1.8.8
20 changes: 9 additions & 11 deletions versionnotes.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
v1.8.8 (2020-10-04) *Not yet released on Mac and Linux
- Fixed or mitigated several possible crashes in all modes.
- Creating/moving markers and creating layers and envelopes in timeline mode can now be undone.
- Fix editor mode text tool not working if alternative ILDA file palette enabled.
- Somewhat improved copy/paste behavior of multiple items in timeline mode.
- Markers have lower priority than items on timeline when dragging/selecting them with the mouse.

v1.8.7 (2020-09-27) *Not yet released on Mac and Linux
- Add possibility of drawing a custom path along which to animate movement etc.
- Fix possible crash when creating animated text
- Better crash handling with possiblity of saving unsaved work and automatically report bug.

v1.8.6 (2020-08-07)
- Fix Ether Dream not working on Mac and Linux.
- Fix possible crash when changing length of animation in editor mode.
- Add customizable position offsets to the simulated projector preview in timeline mode.
- Add shortcuts in timeline mode object menus for fade-in, fade-out, and strobe effects.
- Fix possible crash when playing files with special empty frames on DACs.
- Improved performance when playing very long files in timeline and live mode.
- Add setting for overriding scaling settings for high DPI screens.
- Fix possible crash when creating animated text.
- Better crash handling with possiblity of saving unsaved work and automatically report bug.

0 comments on commit 982a9df

Please sign in to comment.