Merge pull request #2 from eugeneloza/acmepjz-master
Fix merge conflict
Description
Description
Details
Details
- Provenance
Eugene Loza Authored on Oct 6 2018, 1:13 AM GitHub Committed on Oct 6 2018, 1:13 AM - Parents
- R79:480142faabc0: Merge branch 'master' of https://github.com/acmepjz/meandmyshadow into acmepjz…
R79:da1fbeff378c: Proof-reading part 2 (Russian) - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Merged Changes
Merged Changes
This commit merges a very large number of changes. Only the first 50 are shown.
- Authoreugeneloza
- 212010a14607 Merge branch 'origin/master' into WeblateAuthorHosted Weblate
- e1e89c260332 Translated using Weblate (Norwegian Bokmål)AuthorPetter Reinholdtsen
- 0d993fc777d5 show time and recordings during replayAuthoracme_pjz
- 25c13759d397 fix compile under clangAuthoracme_pjz
- 2bf539e387fa fix a stupid mistake and a rand() mistakeAuthoracme_pjz
- Authoracme_pjz
- Authoracme_pjz
- 0913f6d8768b Translated using Weblate (Norwegian Bokmål)AuthorAllan Nordhøy
- 003c32988f93 Merge branch 'origin/master' into WeblateAuthorHosted Weblate
- 0aab9e6c3927 Translated using Weblate (German)AuthorWuzzy
- Authoracme_pjz
- 3d39579b40b4 slightly changes level replay indicatorAuthoracme_pjz
- a91fe0d9494d update http -> https in credits and update authorsAuthoracme_pjz
- 403c0ee7c9d6 add an exit to classic level 24Authoracme_pjz
- 8960c2b4f157 don't show hot key in level edit selection popupAuthoracme_pjz
- 59d90d0d3f7d bump the version to V0.5 RC2Authoracme_pjz
- 537ca03f80e7 Translated using Weblate (Russian)Authormesnevi
- d49879c52d8f Translated using Weblate (Russian)Authormesnevi
- d24dfae29126 Translated using Weblate (Russian)Authormesnevi
- 32c82b97cc97 Translated using Weblate (Russian)Authormesnevi
- 46f3b589ee2b add getBaseSize() to script APIAuthoracme_pjz
- Authoracme_pjz
- Authoracme_pjz
- Authoracme_pjz
- d97a9379dfa0 add getBaseLocation() to script APIAuthoracme_pjz
- f3e41983d6d0 some minor refactoringAuthoracme_pjz
- e3d008d840a9 Translated using Weblate (German)AuthorWuzzy
- Authoracme_pjz
- 1260998320f3 oops, forget to clear screen for loading screenAuthoracme_pjz
- 3603fca0caf9 Merge branch 'origin/master' into WeblateAuthorHosted Weblate
- 059ace5d2050 Translated using Weblate (French)AuthorPoussinou
- Authoracme_pjz
- ef827950e24c Update translation filesAuthorHosted Weblate
- 02c6d80da3e3 Merge pull request #27 from mesnevi/ru_locale_updateAuthorJz Pan
- 6df3d39cf9a8 Merge branch 'master' into ru_locale_updateAuthorJz Pan
- 3e16c1d22f68 Translated using Weblate (Russian)Authormesnevi
- d49db63f0295 Translated using Weblate (Russian)Authormesnevi
- c6d3e735d09e Translated using Weblate (Russian)Authormesnevi
