Skip to content

Commit

Permalink
Some changes for v4.0.0 (locations finder + biome sampling + area inp…
Browse files Browse the repository at this point in the history
…ut change)

* added biome samples filter to check biome proportions (#173, #266)
* added outline display for the area of selected conditions (WIP)
* added "from-visible" to conditions editor (#271)
* added Locations to Search tab, to look for positions in the current seed
* moved Tiggers to Search tab
* changed area/position input fields to use block coordinates (#265)
* changed spiral iterator to use an arbitrary, user defined step size
* fixed octave options and added generated display texts (#253)
  • Loading branch information
Cubitect committed Jan 7, 2024
1 parent 08f0434 commit 01fa706
Show file tree
Hide file tree
Showing 40 changed files with 1,982 additions and 886 deletions.
2 changes: 1 addition & 1 deletion buildguide.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Cubiomes Viewer Build Instructions

Cubiomes Viewer is a Qt5 application and requires:
* Qt5.9 or newer (Qt6 is not supported) and a
* Qt5.9 or newer (Qt6 might work, but isn't currently supported) and a
* GNU C++ compiler (GCC or Clang).

The cubiomes library is included as a submodule to this repository.
Expand Down
2 changes: 1 addition & 1 deletion cubiomes
Submodule cubiomes updated 3 files
+142 −0 finders.c
+51 −0 finders.h
+4 −4 makefile
11 changes: 7 additions & 4 deletions cubiomes-viewer.pro
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ win32: {
static_gnu: {
LIBS += -static -static-libgcc -static-libstdc++
}
sanitizer: {
QMAKE_CFLAGS += -fsanitize=undefined
LIBS += -lubsan -ldl
}

gcc {
greaterThan(QMAKE_GCC_MAJOR_VERSION, 9): QMAKE_CXXFLAGS += -Wno-deprecated-copy
}

CONFIG(debug, debug|release): {
CUTARGET = debug
!win32 {
QMAKE_CFLAGS += -fsanitize=undefined
LIBS += -lubsan -ldl
}
} else {
CUTARGET = release
}
Expand Down Expand Up @@ -115,6 +115,7 @@ SOURCES += \
src/search.cpp \
src/searchthread.cpp \
src/tabbiomes.cpp \
src/tablocations.cpp \
src/tabstructures.cpp \
src/tabtriggers.cpp \
src/mainwindow.cpp \
Expand Down Expand Up @@ -182,6 +183,7 @@ HEADERS += \
src/searchthread.h \
src/seedtables.h \
src/tabbiomes.h \
src/tablocations.h \
src/tabstructures.h \
src/tabtriggers.h \
src/mainwindow.h \
Expand All @@ -206,6 +208,7 @@ FORMS += \
src/mainwindow.ui \
src/rangedialog.ui \
src/tabbiomes.ui \
src/tablocations.ui \
src/tabstructures.ui \
src/tabtriggers.ui

Expand Down
4 changes: 2 additions & 2 deletions etc/com.github.cubitect.cubiomes-viewer.metainfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<name>Cubiomes Viewer</name>
<summary>An efficient Minecraft seed finder and map viewer.</summary>
<description>
<p>Cubiomes Viewer offers highly customizable seed-finding utilities and a map viewer for the biome and structure generation of Minecraft Java Edition for the main releases up to 1.19.</p>
<p>Cubiomes Viewer offers highly customizable seed-finding utilities and a map viewer for the biome and structure generation of Minecraft Java Edition for the main releases up to 1.21.</p>
</description>

<releases>
<release version="3.4.2" date="2024-01-02">
<release version="4.0.dev0" date="2024-01.??">
</release>
</releases>

Expand Down
2 changes: 1 addition & 1 deletion rc/dark.qss
Original file line number Diff line number Diff line change
Expand Up @@ -2116,7 +2116,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qsplitter

--------------------------------------------------------------------------- */
QSplitter {
background-color: #455364;
background-color: #19232D; /*#455364;*/
spacing: 0px;
padding: 0px;
margin: 0px;
Expand Down
6 changes: 3 additions & 3 deletions src/aboutdialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#include <QDialog>
#include <QString>

#define VERS_MAJOR 3
#define VERS_MINOR 4
#define VERS_PATCH 2 // negative patch number designates a development version
#define VERS_MAJOR 4
#define VERS_MINOR 0
#define VERS_PATCH -1 // negative patch number designates a development version

// returns +1 if newer, -1 if older and 0 if equal
inline int cmpVers(int major, int minor, int patch)
Expand Down
Loading

0 comments on commit 01fa706

Please sign in to comment.