Merge dev branch into master #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

mishaturnbull wants to merge 523 commits into master from unstable

.github/CODE_OF_CONDUCT.md

-Original file line number
+Diff line change
@@ -0,0 +1,5 @@
+    # Code of Conduct
+    All interactions with this repository must be in accordance with the University of North Dakota Code of Student Life.
+    The official Code of Student Life can be found here: http://www1.und.edu/code-of-student-life/.

.github/ISSUE_TEMPLATE/bug.md

-Original file line number
+Diff line change
@@ -0,0 +1,36 @@
+    ---
+    name: Bug Report
+    about: Submit a report of a bug/issue/unexpected behavior/etc
+    ---
+    **Bug Location**
+    This bug is most likely:
+    - Somewhere caused by ARC's modifications to the OpenRocket code
+    - A preexisting, but yet undiscovered, OpenRocket bug
+      - This bug should be fixed on ARC's fork because: ???
+    **Describe the bug**
+    A clear and concise description of what the bug is.
+    **To Reproduce**
+    Steps to reproduce the behavior:
+. Go to '...'
+. Click on '....'
+. Scroll down to '....'
+. See error
+    **Expected behavior**
+    A clear and concise description of what you expected to happen.
+    **Screenshots**
+    If applicable, add screenshots to help explain your problem.
+    **System information**
+     - Device: [e.g. HP laptop]
+     - OS: [e.g. Linux kernel 4.18, Debian 9]
+     - Commit id bug exists in: [e.g. 17b9454]
+     - Any other applicable details
+    **Additional context**
+    Add any other context about the problem here.

.github/PULL_REQUEST_TEMPLATE.md

-Original file line number
+Diff line change
@@ -0,0 +1,6 @@
+    This is a [bug fix/new features/something else] pull request.
+    Summary:
+    What does this fix, add, or otherwise change, summed up in a single paragraph.

0 README.md → .github/README.md

File renamed without changes.

.github/contributing.md

-Original file line number
+Diff line change
@@ -0,0 +1,16 @@
+    # Contribution guidelines
+    All contributions to this repository are to be made by a member of the UND-ARC Github organization.  As much as we appreciate the thought, no outside collaborators' PRs will be approved without prior discussion.  This is due to liability concerns.
+    All contributions to this repository are to be in accordance with its code of conduct, which can be found in the same directory as this file, titled `CODE_OF_CONDUCT.md`.
+    All commits that are made to this repository must be signed off.  To do this, add the `-s` flag to the `commit` command, for example:
+    ```
+    git commit -m "Fixes #27"
+    ```
+    would become
+    ```
+    git commit -s -m "Fixes #27"
+    ```

.gitignore

-Original file line number
+Diff line change
@@ -1,5 +1,6 @@
+    *.DS_Store
     *~
+    *.class
     # /
     /bin
@@ Expand Down Expand Up / @@ -87,3 +88,4 @@ com_crashlytics_export_strings.xml @@
     crashlytics.properties
     crashlytics-build.properties
     fabric.properties
+    /.metadata/

.idea/artifacts/openrocket_jar.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

.idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

.idea/runConfigurations/All_tests.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

.idea/runConfigurations/Openrocket_UI_Jar.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

.travis.yml

-Original file line number
+Diff line change
@@ -1,5 +1,23 @@
     language: java
+    dist: trusty
+    sudo: false
+    addons:
+      apt:
+        packages:
+          - ant-optional
     jdk:
-      - oraclejdk7
+      - openjdk8
     script:
      - "ant -buildfile build.xml clean check jar unittest"
+    after_success:
+      - ls -lh /home/travis/build/openrocket/openrocket/swing/build/jar/OpenRocket.jar
+      - ls -lh /home/travis/build/openrocket/openrocket/swing/build/jar/OpenRocket-Core.jar
+      - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+      - bash upload.sh /home/travis/build/openrocket/openrocket/swing/build/jar/OpenRocket.jar
+      - bash upload.sh /home/travis/build/openrocket/openrocket/swing/build/jar/OpenRocket-Core.jar
+    branches:
+      except:
+        - # Do not build tags that we create when we upload to GitHub Releases
+        - /^(?i:continuous)$/

android-libraries/ActionBarSherlock/bin/.gitignore

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/classes/

android-libraries/TreeViewList/bin/classes/pl/polidea/treeview/overview.html

-Original file line number
+Diff line change
@@ -0,0 +1,24 @@
+    <html>
+    <body>
+    This is a small utility that provides quite configurable tree view list.
+    It is based on standard android list view. It separates out different
+    aspects of the tree: there is a separate list view, tree adapter, tree
+    state manager and tree state builder.
+    <p>
+    <ul>
+    	<li>Tree view provides the frame to display the view.</li>
+    	<li>Adapter allows to create visual representation of each tree
+    	node.</li>
+    	<li>State manager provides storage for tree state (connections
+    	between parents and children, collapsed/expanded state). It provides
+    	all the low-level tree manipulation methods.</li>
+    	<li>Tree builder allows to build tree easily providing higher
+    	level methods. The tree can be build either from prepared sequentially
+    	prepared list of nodes (node id, level) or using (parent/child
+    	relationships).</li>
+    	<p>For now only in-memory state manager is provided, but Tree State
+    	Manger interface is done in the way that database tree manager even for
+    	large trees is potentially supported.
+    </ul>
+    </body>
+    </html>

