[python-sfml] 02/12: Merge tag 'upstream/2.2_git20150611.196c88+dfsg' into master-new
James Cowgill
jcowgill-guest at moszumanska.debian.org
Tue Jun 30 14:21:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
jcowgill-guest pushed a commit to branch master
in repository python-sfml.
commit b52c187cfbb6866bf4a197fd44b09e7550373fbf
Merge: e6c26c0 c6135a7
Author: James Cowgill <james410 at cowgill.org.uk>
Date: Tue Jun 30 12:44:13 2015 +0100
Merge tag 'upstream/2.2_git20150611.196c88+dfsg' into master-new
Upstream version 2.2~git20150611.196c88+dfsg
# gpg: Signature made Tue 30 Jun 2015 12:44:12 BST using RSA key ID EA2D01EF
# gpg: Good signature from "James Cowgill <james410 at cowgill.org.uk>"
# gpg: aka "James Cowgill <jc1311 at york.ac.uk>"
# gpg: aka "James Cowgill (Imagination Technologies) <James.Cowgill at imgtec.com>"
COPYING | 165 -
LICENSE | 21 +
README.rst | 13 +-
doc/source/addons.rst | 2 +-
doc/source/api/api_index.rst | 4 +-
doc/source/api/audio.rst | 114 +-
doc/source/api/graphics.rst | 296 +-
doc/source/api/network.rst | 14 +-
doc/source/api/system.rst | 4 +-
doc/source/api/window.rst | 270 +-
doc/source/c_api.rst | 8 +-
doc/source/changelog.rst | 8 +-
doc/source/conf.py | 2 +-
doc/source/download.rst | 64 +-
doc/source/examples.rst | 21 +-
doc/source/gettingstarted.rst | 33 +-
doc/source/index.rst | 12 +-
doc/source/todo.rst | 51 +-
doc/source/tutorials.rst | 8 +-
doc/source/tutorials/handling_time.rst | 2 +-
.../opening_and_managing_a_sfml_window.rst | 8 +-
doc/source/tutorials/threads.rst | 8 +-
doc/source/whatsnew.rst | 14 +-
examples/embedding/main.cpp | 11 -
examples/embedding/script.py | 12 +-
examples/extending/extension.pyx | 10 -
examples/extending/main.py | 12 +-
examples/ftp/ftp.py | 152 +-
examples/opengl/opengl.py | 233 +-
examples/opengl/resources/sansation.ttf | Bin 0 -> 28912 bytes
examples/pong/data/ball.wav | Bin 0 -> 15442 bytes
examples/pong/data/sansation.ttf | Bin 0 -> 28912 bytes
examples/pong/pong.py | 226 +-
examples/pyqt4/pyqt4.py | 12 +-
examples/pyqt4/qsfml_canvas.py | 115 +-
examples/{pyqt4/pyqt4.py => pyqt5/pyqt5.py} | 20 +-
examples/pyqt5/qsfml_canvas.py | 72 +
examples/shader/data/blink.frag | 9 +
examples/shader/data/blur.frag | 20 +
examples/shader/data/devices.png | Bin 0 -> 51410 bytes
examples/shader/data/edge.frag | 32 +
examples/shader/data/pixelate.frag | 9 +
examples/shader/data/sansation.ttf | Bin 0 -> 28912 bytes
examples/shader/data/sfml.png | Bin 0 -> 25973 bytes
examples/shader/data/storm.vert | 19 +
examples/shader/data/text-background.png | Bin 0 -> 745 bytes
examples/shader/data/text.txt | 18 +
examples/shader/data/wave.vert | 15 +
examples/shader/shader.py | 404 ++-
examples/sockets/sockets.py | 200 +-
examples/sound/sound.py | 72 +-
examples/sound_capture/sound_capture.py | 94 +-
examples/spacial_music/data/sansation.ttf | Bin 0 -> 28912 bytes
examples/spacial_music/spacial_music.py | 13 +-
examples/voip/client.py | 88 +-
examples/voip/server.py | 174 +-
examples/voip/voip.py | 16 +-
include/libcpp/blendmode.pxd | 52 +-
include/libcpp/event.pxd | 73 +-
include/libcpp/font.pxd | 30 +
include/libcpp/ftp.pxd | 66 +-
include/libcpp/ftp/response.pxd | 116 +-
include/libcpp/http.pxd | 58 +-
include/libcpp/http/request.pxd | 36 +-
include/libcpp/http/response.pxd | 76 +-
include/libcpp/ipaddress.pxd | 29 +-
include/libcpp/joystick.pxd | 75 +-
include/libcpp/keyboard.pxd | 239 +-
include/libcpp/listener.pxd | 35 +-
include/libcpp/mouse.pxd | 53 +-
include/libcpp/primitivetype.pxd | 44 +-
include/libcpp/renderstates.pxd | 30 +-
include/libcpp/sensor.pxd | 40 +
include/libcpp/sfml.pxd | 1567 +++++-----
include/libcpp/shader.pxd | 45 +-
include/libcpp/socket.pxd | 42 +-
include/libcpp/soundrecorder.pxd | 33 +-
include/libcpp/soundsource.pxd | 36 +-
include/libcpp/soundstream.pxd | 31 +
include/libcpp/style.pxd | 43 +-
include/libcpp/text.pxd | 39 +-
include/libcpp/texture.pxd | 41 +-
include/libcpp/time.pxd | 30 +-
include/libcpp/touch.pxd | 31 +
include/libcpp/transform.pxd | 28 +
include/libcpp/udpsocket.pxd | 32 +-
include/libcpp/videomode.pxd | 31 +-
include/pysfml/audio.pxd | 10 +-
include/pysfml/graphics.pxd | 111 +-
include/pysfml/network.pxd | 10 +-
include/pysfml/system.pxd | 74 +-
include/pysfml/window.pxd | 57 +-
setup.py | 214 +-
src/sfml/DerivableDrawable.cpp | 41 +-
src/sfml/DerivableDrawable.hpp | 34 +-
src/sfml/DerivableRenderWindow.cpp | 44 +-
src/sfml/DerivableRenderWindow.hpp | 42 +-
src/sfml/DerivableSoundRecorder.cpp | 53 +-
src/sfml/DerivableSoundRecorder.hpp | 38 +-
src/sfml/DerivableSoundStream.cpp | 57 +-
src/sfml/DerivableSoundStream.hpp | 38 +-
src/sfml/DerivableWindow.cpp | 45 +-
src/sfml/DerivableWindow.hpp | 42 +-
src/sfml/__init__.py | 20 +-
src/sfml/audio.pyx | 725 +++--
src/sfml/error.cpp | 42 +-
src/sfml/error.hpp | 32 +-
src/sfml/graphics.pyx | 3138 +++++++++++---------
src/sfml/hacks.h | 29 +
src/sfml/network.pyx | 1200 ++++----
src/sfml/sf.py | 14 +
src/sfml/system.pyx | 1049 ++++---
src/sfml/window.pyx | 1583 +++++-----
tests/system/__init__.py | 0
tests/system/test_clock.py | 26 -
tests/system/test_time.py | 36 -
tests/system/test_vector2.py | 24 -
tests/system/test_vector3.py | 27 -
118 files changed, 8328 insertions(+), 6808 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/python-sfml.git
More information about the Pkg-games-commits
mailing list