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.

Sign up for GitHub

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

Jump to bottom

Two new editor hotkeys. More details in the description. #145

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Two new editor hotkeys. More details in the description. #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b03096
Add files via upload
Glimps3 Sep 7, 2024
1d26e7a
Add files via upload
Glimps3 Sep 7, 2024
a427621
Add files via upload
Glimps3 Sep 7, 2024
d4eb611
Add files via upload
Glimps3 Sep 7, 2024
3d86ac3
delete textfile, added to comments instead
Glimps3 Sep 10, 2024
5f418f3
Delete config.txt (added to comments)
Glimps3 Sep 10, 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
2 changes: 1 addition & 1 deletion Data/Scripts/cam.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ void Update() {
}
co.velocity = co.velocity * inertia + target_velocity * (1.0f - inertia);
position += co.velocity * time_step;
if(GetInputDown(controller_id, "mouse0") && !co.ignore_mouse_input){
if((GetInputDown(controller_id, "mouse0") || GetInputDown(controller_id, "g")) && !co.ignore_mouse_input){
target_rotation -= GetLookXAxis(controller_id);
target_rotation2 -= GetLookYAxis(controller_id);
}
Expand Down
6 changes: 6 additions & 0 deletions Source/Editors/map_editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1657,6 +1657,12 @@ void MapEditor::HandleShortcuts(const LineSegment& mouseray) {
if (KeyCommand::CheckPressed(keyboard, KeyCommand::kToggleHotspotEditing, KIMF_LEVEL_EDITOR_GENERAL)) {
SetTypeEnabled(_hotspot_object, !IsTypeEnabled(_hotspot_object));
}
if (KeyCommand::CheckPressed(keyboard, KeyCommand::kToggleLightEditing, KIMF_LEVEL_EDITOR_GENERAL)) {
bool lights_enabled = !IsTypeEnabled(_dynamic_light_object);
SetTypeEnabled(_dynamic_light_object, lights_enabled);
SetTypeEnabled(_reflection_capture_object, lights_enabled);
SetTypeEnabled(_light_volume_object, lights_enabled);
}
// Handle saves
// This bool is needed because the new default keybind for "save level as"
// is the old "save selected items", so to keep backward/forward compatibility
Expand Down
1 change: 1 addition & 0 deletions Source/UserInput/keycommands.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,7 @@ void KeyCommand::Initialize() {
AddPairToHash("toggle_decal_editing", kToggleDecalEditing);
AddPairToHash("toggle_object_editing", kToggleObjectEditing);
AddPairToHash("toggle_hotspot_editing", kToggleHotspotEditing);
AddPairToHash("toggle_light_editing", kToggleLightEditing);
AddPairToHash("open_spawner", kOpenSpawner);
AddPairToHash("save_selected_items", kSaveSelectedItems);
AddPairToHash("save_level", kSaveLevel);
Expand Down
1 change: 1 addition & 0 deletions Source/UserInput/keycommands.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ enum Label {
kToggleDecalEditing,
kToggleObjectEditing,
kToggleHotspotEditing,
kToggleLightEditing,
kOpenSpawner,
kSaveSelectedItems,
kSaveLevel,
Expand Down