Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ability to tilt the isometric camera #3315

Merged
merged 28 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3ff6d10
Ability to tilt the isometric camera
AdamPlenty Jun 18, 2024
770910d
Added a few translations
Loobinex Jun 20, 2024
29029af
Reduced minimum tilt
AdamPlenty Jun 21, 2024
278ba8a
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Jun 21, 2024
600c83e
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Jun 21, 2024
0094baf
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Jun 22, 2024
ed42ce5
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Jun 23, 2024
d45eae7
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Jun 23, 2024
b95627c
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Jun 24, 2024
a060a85
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Jun 27, 2024
b9bf600
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Jun 28, 2024
8d9aafa
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Jul 3, 2024
6140159
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Jul 5, 2024
b08e318
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Jul 9, 2024
e4a231e
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Jul 12, 2024
8917eeb
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Jul 13, 2024
eda0efb
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Jul 13, 2024
370cb56
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Jul 23, 2024
af66e88
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Jul 27, 2024
4777232
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Jul 28, 2024
945d068
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Jul 30, 2024
c02bc8e
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Jul 31, 2024
462d6f3
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Aug 6, 2024
4f95eaa
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Aug 7, 2024
010d361
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Aug 8, 2024
cdc2aa2
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Aug 13, 2024
5671e13
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Aug 17, 2024
a11bded
Merge remote-tracking branch 'upstream/master' into CameraTilt
AdamPlenty Aug 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions lang/gtext_chi.po
Original file line number Diff line number Diff line change
Expand Up @@ -5840,3 +5840,18 @@ msgstr "使不高兴:敌人的所有生物变得不高兴。"
msgctxt "Dungeon special decription"
msgid "Weaken Walls: Destroys the fortifications of enemy walls."
msgstr "削弱城墙: 摧毁敌方城墙的防御工事。"

#: guitext:1063
msgctxt "Game controls"
msgid "Tilt Up"
msgstr ""

#: guitext:1064
msgctxt "Game controls"
msgid "Tilt Down"
msgstr ""

#: guitext:1065
msgctxt "Game controls"
msgid "Reset Tilt"
msgstr ""
17 changes: 16 additions & 1 deletion lang/gtext_cht.po
Original file line number Diff line number Diff line change
Expand Up @@ -6700,4 +6700,19 @@ msgstr "使不高興:敵人的所有生物變得不高興。"
#: guitext:1062
msgctxt "Dungeon special decription"
msgid "Weaken Walls: Destroys the fortifications of enemy walls."
msgstr "削弱城牆: 摧毁敵方城牆的防禦工事。"
msgstr "削弱城牆: 摧毁敵方城牆的防禦工事。"

#: guitext:1063
msgctxt "Game controls"
msgid "Tilt Up"
msgstr ""

#: guitext:1064
msgctxt "Game controls"
msgid "Tilt Down"
msgstr ""

#: guitext:1065
msgctxt "Game controls"
msgid "Reset Tilt"
msgstr ""
17 changes: 16 additions & 1 deletion lang/gtext_cze.po
Original file line number Diff line number Diff line change
Expand Up @@ -6952,4 +6952,19 @@ msgstr "Rozlít nespokojenost: Všechna stvoření nepřítele jsou rozčílená
#: guitext:1062
msgctxt "Dungeon special decription"
msgid "Weaken Walls: Destroys the fortifications of enemy walls."
msgstr "Oslabí zdi: Ničí opevnění nepřátelských zdí."
msgstr "Oslabí zdi: Ničí opevnění nepřátelských zdí."

#: guitext:1063
msgctxt "Game controls"
msgid "Tilt Up"
msgstr ""

#: guitext:1064
msgctxt "Game controls"
msgid "Tilt Down"
msgstr ""

#: guitext:1065
msgctxt "Game controls"
msgid "Reset Tilt"
msgstr ""
17 changes: 16 additions & 1 deletion lang/gtext_dut.po
Original file line number Diff line number Diff line change
Expand Up @@ -6969,4 +6969,19 @@ msgstr "Maak Ongelukkig: Alle wezens van de vijand worden ongelukkig."
#: guitext:1062
msgctxt "Dungeon special decription"
msgid "Weaken Walls: Destroys the fortifications of enemy walls."
msgstr "Zwakke Muren: Vernietigt de versterkingen van vijandelijke muren."
msgstr "Zwakke Muren: Vernietigt de versterkingen van vijandelijke muren."

