Skip to content

Commit f857fa4

Browse files
author
GamerMan7799
authored
Merge pull request #12 from Dragon-Wonder/dev
Update Master v1.4.1-R
2 parents 02eda0d + 2c0f9e9 commit f857fa4

File tree

18 files changed

+514
-245
lines changed

18 files changed

+514
-245
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ There are a few branches of this that use different programming languages.
99
# License
1010

1111
This program has been released in the Public Domain meaning you can use it however you wish, read the license file [here](https://github.com/Dragon-Wonder/Physics-Collision-Simulator/blob/master/docs/LICENSE.md)
12-
or you can read [here](http://unlicense.org) for infomation of the Unlicense in general.
12+
or you can read [here](http://unlicense.org) for information of the Unlicense in general.
1313

1414
## Summary of what license means
1515

1616
* First and foremost, this code is "AS IS", meaning we cannot be sued if it doesn't work
1717

1818
* You can modify this code any way you wish without credit (but we would certainty appreciate it)
1919

20-
* You can any/all of this code for private and/or commerical use
20+
* You can any/all of this code for private and/or commercial use
2121

2222
# Running the program
2323

@@ -38,7 +38,7 @@ FolderName\SDL2.dll
3838
FolderName\SDL2_image.dll
3939
```
4040

41-
If you are using the verision I compile, which can be found in the [release tab](https://github.com/Dragon-Wonder/Physics-Collision-Simulator/releases)
41+
If you are using the version I compile, which can be found in the [release tab](https://github.com/Dragon-Wonder/Physics-Collision-Simulator/releases)
4242
you will also need the following binaries.
4343

4444
```
@@ -145,4 +145,4 @@ Clicking and dragging on a ball will allow you to move a ball where the mouse is
145145

146146
### Info Tool
147147

148-
Clicking on a ball will write infomation about it to the console
148+
Clicking on a ball will write information about it to the console

docs/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ Contribute what you want.
77

88
More or less the Google Style which can be found [here](https://google.github.io/styleguide/cppguide.html)
99

10-
Some expections exist, but they are mostly because of old formatting that hasn't been updated yet.
10+
Some exceptions exist, but they are mostly because of old formatting that hasn't been updated yet.
1111

docs/ChangesLog.md

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
33
All notable changes to this project will be documented here.
44
This project adheres to [Semantic Versioning](http://semver.org/)
55

6+
## [1.4.1-R] - 2020-05-29
7+
### Added
8+
* Math function specifically to deal with vector math.
9+
* Pause symbol for when simulation is paused (Issue #10)
10+
11+
### Fixed
12+
* Spelling mistakes
13+
* Various Code mistakes
14+
* Drag tool not un-pausing correctly
15+
* Defined macros not working correctly since I moved certain functions to core.cpp
16+
17+
### Changed
18+
* Updated Doxygen file
19+
* Info tool now displays if ball is paused
20+
* Modified the check overlap function
21+
622
## [1.4.0-R] - 2018-03-27
723
### Added
824
* Toolbar with different tools including: drag, fire, drop, rope, delete, and info. (Issue #5)
@@ -12,7 +28,7 @@ This project adheres to [Semantic Versioning](http://semver.org/)
1228
* More Doxygen stuff.
1329
* Debug message that prints ball mass when created.
1430
* Ability to pause the simulation.
15-
* Changable Ratio of meters to Pixels (default is 10 pixels/meter)
31+
* Changeable Ratio of meters to Pixels (default is 10 pixels/meter)
1632

1733
### Changed
1834
* Moved Docs to Doc folder.
@@ -25,7 +41,7 @@ This project adheres to [Semantic Versioning](http://semver.org/)
2541
* Floors to casts (due to large number of calls of the floor functions).
2642

2743
### Removed
28-
* Interia/engergy from spins, because it did nothing.
44+
* Inertia/energy from spins, because it did nothing.
2945

3046
### Fixed
3147
* Bug of balls getting stuck in walls.
@@ -42,7 +58,7 @@ This project adheres to [Semantic Versioning](http://semver.org/)
4258

4359
## [1.3.0-R] - 2018-03-06
4460
### Added
45-
* Interia/energy from spins.
61+
* Inertia/energy from spins.
4662

4763
### Notes
4864
* Pretty pointless addition, just wanted to add something since its been a year.
@@ -60,7 +76,7 @@ This project adheres to [Semantic Versioning](http://semver.org/)
6076

6177
### Updated
6278
* Drag equation.
63-
* System is force based instead of acceleation.
79+
* System is force based instead of acceleration.
6480

6581

6682
## [1.1.2-R] - 2017-02-24
@@ -98,7 +114,7 @@ This project adheres to [Semantic Versioning](http://semver.org/)
98114
* Max number of past points is now a config value.
99115

100116
### Notes
101-
* There are still quite a few non-standard elements left from before I started using Google's style guide consistantly.
117+
* There are still quite a few non-standard elements left from before I started using Google's style guide consistently.
102118
I changed the worst offending members, but most of the rest of it will be left.
103119

104120
## [1.0.0-RC] - 2015-11-21
@@ -133,8 +149,8 @@ This project adheres to [Semantic Versioning](http://semver.org/)
133149
* Made most lines to be less than 80 charaters.
134150

135151
### Cleaned
136-
* Depencies on header files.
137-
* Depencies on exteral libraries.
152+
* Dependencies on header files.
153+
* Dependencies on external libraries.
138154

139155
### Added
140156
* More doxygen comments that I missed before.
@@ -465,4 +481,4 @@ This project adheres to [Semantic Versioning](http://semver.org/)
465481

466482
## [1.0.0-Alpha] - 2015-08-11
467483
### Notes
468-
* Inital.
484+
* Initial.

project/Physics-Simulator.cbp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,10 @@
160160
<Unit filename="../src/tick.h" />
161161
<Unit filename="../src/toolbar.cpp" />
162162
<Unit filename="../src/toolbar.h" />
163+
<Unit filename="../src/vector_math.cpp" />
164+
<Unit filename="../src/vector_math.h" />
163165
<Unit filename="../src/version.h" />
164166
<Extensions>
165-
<code_completion />
166-
<envvars />
167-
<debugger />
168-
<lib_finder disable_auto="1" />
169167
<DoxyBlocks>
170168
<comment_style block="5" line="0" />
171169
<doxyfile_project project_number="v1.4.0-R" output_directory="gh-pages" />
@@ -175,6 +173,7 @@
175173
<doxyfile_dot class_diagrams="1" have_dot="1" />
176174
<general use_at_in_tags="1" />
177175
</DoxyBlocks>
176+
<lib_finder disable_auto="1" />
178177
</Extensions>
179178
</Project>
180179
</CodeBlocks_project_file>

0 commit comments

Comments
 (0)