Skip to content

Commit

Permalink
3419: Updates after moving the repo (TrenchBroom#3420)
Browse files Browse the repository at this point in the history
* 3419: Update URLS and build status

* 3419: Replace all mentions of kduske with TrenchBroom

* 3419: Update vecmath submodule URI
  • Loading branch information
kduske authored Aug 22, 2020
1 parent 49df698 commit a3d8b11
Show file tree
Hide file tree
Showing 37 changed files with 85 additions and 85 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "lib/vecmath"]
path = lib/vecmath
url = https://github.com/kduske/vecmath.git
url = https://github.com/TrenchBroom/vecmath.git
[submodule "lib/Catch2"]
path = lib/Catch2
url = https://github.com/catchorg/Catch2
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ else()
endif()

# Request 8MB stack on Windows. (NOTE: /STACK should be used on .exe targets only.)
# Default is 1MB and we need more for our current AABB builder on large maps (https://github.com/kduske/TrenchBroom/issues/2803)
# Default is 1MB and we need more for our current AABB builder on large maps (https://github.com/TrenchBroom/TrenchBroom/issues/2803)
if(COMPILER_IS_MSVC)
set(TB_STACK_SIZE 8388608)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:${TB_STACK_SIZE}")
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
TrenchBroom is a modern cross-platform level editor for Quake-engine based games.

- Trailer: https://www.youtube.com/watch?v=shcAvnYp9ow
- Website: http://kristianduske.com/trenchbroom
- Website: http://github.com/TrenchBroom/TrenchBroom
- Discord: https://discord.gg/WGf9uve
- Tutorial: https://www.youtube.com/watch?v=gONePWocbqA

