Merge branch 'master' into 0.5.1-dev
- Conflicts:
- src/Globals.h
Description
Description
Details
Details
- Provenance
acme_pjz Authored on Oct 5 2018, 5:31 AM - Parents
- R79:1ec4dfa8f9ca: partially revert code to commit 0072762 to fix fragile block hit test bug when…
R79:98a54d02f525: partially reverts sanity check code changes in commit f3e58aa, replaced by… - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Merged Changes
Merged Changes
- 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
