Skip to content

Commit f9e91b3

Browse files
committed
Update to v1.4.1-R
## [1.4.1-R] - 2020-05-29 ### Added * Math function specifically to deal with vector math. * Pause symbol for when simulation is paused (Issue #10) ### Fixed * Spelling mistakes * Various Code mistakes * Drag tool not un-pausing correctly * Defined macros not working correctly since I moved certain functions to core.cpp ### Changed * Updated Doxygen file * Info tool now displays if ball is paused * Modified the check overlap function
1 parent 57cb92b commit f9e91b3

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/global.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
colliding balls. The forces are along the same direction as the velocities
2121
are. It doesn't make sense in the real world. */
2222
/*****************************************************************************/
23-
#define DEFINED_PUSH_BALLS_OUT_OF_OVERLAP 1
23+
#define DEFINED_PUSH_BALLS_OUT_OF_OVERLAP 0
2424
/**< This will turn on a method that will attempt to move the balls until they
2525
are no longer overlapping when detecting collision. */
2626
/*****************************************************************************/

src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
/// @brief Holds all the main functions.
55
/// @author GamerMan7799
66
/// @author xPUREx
7-
/// @version 1.4.1-rc.1
7+
/// @version 1.4.1-R
88
/// @date 2015-2020
99
/// @copyright Public Domain Unlicense.
1010
/////////////////////////////////////////////////

src/version.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
/*****************************************************************************/
3838
/** The version number in a format used by Boilerplate.rc, It is in the following format
3939
[MAJOR].[MINOR].[PATCH].[BUILDNUMBER] */
40-
#define DEFINED_VER_RC_FILEVERSION 1,4,1,4
40+
#define DEFINED_VER_RC_FILEVERSION 1,4,1,5
4141

4242
/** Is the same as DEFINED_VER_RC_FILEVERSION but is a null terminated string */
43-
#define DEFINED_VER_RC_FILEVERSION_STRING "1, 4, 1, 4\0"
43+
#define DEFINED_VER_RC_FILEVERSION_STRING "1, 4, 1, 5\0"
4444

4545
/** A more specific string of the file version */
46-
#define DEFINED_VER_FULLVERSION_STRING "1.4.1-rc.1\0"
46+
#define DEFINED_VER_FULLVERSION_STRING "1.4.1-R\0"
4747

4848
//Software Status
4949
/**
@@ -55,10 +55,10 @@ Software Status can be the following:
5555
| Beta | b | This version will compile and / or run but does not work as expected (or crashes often). |
5656
| Alpha | a | This version does not work at all; it usually won't compile at all or crashes more times than it works; best not to use versions in this state. |
5757
*/
58-
#define DEFINED_VER_STATUS "Release Candidate"
58+
#define DEFINED_VER_STATUS "Release"
5959

6060
/** See the table for DEFINED_VER_STATUS */
61-
#define DEFINED_VER_STATUS_SHORT "rc"
61+
#define DEFINED_VER_STATUS_SHORT "r"
6262
/// @}
6363
/*****************************************************************************/
6464
#endif //__VERSION_HEADER__

0 commit comments

Comments
 (0)