meandmyshadow into acmepjz…
480142faabc0
Actions

Project Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'master' of https://github.com/acmepjz/meandmyshadow into acmepjz-master
MERGE EugeneLoza and Mesnevi Russian translations

Conflicts:
data/levelpacks/classic/locale/ru.po
data/levelpacks/default/locale/ru.po
data/levelpacks/tutorial/locale/ru.po
data/locale/ru.po

Details

Provenance

eugeneloza

Authored on Oct 6 2018, 1:10 AM

Parents

R79:da1fbeff378c: Proof-reading part 2 (Russian)
R79:212010a14607: Merge branch 'origin/master' into Weblate

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

212010a14607 Merge branch 'origin/master' into Weblate
Author
Hosted Weblate
Browse Repository
No Builds
No Audits
e1e89c260332 Translated using Weblate (Norwegian Bokmål)
Author
Petter Reinholdtsen
Browse Repository
No Builds
No Audits
0d993fc777d5 show time and recordings during replay
Author
acme_pjz
Browse Repository
No Builds
No Audits
25c13759d397 fix compile under clang
Author
acme_pjz
Browse Repository
No Builds
No Audits
1ec4dfa8f9ca partially revert code to commit 0072762 to fix fragile block hit test bug when…
Author
acme_pjz
Browse Repository
No Builds
No Audits
2bf539e387fa fix a stupid mistake and a rand() mistake
Author
acme_pjz
Browse Repository
No Builds
No Audits
64f694b09c5a Merge branch 'master' of https://github.com/acmepjz/meandmyshadow
Author
acme_pjz
Browse Repository
No Builds
No Audits
70dc358156b6 add a cheat to temporarily reveal unknown achievements
Author
acme_pjz
Browse Repository
No Builds
No Audits
0913f6d8768b Translated using Weblate (Norwegian Bokmål)
Author
Allan Nordhøy
Browse Repository
No Builds
No Audits
293d26b3d869 Added some achievement images by Wuzzy and reordered first few achievements
Author
acme_pjz
Browse Repository
No Builds
No Audits
003c32988f93 Merge branch 'origin/master' into Weblate
Author
Hosted Weblate
Browse Repository
No Builds
No Audits
0aab9e6c3927 Translated using Weblate (German)
Author
Wuzzy
Browse Repository
No Builds
No Audits
999d8df0db72 disable some keyboard navigation if textbox has focus
Author
acme_pjz
Browse Repository
No Builds
No Audits
4130c41edd80 fix the lock of first level when the level order is changed and the game is not…
Author
acme_pjz
Browse Repository
No Builds
No Audits
cfc1c9dd364f fixed record path and level names, etc. not updated for individual level which…
Author
acme_pjz
Browse Repository
No Builds
No Audits
3d39579b40b4 slightly changes level replay indicator
Author
acme_pjz
Browse Repository
No Builds
No Audits
a91fe0d9494d update http -> https in credits and update authors
Author
acme_pjz
Browse Repository
No Builds
No Audits
403c0ee7c9d6 add an exit to classic level 24
Author
acme_pjz
Browse Repository
No Builds
No Audits
8960c2b4f157 don't show hot key in level edit selection popup
Author
acme_pjz
Browse Repository
No Builds
No Audits
59d90d0d3f7d bump the version to V0.5 RC2
Author
acme_pjz
Browse Repository
No Builds
No Audits
537ca03f80e7 Translated using Weblate (Russian)
Author
mesnevi
Browse Repository
No Builds
No Audits
d49879c52d8f Translated using Weblate (Russian)
Author
mesnevi
Browse Repository
No Builds
No Audits
d24dfae29126 Translated using Weblate (Russian)
Author
mesnevi
Browse Repository
No Builds
No Audits
32c82b97cc97 Translated using Weblate (Russian)
Author
mesnevi
Browse Repository
No Builds
No Audits
46f3b589ee2b add getBaseSize() to script API
Author
acme_pjz
Browse Repository
No Builds
No Audits
3d3db542ea0b copy the scripts when when copy/paste blocks in level editor
Author
acme_pjz
Browse Repository
No Builds
No Audits
bf9ae79a29ac press F3 when it is already ADD mode, toggle the toolbox on and off
Author
acme_pjz
Browse Repository
No Builds
No Audits
8f45ff12bc29 Merge branch 'master' of https://github.com/acmepjz/meandmyshadow
Author
acme_pjz
Browse Repository
No Builds
No Audits
d97a9379dfa0 add getBaseLocation() to script API
Author
acme_pjz
Browse Repository
No Builds
No Audits
f3e41983d6d0 some minor refactoring
Author
acme_pjz
Browse Repository
No Builds
No Audits
e3d008d840a9 Translated using Weblate (German)
Author
Wuzzy
Browse Repository
No Builds
No Audits
3d3c9ae8ad23 fixed a big bad bug of pushable block with moving block introduced in commit…
Author
acme_pjz
Browse Repository
No Builds
No Audits
b50063165d4e now the pushable blocks now collide with spikes and moving spikes; some other…
Author
acme_pjz
Browse Repository
No Builds
No Audits
521a37ea0a74 revert the starting position image to something similar to that of V0.2 version
Author
acme_pjz
Browse Repository
No Builds
No Audits
f521e0a922a6 always render the pushable blocks in front of other blocks
Author
acme_pjz
Browse Repository
No Builds
No Audits
1260998320f3 oops, forget to clear screen for loading screen
Author
acme_pjz
Browse Repository
No Builds
No Audits
3603fca0caf9 Merge branch 'origin/master' into Weblate
Author
Hosted Weblate
Browse Repository
No Builds
No Audits
059ace5d2050 Translated using Weblate (French)
Author
Poussinou
Browse Repository
No Builds
No Audits
75c7ba74ac85 add additional checkboxes to target time/recordings in level editor config…
Author
acme_pjz
Browse Repository
No Builds
No Audits
e2b187943c34 partially reverts commit 9ca7c21 and change the the target time/recordings…
Author
acme_pjz
Browse Repository
No Builds
No Audits
7c1af4adde6b show the keyboard shortcut of the button in the tooltip of bottom toolbar
Author
acme_pjz
Browse Repository
No Builds
No Audits
690c04ccbd16 click the add block button when it is already selected, toggle the toolbox on…
Author
acme_pjz
Browse Repository
No Builds
No Audits
dabc22f8e0d4 add a radio button image provided by Wuzzy (CC0) and change the level editor…
Author
acme_pjz
Browse Repository
No Builds
No Audits
ef827950e24c Update translation files
Author
Hosted Weblate
Browse Repository
No Builds
No Audits
02c6d80da3e3 Merge pull request #27 from mesnevi/ru_locale_update
Author
Jz Pan
Browse Repository
No Builds
No Audits
6df3d39cf9a8 Merge branch 'master' into ru_locale_update
Author
Jz Pan
Browse Repository
No Builds
No Audits
3e16c1d22f68 Translated using Weblate (Russian)
Author
mesnevi
Browse Repository
No Builds
No Audits
d49db63f0295 Translated using Weblate (Russian)
Author
mesnevi
Browse Repository
No Builds
No Audits
c6d3e735d09e Translated using Weblate (Russian)
Author
mesnevi
Browse Repository
No Builds
No Audits
f015b0220107 Translated using Weblate (German)
Author
Wuzzy
Browse Repository
No Builds
No Audits

