Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Workaround para tener aceleración gráfica en placas nvidia con drivers privativos (parche con menos dependencias) #306

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

[WIP] Workaround para tener aceleración gráfica en placas nvidia con drivers privativos (parche con menos dependencias) #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1503735
Merge branch 'develop'
hugoruscitti Nov 22, 2017
ca3484e
release 1.4.12
hugoruscitti Nov 23, 2017
ccb6355
Forma sin dependencias externas de fixear el bug con aceleración
iglosiggio Dec 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
N=
V=

VERSION=1.4.11
VERSION=1.4.12
VPS_HOST=162.243.50.192

all:
Expand Down
8 changes: 4 additions & 4 deletions data/asistente/js/version.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.', ]
}
2 changes: 1 addition & 1 deletion extras/actualizar_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion extras/instalador.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pilasengine/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

import widget

VERSION = "1.4.11"
VERSION = "1.4.12"


def handler(signum, frame):
Expand Down
4 changes: 4 additions & 0 deletions pilasengine/widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion setup-mac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']),
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down