#: guitext:1063
msgctxt "Game controls"
msgid "Tilt Up"
msgstr "Kantel Omhoog"

#: guitext:1064
msgctxt "Game controls"
msgid "Tilt Down"
msgstr "Kantel Omlaag"

#: guitext:1065
msgctxt "Game controls"
msgid "Reset Tilt"
msgstr "Kantel Reset"
15 changes: 15 additions & 0 deletions lang/gtext_eng.pot
Original file line number Diff line number Diff line change
Expand Up @@ -5612,3 +5612,18 @@ msgstr ""
msgctxt "Dungeon special decription"
msgid "Weaken Walls: Destroys the fortifications of enemy walls."
msgstr ""

#: guitext:1063
msgctxt "Game controls"
msgid "Tilt Up"
msgstr ""

#: guitext:1064
msgctxt "Game controls"
msgid "Tilt Down"
msgstr ""

#: guitext:1065
msgctxt "Game controls"
msgid "Reset Tilt"
msgstr ""
15 changes: 15 additions & 0 deletions lang/gtext_fre.po
Original file line number Diff line number Diff line change
Expand Up @@ -7203,3 +7203,18 @@ msgstr "Rendre malheureux : Toutes les créatures de l'ennemi deviennent mécont
msgctxt "Dungeon special decription"
msgid "Weaken Walls: Destroys the fortifications of enemy walls."
msgstr "Affaiblir les murs : Détruit les fortifications des murs ennemis."

#: guitext:1063
msgctxt "Game controls"
msgid "Tilt Up"
msgstr "Incliner Haut"

#: guitext:1064
msgctxt "Game controls"
msgid "Tilt Down"
msgstr "Incliner Bas"

#: guitext:1065
msgctxt "Game controls"
msgid "Reset Tilt"
msgstr "Réinitialiser"
17 changes: 16 additions & 1 deletion lang/gtext_ger.po
Original file line number Diff line number Diff line change
Expand Up @@ -7110,4 +7110,19 @@ msgstr "Kreaturen verärgern: Alle Kreaturen des Feindes werden ärgerlich."
#: guitext:1062
msgctxt "Dungeon special decription"
msgid "Weaken Walls: Destroys the fortifications of enemy walls."
msgstr "Mauern schwächen: Zerstört die Befestigungen der feindlichen Mauern."
msgstr "Mauern schwächen: Zerstört die Befestigungen der feindlichen Mauern."

#: guitext:1063
msgctxt "Game controls"
msgid "Tilt Up"
msgstr "Neigen Hoch"

#: guitext:1064
msgctxt "Game controls"
msgid "Tilt Down"
msgstr "Neigen Runter"

#: guitext:1065
msgctxt "Game controls"
msgid "Reset Tilt"
msgstr "Neigung Zurück"
17 changes: 16 additions & 1 deletion lang/gtext_ita.po
Original file line number Diff line number Diff line change
Expand Up @@ -7058,4 +7058,19 @@ msgstr "Rendi Infelici: Tutte le creature del nemico diventano infelici."
#: guitext:1062
msgctxt "Dungeon special decription"
msgid "Weaken Walls: Destroys the fortifications of enemy walls."
msgstr "Indebolire Mura: Distrugge le fortificazioni delle mura nemiche"
msgstr "Indebolire Mura: Distrugge le fortificazioni delle mura nemiche"

#: guitext:1063
msgctxt "Game controls"
msgid "Tilt Up"
msgstr ""

#: guitext:1064
msgctxt "Game controls"
msgid "Tilt Down"
msgstr ""

#: guitext:1065
msgctxt "Game controls"
msgid "Reset Tilt"
msgstr ""
17 changes: 16 additions & 1 deletion lang/gtext_jpn.po
Original file line number Diff line number Diff line change
Expand Up @@ -6850,4 +6850,19 @@ msgstr "不幸にする: 敵のすべてのクリーチャーが不幸にな
#: guitext:1062
msgctxt "Dungeon special decription"
msgid "Weaken Walls: Destroys the fortifications of enemy walls."
msgstr "壁を弱める:敵の城壁の防御施設を破壊します。"
msgstr "壁を弱める:敵の城壁の防御施設を破壊します。"

