From ec08fff3a788a2efa33cafdba77cf011a79999f3 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 13 Jan 2019 00:20:56 +0100 Subject: [PATCH 1/4] travis: enable Discord notification --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2c4efe8a65..c3991fbeb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,3 +54,8 @@ notifications: on_failure: always use_notice: true skip_join: false + webhooks: + urls: + - https://www.panda3d.org/webhooks/travis-ci.php + on_success: change + on_failure: always From 095d6ac818e88dc2a7a53bb7f68fe9f49d5eefe2 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 13 Jan 2019 13:14:58 +0100 Subject: [PATCH 2/4] readme: fix link to development builds Closes #533 [skip ci] --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 99c7c39a5d..a5cda4ee03 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Installing Panda3D ================== The latest Panda3D SDK can be downloaded from -(this page)[https://www.panda3d.org/download/sdk-1-10-0/]. +[this page](https://www.panda3d.org/download/sdk-1-10-0/). If you are familiar with installing Python packages, you can use the following comand: @@ -40,7 +40,7 @@ pip install --pre --extra-index-url https://archive.panda3d.org/ panda3d If this command fails, please make sure your version of pip is up-to-date. If you prefer to install the full SDK with all tools, the latest development -builds can be obtained from (this page)[https://www.panda3d.org/download/]. +builds can be obtained from [this page](https://www.panda3d.org/download.php?version=devel&sdk). These are automatically kept up-to-date with the latest GitHub version of Panda. From 5a9a87d2c101a940c898a8246bd6ac349ab7b444 Mon Sep 17 00:00:00 2001 From: Younguk Kim Date: Sun, 13 Jan 2019 22:04:27 +0900 Subject: [PATCH 3/4] makepanda: fix link error of assimp tool Closes #535 --- makepanda/makepanda.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index dc0bded1f8..6e56cfccf3 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -5825,7 +5825,7 @@ if not PkgSkip("PANDATOOL") and not PkgSkip("ASSIMP"): TargetAdd('p3assimp_composite1.obj', opts=OPTS, input='p3assimp_composite1.cxx') TargetAdd('libp3assimp.dll', input='p3assimp_composite1.obj') TargetAdd('libp3assimp.dll', input=COMMON_PANDA_LIBS) - TargetAdd('libp3assimp.dll', opts=OPTS+['ZLIB']) + TargetAdd('libp3assimp.dll', opts=OPTS+['ZLIB', 'ADVAPI']) # # DIRECTORY: pandatool/src/daeprogs/ From 955081f81f060f20befd86c8aefbbea64148f75e Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Sun, 13 Jan 2019 13:23:20 -0700 Subject: [PATCH 4/4] movies: Fix missing includes in {opus,vorbis}AudioCursor.cxx --- panda/src/movies/opusAudioCursor.cxx | 4 ++++ panda/src/movies/vorbisAudioCursor.cxx | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/panda/src/movies/opusAudioCursor.cxx b/panda/src/movies/opusAudioCursor.cxx index 2b1591e971..8554215088 100644 --- a/panda/src/movies/opusAudioCursor.cxx +++ b/panda/src/movies/opusAudioCursor.cxx @@ -12,6 +12,10 @@ */ #include "opusAudioCursor.h" + +#include "config_movies.h" + +#include "opusAudio.h" #include "virtualFileSystem.h" #ifdef HAVE_OPUS diff --git a/panda/src/movies/vorbisAudioCursor.cxx b/panda/src/movies/vorbisAudioCursor.cxx index d4478c9f07..d3210ae46e 100644 --- a/panda/src/movies/vorbisAudioCursor.cxx +++ b/panda/src/movies/vorbisAudioCursor.cxx @@ -12,6 +12,10 @@ */ #include "vorbisAudioCursor.h" + +#include "config_movies.h" + +#include "vorbisAudio.h" #include "virtualFileSystem.h" #ifdef HAVE_VORBIS