Merge pull request #37 from acmepjz/0.5.1-dev
merge 0.5.1 dev to master branch
Description
Description
Details
Details
- Provenance
Jz Pan Authored on Jan 7 2019, 5:57 AM GitHub Committed on Jan 7 2019, 5:57 AM - Parents
- R79:c65eb2f4fa61: Merge branch 'master' into 0.5.1-dev
R79:731f648d71d4: Translated using Weblate (Hungarian) - 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.
- c65eb2f4fa61 Merge branch 'master' into 0.5.1-devAuthoracme_pjz
- 4bfe50610455 don't show number of records in arcade modeAuthoracme_pjz
- Authoracme_pjz
- Authoracme_pjz
- Authoracme_pjz
- 5f9871bd5603 added functions to calculate medal and better timesAuthoracme_pjz
- 977f3ead84c2 partially reverts commit 2874dffAuthoracme_pjz
- 3e4151c6883b fix a cheat in classic level 9Authoracme_pjz
- Authoracme_pjz
- 5dae52ddf0e6 make the key name in tutorial translatable #32Authoracme_pjz
- f44c272a2864 fix of charset of pot filesAuthoracme_pjz
- c4a7be7345b7 some fix to CMakeList to fetch git versionAuthoracme_pjz
- 6b78c9481e18 Merge branch 'master' into 0.5.1-devAuthoracme_pjz
- Authoracme_pjz
- 70c94a874976 minor fix to player dead animationAuthoracme_pjz
- 0a0c6a149444 make the grouping gettext friendlyAuthoracme_pjz
- Authoracme_pjz
- a1235ac35f8d Merge branch 'master' into 0.5.1-devAuthoracme_pjz
- 7c4d7cc7f9b5 Merge branch 'master' into 0.5.1-devAuthoracme_pjz
- 63446fec2447 Merge branch 'master' into 0.5.1-devAuthoracme_pjz
- Authoracme_pjz
- Authoracme_pjz
- Authoracme_pjz
- cf4280ba74f9 add block.addBlock() to script APIAuthoracme_pjz
- e1a378bc0128 fix the dynamic remove of collectiblesAuthoracme_pjz
- 392b5f58bcda add setBaseLocation/setBaseSize to script APIAuthoracme_pjz
- Authoracme_pjz
- b234a4aeaf15 Merge branch 'master' into 0.5.1-devAuthoracme_pjz
- 5db1f54f466d Merge branch 'master' into 0.5.1-devAuthoracme_pjz
- c530f1933b71 Merge branch 'master' into 0.5.1-devAuthoracme_pjz
- 3d14c77e8e34 partially reverts commit 0ecf0aeAuthoracme_pjz
- 7a9c234b218a added addMovingPos()/removeMovingPos() to script APIAuthoracme_pjz
- 0f213ff6775a add getBaseLocation() to script APIAuthoracme_pjz
- e0d4736b4d4e some minor refactoringAuthoracme_pjz
- b027942bbc8e Merge branch 'master' into 0.5.1-devAuthoracme_pjz
- 90f0cc3ce144 added gettext library to scripting APIAuthoracme_pjz
- 144a57f2c042 Merge branch 'master' into 0.5.1-devAuthoracme_pjz
- 9e4ccdb1eb1c the level editor should works againAuthoracme_pjz
- 6e5f594231d0 (WIP, LEVEL EDITOR DOESN'T WORK YET)Authoracme_pjz
- 5720c43dcf99 add a comment which explains code a little bitAuthoracme_pjz