Merge community patches #15

rzr · 2021-01-19T11:45:31Z

First we;ll need to identify them:

`git clean -Xdf`

…ot be used) Change on-screen messages related to configuration (reset and ball launch). Also make it possible to change the "reset" key, instead of it being hard-coded. Add modification notices.

This fixes an issue where, if the flippers were up when the game ended, after a reset they would remain up.

Origin: sergiomb2@2141d21 Last-update: 2021-01-19 Relate-to: #15 Change-Id: Ib3307d2d609f212b184d3d94ad95f4c0e7184f7a

Change-Id: I66ebb90ccd40118d94ded82fbb1117e336dde4e4 Origin: sergiomb2@fbe5938 Relate-to: #15 Last-update: 2021-02-11 Signed-off-by: Philippe Coval <[email protected]>

rzr · 2021-05-11T12:48:26Z

sergiomb2@f1e5309e : 'just noted mem leak MLK osx port' @rzr
sergiomb2@0de88042 : 'Macosx trick by Eye (rzr friend)' @rzr
sergiomb2@3b65970d : 'sound and image files' @henqvist
sergiomb2@13604d6c : 'add' @henqvist
sergiomb2@a6feab02 : 'some macosx fixes' @rzr
sergiomb2@f4762c26 : '*** empty log message ***' @rzr
sergiomb2@039ae996 : 'debian metadata (from prev version)' @rzr
sergiomb2@30238cdf : 'started debian patch' @rzr
sergiomb2@055c9ebb : 'debian merge' @rzr
sergiomb2@8c97a88e : '*** empty log message ***' @rzr
sergiomb2@1b887f0e : 'lintian' @rzr
sergiomb2@3b0e2675 : ' * Merged debian patches from : pinball_0.3.1-7.diff.gz (debian/ ommited)' @rzr
sergiomb2@f44d5075 : ' * Replaced debian dir with 'pinball_0.3.1-7.diff.gz'' @rzr
sergiomb2@8fbe786a : 'Rebuilt on debian, fix warnings' @rzr
sergiomb2@5a11117b : 'Remove generated file' @rzr
sergiomb2@2141d210 : 'Fix build issue' @rzr
sergiomb2@55c0eb93 : 'install mid once' @rzr
sergiomb2@c2d3e8eb : 'debuild' @rzr
sergiomb2@e80c47a2 : 'Depends on aclocal' @rzr
sergiomb2@3f45fe35 : 'fix and build on lucid now' @rzr
sergiomb2@890e8a7f : 'Merge: pinball_0.3.1-12.dsc Tested to rebuild gnu table' @rzr
sergiomb2@b347fa16 : 'Merge pinball_0.3.1-12.dsc/debian' @rzr
sergiomb2@23259547 : 'Imported Debian patch 0.3.1-7' @jochen
sergiomb2@f2b98c6c : 'Imported Debian patch 0.3.1-13' @jochen
sergiomb2@4803095b : 'rebuild: on debian x86' @rzr
sergiomb2@39f80463 : 'clean: distclean' @rzr
sergiomb2@b405a331 : 'build: amd64 ubuntu' @rzr
sergiomb2@458245bf : 'clean: manually' @rzr
sergiomb2@29e2d3df : 'build: meego netbook' @rzr
sergiomb2@92df4b8d : 'add: helper links' @rzr
sergiomb2@9d6b1957 : 'build: meego rpm' @rzr
sergiomb2@03f56cea : 'fix: debian' @rzr
sergiomb2@32342e27 : 'build: deb on debian' @rzr
sergiomb2@f8720914 : 'build: ignore generated files (debian)' @rzr
sergiomb2@56c7910f : 'build: meego-handset-sdk' @rzr
sergiomb2@6c773f95 : 'fix: ac on meego' @rzr
sergiomb2@56344611 : 'build: meego-handset-sdk' @rzr
sergiomb2@ec3badd6 : 'build: meego-handset-sdk' @rzr
sergiomb2@07e5e117 : 'build: meego-handset-sdk' @rzr
sergiomb2@f3b75e52 : 'build: meego-handset-sdk' @rzr
sergiomb2@c9a3bf9a : 'add: ratio Close #555251 ( http://bugs.debian.org/555251 )' @rzr
sergiomb2@b2bf4d30 : 'fix: minor bug' @rzr
sergiomb2@34ef2c57 : 'merge: from tracker' @rzr
sergiomb2@0136a78f : 'build: debian x86' @rzr
sergiomb2@0b86c850 : 'fix: ratio bug' @rzr
sergiomb2@1ab59483 : 'fail: build: meego: obs:' @rzr
sergiomb2@6bb98362 : 'fix: width issue ; run: meego-neetbook' @rzr
sergiomb2@b5528f91 : 'branch: pinball-data-extra provide a hurd table' @rzr
sergiomb2@b3469fea : 'merge: professor form Paolo Caroni' @rzr
sergiomb2@faf300ae : 'build: maemo: freemantle (x86)' @rzr
sergiomb2@9d2a9a25 : 'add: comment fr' @rzr
sergiomb2@ef549c96 : 'revert: deb' @rzr
sergiomb2@ab7568cd : 'merge: http://pdb.finkproject.org/pdb/package.php/pinball' @rzr
sergiomb2@7d6355ec : 'fix: const' @rzr
sergiomb2@8bd71af5 : 'verbose version' @rzr
sergiomb2@e03687d0 : 'imported gnu table from Paolo Caroni archive see 'data/hurd/README.txt'' @rzr
sergiomb2@b6ba5456 : 'import: http://pastefile.com/uploads/gnu.tar.gz [Ben Asselstine]' @rzr
sergiomb2@46dcb9c6 : 'delete mkinstalldirs' @rzr
sergiomb2@0ca7f5cb : 'Merge branch 'pinball-data-extra'' @sergio
sergiomb2@9e1d9fe2 : 'I18n and translation into German added.' @stephankreutzer
sergiomb2@08e78d30 : 'Merge pull request I18n and translation into German added. #1 from skreutzer/master' @rzr
sergiomb2@a77ef7ef : 'Merge github.com:rzr/pinball' @sergio
sergiomb2@19b666f3 : 'Deleted: data/gnu/.README.swp' @sergio
sergiomb2@4ce3ad76 : 'Increase drawing quality of the ball' @Willem3141
sergiomb2@579493fc : 'Try update hurd table.' @sergio
sergiomb2@7ebc35f9 : 'The incomplete and mysterious table named house.' @sergio
sergiomb2@48f0aa5b : 'Update gnu table to gnu-3.1-20130301.tar.gz' @sergio
sergiomb2@f13ad5c3 : 'Removed patches that are already applied' @sergio
sergiomb2@313afd74 : 'cp data/hurd.old/up.wav data/hurd' @sergio
sergiomb2@508b7f95 : 'Removed Debian patches, also already committed.' @sergio
sergiomb2@a44b37fe : 'Updated pinball.desktop' @sergio
sergiomb2@fbe59383 : 'Fixed the permissions of all files.' @sergio
sergiomb2@a0f1872e : 'deleted: depcomp' @sergio
sergiomb2@7a563cf8 : 'Add missing file for RZR_PATCHES' @sergio
sergiomb2@ca7738fa : 'Fix and update autotools' @sergio
sergiomb2@bcab49ad : 'Added pinball.appdata.xml' @sergio
sergiomb2@74d271b9 : 'data/hurd.old/ equal to pinball.rzr/data/hurd' @sergio
sergiomb2@cbc0d6a2 : 'Add more screen ratios and add a test of setScale' @sergio
sergiomb2@784c7d1b : 'Update urls of homepage to advertise new releases.' @sergio
sergiomb2@b5743829 : 'Don't create highscores files.' @sergio
sergiomb2@438fcdc3 : 'Bring back old professor table' @sergio
sergiomb2@bcbc2627 : 'Move configuration to ~/.config' @sergio
sergiomb2@f78a46a6 : 'upgrade Professor2 to the last version' @kenren89
sergiomb2@7c664af0 : 'Upgrade README file on my table' @kenren89
sergiomb2@bf53b002 : 'Fedora pinball.spec' @sergio
sergiomb2@2b3d82b3 : 'Add License.txt' @sergio
sergiomb2@883cfe4d : 'Update License.txt' @sergio
sergiomb2@a76d9cf6 : 'Keyboard is now cleared on reset.' @c30zd.x
sergiomb2@32db9b5e : 'Do not install midi version of the intro' @lists.jjorge
sergiomb2@925793a8 : 'Save .hiscore in ~/.config/emilia' @sergio
sergiomb2@631b4d01 : 'Simulate behavior of flippers when the game has ended (i.e. they cannot be used)' @c30zd.x
sergiomb2@173a9047 : 'Fix gettext strings in Score.cpp and update localization files.' @c30zd.x
sergiomb2@04164ec8 : 'Started french translation' @jjorge
sergiomb2@9b7a7d52 : 'Finish french translation, removed bogus references to de_DE translator.' @jjorge
sergiomb2@0555b16a : 'ascii only french text as pinball font only understands that' @jjorge
sergiomb2@ccf34ddf : 'fix french texts to fit on screen' @jjorge
sergiomb2@733f1537 : 'portuguese translation' @jjorge
sergiomb2@7191611e : 'corrected french translation' @jjorge
sergiomb2@7c6e0709 : 'Correct one sentence' @sergio
sergiomb2@b9878524 : 'Add AM_GNU_GETTEXT and bump release.' @sergio
sergiomb2@07cdbff2 : 'Fix commit 1f16f06 not use array with limited size' @sergio
sergiomb2@616a1caf : 'Use charset=UTF-8 in translations' @sergio
sergiomb2@74cb9027 : 'We may require just gettext-0.17 to build in RHEL6' @sergio
sergiomb2@499b1ea2 : 'fix long strings' @lists.jjorge
sergiomb2@3205b02e : 'Move debian folder to downstream folder' @sergio
sergiomb2@b96a7f2d : 'delete data/locale/update_utf8.sh and update po files' @sergio
sergiomb2@bf295487 : 'Add generated files by gettext to .gitignore' @sergio
sergiomb2@1d9c2e78 : 'Add gettext to debian package depends' @sergio
sergiomb2@5713beda : 'Deleted clean file, clean is done with git' @sergio
sergiomb2@38bd6037 : 'Translations for Catalan and Spanish' @sergio
sergiomb2@21c3e144 : '01-random-table-load.patch' @sergio
sergiomb2@d1177ba7 : 'pinball.desktop set keywords' @sergio
sergiomb2@eeef6532 : 'Update ChangeLog with git changelog -a' @sergio
sergiomb2@634f92ef : 'Delete file pinball.pot' @sergio
sergiomb2@f525c003 : 'close this error report:' @sergio
sergiomb2@295235c6 : 'Rename README to README.md' @arashrj
sergiomb2@c8abf5d2 : 'Update README.md' @arashrj
sergiomb2@f66b02e6 : 'Update README.md' @arashrj
sergiomb2@2d8be762 : 'Bugfix : config width can't be saved if it is bigger than 1600 pixels' @lists.jjorge
sergiomb2@074f15ef : 'Add some screens sizes' @lists.jjorge
sergiomb2@dd7f5679 : 'Revert changes on README' @sergio
sergiomb2@0ccffed1 : 'Merge remote-tracking branch 'upstream/master'' @sergio
sergiomb2@afd9b559 : 'Readd changes on README' @sergio