core/.classpath

-Original file line number
+Diff line change
@@ Expand Up / @@ -25,5 +25,7 @@ @@
     	<classpathentry kind="lib" path="/OpenRocket Test Libraries/junit-dep-4.8.2.jar"/>
     	<classpathentry kind="lib" path="/OpenRocket Test Libraries/test-plugin.jar"/>
     	<classpathentry kind="lib" path="/OpenRocket Test Libraries/uispec4j-2.3-jdk16.jar"/>
+    	<classpathentry kind="lib" path="/OpenRocket Swing/lib/logback-classic-1.0.12.jar"/>
+    	<classpathentry kind="lib" path="/OpenRocket Swing/lib/logback-core-1.0.12.jar"/>
     	<classpathentry kind="output" path="bin"/>
     </classpath>

core/.settings/org.eclipse.jdt.core.prefs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,9 +1,9 @@
  
    eclipse.preferences.version=1

    org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

    org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate

    org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7

    org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

    org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

    org.eclipse.jdt.core.compiler.compliance=1.7

    org.eclipse.jdt.core.compiler.compliance=1.8

    org.eclipse.jdt.core.compiler.debug.lineNumber=generate

    org.eclipse.jdt.core.compiler.debug.localVariable=generate

    org.eclipse.jdt.core.compiler.debug.sourceFile=generate

    @@ -71,7 +71,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
  
    org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

    org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning

    org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

    org.eclipse.jdt.core.compiler.source=1.7

    org.eclipse.jdt.core.compiler.source=1.8

    org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

    org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

    org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

core/.settings/org.eclipse.jdt.ui.prefs

-Original file line number
+Diff line change
@@ -1,56 +1,3 @@
     eclipse.preferences.version=1
-    editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
     formatter_profile=_OpenRocket style
     formatter_settings_version=12
-    sp_cleanup.add_default_serial_version_id=true
-    sp_cleanup.add_generated_serial_version_id=false
-    sp_cleanup.add_missing_annotations=true
-    sp_cleanup.add_missing_deprecated_annotations=true
-    sp_cleanup.add_missing_methods=false
-    sp_cleanup.add_missing_nls_tags=false
-    sp_cleanup.add_missing_override_annotations=true
-    sp_cleanup.add_missing_override_annotations_interface_methods=true
-    sp_cleanup.add_serial_version_id=false
-    sp_cleanup.always_use_blocks=true
-    sp_cleanup.always_use_parentheses_in_expressions=false
-    sp_cleanup.always_use_this_for_non_static_field_access=false
-    sp_cleanup.always_use_this_for_non_static_method_access=false
-    sp_cleanup.convert_to_enhanced_for_loop=false
-    sp_cleanup.correct_indentation=false
-    sp_cleanup.format_source_code=true
-    sp_cleanup.format_source_code_changes_only=false
-    sp_cleanup.make_local_variable_final=false
-    sp_cleanup.make_parameters_final=false
-    sp_cleanup.make_private_fields_final=true
-    sp_cleanup.make_type_abstract_if_missing_method=false
-    sp_cleanup.make_variable_declarations_final=true
-    sp_cleanup.never_use_blocks=false
-    sp_cleanup.never_use_parentheses_in_expressions=true
-    sp_cleanup.on_save_use_additional_actions=false
-    sp_cleanup.organize_imports=true
-    sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-    sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-    sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-    sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-    sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-    sp_cleanup.remove_private_constructors=true
-    sp_cleanup.remove_trailing_whitespaces=false
-    sp_cleanup.remove_trailing_whitespaces_all=true
-    sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-    sp_cleanup.remove_unnecessary_casts=true
-    sp_cleanup.remove_unnecessary_nls_tags=false
-    sp_cleanup.remove_unused_imports=false
-    sp_cleanup.remove_unused_local_variables=false
-    sp_cleanup.remove_unused_private_fields=true
-    sp_cleanup.remove_unused_private_members=false
-    sp_cleanup.remove_unused_private_methods=true
-    sp_cleanup.remove_unused_private_types=true
-    sp_cleanup.sort_members=false
-    sp_cleanup.sort_members_all=false
-    sp_cleanup.use_blocks=false
-    sp_cleanup.use_blocks_only_for_return_and_throw=false
-    sp_cleanup.use_parentheses_in_expressions=false
-    sp_cleanup.use_this_for_non_static_field_access=false
-    sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-    sp_cleanup.use_this_for_non_static_method_access=false
-    sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge dev branch into master #2

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Merge dev branch into master #2

Are you sure you want to change the base?

Uh oh!

Merge dev branch into master #2

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!