From ca3484ed8fe734632cd16764506739c1134ca310 Mon Sep 17 00:00:00 2001 From: Hugo Ruscitti Date: Thu, 23 Nov 2017 17:26:21 -0300 Subject: [PATCH 1/2] release 1.4.12 --- Makefile | 2 +- data/asistente/js/version.js | 8 ++++---- extras/actualizar_version.py | 2 +- extras/instalador.nsi | 2 +- pilasengine/__init__.py | 2 +- setup-mac.py | 2 +- setup.py | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 7055edf18..d3d32cfd9 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ N= V= -VERSION=1.4.11 +VERSION=1.4.12 VPS_HOST=162.243.50.192 all: diff --git a/data/asistente/js/version.js b/data/asistente/js/version.js index 47b1b3d66..1d77e9e07 100644 --- a/data/asistente/js/version.js +++ b/data/asistente/js/version.js @@ -1,7 +1,7 @@ window.DESCRIPCION_VERSION = { - version: '1.4.11', - fecha: '14 de Jun del 2017', - commit: '8c1bb38', - changelog: ['Merge branch "develop"', 'actualizando manual.', 'Implementando el método luego_de_actualizar en los actores.', 'actualizando manual.', 'Merge branch "develop" of github.com:hugoruscitti/pilas into develop', ] + version: '1.4.12', + fecha: '23 de Nov del 2017', + commit: '1503735d', + changelog: ['Merge branch "develop"', 'Agregando función para obtener todos los actores de la escena closes #303', 'Merge branch "master" into develop', 'Agregando instrucciones para instalar pyqt4.', 'Resolviendo conflicto de versiones.', ] } diff --git a/extras/actualizar_version.py b/extras/actualizar_version.py index 5368880c1..8312387bf 100644 --- a/extras/actualizar_version.py +++ b/extras/actualizar_version.py @@ -28,7 +28,7 @@ changelist = item template = template.\ - replace('VERSION_STR', '1.4.11').\ + replace('VERSION_STR', '1.4.12').\ replace('FECHA', hoy.strftime('%d de %b del %Y')).\ replace('CHANGELOG_LIST', changelist).\ replace('COMMIT', str(commit)) diff --git a/extras/instalador.nsi b/extras/instalador.nsi index 9821fe83f..b792689d3 100644 --- a/extras/instalador.nsi +++ b/extras/instalador.nsi @@ -13,7 +13,7 @@ ;Name and file Name "pilas-engine" - OutFile "pilas-engine_1.4.11.exe" + OutFile "pilas-engine_1.4.12.exe" ;Default installation folder InstallDir "c:\pilas-engine" diff --git a/pilasengine/__init__.py b/pilasengine/__init__.py index 0929fc2d5..5ca8458a0 100644 --- a/pilasengine/__init__.py +++ b/pilasengine/__init__.py @@ -43,7 +43,7 @@ import widget -VERSION = "1.4.11" +VERSION = "1.4.12" def handler(signum, frame): diff --git a/setup-mac.py b/setup-mac.py index 2ba674ac2..fb9944838 100644 --- a/setup-mac.py +++ b/setup-mac.py @@ -2,7 +2,7 @@ setup( name='pilas-engine', - version="1.4.11", + version="1.4.12", app=["bin/pilasengine"], data_files = [ ('bin/pilasengine', ['bin/pilasengine']), diff --git a/setup.py b/setup.py index 704b1cb2f..5b8ea3313 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name='pilas', zip_safe=False, - version="1.4.11", + version="1.4.12", description="""Pilas Engine - un motor para realizar videojuegos de manera rápida y sencilla. Es una herramienta orientada a programadores casuales From ccb6355916e7b34738e1e2fddd3569d66f0526c6 Mon Sep 17 00:00:00 2001 From: Ignacio Losiggio Date: Fri, 22 Dec 2017 16:54:36 -0300 Subject: [PATCH 2/2] =?UTF-8?q?Forma=20sin=20dependencias=20externas=20de?= =?UTF-8?q?=20fixear=20el=20bug=20con=20aceleraci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pilasengine/widget.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pilasengine/widget.py b/pilasengine/widget.py index 2d7fb4b71..ed4ea0ef0 100644 --- a/pilasengine/widget.py +++ b/pilasengine/widget.py @@ -41,6 +41,10 @@ class WidgetConAceleracion(QGLWidget): """ def __init__(self, pilas, titulo, ancho, alto, capturar_errores=True): + # Workaround para este bug + # https://riverbankcomputing.com/pipermail/pyqt/2014-January/033681.html + import ctypes, ctypes.util + ctypes.CDLL(ctypes.util.find_library('GL'), ctypes.RTLD_GLOBAL) self.pilas = pilas super(WidgetConAceleracion, self).__init__() self.setMinimumSize(200, 200)