Merge remote-tracking branch 'origin/main'

assets/languages/en/Editors.xml

@@ -225,6 +225,8 @@
 				<group name="SongMenu" prefix="song.">
 					<str id="goStart">Go back to the start</str>
 					<str id="goEnd">Go forward to the end</str> <!-- used to be "Go to the end" -->
+					<str id="addOpponentCamera">Add camera on Opponent</str>
+					<str id="addPlayerCamera">Add camera on Player</str>
 					<str id="muteInst">Mute instrumental</str>
 					<str id="muteVoices">Mute voices</str>
 				</group>

assets/languages/pl/Editors.xml

@@ -2,7 +2,7 @@
 <language>
 	<group name="General Editor Translations" prefix="editor.">
 		<str id="autosavingIn">Autozapisywanie za {0} sekund{1}</str>
-		<str id="autosavingCanceledSuffix">((Anulowane)!</str>
+		<str id="autosavingCanceledSuffix">(Anulowane)!</str>
 
 		<str id="ok">Ok</str>
 		<str id="cancel">Anuluj</str>
@@ -225,6 +225,8 @@
 			<group name="SongMenu" prefix="song.">
 				<str id="goStart">Wróć do początku</str>
 				<str id="goEnd">Idź do końca</str> <!-- used to be "Go to the end" -->
+				<str id="addOpponentCamera">Dodaj kamerę na Oponenta</str>
+				<str id="addPlayerCamera">Dodaj kamerę na Gracza</str>
 				<str id="muteInst">Wycisz Instrumental</str>
 				<str id="muteVoices">Wycisz Wokale</str>
 			</group>

source/funkin/editors/charter/Charter.hx

@@ -1853,6 +1853,34 @@ class Charter extends UIState {
 		return bookmarks;
 	}
 
+		function _opponent_camera_add(_) {
+		var __event:CharterEvent = null;
+
+				__event = new CharterEvent(curStepFloat, [{
+				name: "Camera Movement",
+				params:[0],
+				time: Conductor.getTimeForStep(curStepFloat)
+			}], true);
+				__event.refreshEventIcons();
+				__event.global = true;
+				rightEventsGroup.add(__event);
+				undos.addToUndo(CEditEvent(__event, [], __event.events));
+			
+	}
+		function _player_camera_add(_) {
+		var __event:CharterEvent = null;
+
+				__event = new CharterEvent(curStepFloat, [{
+				name: "Camera Movement",
+				params:[1],
+				time: Conductor.getTimeForStep(curStepFloat)
+			}], true);
+				__event.refreshEventIcons();
+				rightEventsGroup.add(__event);
+				undos.addToUndo(CEditEvent(__event, [], __event.events));
+			
+	}
+
 	function _bookmarks_add(_) {
 		var addBookmarkAt = function(name:String, color:FlxColor, daStep:Float)
 		{
@@ -1965,6 +1993,17 @@ class Charter extends UIState {
 				onSelect: _song_end
 			},
 			null,
+			{
+				label: translate("song.addOpponentCamera"),
+				keybind: [Q],
+				onSelect: _opponent_camera_add
+			},
+			{
+				label: translate("song.addPlayerCamera"),
+				keybind: [E],
+				onSelect: _player_camera_add
+			},
+			null,
 			{
 				label: translate("bookmarks.addBookmarkHere"),
 				onSelect: _bookmarks_add