Commits · master · Games / Amor

23 Mar, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 4c52b056

Script Kiddy authored Mar 23, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

4c52b056

20 Mar, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 94ccf262

Script Kiddy authored Mar 20, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

94ccf262

18 Nov, 2021 2 commits
- Make more cmake target centric code · 803bb85b
  Laurent Montel authored Nov 18, 2021
  
  803bb85b
- GIT_SILENT: allow to show header file in qtc6 · 5a52b770
  Laurent Montel authored Nov 18, 2021
  
  5a52b770
03 Nov, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 082dc29f

Script Kiddy authored Nov 03, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

082dc29f

29 Oct, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · f65df515

Script Kiddy authored Oct 29, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

f65df515

26 Oct, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · b26baf8c

Script Kiddy authored Oct 26, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

b26baf8c

09 Oct, 2021 2 commits
- Documentation updates · 11aaaa67
  Antoni Bella Pérez authored Oct 09, 2021
```
* Update date and version numbers
* Suitable tags, punctuation and some improves (update to oneko-sakura, current app)
* GUI sync
* Change http: to https:
* Rework the man page
```
  11aaaa67
- Add a @title:window helper to GUI messages · 14d055a7
  Antoni Bella Pérez authored Oct 09, 2021
  
  14d055a7
29 Sep, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · b03d9891

Script Kiddy authored Sep 29, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

b03d9891

23 Aug, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · f2a44a97

Script Kiddy authored Aug 23, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

f2a44a97

08 Jul, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 973dc27b

Script Kiddy authored Jul 08, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

973dc27b

24 Jun, 2021 2 commits
- Ignore file · 74c1c637
  Laurent Montel authored Jun 24, 2021
  
  74c1c637
- GIT_SILENT: time to increase version · 41df0880
  Laurent Montel authored Jun 24, 2021
  
  41df0880
06 May, 2021 1 commit
- GIT_SILENT Add auto generated files to .gitignore · dbd8ecd7
  Alexander Lohnau authored May 06, 2021
  
  dbd8ecd7
08 Apr, 2021 1 commit
- Add missing override · 3306c90e
  Laurent Montel authored Apr 08, 2021
```
Fix compile without deprecated method
```
  3306c90e
30 Dec, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 4fed9024

Script Kiddy authored Dec 30, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

4fed9024

04 Jul, 2020 1 commit
- KRandom -> QRandomGenerator · d434e087
  Albert Astals Cid authored Jul 04, 2020
```
KRandom is now deprecated
```
  d434e087
18 Jun, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · b96f8ca8

Script Kiddy authored Jun 18, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

b96f8ca8

17 Jun, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 43f16cec

Script Kiddy authored Jun 17, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

43f16cec

02 Jun, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · e0d24692

Script Kiddy authored Jun 02, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

e0d24692

20 May, 2020 1 commit
- GIT_SILENT: add Amor icon as repository logo · 5620c2e3
  Yuri Chornoivan authored May 20, 2020
  
  5620c2e3
26 Dec, 2019 4 commits
- change animation to destroy on change window · 013e1f4d
  Stefan Yohansson Areeira Pinto authored Dec 25, 2019
  
  013e1f4d
- current desktop change signal is only emitted when desktop changed. · 66dcbf60
  Stefan Yohansson Areeira Pinto authored Dec 25, 2019
  
  66dcbf60
- Prevent choose another window when change active window. · 758ee761
  Stefan Yohansson Areeira Pinto authored Dec 25, 2019
```
- Prevent animations on drag
```
  758ee761
- use fitsInWorkArea variable in order to improve readability · 969220a6
  Stefan Yohansson Areeira Pinto authored Dec 25, 2019
  
  969220a6
19 Nov, 2019 1 commit
- remove super outdated TODO list · 29eedd11
  Stefan Yohansson Areeira Pinto authored Nov 18, 2019
  
  29eedd11
12 Jun, 2019 1 commit
- doc: Write docbook date in standard format · 96a9bb76
  Alexander Potashev authored Jun 12, 2019
  
  96a9bb76
01 Jun, 2019 8 commits

React to the screensaver properly · 906583e8
Pino Toscano authored Jun 01, 2019
```
Connect to the right D-Bus signal.
```
906583e8

Remove wrong methods from D-Bus interface · 5b6a8256

Pino Toscano authored Jun 01, 2019

screenSaverStopped, and screenSaverStarted are private slots to react
to the screensaver start/stop, not to be called by users.

5b6a8256

Drop the session widget · ef4b8c99

Pino Toscano authored Jun 01, 2019

Originally introduced in 1999 (!), it seems it is no longer needed:
- there is no session handling done
- there is already the AmorWidget as main widget of the application

ef4b8c99

Delete all the AmorAnimationGroup's · 0861b46d
Pino Toscano authored Jun 01, 2019

0861b46d

Hash the AmorAnimationGroup lists by value · 5d3ec600

Pino Toscano authored Jun 01, 2019

No need to create AmorAnimationGroup as objects on the heap, just store
them as values in the hash of the animations.

5d3ec600

Delete cache pixmaps when changing theme · bda5cbfb
Pino Toscano authored Jun 01, 2019
```
Make sure to delete all the pixmaps when the theme is changed.
```
bda5cbfb
Delete the context menu · 340ae64b
Pino Toscano authored Jun 01, 2019
```
Make sure the context menu is properly deleted on shutdown.
```
340ae64b

Store QueueItem's by value · 93b5121b

Pino Toscano authored Jun 01, 2019

Instead of storing them as heap objects, store them by value; QQueue
allows to in-place change the items in it.

This fixes the leaks of the QueueItem objects, dequeued after showing
the tips they contain.

93b5121b

31 May, 2019 2 commits
- Remove Q_OS_LINUX conditionals for XCB code · b68f1c70
  Pino Toscano authored May 31, 2019
```
XCB is not specific to Linux, and anyway it is already an unconditional
build requirement.
```
  b68f1c70
- cmake: use feature_summary() · f99eae97
  Pino Toscano authored May 31, 2019
  
  f99eae97
06 Jan, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · b7699997

Script Kiddy authored Jan 06, 2019

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

b7699997

05 Jan, 2019 1 commit
- Use ecm_setup_version · 278a0d41
  Pino Toscano authored Jan 05, 2019
```
Avoids the need to maintain a version header.
```
  278a0d41