#: guitext:1063
msgctxt "Game controls"
msgid "Tilt Up"
msgstr "上へ指向"

#: guitext:1064
msgctxt "Game controls"
msgid "Tilt Down"
msgstr "下へ指向"

#: guitext:1065
msgctxt "Game controls"
msgid "Reset Tilt"
msgstr "傾きをリセット"
17 changes: 16 additions & 1 deletion lang/gtext_kor.po
Original file line number Diff line number Diff line change
Expand Up @@ -6992,4 +6992,19 @@ msgstr "불행하게 만들기: 적의 모든 생물이 화가 납니다."
#: guitext:1062
msgctxt "Dungeon special decription"
msgid "Weaken Walls: Destroys the fortifications of enemy walls."
msgstr "벽 약화: 적의 벽 방어를 파괴합니다."
msgstr "벽 약화: 적의 벽 방어를 파괴합니다."

#: guitext:1063
msgctxt "Game controls"
msgid "Tilt Up"
msgstr ""

#: guitext:1064
msgctxt "Game controls"
msgid "Tilt Down"
msgstr ""

#: guitext:1065
msgctxt "Game controls"
msgid "Reset Tilt"
msgstr ""
15 changes: 15 additions & 0 deletions lang/gtext_lat.po
Original file line number Diff line number Diff line change
Expand Up @@ -5795,3 +5795,18 @@ msgstr "Tristem facere: Omnes creaturae inimicis solliciti fiunt."
msgctxt "Dungeon special decription"
msgid "Weaken Walls: Destroys the fortifications of enemy walls."
msgstr "Muros debilitare: Fortificationes murorum inimicis delet."

#: guitext:1063
msgctxt "Game controls"
msgid "Tilt Up"
msgstr ""

#: guitext:1064
msgctxt "Game controls"
msgid "Tilt Down"
msgstr ""

#: guitext:1065
msgctxt "Game controls"
msgid "Reset Tilt"
msgstr ""
17 changes: 16 additions & 1 deletion lang/gtext_pol.po
Original file line number Diff line number Diff line change
Expand Up @@ -7069,4 +7069,19 @@ msgstr "Spraw, by były nieszczęśliwe: Wszystkie istoty wroga stają się nies
#: guitext:1062
msgctxt "Dungeon special decription"
msgid "Weaken Walls: Destroys the fortifications of enemy walls."
msgstr "Osłabiaj Ściany: Niszczy umocnienia wrogich murów."
msgstr "Osłabiaj Ściany: Niszczy umocnienia wrogich murów."

#: guitext:1063
msgctxt "Game controls"
msgid "Tilt Up"
msgstr ""

#: guitext:1064
msgctxt "Game controls"
msgid "Tilt Down"
msgstr ""

#: guitext:1065
msgctxt "Game controls"
msgid "Reset Tilt"
msgstr ""
17 changes: 16 additions & 1 deletion lang/gtext_rus.po
Original file line number Diff line number Diff line change
Expand Up @@ -7137,4 +7137,19 @@ msgstr "Сделать несчастными: Все существа враг
#: guitext:1062
msgctxt "Dungeon special decription"
msgid "Weaken Walls: Destroys the fortifications of enemy walls."
msgstr "Ослабление стен: Разрушает укрепления вражеских стен."
msgstr "Ослабление стен: Разрушает укрепления вражеских стен."

#: guitext:1063
msgctxt "Game controls"
msgid "Tilt Up"
msgstr ""

#: guitext:1064
msgctxt "Game controls"
msgid "Tilt Down"
msgstr ""

#: guitext:1065
msgctxt "Game controls"
msgid "Reset Tilt"
msgstr ""
17 changes: 16 additions & 1 deletion lang/gtext_spa.po
Original file line number Diff line number Diff line change
Expand Up @@ -6123,4 +6123,19 @@ msgstr "Hacer Infelices: Todas las criaturas del enemigo se vuelven infelices."
#: guitext:1062
msgctxt "Dungeon special decription"
msgid "Weaken Walls: Destroys the fortifications of enemy walls."
msgstr "Debilitar Murallas: Destruye las fortificaciones de las murallas enemigas."
msgstr "Debilitar Murallas: Destruye las fortificaciones de las murallas enemigas."