rzr mentioned this issue Jan 19, 2021

Please forward patches upstream sergiomb2/pinball#32

Open

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

import: http://pastefile.com/uploads/gnu.tar.gz [Ben Asselstine]

b6ba545

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

Checked for Mem leak , not corrected just noted MLK

c540121

rzr referenced this issue Jan 19, 2021

isn't it better 10 high scores?

2193408

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

isn't it better 10 high scores?

8bd71a7

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

Removed Debian patches, also already committed.

508b7f9

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

Deleted clean file, clean is done with git

5713bed

`git clean -Xdf`

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

pinball.desktop set keywords

d1177ba

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

*** empty log message ***

8c97a88

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

lintian

1b887f0

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

delete mkinstalldirs

46dcb9c

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

Added pinball.appdata.xml

bcab49a

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

Keyboard is now cleared on reset.

a76d9cf

This fixes an issue where, if the flippers were up when the game ended, after a reset they would remain up.

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

debian merge

055c9eb

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

started debian patch

30238cd

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

debian metadata (from prev version)

039ae99

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

* Replaced debian dir with 'pinball_0.3.1-7.diff.gz'

f44d507

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

install mid once

55c0eb9

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

debuild

c2d3e8e

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

Depends on aclocal

e80c47a

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

fix and build on lucid now