Changes (85)

Path

Size

data/

gfx/

UNUSED_programmer.png

levelpacks/

classic/

Credits.map

locale/

de.po

	nb.po
	de.po

ru.po

default/

locale/

	nb.po
	de.po

ru.po

tutorial/

locale/

locale/

themes/

Cloudscape/

tiles/

docs/

src/

StatisticsManager.cpp

StatisticsScreen.cpp

StatisticsScreen.h

ThemeManager.cpp

R79:480142faabc0

View Options

AUTHORS

View Options

data/Credits.txt

View Options

data/gfx/achievements/UNUSED_hook.png

View Options

data/gfx/achievements/UNUSED_programmer.png

View Options

data/gfx/achievements/UNUSED_switch1k.png

View Options

data/gfx/achievements/addicted.png

View Options

data/gfx/achievements/cheat.png

View Options

data/gfx/achievements/constructor.png

View Options

data/gfx/achievements/constructor2.png

View Options

data/gfx/achievements/die1000.png

View Options

data/gfx/achievements/die10in5.png

View Options

data/gfx/achievements/die50.png

View Options

data/gfx/achievements/die5in5.png

View Options

data/gfx/achievements/doublekill.png

View Options

data/gfx/achievements/experienced.png

View Options

data/gfx/achievements/expert.png

View Options

data/gfx/achievements/forget.png

View Options

data/gfx/achievements/helloworld.png

View Options

data/gfx/achievements/jit.png

View Options

data/gfx/achievements/load1k.png

View Options

data/gfx/achievements/loadanddie.png

View Options

data/gfx/achievements/loadanddie100.png

View Options

data/gfx/achievements/loyalfan.png

View Options

data/gfx/achievements/panicload.png

View Options

data/gfx/achievements/panicsave.png

View Options

data/gfx/achievements/programmer.png

View Options

data/gfx/achievements/quickswap.png

View Options

data/gfx/achievements/record100.png

View Options

data/gfx/achievements/save1k.png

View Options

data/gfx/achievements/squash1.png

View Options

data/gfx/achievements/squash50.png

View Options

data/gfx/achievements/switch1k.png

View Options

data/gfx/achievements/tutorial.png

View Options

data/gfx/achievements/tutorialgold.png

View Options

data/gfx/achievements/withoutsave.png

View Options

data/gfx/gui.png

View Options

data/levelpacks/classic/Credits.map

View Options

data/levelpacks/classic/locale/de.po

View Options

data/levelpacks/classic/locale/nb.po

