Skip to content

v2.5.0: Merge pull request #3161 from OpenShot/release-20200105
Compare
Choose a tag to compare
@jonoomph jonoomph released this 08 Feb 21:30
· 1141 commits to master since this release
v2.5.0
fa699d7

Highlights:

  • Hardware encoding and decoding support (still a bit experimental)
  • Keyframe performance improvements (magnitudes faster)
  • Export and Import of EDL and XML (Premiere and Final Cut Pro)
  • Thumbnail generation much improved (uses local HTTP server), checks multiple locations, regenerate missing ones
  • Huge update to animated titles to support Blender 2.8
  • New ability to recover previous saves (~/.openshot_qt/recovery/) and improved auto-backup
  • SVG compatibility and support improvements
  • Preview window improvements (dimensions divisible by 2)
  • Export improvements (no longer modifies project keyframe data)
  • Disable metrics until opt-in (privacy improvements)
  • Tons of CMake and build improvements
  • Cross-platform improvements (fixed lots of small differences between OSes)

Details:

  • 75632f3 2020-01-13 Jonathan Thomas For Mac, preferences should try and append AppBundle executable name for common apps (Blender, Inkscape) HEAD -> release-20200105, origin/release-20200105
  • e4d79f6 2020-01-13 Jonathan Thomas Bumping version to 2.5.0 (large bump from the previous version, but due to the extensive changes)
  • 27bf096 2020-01-10 FeRD (Frank Dana) main_window: Code style (indentation, exceptions)
  • 87211f7 2020-01-09 Jonathan Thomas Updating some Linux dependencies missing in AppImage
  • 83c4563 2020-01-08 Jonathan Thomas Fixing Windows powershell escaped char in 'git log' call
  • f2bc30b 2020-01-08 FeRD (Frank Dana) launch.py: Fix command-line output
  • d35dc53 2020-01-08 Jonathan Thomas Testing a better way to generate git logs from the current commit to the previous tag. During a release, we tag the current commit during the publishing, and then it starts detecting no changes (since we are ON the current tag).
  • 0cb9751 2020-01-08 Jonathan Thomas Don't read the changelog more than 1 time (when testing different encodings)
  • f840d6d 2020-01-08 Jonathan Thomas Stopping video playback when opening a project, trying to simplify some edge cases (no need for continous playback during switching project files, lol)
  • 2ebef94 2020-01-07 Jonathan Thomas Attempt to fix invalid resources folder in Mac App Bundle
  • e276d62 2020-01-07 Jonathan Thomas Add queue for sending metrics, and disable metrics completely on initial launch. Once the user has opted in, flush the queue and send all metrics which are queued. If the user doesn't opt-in, we send no metrics at all.
  • 8aeda71 2020-01-07 Jonathan Thomas Adding a version for Unity importing... trying to get rid of an error I keep seeing related to this.
  • fd620f4 2020-01-07 Jonathan Thomas Updating rescale_keyframes() method to not modify the current project. This allows the Export dialog to make a copy of the rescaled keyframes, and not modify the active project when exporting to a different FPS. Now Export feels much safer, because it doesn't modify project data.
  • 0cf6539 2020-01-06 Jonathan Thomas Fixing keyframe rescale issue after an export is completed (we were scaling all keyframes twice on accident)
  • 67d6a76 2020-01-06 Jonathan Thomas Adding libopenshot version to About dialog
  • 5dbb993 2020-01-05 Jonathan Thomas Removing verbose debug statement when getting properties for property dialog (which happens as the user scrubs the timeline)
  • eb98bf6 2020-01-05 Jonathan Thomas Bump version to 2.4.5 (minimum libopenshot version: 0.2.4)
  • c6e5ee7 2020-01-03 Jonathan Thomas Remove spaces from effect icon file paths (i.e. Color Shift -> ColorShift) origin/update-image-cache, update-image-cache
  • 95806f9 2020-01-03 Jonathan Thomas More debugging
  • 8d7050d 2020-01-03 Jonathan Thomas Refactoring to always create HTTP server
  • bf028d1 2020-01-03 Jonathan Thomas Adding additional logging to startup, to determine why Travis is hanging hopefully
  • ec3f7b1 2020-01-03 Jonathan Thomas Trying to ensure socket used for port detection is closed before starting the HTTP thumbnail sever.
  • ef4e8c4 2020-01-03 Jonathan Thomas Fixing a thumbnail server race condition
  • ef9549f 2020-01-03 Jonathan Thomas Refreshing cache images, including new blender thumbnails, and updated title thumbnails (after some of the tweaks to titles)
  • f514fb0 2020-01-03 Jonathan Thomas Updating cache generation logic to use 85% PNG compression, to reduce the size of cache images (used by titles, transitions, effects, animated titles, etc...). This reduces at least 20 MB of images of included assets in OpenShot distribution packages.
  • 27ce9c0 2020-01-03 Jonathan Thomas Removing feColorMatrix effect from a few titles, because ReSVG does not support it and it generates errors.
  • b5c9005 2020-01-03 Jonathan Thomas Modifying titles to have more readability (stroke and outline and gradient tweaks) origin/title-outline-tweaks, title-outline-tweaks
  • 09ed042 2020-01-02 Jonathan Thomas Support older versions of webkit, since nothing renders for keyframes using the -webkit-fill-available value. origin/support-older-webkit-keyframe-rendering, support-older-webkit-keyframe-rendering
  • 5c88c6f 2020-01-02 Jonathan Thomas When resizing the preview video widget, find the nearest even QSize, so that both width and height are divisible by 2. This prevents some strange phantom resizing black bars when resizing the preview window. origin/find-nearest-even-number-ratio, find-nearest-even-number-ratio
  • 60c61d0 2020-01-02 Jonathan Thomas Updating supporters/donations origin/new-translations-and-donations, new-translations-and-donations
  • 78fac69 2020-01-02 Jonathan Thomas Adding new compliled translations
  • a5cef5b 2020-01-02 Jonathan Thomas Fixing name of colorshift.png file, since we changed (i.e. fixed) the classname of the effect in libopenshot. origin/fix-color-shift-icon-name, fix-color-shift-icon-name
  • 46a50e0 2019-12-30 FeRD (Frank Dana) Mark project as dirty on export
  • f627fa9 2019-12-25 FeRD (Frank Dana) classes.assets: Remove unused settings import
  • 5925707 2019-12-25 FeRD (Frank Dana) User Guide: Formatting, link updates
  • 676f004 2019-12-25 Frank Dana README: Mention PYTHONPATH, reformat commands
  • 8e16d2a 2019-12-25 FeRD (Frank Dana) Remove ModuleNotFoundError exception check
  • b91780c 2019-12-24 FeRD (Frank Dana) files_treeview: Fix image import
  • 0864429 2019-12-19 SuslikV Attempt to set option only for existing stream
  • d1f1ccf 2019-12-15 SuslikV Check if playhead follow code is available
  • 854fefd 2019-12-09 FeRD (Frank Dana) Restore saving of thumbnail paths
  • d40ce81 2019-12-09 FeRD (Frank Dana) Rebuild resource file
  • 770d6e0 2019-12-09 SuslikV Use icon with the quiet colors
  • 9ca1576 2019-12-06 FeRD (Frank Dana) Revert "thumbnail: Fix path for thumb output"
  • 005791d 2019-12-04 FeRD (Frank Dana) Don't track export_path changes in undo history
  • 008e234 2019-12-04 FeRD (Frank Dana) classes.updates: Keep redo, if ignore_history set
  • 5796a18 2019-12-04 FeRD (Frank Dana) classes.updates: Add update_untracked method
  • e6bdd60 2019-11-30 FeRD (Frank Dana) Log warning on missing library file origin/win-cli-tool
  • 6adf3c1 2019-11-28 FeRD (Frank Dana) Add ARCHLIB for system library path
  • 33c7644 2019-11-28 FeRD (Frank Dana) freeze.py: Fix py-extensions, prefixing
  • 07b73b9 2019-11-23 FeRD (Frank Dana) Add Win CLI tool openshot-cli.exe
  • 9d54586 2019-11-26 FeRD (Frank Dana) Blender: Fix injection of params
  • 9c802f4 2019-11-20 FeRD (Frank Dana) Export: Don't double file extensions
  • 5a1419d 2019-11-20 FeRD (Frank Dana) thumbnail: Fix path for thumb output
  • bb3e8a1 2019-11-20 FeRD (Frank Dana) Add overrides for HTTP logging
  • 9fb11f8 2019-11-20 FeRD (Frank Dana) Look up ID earlier, error if not found
  • 62cb452 2019-11-20 FeRD (Frank Dana) Don't create useless variable
  • 8286345 2019-11-20 FeRD (Frank Dana) thumbnail: Name & lookup RE groups
  • 1742d56 2019-11-20 FeRD (Frank Dana) thumbnail: Don't log 200 responses
  • 5d459d9 2019-11-20 FeRD (Frank Dana) json_data: Eliminate utf_path
  • 762c663 2019-11-20 FeRD (Frank Dana) Avoid code duplication
  • f11a39f 2019-11-20 FeRD (Frank Dana) Check self.prev_row before using
  • 0166bb0 2019-11-20 FeRD (Frank Dana) Linter fixes
  • 1c0bd25 2019-11-17 Jonathan Thomas Revert many JS loop syntax changes from #3022. Those changes broke all HTML rendering on my local dev version. origin/revert-some-JS-changes, revert-some-JS-changes
  • ef90f49 2019-11-17 Jonathan Thomas Updating OpenShot translations and template origin/updating-translations, updating-translations
  • 6fcfea5 2019-11-17 Jonathan Thomas Hack to make processing of thousands of thumbnails work more reliable, until a thread pool solution can be found. origin/project-asset-folders, project-asset-folders
  • e168acf 2019-11-16 Jonathan Thomas Correctly shutdown HTTP thumbnail server, and find and available port (this fixes freezing unit tests on shutdown)
  • 607d7e6 2019-11-16 Jonathan Thomas Catch undefined http file_ids, caused by DummyReaders and unit tests
  • 62e757f 2019-11-16 Jonathan Thomas Large assets refactor, plus adding recovery ability (~/.openshot_qt/recovery/). Introduced a new @assets path placeholder which is replaced by the project's dynamic asset path. This allows for external renaming of assets folder + project file. Also simplifies 'Save As', as we no longer have hard-coded absolute paths to assets folders. Also, once a project is saved/loaded, Titles and Thumbnails are saved inside the new assets folder (instead of inside our temp ~/.openshot_qt/ folders).
  • dea4edc 2019-11-14 Jonathan Thomas Large overhaul of thumbnail generation. Use an HTTP server to "serve" thumbnails to our UI and HTML timeline. This allows the HTTP server to handle requests, and handle cases such as missing files, different thumbnail folders, etc...
  • 00e935f 2019-11-11 FeRD (Frank Dana) Timeline: Refresh position on JSON load
  • d90c78e 2019-11-09 SuslikV Set minimum mouse move threshold for edit
  • 12992f1 2019-11-09 SuslikV Do not change selected row during mouse move
  • 0b3221f 2019-11-09 FeRD (Frank Dana) Fix SVG image sequences
  • 8325565 2019-09-05 FeRD (Frank Dana) Fix path recovery for image sequence clips
  • 0eaead3 2019-11-02 FeRD (Frank Dana) keyPressEvent: Remove debugging, simplify
  • f9c6f04 2019-10-29 FeRD (Frank Dana) Correct profile references
  • ae76ac7 2019-10-29 FeRD (Frank Dana) Create Vertical profiles
  • 309e389 2019-10-28 FeRD (Frank Dana) Don't reformat project file names
  • 272e4b5 2019-10-26 FeRD (Frank Dana) Fix favicon for timeline/index.html
  • 7ff7c95 2019-10-19 FeRD (Frank Dana) functions.js/track.js: Use for...of loops
  • 9bf8728 2019-10-19 FeRD (Frank Dana) controllers.js: replace indexed loops with for...of
  • eae5179 2019-10-18 Frank Dana docs/contributing: correct log filename in manual
  • aaa392e 2019-10-05 FeRD (Frank Dana) freeze.py: Don't hardcode Python extension paths
  • 152ac1c 2019-10-17 Frank Dana CONTRIBUTING: Correct filename of openshot logfile
  • 6555a15 2019-10-10 FeRD (Frank Dana) Draw keyframe points as styled divs
  • db54ba0 2019-10-10 FeRD (Frank Dana) Update timeline zoom directly, on project load
  • 8421f91 2019-10-05 FeRD (Frank Dana) Proposed .py and .js style rules
  • 528d6ce 2019-10-05 FeRD (Frank Dana) Add root-file marker, and LF line-endings setting
  • c2110b4 2019-10-05 FeRD (Frank Dana) Add barebones .editorconfig
  • 9920b3a 2019-10-05 FeRD (Frank Dana) Blender fixes
  • 0725010 2019-10-02 FeRD (Frank Dana) Make onLogTheEnd() a Python atexit function
  • 682a4ca 2019-09-30 FeRD (Frank Dana) Add libX11-xcb.so.1 exclusion
  • 7e3a093 2019-09-29 FeRD (Frank Dana) More unused variables/imports
  • e5d533c 2019-09-29 Frank Dana Add web link to README Documentation section
  • fe1615a 2019-09-27 FeRD (Frank Dana) js: Use === and !== with bool/numbers
  • 9b3f4d8 2019-09-27 FeRD (Frank Dana) main_window: use app var, when we have it
  • 6abc10e 2019-09-27 FeRD (Frank Dana) repo-wide: Eliminate os.path throwaways, cleanup
  • 1501e39 2019-09-27 FeRD (Frank Dana) classes.project_data: Exception fixes
  • 1fbec3c 2019-09-27 FeRD (Frank Dana) main_window: add new=1 to webbrowser.open
  • 81a081a 2019-09-27 FeRD (Frank Dana) main_window: browser-launching fixes
  • 2bdc0d7 2019-09-26 FeRD (Frank Dana) QFileDialog: Ignore file_type return value
  • ae15fb2 2019-08-28 FeRD (Frank Dana) classes/updates: Fix history-cleaning, log tweaks
  • 7fd081a 2019-09-25 Frank Dana Aaand, update the Feature Request / enhancement label
  • 30f1cf9 2019-09-25 Frank Dana Update "bug" label for bug report issue template
  • 318131d 2019-09-22 FeRD (Frank Dana) Last try at excluding font libs
  • a8a24ba 2019-09-22 FeRD (Frank Dana) freeze.py: Exclude more system libs
  • 2ab9008 2019-09-22 FeRD (Frank Dana) Profile dialog: Remove skip_first, fix loading
  • 75fb7bf 2019-09-18 FeRD (Frank Dana) JSON: Lower indent level on formatted data
  • 10e47f2 2019-09-17 FeRD (Frank Dana) blender_listview: Remove unused QBlenderEvent class
  • ee29ce9 2019-09-17 FeRD (Frank Dana) Animated Titles: Use QPlainTextEdit for multiline
  • 1af03e2 2019-09-16 FeRD (Frank Dana) Animated Titles: Don't add files if canceled
  • 6821874 2019-09-16 Frank Dana Fix render progress display in Animated Titles editor (#2964)
  • 7cdbcb8 2019-09-16 Frank Dana Whitespace-change commit to trigger GitHub rescan
  • c46de33 2019-09-16 FeRD (Frank Dana) Set scale=none on audio clips when splitting
  • 335aea3 2019-09-14 FeRD (Frank Dana) properties_tableview: Code cleanup
  • cf76d8a 2019-09-14 FeRD (Frank Dana) properties_tableview: Don't shadow "property"
  • 50cd2be 2019-09-14 FeRD (Frank Dana) Properties: Ignore overlapping context menu events
  • 213d33b 2019-09-13 FeRD (Frank Dana) blender_listview: Use generate_id() to name folders
  • db01eec 2019-09-13 FeRD (Frank Dana) project_data: Dumb typo
  • 0524a02 2019-09-12 FeRD (Frank Dana) Blender Python scripts: Code formatting
  • cbe31e2 2019-09-11 SuslikV Fix typo in the comment
  • 4755fa7 2019-09-11 SuslikV Clarify comment in paintEvent
  • d2f35be 2019-09-09 FeRD (Frank Dana) json_data: use os.fsencode() for utf_path
  • 6428992 2019-09-09 FeRD (Frank Dana) Eliminate forced UTF-8 path encoding
  • 60777db 2019-09-09 FeRD (Frank Dana) classes.info: Path list fixes
  • 958382c 2019-09-09 FeRD (Frank Dana) Add and use info.BACKUP_FILE
  • 4885c81 2019-09-09 FeRD (Frank Dana) classes.info: Formatting, linter
  • bd31282 2019-09-08 Brad Kartchner Various fixes to the last commit. Moved the follow playhead logic from Python to Javascript, where it should be. Fixed an error in calculating determining where the playhead is centered.
  • 7591b02 2019-09-08 FeRD (Frank Dana) eval_js: Less severe logs, longer delays
  • ef91065 2019-09-08 FeRD (Frank Dana) project_data: Also migrate from asset folders
  • d83ddf5 2019-09-08 FeRD (Frank Dana) Fix some weird formatting, linter, etc.
  • 197e4b0 2019-08-31 SuslikV Use theme color for Video Preview background
  • 60d170c 2019-09-06 Brad Kartchner Finished changes suggested by ferdnyc
  • 81c9dbe 2019-09-06 Brad Kartchner Made some changes in response to ferdnyc's comments. Created a $scope.centerOnPlayhead function devoted solely to centering on the playhead in Javascript. This avoids the calculates required in Python to determine the playhead's current time position since the Javascript side already knows it.
  • 4b06a1e 2019-09-04 FeRD (Frank Dana) JS: isTimeVisible(), isPlayheadVisible()
  • 8b1e3e1 2019-09-06 FeRD (Frank Dana) Custom center-on-playhead icon
  • a2ee5f1 2019-08-21 Mario Hros presets for more HW VAAPI encoding formats
  • 05b6856 2019-09-05 FeRD (Frank Dana) Store filename.osp assets in filename_assets dir
  • 3786d38 2019-09-05 FeRD (Frank Dana) Asset folder name-generation and storage
  • 456c7bf 2019-09-05 FeRD (Frank Dana) Add previous_path arg (optional) to move_temp_paths...()
  • a66e499 2019-09-05 FeRD (Frank Dana) Fix path recovery for image sequence clips
  • 670b872 2019-09-05 FeRD (Frank Dana) Prevent slicing with 'raise' instead of 'raise ex'
  • 92f3f91 2019-09-04 FeRD (Frank Dana) JS: isTimeVisible(), isPlayheadVisible()
  • 067de0e 2019-09-03 SuslikV Update data from the default project too
  • b7276a6 2019-09-03 FeRD (Frank Dana) Don't copy permissions when dup'ing template files
  • 9e9c7cd 2019-09-01 FeRD (Frank Dana) Title editor: linter fixes, log import failure reason
  • 5d5da4e 2019-08-31 Brad Kartchner Added the ability to center the timeline view at an arbitrary time. Currently, this can be used by the user to automatically jump to the current playhead position rather than manually searching for it. The timeline also recenters itself when jumping to a marker or to the beginning or end of the timeline.
  • b9f4e37 2019-08-28 FeRD (Frank Dana) Remove "View Toolbar" icon, default checked
  • 23d6c25 2019-08-28 Tre Fix a bug with the actionView_Toolbar checked state.
  • e05ea48 2019-08-27 FeRD (Frank Dana) classes/ui_util: Remove unused variable
  • 61f72a8 2019-08-26 FeRD (Frank Dana) metrics.py: Use openshot.OPENSHOT_VERSION_FULL
  • 73af456 2019-08-26 FeRD (Frank Dana) Use openshot.OPENSHOT_VERSION_FULL
  • ef34fde 2019-08-25 FeRD (Frank Dana) Project files: Image sequence fixes
  • fa8c851 2019-08-25 FeRD (Frank Dana) File import: Log error on failed import
  • 493c071 2019-08-25 FeRD (Frank Dana) Titles: Font selector reuses selection
  • 645d9ea 2019-08-25 FeRD (Frank Dana) title_editor.py: Linter cleanup
  • b516534 2019-08-25 FeRD (Frank Dana) Title Editor: Don't update on no-op
  • bb6fc25 2019-08-25 FeRD (Frank Dana) Preferences: Browse opens at previous-value location
  • 81ad4b1 2019-08-22 Jonathan Thomas Terminate blender process upon canceling origin/blender-2.8-support, blender-2.8-support
  • feab599 2019-08-22 Jonathan Thomas Fixing dissolve animated title (for sure one of the coolest)! Had to add new material nodes, fix some syntax, and change to emitting light.
  • 59e8fde 2019-08-19 Jonathan Thomas Removing zoom halo blender animated title (also kind of redundant)
  • a215b2b 2019-08-19 Jonathan Thomas Had to fix the UV Maps and render nodes for the clapboard textures, and up the light power (since it was too dim)
  • c733e4d 2019-08-16 SuslikV Hide tutorial window before exit
  • fe7c9a4 2019-08-16 SuslikV Specify exception type
  • 8d073c5 2019-08-15 SuslikV Log start-end of the application current session
  • cf9573f 2019-08-13 SuslikV Log the exit routine
  • 5cf00ae 2019-08-15 SuslikV Import missing variable
  • eb96d08 2019-08-14 FeRD (Frank Dana) Zoom centered on playhead, if visible
  • 5760491 2019-08-13 Jonathan Thomas Fixed animated titles Cancel button functionality (which I don't think ever worked during a render). Now it works during a render or with no rendering.
  • 88d0a3a 2019-08-13 Jonathan Thomas Fixing lens flare animated title (mostly works now). Lots of old settings removed, but also it now has less capabilities I think.
  • 5c1d0ca 2019-08-13 Jonathan Thomas Removing Trees animated title (kind of tired and pointless in my opinion)
  • a411085 2019-08-13 Jonathan Thomas Fixing snow animated title
  • 3f9288d 2019-08-13 Jonathan Thomas WIP: Dissolve animation still is broken, but at least doesn't throw an error message now.
  • 29ea9cf 2019-08-12 Jonathan Thomas Adding blender.svg icon for Animated Titles and updating window title to give Blender credit =)
  • 47c53f1 2019-08-12 Jonathan Thomas Prevent double render on load of animations
  • 1b7c954 2019-08-12 Jonathan Thomas Removing real earth blend, and defocus animation (too similar to blur animation)
  • 78a6769 2019-08-12 Jonathan Thomas Removing read earth animated title. Too many changes required for Blender 2.8.
  • 9af67ec 2019-08-12 Jonathan Thomas Fixed space movie animated title (needed new alpha keyframe and some new materials), and updated icon from 1.6 MB to 5kb!
  • 6193e22 2019-08-11 Frank Dana Preferences: Raise max samplerate to 192kHz.
  • 163095c 2019-08-10 FeRD (Frank Dana) Preferences: Avoid code duplication for browse type
  • 42660a1 2019-08-10 FeRD (Frank Dana) Razor tool: Disable right-click
  • 299ae01 2019-08-09 Jonathan Thomas Improving some "earth" animation issues... still has lots of issues.
  • 513a8a7 2019-08-09 Jonathan Thomas Fixed picture frame animated title. Added UV Maps to all frames, and updated syntax. Then, I had to reverse the scale_x and scale_y to flip the image textures.
  • 17b0ce2 2019-08-09 Jonathan Thomas Removed specular setting from Glare animation, and added in control of glare type
  • 563cbb5 2019-08-09 Jonathan Thomas Fixed neon lines animation (it's not perfect, but good enough for now)
  • d76250e 2019-08-08 Jonathan Thomas Fixed magic wand animated title, added some new properties, added glare, improved gravity (-3 to +3 for some fun), updated thumbnail
  • c63cc50 2019-08-07 FeRD (Frank Dana) build-server.py: Update uses of renamed metadata origin/pr-2925
  • 3dee83d 2019-08-07 FeRD (Frank Dana) Revert "Restore 'use_shadeless' in colors.py/colors.blend"
  • 1f9fd5e 2019-08-07 FeRD (Frank Dana) Restore 'use_shadeless' in colors.py/colors.blend
  • 13ef191 2019-08-07 FeRD (Frank Dana) Animated Titles: Save/Restore keyboard focus
  • d198170 2019-08-07 Jonathan Thomas Fixed glass slider animated title (required new settings and lots of changes)
  • a69544f 2019-08-07 Jonathan Thomas Made animated title window larger to account for larger labels (so list doesn't get squished when certain animations are selected)
  • 2082b5f 2019-08-07 Jonathan Thomas Fix issue with diffuse color logic not matching all params needed
  • 9452496 2019-08-07 Peter Eszlari rename Linux metadata
  • 1f234ba 2019-08-06 Jonathan Thomas Fixed expode.py blender script (mostly refactored methods and syntax changes)
  • d24d2c0 2019-08-06 Jonathan Thomas Fixed glare.blend (by emitting light with keyframes and adjusting some nodes)
  • 2f2a554 2019-08-05 FeRD (Frank Dana) Clean up logging in Animated Titles
  • f2aac66 2019-08-05 Jonathan Thomas Fixed defocus blender animation, and now allow control of Z focal depth
  • 6ed3160 2019-08-05 Jonathan Thomas Fixed blur effect, added controls for X and Y control of the blur, increased the amount of blur (spinner max)
  • f067ce5 2019-08-05 Jonathan Thomas Removing unused syntax in blender 2.8
  • eaf4846 2019-08-05 Jonathan Thomas Sorted blender model by file name.Fixed color picker to work with diffuse and non-diffuse params, and removed RGB preview mode (RGBA seems to work fine)
  • 621b60b 2019-08-05 Jonathan Thomas Fixing wireframe blender animation (and adding thickness param)
  • c22ddbe 2019-08-04 Frank Dana Revert "Revert "Set default multiplexing preset for exported media""
  • d035737 2019-08-04 FeRD (Frank Dana) Revert "Set default multiplexing preset for exported media"
  • 4428f72 2019-08-03 FeRD (Frank Dana) darkPalette: More complete disabled color group
  • 8ef8300 2019-08-03 FeRD (Frank Dana) Fix preferences access in GPU code for 2.80
  • 49d794d 2019-08-02 Jonathan Thomas Output filepath of each frame rendered
  • d48ae1b 2019-08-02 Jonathan Thomas Refactoring blender animations for 2.8 support (WIP): - alpha_mode no longer exists (replaced with bpy.context.scene.render.film_transparent) - horizon_color no longer exists (replaced with bpy.data.worlds[0].color) - material_object.diffuse_color now accepts 4 values (including alpha) - material_object.alpha is no longer used (and deleted.... inherits from diffuse color i think) - material_object.use_shadeless is no longer used (disabled for now) - bpy.ops.object.text_add has new parameters (refactored it to work)
  • 4dbb441 2019-08-02 Jonathan Thomas Show waiting cursor when launching Preferences, and normal cursor once preferences has loaded fully. add-wait-cursor-preferences
  • 54063b7 2019-08-02 Jonathan Thomas Fix bugs related to "New Project" and a missing user project default file (this is a regression). fix-user-project-override
  • 9c28d20 2019-08-02 FeRD (Frank Dana) Move blender_gpu preference to bottom
  • b3b9e1a 2019-07-31 FeRD (Frank Dana) Remove external filter clear-buttons
  • ef9c4e0 2019-07-31 FeRD (Frank Dana) Properties: Enable filter clear button
  • afe06ff 2019-07-31 FeRD (Frank Dana) Make Preferences window taller & wider
  • 2f07a52 2019-07-30 Jonathan Thomas Renaming launch file on Linux, so it doesn't collide with the cx_Freeze created file (openshot-qt) fix-cxfreeze-exe-name-change
  • 3dd34db 2019-07-30 Jonathan Thomas Fixing wrong path and missing launch.exe string
  • 344862b 2019-07-30 Jonathan Thomas Removing copyright from cx_Freeze setup() call, since 2 of our build servers exploded on that. Adding "exe" to windows targetname, to prevent crash in cx_Freeze.
  • cc16931 2019-07-30 FeRD (Frank Dana) Change "CPU" accel icon to light orange
  • 24bfb6c 2019-07-30 FeRD (Frank Dana) Don't make Timeline closable on unfreeze
  • 040bcd4 2019-07-30 FeRD (Frank Dana) Don't use deprecated AllDockWidgetFeatures
  • 2a688ef 2019-07-25 SuslikV Restore UI state on startup
  • 95f5283 2019-07-29 Jonathan Thomas Take 2 fix-file-assoc-flags
  • c75d1e4 2019-07-29 Jonathan Thomas Fix another regression in #2872
  • 6ebd5f4 2019-07-29 Jonathan Thomas Fix a regression in #2872
  • 71fa042 2019-07-29 Jonathan Thomas Fixing uninstall firewall rule syntax new-windows-firewall
  • ade64c3 2019-07-29 Jonathan Thomas Adding optional task for windows firewall
  • 5eb1ccd 2019-07-29 Jonathan Thomas Remove firewall rule on uninstall
  • c0b09f1 2019-07-28 Jonathan Thomas Switching direction of firewall rule
  • 4253847 2019-07-28 Jonathan Thomas Adding experimental Windows firewall exception during install
  • 3fa8420 2019-07-28 Jonathan Thomas Add Qt5Core and Qt5Svg DLLs when missing from frozen folder (this fixes missing icons in daily builds) fix_missing_qt5svg
  • 7d288db 2019-07-26 FeRD (Frank Dana) Raise max video dimensions to 40000x40000
  • 7d483bc 2019-07-26 FeRD (Frank Dana) Add SVG to image-sequence extensions
  • ebd7083 2019-07-26 Jonathan Thomas Add Qt5Core.dll to root of frozen dir remove-resvg-freeze-logic
  • 2934ae4 2019-07-25 Jonathan Thomas Remove Windows resvg freeze logic (no longer needed for newer versions of cx_Freeze)
  • 8a639b6 2019-07-25 Jonathan Thomas Revert: Disabling editbin and verpatch temporarily msys2-update
  • e00848e 2019-07-25 Jonathan Thomas Disabling editbin and verpatch temporarily
  • d009195 2019-07-23 Jonathan Thomas Remove more unused dlls
  • 3aacd51 2019-07-22 Jonathan Thomas Adding missing images to image cache (makes initial Title dialog open super quickly)
  • 7995e5b 2019-07-22 Jonathan Thomas Testing cx_Freeze tweaks
  • 1dc5383 2019-07-22 FeRD (Frank Dana) Destroy webview when exiting
  • 8af2e79 2019-07-22 FeRD (Frank Dana) PlayheadMoved: Eliminate unused args
  • 69d6e2d 2019-07-20 Jonathan Thomas Testing cx_Freeze tweaks
  • 19eb01e 2019-07-20 FeRD (Frank Dana) Recents list: Never add relative paths
  • bee098f 2019-07-10 SuslikV Set default multiplexing preset for exported media
  • de4caec 2019-07-20 FeRD (Frank Dana) Connect resource file to consumers
  • f48fe58 2019-07-19 FeRD (Frank Dana) Remove ellipses from "New Project" menu/binding
  • 263ca5b 2019-07-19 FeRD (Frank Dana) Remove unused "window_splitter" settings
  • 4bb7a7c 2019-07-19 FeRD (Frank Dana) Update Advanced View
  • 6c9841a 2019-07-18 Jonathan Thomas Testing cx_Freeze tweaks
  • a06124c 2019-07-17 FeRD (Frank Dana) Don't package openshot-qt.ico on Windows
  • fc9a87f 2019-07-17 FeRD (Frank Dana) About/credits: Use :/about/ resources
  • 67d5a83 2019-07-17 FeRD (Frank Dana) All UI files: get openshot.svg from .qrc
  • c178d22 2019-07-17 FeRD (Frank Dana) Add more icons to resource file
  • dbc4d76 2019-07-17 FeRD (Frank Dana) export.ui cleanup & fixes
  • b5b1910 2019-07-16 Jonathan Thomas Testing cx_Freeze tweaks
  • 167b3ad 2019-07-16 Jonathan Thomas Fixing ISS installer file
  • 720cd99 2019-07-16 Jonathan Thomas Testing cx_Freeze tweaks
  • 88ac8f7 2019-07-16 FeRD (Frank Dana) Make .osp association optional (default on)
  • 64dfe46 2019-07-16 Jonathan Thomas Testing cx_Freeze tweaks
  • cf03d0a 2019-07-16 FeRD (Frank Dana) InnoSetup: Update copyright year, URLs
  • 3ed1cc9 2019-07-16 FeRD (Frank Dana) InnoSetup: Add .osp file association
  • a513aa4 2019-05-06 FeRD (Frank Dana) Add 128, 256, 512px Win icon sizes
  • bacdfbc 2019-05-06 FeRD (Frank Dana) Add 128x128 icon png
  • a5282ad 2019-07-15 luz.paz Fix source comment typos
  • 9b87ec6 2019-07-14 FeRD (Frank Dana) Update appdata.xml file with 2.4.4 release
  • c9f91b6 2019-07-14 FeRD (Frank Dana) Add over a dozen languages to InnoSetup
  • 8dbbf54 2019-07-14 FeRD (Frank Dana) Retire Windows envvar-deletion code
  • 1756655 2019-07-14 Frank Dana Fix path in show_translations.py
  • 2469712 2019-07-14 Frank Dana Fix import error popup, other exceptions (#2867)
  • 77a3a68 2019-07-12 FeRD (Frank Dana) Check for empty/null path strings
  • 9b7b821 2019-07-10 FeRD (Frank Dana) Add support for a user default project file
  • 139b9ec 2019-07-10 FeRD (Frank Dana) Permission popup: Don't eat other exceptions
  • 2c2b7fd 2019-07-09 Jonathan Thomas Removing fractional values from X,Y coordinates on common transitions (trying to prevent strange rendering issues with 1 pixel borders). simplify-common-svg-transitions
  • 21e157d 2019-07-09 SuslikV Change order of tabbing items in export dialog (#2782)
  • d7e8f05 2019-07-09 SuslikV Use regular CSS properties in scrollbars
  • 646d703 2019-07-09 SuslikV Fix styling and unify code
  • 3dec467 2019-07-08 FeRD (Frank Dana) Remove text outlines from most titles
  • eede906 2019-07-08 FeRD (Frank Dana) Change project.get(["foo"]) to project.get("foo")
  • 88e41c5 2019-07-08 FeRD (Frank Dana) project.get(): Accept non-list args
  • 1490db3 2019-07-03 SuslikV Add comment to code
  • d59ec20 2019-07-03 SuslikV Fix cursor and cursor-line shift
  • ec95f15 2019-07-03 SuslikV Rewrite timeline cursor styling
  • 74b6044 2019-07-02 Jonathan Thomas Fix IO error race condition on build server fix-build-server
  • f486bed 2019-07-02 Jonathan Thomas Output more details to build-server.log, and fix verpatch
  • 22fab66 2019-07-02 FeRD (Frank Dana) Re-export backgrounds with correct font
  • 35e3e5e 2019-07-01 Jonathan Thomas Flush log file before end of script (experimental)
  • 0854108 2019-07-01 Jonathan Thomas Add build log to GitLab CI artifacts
  • e0ab10b 2019-07-01 FeRD (Frank Dana) Fix shape of hw-accel-*.svg
  • 485348e 2019-07-01 Jonathan Thomas Fixing exe_path which is undefined
  • f285b16 2019-07-01 Jonathan Thomas Fix escaped v char
  • e8f3ca8 2019-06-30 FeRD (Frank Dana) Use SVG icons for hw-accel markers
  • f1621a4 2019-06-30 FeRD (Frank Dana) Replace PNG accel icons with SVG
  • c254a0a 2019-06-15 Florian Pritz Install icons to hicolor/NxN instead of hicolor/N
  • b9e736e 2019-06-11 SuslikV Update video_length of the Timeline object
  • 0f45d49 2019-06-08 Jonathan Thomas Updating CheckPixel to use a threshold of 5
  • 3186e00 2019-06-08 SuslikV Make track of the scroll more noticeable
  • b4f040e 2019-06-08 SuslikV Make clip selection always visible
  • 0747604 2019-06-07 FeRD (Frank Dana) New Blender GPU enable code
  • 0be375e 2019-06-07 FeRD (Frank Dana) Inject blender GPU code if enabled in settings
  • da22ec8 2019-06-06 FeRD (Frank Dana) Add setting to enable blender GPU usage
  • 917eaa8 2019-06-06 FeRD (Frank Dana) Fix outdated comments about Blender version
  • 2309e10 2019-06-04 Jonathan Thomas Speed up hardware decode tests in preferences hardware-improvements
  • 3c8b0df 2019-06-04 Jonathan Thomas Tweak name of graphics card used by "CPU only" mode
  • a2dcce7 2019-06-01 SuslikV Make scrolls of the Timeline thicker
  • a8dd181 2019-06-01 SuslikV Lower scroll area minimum height
  • 0c7c9f8 2019-05-31 Jonathan Thomas Adding test mp4 to verify decoding preferences (hardware decoding), and only display valid devices and modes. Also, disable card selection for Windows and Mac (until they are supported)
  • b7c4bb6 2019-05-31 Jonathan Thomas Refactor of 'resources' paths
  • b26e3d8 2019-05-31 Jonathan Thomas Disable graphics card selection in Window and Mac (since that is not yet supported in libopenshot)
  • fa928aa 2019-05-30 Jonathan Thomas Bumping version to 2.4.4-dev2 edl-export
  • 5be1f46 2019-05-28 FeRD (Frank Dana) win32: Add verpatch cmd to build-server
  • bdd2135 2019-05-27 Jonathan Thomas Large refactor of some common functions. Improved logic to find missing files on project open and project import. Files can be skipped or updated, and internal cache remembers previously searched folders. Much faster to find missing and fix missing files when opening a project.
  • 1b25ddd 2019-05-25 Jonathan Thomas Updating XML exporter to NTSC=FALSE
  • b1422e1 2019-05-25 Jonathan Thomas Added documentation for EDL and XMl importing and exporting
  • ea332b1 2019-05-23 Jonathan Thomas Completed XML importer. Supports video, image, and audio clips. Opacity keyframes and volume keyframes, and multiple tracks.
  • 1ab6a7a 2019-05-23 Jonathan Thomas Wrapping up first version of EDL importer (supports videos, images, and audio files), volume keyframes, and alpha keyframes. Only supports importing a single track through.
  • 8355b92 2019-05-23 SuslikV Use actual import source
  • bc3a628 2019-05-22 Jonathan Thomas File selector and XML parsing for XML importer
  • 60bd1d0 2019-05-22 Jonathan Thomas Initial EDL parsing / importer (WIP)
  • 54f89f6 2019-05-22 Jonathan Thomas Fixed edit index on EDL export
  • c708340 2019-05-06 FeRD (Frank Dana) Add 128, 256, 512px Win icon sizes
  • 94fbf31 2019-05-06 FeRD (Frank Dana) Add 128x128 icon png
  • 666ea4c 2019-05-21 FeRD (Frank Dana) Rename frozen executable to openshot-qt
  • f23d2f8 2019-05-21 Jonathan Thomas Adding 'import project' to menu
  • dee3eb2 2019-05-21 Jonathan Thomas Adding 'resources' folder, and moving some non-settings file there (trying to clean-up the folder structure a bit). Also stubbing out the EDL and XML importers (WIP).
  • 4dcf3a2 2019-05-20 Jonathan Thomas Added volume keyframes to EDL export
  • edd7d2a 2019-05-20 Jonathan Thomas Added volume keyframes to Final Cut Pro XML export (and fixed In/Out bug)
  • bccafa2 2019-05-20 Jonathan Thomas Adding opactiy keyframes to Final Cut Pro XML export (and fixing issue with duplicate keyframe times)
  • 46cc8a7 2019-05-20 Jonathan Thomas Fixing audio track handling with Final Cut Pro XML export. Now images, audio, and video files (with and without audio tracks)
  • 1fa3f71 2019-05-17 Jonathan Thomas Adding initial Final Cut Pro XML export (needs lots of work still, but the basics work for video tracks now)
  • 74290d1 2019-05-17 Jonathan Thomas Generate project ID correctly on new projects, and fix old default project id's (which are 'T0')
  • 8b9a6b1 2019-05-16 Jonathan Thomas Refactoring EDL creation into it's own file. Adding Final Cut Pro XML template, and some refactoring around exports in general.
  • 3d80d88 2019-05-16 Jonathan Thomas EDL Exporter, which currently supports images, video+audio, audio-only, blank/gaps between clips, and opacity. It generates 1 EDL file per track. Also a refactor of time_parts, a common function used in a few places to convert seconds into a formatted time stamp.
  • 6cf6b59 2019-05-14 Jonathan Thomas Remove unused duplicate files from Windows installer reduce-windows-installer-size
  • aa165c4 2019-05-13 Jonathan Thomas Closing timeline object before Python kills the object itself memory-fixes
  • 924a9cf 2019-05-07 Jonathan Thomas Import info separately check-permissions
  • 1207b88 2019-05-07 Jonathan Thomas Improving permission error detection, as well as import error detection. Refactoring some imports to prevent initializing the logger before OpenShotApp
  • 714f917 2019-05-07 Jonathan Thomas Fixing spelling error
  • 56e8bfd 2019-05-07 Jonathan Thomas Check permissions on launch, and show error message to user if needed
  • 3abb8bb 2019-05-04 FeRD (Frank Dana) Add Retina background at double resolution
  • 58f444e 2019-05-04 FeRD (Frank Dana) Export updated dmg-backgroung.png
  • 7e2286a 2019-05-04 FeRD (Frank Dana) DMG Background: Update, clean up SVG file
  • 5f68bb2 2019-05-03 Jonathan Thomas Improved property validation (type checking, error handling, logging) and making certain properties (Tracks, Dropdowns) non-editable when double clicked. property-editing
  • 7ff925b 2019-05-02 Jonathan Thomas Fix broken history (null history attribute) fix-broken-history
  • 4a9e2fe 2019-05-02 FeRD (Frank Dana) Remove simplejson fallback
  • eae7170 2019-05-01 Jonathan Thomas Adding display_ratio and pixel_ratio to default project, and adding support for different aspect ratio video previews (fixes a ton of issues), and maximizes the video preview window. hardware-support
  • 4ab52ca 2019-04-30 Jonathan Thomas Fixing white background on Mac preferences, and fixing some layout icon issues with Effects thumbnails
  • c0ed14e 2019-04-29 Jonathan Thomas Improving export decoration logic (to show correct hwaccel graphic), and adding preset for videotoolbox acceleration (even though it currently crashes for me during testing)
  • 1052eea 2019-04-28 Jonathan Thomas Adding Intel QSV decoding support
  • fb1349b 2019-04-28 Jonathan Thomas Adding VDPAU option for decoding, fixing preview player to correct size player.
  • 47b5473 2019-04-24 Jonathan Thomas Adding NVENC to export dialog (instead of NVDEC), and fixing cancel export logic.
  • 294aa21 2019-04-23 Jonathan Thomas Adding search box to preferences, where only tabs witch matching preferences will appear
  • 2c1cec0 2019-04-23 Jonathan Thomas Added Playback Audio Device to preferences, and set audio device name on launch. Also fixed a few typos, and widened the preferences window a bit.
  • 2ea4bb3 2019-04-21 Jonathan Thomas Improving some translations for "Graphics Card %s" with placeholders
  • 38531f4 2019-04-21 Jonathan Thomas Added setting dropdown names to translation, and generated POT template
  • 7020d82 2019-04-21 Jonathan Thomas Add "default" to Graphics Card 1
  • b4182e0 2019-04-21 eisneinechse Remove the old way to select hardware support
  • b6a2d34 2019-04-21 eisneinechse Reorder number of cards
  • 710ff4c 2019-04-20 Jonathan Thomas Adding dropdown to encoder / decoder selection in preferences, and changing "SOFTWARE" to "CPU" (so we don't have to translate it)
  • 7aa70f8 2019-04-19 Jonathan Thomas Added elapsed time to export dialog title bar (once it is finished)
  • ba7569d 2019-04-18 Jonathan Thomas Removing hardware acceleration modes from incompatible OSes (i.e. don't show Mac VTB mode on Windows and Linux)
  • 4dc3849 2019-04-18 Jonathan Thomas Adding new images for hw-accel dropdowns (preferences and export), integrating these images into the dialogs, and removing any videocodec from the Export dialog which is not supported by libopenshot.
  • cc813ba 2019-04-18 Jonathan Thomas Changing location of backup.osp, fixing some backup.osp related regressions (missing thumbnails), and preventing a "hang" when recovering backup.osp. Also, adding new option to leave open export dialog and raise the export window (to alert the user the export is done)
  • bb7f10f 2019-04-18 Jonathan Thomas Updating default settings (autosave interval >= 1.0, history limit to 99, and renaming some hw-accel preferences)
  • bbbcb25 2019-04-17 Jonathan Thomas Adding improved invalid path detection when exporting a video invalid-path-detection
  • 0a798de 2019-04-17 Jonathan Thomas Fix Time->Reset Time menu (which was doing nothing)
  • 485148c 2019-04-13 FeRD (Frank Dana) Fix author string in init.py
  • 68db83f 2019-04-04 Jonathan Thomas Fix unittest which are freezing on travis ci fix-unit-tests
  • ca8b12b 2019-04-04 Jonathan Thomas Updating travis ci dist to xenial (from trusty) new-xenial-dist
  • 20d614c 2019-04-04 Jonathan Thomas Bumping version to 2.4.4-dev1 juce5
  • c070d4f 2019-04-04 Jonathan Thomas Generate translation POT template
  • 33c02dc 2019-04-04 Jonathan Thomas Display error to user when initialise() method is called by JUCE (and if JUCE returns any error string)
  • 728136c 2019-03-17 eisneinechse Improved finished window, more information
  • 9512b40 2019-03-16 eisneinechse Show finished window only when switched on in Preferences->Debug
  • 853049b 2019-02-25 eisneinechse Update of hardware support information text
  • 676ea2b 2019-02-13 eisneinechse Include a text with information regarding hardware accelerated codecs
  • fef8941 2019-02-02 eisneinechse Add a preset for av1 When openshot is installed on a system with ffmpeg 4.1 or higher, or when the appimage is created with ffmpeg 4.1 or higher AV1 is supported. But encoding is extremly slow!
  • 3c76f0e 2019-02-01 eisneinechse Typo that prevented that Setting was read fixed
  • 6befba2 2019-01-31 eisneinechse Cleanup source
  • 1b576cc 2019-01-31 eisneinechse Remove one environment variable reference that was overlooked
  • b56ee56 2019-01-30 eisneinechse More changes to move to Settings, still needs work
  • 0dbba24 2019-01-30 eisneinechse First changes to move from GetEnv to Settings
  • 6484e51 2019-01-29 eisneinechse Fixed Typo in the VP9 presets
  • 131fc3a 2019-01-27 eisneinechse Form follows function Use SetVideoOption again for crf Changes to prepare change for Settings
  • d6018f2 2019-01-26 eisneinechse Cosmetic changes
  • c43b5eb 2019-01-25 eisneinechse Different finished window
  • 8594382 2018-12-08 eisneinechse Bring Windows and Mac up to date
  • 79b4a65 2018-12-08 eisneinechse Removed the old hardware decode enable to avoid confusion
  • a1e86a0 2018-12-08 eisneinechse Hardware decode and encode can now be configured completely in Preferences->Performance. The old enable hardware decode is disabled. Now the graphics card can be chosen (0 is the first one) that should be used for encode and/or decode. They needn't be the same! nVidia decode still not working nVidia encode is working with driver 396 Vaapi should be working. mesa-va-drivers must be installed for AMD i965-va-driver must be installed for intel GPUs. Using one card to decode and one to encode an option with laptops with an iGPU and a dedicated GPU (dGPU), as an example.
  • c5122b0 2018-11-15 eisneinechse Changes to use AV1 if ffmpeg >= 4.0 is used with libaom support
  • 3876360 2018-11-08 eisneinechse Add a preset for AV1 in a mkv container. This is supported when ffmpeg 4 with libaom is used. Export is extremly slow though. Like 0.01 fps slow.
  • 912f6bc 2018-10-25 eisneinechse Added the message box at the end of export
  • 6f70b25 2018-09-20 eisneinechse Adjust the presets for VP9 with CRF quality settings
  • 3aeb353 2018-09-16 eisneinechse Add a preset for VP9 with CRF quality setting
  • 5df5322 2018-09-16 eisneinechse Implement the use of CRF instead od kB/s or MB/s for some formats: VP8, VP9, h264, h265 0 crf with VP9 is lossless 0 crf with VP8, h264, h265 should be lossless
  • df75ba0 2018-09-16 eisneinechse Fix slice keep both sides
  • 9c0f0a3 2018-09-13 eisneinechse Maximum width and height for hardware decode can now be set in preferences
  • ad3e223 2018-09-12 eisneinechse New presets (untested) to include hardware encoding for Linux nvidia (nv), Windows (DX), and Mac (QSV). Rename of the Linux AMD/intel entry to (va)
  • dabf2d5 2018-09-02 eisneinechse Let the user set an upper limit on the thread count used by OpenMP and ffmpeg The default is use the number of threads the CPU can use With CPUs with very high thread count it might be faster and more stable to use less cores in one part of the program.
  • ea6a44a 2018-09-01 eisneinechse Add a preset that uses the hardware accelerated VAAPI (h264 hw)
  • ca88ba5 2018-08-31 eisneinechse Show switch to enable hardware enabled decoding
  • 9d1e6b4 2018-08-23 Jonathan Thomas Fixing scale/zoom bar to correctly work when loading/saving projects. Also, fixed issues with recursive 'history' attributes on a project, causing crazy slow loading of projects / high memory utilization when opening projects.
Assets 10
Loading