3f45fe3

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

fix: debian

03f56ce

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

build: deb on debian

32342e2

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

build: ignore generated files (debian)

f872091

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

build: debian x86

0136a78

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

Remove generated file

5a11117

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

clean: distclean

39f8046

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

add: comment fr

9d2a9a2

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

revert: deb

ef549c9

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

Deleted: data/gnu/.README.swp

19b666f

rzr referenced this issue in sergiomb2/pinball Jan 19, 2021

Fixed the permissions of all files.

fbe5938

rzr added a commit that referenced this issue Jan 22, 2021

Fix build issue

0eb409e

Origin: sergiomb2@2141d21 Last-update: 2021-01-19 Relate-to: #15 Change-Id: Ib3307d2d609f212b184d3d94ad95f4c0e7184f7a

rzr pushed a commit that referenced this issue Feb 13, 2021

data: Fixed the permissions of all files.

c3c9355

Change-Id: I66ebb90ccd40118d94ded82fbb1117e336dde4e4 Origin: sergiomb2@fbe5938 Relate-to: #15 Last-update: 2021-02-11 Signed-off-by: Philippe Coval <[email protected]>

rzr referenced this issue in sergiomb2/pinball Jun 10, 2021

I18n and translation into German added.

9e1d9fe

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge community patches #15

Merge community patches #15

rzr commented Jan 19, 2021

rzr commented May 11, 2021 •

edited

Loading

Merge community patches #15

Merge community patches #15

Comments

rzr commented Jan 19, 2021

rzr commented May 11, 2021 • edited Loading

rzr commented May 11, 2021 •

edited

Loading