Skip to content

Commit

Permalink
Merge pull request #50165 from KoBeWi/take_it_easing
Browse files Browse the repository at this point in the history
  • Loading branch information
akien-mga authored Sep 24, 2021
2 parents 5e4a712 + 11e7963 commit 53306cb
Show file tree
Hide file tree
Showing 6 changed files with 437 additions and 335 deletions.
12 changes: 7 additions & 5 deletions COPYRIGHT.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,13 @@ Copyright: 2008-2016, The Android Open Source Project
2002, Google, Inc.
License: Apache-2.0

Files: ./scene/animation/easing_equations.h
Comment: Robert Penner's Easing Functions
Copyright: 2001, Robert Penner
2007-2021 Juan Linietsky, Ariel Manzur.
2014-2021 Godot Engine contributors.
License: Expat

Files: ./servers/physics_3d/collision_solver_3d_sat.cpp
Comment: Open Dynamics Engine
Copyright: 2001-2003, Russell L. Smith, Alen Ladavac, Nguyen Binh
Expand Down Expand Up @@ -307,11 +314,6 @@ Comment: Fast Filtering of Reflection Probes
Copyright: 2016, Activision Publishing, Inc.
License: Expat

Files: ./thirdparty/misc/easing_equations.cpp
Comment: Robert Penner's Easing Functions
Copyright: 2001, Robert Penner
License: BSD-3-clause

Files: ./thirdparty/misc/fastlz.c
./thirdparty/misc/fastlz.h
Comment: FastLZ
Expand Down
3 changes: 0 additions & 3 deletions scene/animation/SCsub
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@ Import("env")

thirdparty_obj = []

thirdparty_sources = "#thirdparty/misc/easing_equations.cpp"

env_thirdparty = env.Clone()
env_thirdparty.disable_warnings()
env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
env.scene_sources += thirdparty_obj

# Godot source files
Expand Down
Loading

0 comments on commit 53306cb

Please sign in to comment.