View Options

data/levelpacks/classic/locale/ru.po

View Options

data/levelpacks/default/locale/nb.po

View Options

data/levelpacks/default/locale/ru.po

View Options

data/levelpacks/tutorial/locale/nb.po

View Options

data/levelpacks/tutorial/locale/ru.po

View Options

data/levelpacks/tutorial/tut15.map

View Options

data/locale/de.po

View Options

data/locale/fr.po

View Options

data/locale/hu.po

View Options

data/locale/nb.po

View Options

data/locale/ru.po

View Options

data/themes/Cloudscape/theme.mnmstheme

View Options

data/themes/Cloudscape/tiles/tiles.png

View Options

docs/ScriptAPI.md

View Options

docs/ThemeDescription.md

View Options

src/AchievementList.cpp

View Options

src/Addons.cpp

View Options

src/Block.cpp

View Options

src/Block.h

View Options

src/CommandManager.cpp

View Options

src/EasterEggScreen.cpp

View Options

src/EasterEggScreen.h

View Options

src/GUIListBox.cpp

View Options

src/GUIListBox.h

View Options

src/GUIObject.cpp

View Options

src/GUISpinBox.cpp

View Options

src/GUISpinBox.h

View Options

src/Game.cpp

View Options

src/GameObjects.cpp

View Options

src/GameObjects.h

View Options

src/Globals.h

View Options

src/InputManager.cpp

View Options

src/InputManager.h

View Options

src/LevelEditor.cpp

View Options

src/LevelEditor.h

View Options

src/LevelPack.cpp

View Options

src/LevelPlaySelect.cpp

View Options

src/Player.cpp

View Options

src/Scenery.cpp

View Options

src/Scenery.h

View Options

src/ScriptAPI.cpp

View Options

src/StatisticsManager.cpp

View Options

src/StatisticsScreen.cpp

View Options

src/StatisticsScreen.h

View Options

Merge branch 'master' of https://github.com/acmepjz/meandmyshadow into acmepjz…480142faabc0Actions

Description

Details

Event Timeline

Merged Changes

Changes (85)

R79:480142faabc0

AUTHORS

data/Credits.txt

data/gfx/achievements/UNUSED_hook.png

data/gfx/achievements/UNUSED_programmer.png

data/gfx/achievements/UNUSED_switch1k.png

data/gfx/achievements/addicted.png

data/gfx/achievements/cheat.png

data/gfx/achievements/constructor.png

data/gfx/achievements/constructor2.png

data/gfx/achievements/die1000.png

data/gfx/achievements/die10in5.png

data/gfx/achievements/die50.png

data/gfx/achievements/die5in5.png

data/gfx/achievements/doublekill.png

data/gfx/achievements/experienced.png

data/gfx/achievements/expert.png

data/gfx/achievements/forget.png

data/gfx/achievements/helloworld.png

data/gfx/achievements/jit.png

data/gfx/achievements/load1k.png

data/gfx/achievements/loadanddie.png

data/gfx/achievements/loadanddie100.png

data/gfx/achievements/loyalfan.png

data/gfx/achievements/panicload.png

data/gfx/achievements/panicsave.png

data/gfx/achievements/programmer.png

data/gfx/achievements/quickswap.png

data/gfx/achievements/record100.png

data/gfx/achievements/save1k.png

data/gfx/achievements/squash1.png

data/gfx/achievements/squash50.png

data/gfx/achievements/switch1k.png

data/gfx/achievements/tutorial.png

data/gfx/achievements/tutorialgold.png

data/gfx/achievements/withoutsave.png

data/gfx/gui.png

data/levelpacks/classic/Credits.map

data/levelpacks/classic/locale/de.po

data/levelpacks/classic/locale/nb.po

data/levelpacks/classic/locale/ru.po

data/levelpacks/default/locale/nb.po

data/levelpacks/default/locale/ru.po

data/levelpacks/tutorial/locale/nb.po

data/levelpacks/tutorial/locale/ru.po

data/levelpacks/tutorial/tut15.map

data/locale/de.po

data/locale/fr.po

data/locale/hu.po

data/locale/nb.po

data/locale/ru.po

data/themes/Cloudscape/theme.mnmstheme

data/themes/Cloudscape/tiles/tiles.png

docs/ScriptAPI.md

docs/ThemeDescription.md

src/AchievementList.cpp

src/Addons.cpp

src/Block.cpp

src/Block.h

src/CommandManager.cpp

src/EasterEggScreen.cpp

src/EasterEggScreen.h

src/GUIListBox.cpp

src/GUIListBox.h

src/GUIObject.cpp

src/GUISpinBox.cpp

src/GUISpinBox.h

src/Game.cpp

src/GameObjects.cpp

src/GameObjects.h

src/Globals.h

src/InputManager.cpp

src/InputManager.h

src/LevelEditor.cpp

Merge branch 'master' of https://github.com/acmepjz/meandmyshadow into acmepjz…
480142faabc0
Actions