[![Build Status](https://travis-ci.org/kduske/TrenchBroom.svg?branch=release%2Fv2.0.0)](https://travis-ci.org/kduske/TrenchBroom) [![Build status](https://ci.appveyor.com/api/projects/status/github/kduske/trenchbroom?branch=release%2Fv2.0.0&svg=true)](https://ci.appveyor.com/project/kduske/trenchbroom/branch/release/v2.0.0)
[![Build Status](https://travis-ci.org/TrenchBroom/TrenchBroom.svg)](https://travis-ci.org/TrenchBroom/TrenchBroom) [![Build status](https://ci.appveyor.com/api/projects/status/github/TrenchBroom/trenchbroom?svg=true)](https://ci.appveyor.com/project/TrenchBroom/trenchbroom)

## Features
* **General**
Expand Down Expand Up @@ -71,4 +71,4 @@ TrenchBroom is a modern cross-platform level editor for Quake-engine based games
- [Source Sans Pro](https://fonts.google.com/specimen/Source+Sans+Pro) font

## Changes
See [releases](https://github.com/kduske/TrenchBroom/releases) for latest changes.
See [releases](https://github.com/TrenchBroom/TrenchBroom/releases) for latest changes.
4 changes: 2 additions & 2 deletions app/resources/documentation/manual/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2419,8 +2419,8 @@ Open the "About TrenchBroom" dialog from the menu. The light gray text on the le
- [Quake Mapping Discord] - Quake Mapping Discord
- [Tome of Preach] - Quake Map Hacks and QuakeC Hacks

[TrenchBroom on GitHub]: http://github.com/kduske/TrenchBroom/
[TrenchBroom issue tracker]: http://github.com/kduske/TrenchBroom/issues/
[TrenchBroom on GitHub]: http://github.com/TrenchBroom/TrenchBroom/
[TrenchBroom issue tracker]: http://github.com/TrenchBroom/TrenchBroom/issues/
[TrenchBroom Discord]: https://discord.gg/WGf9uve
[func_msgboard]: http://celephais.net/board/
[Quake Tools]: https://joshua.itch.io/quake-tools
Expand Down
2 changes: 1 addition & 1 deletion common/src/IO/ObjSerializer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ namespace TrenchBroom {
std::fprintf(m_stream, "# texture coordinates\n");
for (const vm::vec2f& elem : m_texCoords.list()) {
// multiplying Y by -1 needed to get the UV's to appear correct in Blender and UE4
// (see: https://github.com/kduske/TrenchBroom/issues/2851 )
// (see: https://github.com/TrenchBroom/TrenchBroom/issues/2851 )
std::fprintf(m_stream, "vt %.17g %.17g\n", static_cast<double>(elem.x()), static_cast<double>(-elem.y()));
}
}
Expand Down
2 changes: 1 addition & 1 deletion common/src/Model/GroupNode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ namespace TrenchBroom {
// This avoids a potential performance trap where we'd have to exhaustively
// test many objects if most of the map was inside groups, but it means
// the pick results need to be postprocessed to account for groups (if desired).
// See: https://github.com/kduske/TrenchBroom/issues/2742
// See: https://github.com/TrenchBroom/TrenchBroom/issues/2742
}

void GroupNode::doFindNodesContaining(const vm::vec3& point, std::vector<Node*>& result) {
Expand Down
2 changes: 1 addition & 1 deletion common/src/Renderer/BrushRenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ namespace TrenchBroom {
bool BrushRenderer::shouldDrawFaceInTransparentPass(const Model::BrushNode* brush, const Model::BrushFace& face) const {
if (m_transparencyAlpha >= 1.0f) {
// In this case, draw everything in the opaque pass
// see: https://github.com/kduske/TrenchBroom/issues/2848
// see: https://github.com/TrenchBroom/TrenchBroom/issues/2848
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion common/src/TrenchBroomApp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ namespace TrenchBroom {
//
// Previously were calling `qt_set_sequence_auto_mnemonic(false);` in main(), but it turns out we
// also need to suppress an Alt press followed by release from focusing the menu bar
// (https://github.com/kduske/TrenchBroom/issues/3140), so the following QProxyStyle disables
// (https://github.com/TrenchBroom/TrenchBroom/issues/3140), so the following QProxyStyle disables
// that completely.

class TrenchBroomProxyStyle : public QProxyStyle {
Expand Down
2 changes: 1 addition & 1 deletion common/src/View/AboutDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ namespace TrenchBroom {
}

void AboutDialog::createGui() {
const QString creditsString = tr("github.com/kduske/TrenchBroom\n\n"
const QString creditsString = tr("github.com/TrenchBroom/TrenchBroom\n\n"
"<b>Developers</b>\n"
"Kristian Duske\n"
"Eric Wasylishen\n\n"
Expand Down
2 changes: 1 addition & 1 deletion common/src/View/ControlListBox.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ namespace TrenchBroom {
auto* renderer = this->renderer(row);
// FIXME: this uses QListWidgetItem::isSelected() but addItemRenderer() is doing
// it based on QListWidget::currentItem() - should be consistent.
// (see: https://github.com/kduske/TrenchBroom/issues/3104)
// (see: https://github.com/TrenchBroom/TrenchBroom/issues/3104)
renderer->setSelected(listItem->isSelected(), m_listWidget);
if (listItem->isSelected()) {
selectedRowChanged(row);
Expand Down
2 changes: 1 addition & 1 deletion common/src/View/CrashDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ namespace TrenchBroom {
auto* reportButton = buttonBox->addButton(tr("Report"), QDialogButtonBox::AcceptRole);

connect(reportButton, &QAbstractButton::clicked, this, [](){
QDesktopServices::openUrl(QUrl("https://github.com/kduske/TrenchBroom/issues/new"));
QDesktopServices::openUrl(QUrl("https://github.com/TrenchBroom/TrenchBroom/issues/new"));
});
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);

Expand Down
2 changes: 1 addition & 1 deletion common/src/View/EntityAttributeItemDelegate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ namespace TrenchBroom {
// show the completions immediately when the editor is opened if the editor's text is empty
auto* lineEdit = dynamic_cast<QLineEdit*>(editor);
if (lineEdit != nullptr) {
// Delay to work around https://github.com/kduske/TrenchBroom/issues/3082
// Delay to work around https://github.com/TrenchBroom/TrenchBroom/issues/3082
// Briefly, when typing the first letter of the text you want to enter to open the cell editor,
// when setEditorData() runs, the letter has not been inserted into the QLineEdit yet.
// Opening the completion popup and then typing the letter causes the editor to close, which is
Expand Down
2 changes: 1 addition & 1 deletion common/src/View/MapFrame.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,7 @@ namespace TrenchBroom {
const vm::bbox3 bounds = m_document->selectionBounds();

// The pasted objects must be hidden to prevent the picking done in pasteObjectsDelta
// from hitting them (https://github.com/kduske/TrenchBroom/issues/2755)
// from hitting them (https://github.com/TrenchBroom/TrenchBroom/issues/2755)
const std::vector<Model::Node*> nodes = m_document->selectedNodes().nodes();
m_document->hide(nodes);
const vm::vec3 delta = m_mapView->pasteObjectsDelta(bounds, referenceBounds);
Expand Down
2 changes: 1 addition & 1 deletion common/src/View/MapViewActivationTracker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ namespace TrenchBroom {
// and exited early. But sometimes we may receive a button up event without having received a
// corresponding mouse down event. In that case, we want to activate in any case, but only discard the
// event if it was a left click.
// see https://github.com/kduske/TrenchBroom/issues/3045
// see https://github.com/TrenchBroom/TrenchBroom/issues/3045
return event->button() == Qt::LeftButton;
}

Expand Down
2 changes: 1 addition & 1 deletion common/src/View/MapViewBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ namespace TrenchBroom {
// If we snap the selection bounds' center to the grid size, then
// selections that are an odd number of grid units wide get translated.
// Instead, snap to 1/2 the grid size.
// (see: https://github.com/kduske/TrenchBroom/issues/1495 )
// (see: https://github.com/TrenchBroom/TrenchBroom/issues/1495 )
Grid halfGrid(document->grid().size());
halfGrid.decSize();

Expand Down
2 changes: 1 addition & 1 deletion common/src/View/QtUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ namespace TrenchBroom {
case MapTextEncoding::Quake:
// Quake uses the full 1-255 range for its bitmap font.
// So using a "just assume UTF-8" approach would not work here.
// See: https://github.com/kduske/TrenchBroom/issues/3122
// See: https://github.com/TrenchBroom/TrenchBroom/issues/3122
return QTextCodec::codecForLocale();
case MapTextEncoding::Iso88591:
return QTextCodec::codecForName("ISO 8859-1");
Expand Down
2 changes: 1 addition & 1 deletion common/src/View/SetBrushFaceAttributesTool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ namespace TrenchBroom {

if (!document->canUndoCommand() || document->undoCommandName() != TransferFaceAttributesTransactionName) {
// The last click may not have been handled by this tool, see:
// https://github.com/kduske/TrenchBroom/issues/3332
// https://github.com/TrenchBroom/TrenchBroom/issues/3332
return false;
}
document->undoCommand();
Expand Down
2 changes: 1 addition & 1 deletion common/src/View/ToolBoxConnector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ namespace TrenchBroom {
// Move the mouse back to where it was when the user clicked (see InputEventRecorder::recordEvent)
// and re-pick, since we're currently 2px off from there, and the user will expects to drag exactly
// what was under the pixel they clicked.
// See: https://github.com/kduske/TrenchBroom/issues/2808
// See: https://github.com/TrenchBroom/TrenchBroom/issues/2808
mouseMoved(event.posX, event.posY);
updatePickResult();

Expand Down
2 changes: 1 addition & 1 deletion common/test/src/IO/FgdParserTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ namespace TrenchBroom {

/**
* Support having an integer (or decimal) as a default for a string attribute. Technically
* a type mismatch, but appears in the wild; see: https://github.com/kduske/TrenchBroom/issues/2833
* a type mismatch, but appears in the wild; see: https://github.com/TrenchBroom/TrenchBroom/issues/2833
*/
TEST_CASE("FgdParserTest.parseStringAttribute_IntDefault", "[FgdParserTest]") {
const std::string file = R"(@PointClass = info_notnull : "Wildcard entity"
Expand Down
2 changes: 1 addition & 1 deletion common/test/src/IO/FreeImageTextureReaderTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ namespace TrenchBroom {
ASSERT_NE(0u, texture.height());
}

// https://github.com/kduske/TrenchBroom/issues/2474
// https://github.com/TrenchBroom/TrenchBroom/issues/2474
static void testImageContents(const Assets::Texture& texture, const ColorMatch match) {
const std::size_t w = 64u;
const std::size_t h = 64u;
Expand Down
2 changes: 1 addition & 1 deletion common/test/src/IO/Md3ParserTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ namespace TrenchBroom {
}

TEST_CASE("Md3ParserTest.loadFailure_2659", "[Md3ParserTest]") {
// see https://github.com/kduske/TrenchBroom/issues/2659
// see https://github.com/TrenchBroom/TrenchBroom/issues/2659

NullLogger logger;
const auto shaderSearchPath = Path("scripts");
Expand Down
4 changes: 2 additions & 2 deletions common/test/src/IO/NodeWriterTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@ R"(( -32 -32 -32 ) ( -32 -31 -32 ) ( -32 -32 -31 ) none 0 0 0 1 1
"}\n", result.c_str());
}

// https://github.com/kduske/TrenchBroom/issues/1739
// https://github.com/TrenchBroom/TrenchBroom/issues/1739
TEST_CASE("NodeWriterTest.writePropertiesWithNewlineEscapeSequence", "[NodeWriterTest]") {
Model::WorldNode map(Model::MapFormat::Standard);
map.addOrUpdateAttribute("classname", "worldspawn");
Expand All @@ -725,7 +725,7 @@ R"(( -32 -32 -32 ) ( -32 -31 -32 ) ( -32 -32 -31 ) none 0 0 0 1 1
"}\n", result.c_str());
}

// https://github.com/kduske/TrenchBroom/issues/2556
// https://github.com/TrenchBroom/TrenchBroom/issues/2556
TEST_CASE("NodeWriterTest.writePropertiesWithTrailingBackslash", "[NodeWriterTest]") {
Model::WorldNode map(Model::MapFormat::Standard);
map.addOrUpdateAttribute("classname", "worldspawn");
Expand Down
6 changes: 3 additions & 3 deletions common/test/src/IO/Quake3ShaderParserTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ waterBubble
}

TEST_CASE("Quake3ShaderParserTest.parseShadersWithInvalidWhitespace", "[Quake3ShaderParserTest]") {
// see https://github.com/kduske/TrenchBroom/issues/2537
// see https://github.com/TrenchBroom/TrenchBroom/issues/2537
// The file contains a carriage return without a consecutive line feed, which tripped the parser.

const auto workDir = Disk::getCurrentWorkingDir();
Expand All @@ -516,7 +516,7 @@ waterBubble
}

TEST_CASE("Quake3ShaderParserTest.parseShaderAbsolutePath", "[Quake3ShaderParserTest]") {
// see https://github.com/kduske/TrenchBroom/issues/2633
// see https://github.com/TrenchBroom/TrenchBroom/issues/2633
// apparently, the Q3 engine can handle this

const std::string data(R"(
Expand All @@ -543,7 +543,7 @@ waterBubble
}

TEST_CASE("Quake3ShaderParserTest.parseShaderWithMissingCBrace", "[Quake3ShaderParserTest]") {
// see https://github.com/kduske/TrenchBroom/issues/2663
// see https://github.com/TrenchBroom/TrenchBroom/issues/2663
// Quake 3 allows this, too.

const std::string data(R"(
Expand Down
4 changes: 2 additions & 2 deletions common/test/src/IO/WorldReaderTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1169,7 +1169,7 @@ common/caulk
}

TEST_CASE("WorldReaderTest.parseMultipleClassnames", "[WorldReaderTest]") {
// See https://github.com/kduske/TrenchBroom/issues/1485
// See https://github.com/TrenchBroom/TrenchBroom/issues/1485

const std::string data(R"(
{
Expand Down Expand Up @@ -1270,7 +1270,7 @@ common/caulk
ASSERT_STREQ("test\\\\", world->attribute("message").c_str());
}

// https://github.com/kduske/TrenchBroom/issues/1739
// https://github.com/TrenchBroom/TrenchBroom/issues/1739
TEST_CASE("WorldReaderTest.parseAttributeNewlineEscapeSequence", "[WorldReaderTest]") {
const std::string data(R"(
{
Expand Down
6 changes: 3 additions & 3 deletions common/test/src/Model/BrushFaceTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ namespace TrenchBroom {
checkTextureLockOffWithScale(cube);
}

// https://github.com/kduske/TrenchBroom/issues/2001
// https://github.com/TrenchBroom/TrenchBroom/issues/2001
TEST_CASE("BrushFaceTest.testValveRotation", "[BrushFaceTest]") {
const std::string data("{\n"
"\"classname\" \"worldspawn\"\n"
Expand Down Expand Up @@ -580,7 +580,7 @@ namespace TrenchBroom {
kdl::vec_clear_and_delete(nodes);
}

// https://github.com/kduske/TrenchBroom/issues/1995
// https://github.com/TrenchBroom/TrenchBroom/issues/1995
TEST_CASE("BrushFaceTest.testCopyTexCoordSystem", "[BrushFaceTest]") {
const std::string data("{\n"
" \"classname\" \"worldspawn\"\n"
Expand Down Expand Up @@ -639,7 +639,7 @@ namespace TrenchBroom {
kdl::vec_clear_and_delete(nodes);
}

// https://github.com/kduske/TrenchBroom/issues/2315
// https://github.com/TrenchBroom/TrenchBroom/issues/2315
TEST_CASE("BrushFaceTest.move45DegreeFace", "[BrushFaceTest]") {
const std::string data(R"(
// entity 0
Expand Down
Loading

0 comments on commit a3d8b11

Please sign in to comment.