Skip to content

Commit

Permalink
Merge branch 'master' into wind_fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
biggeryetbetter authored Aug 2, 2024
2 parents ba6cee5 + c706def commit 233428b
Show file tree
Hide file tree
Showing 379 changed files with 5,380 additions and 2,110 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/scripting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ on:
push:
branches: [ "master" ]
paths:
- src/*
- src/**
- tools/scripting_docs_gen/**
workflow_dispatch:

jobs:
Expand Down
Binary file added data/images/creatures/ghosttree/hudlife.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion data/images/engine/editor/objects.stoi
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,10 @@
(icon "images/engine/editor/stalactite_ice_yeti.png"))
(object
(class "dart")
(icon "images/creatures/darttrap/granito/root_dart_left.png"))
(icon "images/creatures/darttrap/granito/root_dart_left.png"))
(object
(class "bigsnowball")
(icon "images/objects/big_snowball/big_snowball.png"))
)

(objectgroup
Expand Down
Binary file added data/images/objects/big_snowball/big_snowball.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions data/images/objects/big_snowball/big_snowball.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
(supertux-sprite
(action
(name "default")
(hitbox 6 6 87 84)
(images "big_snowball.png"))

(action
(name "particle")
(hitbox 2 2 29 28)
(images "big_snowball_particle.png"))
)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions data/levels/bonus1/ar.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This file is distributed under the same license as the SuperTux package.
#
# Translators:
# 111More1, 2023
# IAN RODRÍGUEZ Lorenzo, 2023
# Israa Zamzami, 2018
# Hasan Nahleh <[email protected]>, 2019
msgid ""
Expand All @@ -12,7 +12,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
"POT-Creation-Date: 2024-03-03 03:26+0100\n"
"PO-Revision-Date: 2013-08-10 23:04+0000\n"
"Last-Translator: 111More1, 2023\n"
"Last-Translator: IAN RODRÍGUEZ Lorenzo, 2023\n"
"Language-Team: Arabic (http://app.transifex.com/arctic-games/supertux/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
4 changes: 2 additions & 2 deletions data/levels/bonus1/az.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
# This file is distributed under the same license as the SuperTux package.
#
# Translators:
# 111More1, 2023
# IAN RODRÍGUEZ Lorenzo, 2023
msgid ""
msgstr ""
"Project-Id-Version: SuperTux\n"
"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
"POT-Creation-Date: 2024-03-03 03:26+0100\n"
"PO-Revision-Date: 2013-08-10 23:04+0000\n"
"Last-Translator: 111More1, 2023\n"
"Last-Translator: IAN RODRÍGUEZ Lorenzo, 2023\n"
"Language-Team: Azerbaijani (http://app.transifex.com/arctic-games/supertux/language/az/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
4 changes: 2 additions & 2 deletions data/levels/bonus1/ca.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Translators:
# Ariadna Pascual <[email protected]>, 2016
# Catalanoic <[email protected]>, 2016
# 111More1, 2022
# IAN RODRÍGUEZ Lorenzo, 2022
# 76352799d6904fac47e3a0fa3ed5fd59_334826e <af5856938576e19ac7f099472ce1a9b6_234157>, 2014
# Yael Codesal, 2016
msgid ""
Expand All @@ -14,7 +14,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
"POT-Creation-Date: 2024-03-03 03:26+0100\n"
"PO-Revision-Date: 2013-08-10 23:04+0000\n"
"Last-Translator: 111More1, 2022\n"
"Last-Translator: IAN RODRÍGUEZ Lorenzo, 2022\n"
"Language-Team: Catalan (http://app.transifex.com/arctic-games/supertux/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
4 changes: 2 additions & 2 deletions data/levels/bonus1/el.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This file is distributed under the same license as the SuperTux package.
#
# Translators:
# 111More1, 2022
# IAN RODRÍGUEZ Lorenzo, 2022
# I will not tell you that <[email protected]>, 2015
# Vangelis Nomikos <[email protected]>, 2013-2014
# Vangelis Skarmoutsos (SkarmoutsosV) <[email protected]>, 2016
Expand All @@ -13,7 +13,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
"POT-Creation-Date: 2024-03-03 03:26+0100\n"
"PO-Revision-Date: 2013-08-10 23:04+0000\n"
"Last-Translator: 111More1, 2022\n"
"Last-Translator: IAN RODRÍGUEZ Lorenzo, 2022\n"
"Language-Team: Greek (http://app.transifex.com/arctic-games/supertux/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
4 changes: 2 additions & 2 deletions data/levels/bonus1/et.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
# This file is distributed under the same license as the SuperTux package.
#
# Translators:
# 111More1, 2023
# IAN RODRÍGUEZ Lorenzo, 2023
msgid ""
msgstr ""
"Project-Id-Version: SuperTux\n"
"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
"POT-Creation-Date: 2024-03-03 03:26+0100\n"
"PO-Revision-Date: 2013-08-10 23:04+0000\n"
"Last-Translator: 111More1, 2023\n"
"Last-Translator: IAN RODRÍGUEZ Lorenzo, 2023\n"
"Language-Team: Estonian (http://app.transifex.com/arctic-games/supertux/language/et/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
4 changes: 2 additions & 2 deletions data/levels/bonus1/eu.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
# This file is distributed under the same license as the SuperTux package.
#
# Translators:
# 111More1, 2023
# IAN RODRÍGUEZ Lorenzo, 2023
# Mielanjel Iraeta <[email protected]>, 2018
msgid ""
msgstr ""
"Project-Id-Version: SuperTux\n"
"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
"POT-Creation-Date: 2024-03-03 03:26+0100\n"
"PO-Revision-Date: 2013-08-10 23:04+0000\n"
"Last-Translator: 111More1, 2023\n"
"Last-Translator: IAN RODRÍGUEZ Lorenzo, 2023\n"
"Language-Team: Basque (http://app.transifex.com/arctic-games/supertux/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
4 changes: 2 additions & 2 deletions data/levels/bonus1/fr_CA.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
# This file is distributed under the same license as the SuperTux package.
#
# Translators:
# 111More1, 2022
# IAN RODRÍGUEZ Lorenzo, 2022
# Jean-Philippe L'Étoile <[email protected]>, 2019
msgid ""
msgstr ""
"Project-Id-Version: SuperTux\n"
"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
"POT-Creation-Date: 2024-03-03 03:26+0100\n"
"PO-Revision-Date: 2013-08-10 23:04+0000\n"
"Last-Translator: 111More1, 2022\n"
"Last-Translator: IAN RODRÍGUEZ Lorenzo, 2022\n"
"Language-Team: French (Canada) (http://app.transifex.com/arctic-games/supertux/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
4 changes: 2 additions & 2 deletions data/levels/bonus1/he.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# Translators:
# Evgeny Satanovsky <[email protected]>, 2019
# 111More1, 2022
# IAN RODRÍGUEZ Lorenzo, 2022
# 63f334ffc0709ba0fc2361b80bf3c0f0_00ffd1e <ab96c93ca0ac55ba7fa06385427e60dd_878890>, 2020-2021
# 63f334ffc0709ba0fc2361b80bf3c0f0_00ffd1e <ab96c93ca0ac55ba7fa06385427e60dd_878890>, 2021
# 63f334ffc0709ba0fc2361b80bf3c0f0_00ffd1e <ab96c93ca0ac55ba7fa06385427e60dd_878890>, 2020
Expand All @@ -14,7 +14,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
"POT-Creation-Date: 2024-03-03 03:26+0100\n"
"PO-Revision-Date: 2013-08-10 23:04+0000\n"
"Last-Translator: 111More1, 2022\n"
"Last-Translator: IAN RODRÍGUEZ Lorenzo, 2022\n"
"Language-Team: Hebrew (http://app.transifex.com/arctic-games/supertux/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
4 changes: 2 additions & 2 deletions data/levels/bonus1/hr.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
# This file is distributed under the same license as the SuperTux package.
#
# Translators:
# 111More1, 2022
# IAN RODRÍGUEZ Lorenzo, 2022
msgid ""
msgstr ""
"Project-Id-Version: SuperTux\n"
"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
"POT-Creation-Date: 2024-03-03 03:26+0100\n"
"PO-Revision-Date: 2013-08-10 23:04+0000\n"
"Last-Translator: 111More1, 2022\n"
"Last-Translator: IAN RODRÍGUEZ Lorenzo, 2022\n"
"Language-Team: Croatian (http://app.transifex.com/arctic-games/supertux/language/hr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
4 changes: 2 additions & 2 deletions data/levels/bonus1/hy.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
# This file is distributed under the same license as the SuperTux package.
#
# Translators:
# 111More1, 2023
# IAN RODRÍGUEZ Lorenzo, 2023
msgid ""
msgstr ""
"Project-Id-Version: SuperTux\n"
"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
"POT-Creation-Date: 2024-03-03 03:26+0100\n"
"PO-Revision-Date: 2013-08-10 23:04+0000\n"
"Last-Translator: 111More1, 2023\n"
"Last-Translator: IAN RODRÍGUEZ Lorenzo, 2023\n"
"Language-Team: Armenian (http://app.transifex.com/arctic-games/supertux/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
4 changes: 2 additions & 2 deletions data/levels/bonus1/is.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
# This file is distributed under the same license as the SuperTux package.
#
# Translators:
# 111More1, 2022
# IAN RODRÍGUEZ Lorenzo, 2022
# Kristján Magnússon, 2022
msgid ""
msgstr ""
"Project-Id-Version: SuperTux\n"
"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
"POT-Creation-Date: 2024-03-03 03:26+0100\n"
"PO-Revision-Date: 2013-08-10 23:04+0000\n"
"Last-Translator: 111More1, 2022\n"
"Last-Translator: IAN RODRÍGUEZ Lorenzo, 2022\n"
"Language-Team: Icelandic (http://app.transifex.com/arctic-games/supertux/language/is/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
4 changes: 2 additions & 2 deletions data/levels/bonus1/nb.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
#
# Translators:
# Allan Nordhøy <[email protected]>, 2016
# 111More1, 2022
# IAN RODRÍGUEZ Lorenzo, 2022
# Karl Ove Hufthammer <[email protected]>, 2007,2015-2016
msgid ""
msgstr ""
"Project-Id-Version: SuperTux\n"
"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
"POT-Creation-Date: 2024-03-03 03:26+0100\n"
"PO-Revision-Date: 2013-08-10 23:04+0000\n"
"Last-Translator: 111More1, 2022\n"
"Last-Translator: IAN RODRÍGUEZ Lorenzo, 2022\n"
"Language-Team: Norwegian Bokmål (http://app.transifex.com/arctic-games/supertux/language/nb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
4 changes: 2 additions & 2 deletions data/levels/bonus1/nn.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This file is distributed under the same license as the SuperTux package.
#
# Translators:
# 111More1, 2022
# IAN RODRÍGUEZ Lorenzo, 2022
# Karl Ove Hufthammer <[email protected]>, 2006-2007,2015-2016,2019-2020
# Karl Ove Hufthammer <[email protected]>, 2015
msgid ""
Expand All @@ -12,7 +12,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
"POT-Creation-Date: 2024-03-03 03:26+0100\n"
"PO-Revision-Date: 2013-08-10 23:04+0000\n"
"Last-Translator: 111More1, 2022\n"
"Last-Translator: IAN RODRÍGUEZ Lorenzo, 2022\n"
"Language-Team: Norwegian Nynorsk (http://app.transifex.com/arctic-games/supertux/language/nn/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
4 changes: 2 additions & 2 deletions data/levels/bonus1/sk.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This file is distributed under the same license as the SuperTux package.
#
# Translators:
# 111More1, 2022
# IAN RODRÍGUEZ Lorenzo, 2022
# c79a840bffc1621596a73d9f7d995b66_5f97bea <821296eb068acbf38f8fe02d322f4248_155187>, 2014
# MiroslavR <[email protected]>, 2015-2016
msgid ""
Expand All @@ -12,7 +12,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
"POT-Creation-Date: 2024-03-03 03:26+0100\n"
"PO-Revision-Date: 2013-08-10 23:04+0000\n"
"Last-Translator: 111More1, 2022\n"
"Last-Translator: IAN RODRÍGUEZ Lorenzo, 2022\n"
"Language-Team: Slovak (http://app.transifex.com/arctic-games/supertux/language/sk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
4 changes: 2 additions & 2 deletions data/levels/bonus1/sq.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
# This file is distributed under the same license as the SuperTux package.
#
# Translators:
# 111More1, 2022
# IAN RODRÍGUEZ Lorenzo, 2022
# Indrit Bashkimi <[email protected]>, 2015
msgid ""
msgstr ""
"Project-Id-Version: SuperTux\n"
"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
"POT-Creation-Date: 2024-03-03 03:26+0100\n"
"PO-Revision-Date: 2013-08-10 23:04+0000\n"
"Last-Translator: 111More1, 2022\n"
"Last-Translator: IAN RODRÍGUEZ Lorenzo, 2022\n"
"Language-Team: Albanian (http://app.transifex.com/arctic-games/supertux/language/sq/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
4 changes: 2 additions & 2 deletions data/levels/bonus1/tr.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Alkım Kaçmaz <[email protected]>, 2013
# mahmut özcan <[email protected]>, 2015
# Tan Siret Akıncı <[email protected]>, 2020
# 111More1, 2022
# IAN RODRÍGUEZ Lorenzo, 2022
# mahmut özcan <[email protected]>, 2020
# Yusuf Özsoy <[email protected]>, 2013
msgid ""
Expand All @@ -15,7 +15,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
"POT-Creation-Date: 2024-03-03 03:26+0100\n"
"PO-Revision-Date: 2013-08-10 23:04+0000\n"
"Last-Translator: 111More1, 2022\n"
"Last-Translator: IAN RODRÍGUEZ Lorenzo, 2022\n"
"Language-Team: Turkish (http://app.transifex.com/arctic-games/supertux/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
4 changes: 2 additions & 2 deletions data/levels/bonus1/tt.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
# This file is distributed under the same license as the SuperTux package.
#
# Translators:
# 111More1, 2022
# IAN RODRÍGUEZ Lorenzo, 2022
# Булат Ибраһим <[email protected]>, 2016
msgid ""
msgstr ""
"Project-Id-Version: SuperTux\n"
"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
"POT-Creation-Date: 2024-03-03 03:26+0100\n"
"PO-Revision-Date: 2013-08-10 23:04+0000\n"
"Last-Translator: 111More1, 2022\n"
"Last-Translator: IAN RODRÍGUEZ Lorenzo, 2022\n"
"Language-Team: Tatar (http://app.transifex.com/arctic-games/supertux/language/tt/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
2 changes: 1 addition & 1 deletion data/levels/bonus1/uk.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This file is distributed under the same license as the SuperTux package.
#
# Translators:
# 111More1, 2022
# IAN RODRÍGUEZ Lorenzo, 2022
# Asemif official, 2023
# Ievgen Tkach <[email protected]>, 2018
# Max Lyashuk <[email protected]>, 2015
Expand Down
4 changes: 2 additions & 2 deletions data/levels/bonus1/uz.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
# This file is distributed under the same license as the SuperTux package.
#
# Translators:
# 111More1, 2023
# IAN RODRÍGUEZ Lorenzo, 2023
msgid ""
msgstr ""
"Project-Id-Version: SuperTux\n"
"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
"POT-Creation-Date: 2024-03-03 03:26+0100\n"
"PO-Revision-Date: 2013-08-10 23:04+0000\n"
"Last-Translator: 111More1, 2023\n"
"Last-Translator: IAN RODRÍGUEZ Lorenzo, 2023\n"
"Language-Team: Uzbek (http://app.transifex.com/arctic-games/supertux/language/uz/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
4 changes: 2 additions & 2 deletions data/levels/bonus2/ar.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
# This file is distributed under the same license as the SuperTux package.
#
# Translators:
# 111More1, 2023
# IAN RODRÍGUEZ Lorenzo, 2023
msgid ""
msgstr ""
"Project-Id-Version: SuperTux\n"
"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
"POT-Creation-Date: 2024-03-03 03:26+0100\n"
"PO-Revision-Date: 2013-08-10 23:07+0000\n"
"Last-Translator: 111More1, 2023\n"
"Last-Translator: IAN RODRÍGUEZ Lorenzo, 2023\n"
"Language-Team: Arabic (http://app.transifex.com/arctic-games/supertux/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
4 changes: 2 additions & 2 deletions data/levels/bonus2/az.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
# This file is distributed under the same license as the SuperTux package.
#
# Translators:
# 111More1, 2023
# IAN RODRÍGUEZ Lorenzo, 2023
msgid ""
msgstr ""
"Project-Id-Version: SuperTux\n"
"Report-Msgid-Bugs-To: https://github.com/SuperTux/supertux/issues\n"
"POT-Creation-Date: 2024-03-03 03:26+0100\n"
"PO-Revision-Date: 2013-08-10 23:07+0000\n"
"Last-Translator: 111More1, 2023\n"
"Last-Translator: IAN RODRÍGUEZ Lorenzo, 2023\n"
"Language-Team: Azerbaijani (http://app.transifex.com/arctic-games/supertux/language/az/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
Loading

0 comments on commit 233428b

Please sign in to comment.