#: guitext:1063
msgctxt "Game controls"
msgid "Tilt Up"
msgstr "Inclinar Arriba"

#: guitext:1064
msgctxt "Game controls"
msgid "Tilt Down"
msgstr "Inclinar Abajo"

#: guitext:1065
msgctxt "Game controls"
msgid "Reset Tilt"
msgstr "Reiniciar Inclinación"
15 changes: 15 additions & 0 deletions lang/gtext_swe.po
Original file line number Diff line number Diff line change
Expand Up @@ -6127,3 +6127,18 @@ msgstr "Göra Olyckliga: Alla varelser av fienden blir upprörda."
msgctxt "Dungeon special decription"
msgid "Weaken Walls: Destroys the fortifications of enemy walls."
msgstr "Försvaga väggarna: Förstör befästningarna på fiendens murar."

#: guitext:1063
msgctxt "Game controls"
msgid "Tilt Up"
msgstr ""

#: guitext:1064
msgctxt "Game controls"
msgid "Tilt Down"
msgstr ""

#: guitext:1065
msgctxt "Game controls"
msgid "Reset Tilt"
msgstr ""
5 changes: 5 additions & 0 deletions src/config_settings.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "bflib_cpu.h"

#include "config.h"
#include "engine_camera.h"
#include "game_merge.h"
#include "vidmode.h"
#include "post_inc.h"
Expand Down Expand Up @@ -100,6 +101,9 @@ void setup_default_settings(void)
{KC_MOUSEWHEEL_DOWN, KMod_NONE}, // Gkey_RoomSpaceIncSize
{KC_MOUSEWHEEL_UP, KMod_NONE}, // Gkey_RoomSpaceDecSize
{KC_LALT, KMod_NONE}, // Gkey_SellTrapOnSubtile
{KC_PGUP, KMod_SHIFT}, // Gkey_TiltUp
{KC_PGDOWN, KMod_SHIFT}, // Gkey_TiltDown
{KC_INSERT, KMod_SHIFT}, // Gkey_TiltReset
}, // kbkeys
true, // tooltips_on
0, // first_person_move_invert
Expand All @@ -108,6 +112,7 @@ void setup_default_settings(void)
8192, // isometric_view_zoom_level
65536, // frontview_zoom_level
127, // mentor_volume
CAMERA_TILT_DEFAULT, // isometric_tilt
};
LbMemoryCopy(&settings, &default_settings, sizeof(struct GameSettings));
settings.switching_vidmodes_index = 0;
Expand Down
3 changes: 2 additions & 1 deletion src/config_settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "bflib_basics.h"

#define DK_GAME_KEYS_COUNT 32
#define GAME_KEYS_COUNT 40
#define GAME_KEYS_COUNT 43

#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -56,6 +56,7 @@ struct GameSettings { // KFX settings
unsigned long isometric_view_zoom_level;
unsigned long frontview_zoom_level;
long mentor_volume;
int isometric_tilt;
};
#pragma pack()
/******************************************************************************/
Expand Down
5 changes: 4 additions & 1 deletion src/config_strings.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ extern "C" {
/******************************************************************************/
#define STRINGS_MAX 2000
#define DK_STRINGS_MAX 941
#define GUI_STRINGS_COUNT 1063
#define GUI_STRINGS_COUNT 1066

struct GameCampaign;

Expand Down Expand Up @@ -427,6 +427,9 @@ enum GUIStrings {
GUIStr_NetUnsyncedMap = STRINGS_MAX + 1006,
GUIStr_DisplayResolution = STRINGS_MAX + 1007,
GUIStr_OptionVoice = STRINGS_MAX + 1008,
GUIStr_CtrlTiltUp = STRINGS_MAX + 1063,
GUIStr_CtrlTiltDown = STRINGS_MAX + 1064,
GUIStr_CtrlTiltReset = STRINGS_MAX + 1065,
};

enum CampaignStrings {
Expand Down
Loading