From 5cccb06211e6e4f3d5fb2508e9f366a035641ef8 Mon Sep 17 00:00:00 2001 From: Samuli Vuorinen Date: Sun, 14 Jul 2019 09:01:48 +0300 Subject: [PATCH 1/3] Add some caveats to README and CHANGELOG about double scattering --- CHANGELOG.md | 2 +- README.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4183b75..19f5133 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Added menu bar with option to save simulation result as image -- Added slider for setting the probability of double scattering +- Added slider for setting the probability of simple double scattering ### Changed - Replaced Add Population and Remove Population texts with icons diff --git a/README.md b/README.md index 896c236..dbd5212 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,8 @@ Here are some general settings for the whole simulation. - **Double scattering:** Probability of a single light ray to scatter from two different ice crystals - Note that this slows down the simulation significantly! + - The current implementation only does double scattering inside one crystal + population - A value of 0.0 means no rays are scattered twice, and 1.0 means all rays are scattered twice From 0490cf08603ed4c0a5d72749939ea5fd96e2a6e3 Mon Sep 17 00:00:00 2001 From: Samuli Vuorinen Date: Sun, 14 Jul 2019 09:55:26 +0300 Subject: [PATCH 2/3] Fix bug where resource files weren't being linked on Linux --- CHANGELOG.md | 5 +++++ src/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19f5133..fb57fcf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Unreleased + +### Fixed +- Fixed build configuration bug where resources were not being linked on Linux + ## 2.3.0 - 2019-07-13 ### Added diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 516dbbf..ecf7abb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -32,7 +32,7 @@ set(RESOURCE_FILES resources/haloray.qrc resources/haloray.rc) IF (WIN32) add_executable(haloray WIN32 ${HALORAY_SOURCES} ${RESOURCE_FILES}) ELSE() - add_executable(haloray ${HALORAY_SOURCES}) + add_executable(haloray ${HALORAY_SOURCES} ${RESOURCE_FILES}) ENDIF() target_link_libraries(haloray Qt5::Core Qt5::Widgets Qt5::Gui) From 1b984b0c4f6ae1d50196f254dc5d8d6f9fd538ac Mon Sep 17 00:00:00 2001 From: Samuli Vuorinen Date: Sun, 14 Jul 2019 09:58:25 +0300 Subject: [PATCH 3/3] Bump version number --- CHANGELOG.md | 2 +- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb57fcf..2e894de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## Unreleased +## 2.3.1 - 2019-07-14 ### Fixed - Fixed build configuration bug where resources were not being linked on Linux diff --git a/appveyor.yml b/appveyor.yml index fadf82b..4baf777 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: '2.3.0-{build}' +version: '2.3.1-{build}' branches: only: - master