mirror of
https://github.com/panda3d/panda3d.git
synced 2026-04-22 06:28:43 -05:00
Merge branch 'release/1.10.x'
This commit is contained in:
@@ -392,10 +392,10 @@ jobs:
|
||||
- name: Get thirdparty packages (macOS)
|
||||
if: runner.os == 'macOS'
|
||||
run: |
|
||||
curl -O https://www.panda3d.org/download/panda3d-1.10.15/panda3d-1.10.15-tools-mac.tar.gz
|
||||
tar -xf panda3d-1.10.15-tools-mac.tar.gz
|
||||
mv panda3d-1.10.15/thirdparty thirdparty
|
||||
rmdir panda3d-1.10.15
|
||||
curl -O https://www.panda3d.org/download/panda3d-1.10.16/panda3d-1.10.16-tools-mac.tar.gz
|
||||
tar -xf panda3d-1.10.16-tools-mac.tar.gz
|
||||
mv panda3d-1.10.16/thirdparty thirdparty
|
||||
rmdir panda3d-1.10.16
|
||||
(cd thirdparty/darwin-libs-a && rm -rf rocket)
|
||||
|
||||
- name: Set up XCode (macOS)
|
||||
|
||||
@@ -24,7 +24,7 @@ Installing Panda3D
|
||||
==================
|
||||
|
||||
The latest Panda3D SDK can be downloaded from
|
||||
[this page](https://www.panda3d.org/download/sdk-1-10-15/).
|
||||
[this page](https://www.panda3d.org/download/sdk-1-10-16/).
|
||||
If you are familiar with installing Python packages, you can use
|
||||
the following command:
|
||||
|
||||
@@ -136,7 +136,7 @@ macOS
|
||||
-----
|
||||
|
||||
On macOS, you will need to download a set of precompiled thirdparty packages in order to
|
||||
compile Panda3D, which can be acquired from [here](https://www.panda3d.org/download/panda3d-1.10.15/panda3d-1.10.15-tools-mac.tar.gz).
|
||||
compile Panda3D, which can be acquired from [here](https://www.panda3d.org/download/panda3d-1.10.16/panda3d-1.10.16-tools-mac.tar.gz).
|
||||
|
||||
After placing the thirdparty directory inside the panda3d source directory,
|
||||
you may build Panda3D using a command like the following:
|
||||
|
||||
@@ -12,6 +12,7 @@ This maintenance release fixes some minor defects and stability issues.
|
||||
* Fix use-after-free in collision system with transform cache disabled (#1733)
|
||||
* Egg: Add limited forward compatibility for metallic-roughness textures
|
||||
* OpenGL: fix error blitting depth texture on macOS (#1719)
|
||||
* OpenGL: fix SSBO not being rebound if deleted and recreated immediately
|
||||
* OpenGL: fix SSBO support not being detected in certain situations
|
||||
* GLSL: Add p3d_MetallicRoughnessTexture input mapped to M_metallic_roughness
|
||||
* X11: Add config variable to enable detection of autorepeat key events (#1735)
|
||||
|
||||
@@ -20,6 +20,7 @@ classifiers =
|
||||
Programming Language :: Python :: 3.11
|
||||
Programming Language :: Python :: 3.12
|
||||
Programming Language :: Python :: 3.13
|
||||
Programming Language :: Python :: 3.14
|
||||
Programming Language :: Python :: Implementation :: CPython
|
||||
Topic :: Games/Entertainment
|
||||
Topic :: Multimedia
|
||||
|
||||
@@ -37,6 +37,9 @@ def check_result(fut, expected):
|
||||
if fut.result() != expected:
|
||||
return False
|
||||
|
||||
if sys.version_info < (3, 5):
|
||||
return True
|
||||
|
||||
# Make sure that await also returns the values properly
|
||||
with pytest.raises(StopIteration) as e:
|
||||
next(fut.__await__())
|
||||
|
||||
Reference in New Issue
Block a user