Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'remotes/orbweaver/master'
- Loading branch information
Showing
35 changed files
with
3,109 additions
and
490 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| usr/lib/*/darkradiant/plugins/libvcs* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,231 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
| <resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1"> | ||
| <object class="wxPanel" name="GameConnectionMainPanel"> | ||
| <style>wxTAB_TRAVERSAL</style> | ||
| <size>360,222</size> | ||
| <object class="wxBoxSizer"> | ||
| <orient>wxVERTICAL</orient> | ||
| <object class="sizeritem"> | ||
| <option>1</option> | ||
| <flag>wxEXPAND</flag> | ||
| <border>5</border> | ||
| <object class="wxBoxSizer"> | ||
| <orient>wxVERTICAL</orient> | ||
| <object class="sizeritem"> | ||
| <option>0</option> | ||
| <flag>wxEXPAND</flag> | ||
| <border>5</border> | ||
| <object class="wxBoxSizer"> | ||
| <orient>wxHORIZONTAL</orient> | ||
| <object class="sizeritem"> | ||
| <option>1</option> | ||
| <flag>wxEXPAND</flag> | ||
| <border>5</border> | ||
| <object class="wxBoxSizer"> | ||
| <orient>wxHORIZONTAL</orient> | ||
| <object class="sizeritem"> | ||
| <option>0</option> | ||
| <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag> | ||
| <border>5</border> | ||
| <object class="wxCheckBox" name="ConnectedCheckbox"> | ||
| <label>Connected</label> | ||
| <checked>0</checked> | ||
| </object> | ||
| </object> | ||
| <object class="sizeritem"> | ||
| <option>0</option> | ||
| <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag> | ||
| <border>5</border> | ||
| <object class="wxStaticBitmap" name="ConnectedActivityIndicator"> | ||
| <bitmap stock_id="darkradiant:activityindicator.png" stock_client="">undefined.png</bitmap> | ||
| </object> | ||
| </object> | ||
| </object> | ||
| </object> | ||
| <object class="sizeritem"> | ||
| <option>1</option> | ||
| <flag>wxEXPAND</flag> | ||
| <border>5</border> | ||
| <object class="wxBoxSizer"> | ||
| <orient>wxHORIZONTAL</orient> | ||
| <object class="sizeritem"> | ||
| <option>0</option> | ||
| <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag> | ||
| <border>5</border> | ||
| <object class="wxButton" name="RestartGameButton"> | ||
| <tooltip>Restarts current map in game, starting TheDarkMod if necessary.\n\n* Note that it saves the current map first.\n* Make sure to configure "File :: Game Setup" settings.\n* Can attach to running game if "com__automation 1" is set in game console.\n</tooltip> | ||
| <label>(Re)Start game</label> | ||
| <default>0</default> | ||
| <markup>0</markup> | ||
| <bitmap /> | ||
| </object> | ||
| </object> | ||
| <object class="sizeritem"> | ||
| <option>0</option> | ||
| <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag> | ||
| <border>5</border> | ||
| <object class="wxCheckBox" name="DmapCheckbox"> | ||
| <tooltip>Dmap every time "Restart game" button is clicked.</tooltip> | ||
| <label>dmap</label> | ||
| <checked>1</checked> | ||
| </object> | ||
| </object> | ||
| </object> | ||
| </object> | ||
| </object> | ||
| </object> | ||
| <object class="sizeritem"> | ||
| <option>0</option> | ||
| <flag>wxEXPAND | wxALL</flag> | ||
| <border>5</border> | ||
| <object class="wxStaticLine" name="m_staticline1"> | ||
| <style>wxLI_HORIZONTAL</style> | ||
| </object> | ||
| </object> | ||
| <object class="sizeritem"> | ||
| <option>1</option> | ||
| <flag>wxEXPAND</flag> | ||
| <border>5</border> | ||
| <object class="wxFlexGridSizer"> | ||
| <rows>3</rows> | ||
| <cols>3</cols> | ||
| <vgap>0</vgap> | ||
| <hgap>0</hgap> | ||
| <growablecols></growablecols> | ||
| <growablerows></growablerows> | ||
| <object class="sizeritem"> | ||
| <option>0</option> | ||
| <flag>wxALL|wxALIGN_CENTER_VERTICAL</flag> | ||
| <border>5</border> | ||
| <object class="wxStaticText" name="m_staticText8"> | ||
| <label>Camera sync</label> | ||
| <wrap>-1</wrap> | ||
| </object> | ||
| </object> | ||
| <object class="sizeritem"> | ||
| <option>0</option> | ||
| <flag>wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND</flag> | ||
| <border>5</border> | ||
| <object class="wxButton" name="CameraLoadFromGameButton"> | ||
| <tooltip>Set preview camera to player's location in game.</tooltip> | ||
| <label>Load from game</label> | ||
| <default>0</default> | ||
| <markup>0</markup> | ||
| <bitmap /> | ||
| </object> | ||
| </object> | ||
| <object class="sizeritem"> | ||
| <option>0</option> | ||
| <flag>wxALL|wxALIGN_CENTER_VERTICAL</flag> | ||
| <border>5</border> | ||
| <object class="wxCheckBox" name="CameraSendToGameCheckbox"> | ||
| <tooltip>Player's location in game constantly follows preview camera.\n\n* Also enables "ghost mode": noclip + notarget +god.</tooltip> | ||
| <label>Send to game</label> | ||
| <checked>0</checked> | ||
| </object> | ||
| </object> | ||
| <object class="sizeritem"> | ||
| <option>0</option> | ||
| <flag>wxALL|wxALIGN_CENTER_VERTICAL</flag> | ||
| <border>5</border> | ||
| <object class="wxStaticText" name="m_staticText9"> | ||
| <label>Map file</label> | ||
| <wrap>-1</wrap> | ||
| </object> | ||
| </object> | ||
| <object class="sizeritem"> | ||
| <option>0</option> | ||
| <flag>wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND</flag> | ||
| <border>5</border> | ||
| <object class="wxButton" name="MapFileReloadNowButton"> | ||
| <tooltip>Reload game entities from .map file on disk.\n\n* You should save your map before doing this.\n* Game only updates entities which have changed since last hot reload update of any kind.</tooltip> | ||
| <label>Reload now</label> | ||
| <default>0</default> | ||
| <markup>0</markup> | ||
| <bitmap /> | ||
| </object> | ||
| </object> | ||
| <object class="sizeritem"> | ||
| <option>0</option> | ||
| <flag>wxALL|wxALIGN_CENTER_VERTICAL</flag> | ||
| <border>5</border> | ||
| <object class="wxCheckBox" name="MapFileReloadOnSaveCheckbox"> | ||
| <tooltip>Reload game entities from .map file every time you save it.\n\nThis has same effect as clicking "Reload now" after every save.</tooltip> | ||
| <label>Reload on save</label> | ||
| <checked>0</checked> | ||
| </object> | ||
| </object> | ||
| <object class="sizeritem"> | ||
| <option>0</option> | ||
| <flag>wxALL|wxALIGN_CENTER_VERTICAL</flag> | ||
| <border>5</border> | ||
| <object class="wxStaticText" name="m_staticText10"> | ||
| <label>Hot reload</label> | ||
| <wrap>-1</wrap> | ||
| </object> | ||
| </object> | ||
| <object class="sizeritem"> | ||
| <option>0</option> | ||
| <flag>wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND</flag> | ||
| <border>5</border> | ||
| <object class="wxButton" name="HotReloadUpdateNowButton"> | ||
| <tooltip>Quickly update game entities to their current state in DarkRadiant.\n\n* The .map file is not touched: modifications are sent directly to game.\n* To enable "Hot reload" mode: save map and click "Reload now".</tooltip> | ||
| <label>Update now</label> | ||
| <default>0</default> | ||
| <markup>0</markup> | ||
| <bitmap /> | ||
| </object> | ||
| </object> | ||
| <object class="sizeritem"> | ||
| <option>0</option> | ||
| <flag>wxALL|wxALIGN_CENTER_VERTICAL</flag> | ||
| <border>5</border> | ||
| <object class="wxCheckBox" name="HotReloadUpdateOnChangeCheckbox"> | ||
| <tooltip>Update game entities automatically after every change.\n\nThis has same effect as clicking "Update now" very often.</tooltip> | ||
| <label>Update on change</label> | ||
| <checked>0</checked> | ||
| </object> | ||
| </object> | ||
| </object> | ||
| </object> | ||
| <object class="sizeritem"> | ||
| <option>0</option> | ||
| <flag>wxEXPAND | wxALL</flag> | ||
| <border>5</border> | ||
| <object class="wxStaticLine" name="m_staticline11"> | ||
| <style>wxLI_HORIZONTAL</style> | ||
| </object> | ||
| </object> | ||
| <object class="sizeritem"> | ||
| <option>1</option> | ||
| <flag>wxEXPAND</flag> | ||
| <border>5</border> | ||
| <object class="wxBoxSizer"> | ||
| <orient>wxHORIZONTAL</orient> | ||
| <object class="sizeritem"> | ||
| <option>0</option> | ||
| <flag>wxALL</flag> | ||
| <border>5</border> | ||
| <object class="wxBitmapButton" name="RespawnSelectedButton"> | ||
| <tooltip>Respawns currently selected entities in game.\n\nRespawning means that existing game entity is deleted, and a fresh one is spawned. It allows to force in-game update of a modified entity after ordinary hot reload did not work.</tooltip> | ||
| <bitmap stock_id="darkradiant:refresh.png" stock_client="">undefined.png</bitmap> | ||
| <default>0</default> | ||
| </object> | ||
| </object> | ||
| <object class="sizeritem"> | ||
| <option>0</option> | ||
| <flag>wxALL</flag> | ||
| <border>5</border> | ||
| <object class="wxBitmapButton" name="PauseGameButton"> | ||
| <tooltip>Pause/unpause the game.</tooltip> | ||
| <bitmap stock_id="darkradiant:media-playback-pause.png" stock_client="">undefined.png</bitmap> | ||
| <default>0</default> | ||
| </object> | ||
| </object> | ||
| </object> | ||
| </object> | ||
| </object> | ||
| </object> | ||
| </object> | ||
| </object> | ||
| </resource> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.