hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,864 Commits 2 Branches 43 Tags
Commit Graph

27 Commits

Author SHA1 Message Date
thzero
e35b7bda2d
Merge branch 'openrocket:unstable' into scripting 2022-07-20 08:28:17 -05:00
SiboVG
ab7915c998 Change generate-orc-files build directory 2022-07-19 22:49:29 +02:00
thzero
aceaa328fc Resolving issue #1270, unexpected exception with simulation scripting 2022-07-01 15:36:52 -05:00
thzero
c2c22697cc
Dependency Updates (#1483) 
* remove the resources\datafiles\presets folder as its is being built by the copy-orc-files build script

* Refactored from new Boolean and new Integer to Boolean.valueOf and Integer.valueOf due to deprecation warnings.   Value of is supported in Java 8 (https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html)

* Removed non-atomic updates around deprecation

* updated test dependencies

* dependency updates

* dependency updates
 2022-06-26 18:58:18 +02:00
JoePfeiffer
326399fe85 Copy LICENSE from new database into presets directory when building 2022-02-07 15:25:49 -07:00
JoePfeiffer
497f185790 Check for database submodule and give instructions for including it 
if not found
 2022-02-01 09:21:06 -07:00
SiboVG
6e4faa8b6a
Merge pull request #1077 from JoePfeiffer/fix-713 
Fix 713: Include legacy and new databases
 2022-01-31 18:40:33 +01:00
Sibo Van Gool
88b14ff709 [fixes #825] Add commonmark to build file 
Needed to fully include the library in OR (when you export it as a JAR file)
 2022-01-27 15:26:30 +01:00
JoePfeiffer
0cd5dcbe09 Eliminate serialization of component preset files 
Relabel "Legacy Component Checkbox" to "Legacy Database Checkbox" to make clearer
 2022-01-26 09:54:28 -07:00
JoePfeiffer
71202abfdc Add Dave Cook's parts database as a git submodule, in a directory called swing/swing/resources-src/datafiles/components/ 
Move old rocksim-based database from .../presets to .../legacy_components
Move rocksim .csv files from .../rocksim_components to .../rocksim_src
Modify BaseComponentDTO to process units
Modify SerializePresets to take a set of directories containing .orc files
as command-line arguments, and process all of them.
Modify swing/build.xml to specify both legacy and new databases for import
 2022-01-18 14:50:30 -07:00
Justin Hanney
0fff7e2d50 Update guice library to remove AOP; Fixes issue #609 2020-04-02 15:56:55 -07:00
Justin Hanney
b78b07e76e Merge branch 'unstable' into feature/fix-macos-after-java11-upgrade 2020-03-14 12:34:45 -04:00
Daniel_M_Williams
630b5eca58 [upgrade][jar] upgrades slf4j logging libraries from 1.7.5 => 1.7.30 
- updates ant build
- updates Intellij build
- updates Eclipse build
 2020-03-13 23:27:34 -04:00
Justin Hanney
3d3d9cca90 Revert build.xml source/target back to 1.8 2020-03-11 20:22:10 -04:00
Justin Hanney
a7c0cb2b8a Fix OSXSetup after migration to Java9+ 2020-03-11 20:16:46 -04:00
Daniel_M_Williams
92308c7665 [fix][build][ant] Fixes ant builds 2020-03-07 20:27:37 -05:00
Daniel Williams
84203b014b
Travis CI now builds for Java 13 -- and fixed some issues for Java 13 (#572) 
* [jar][Upgrade] Upgrade lib-tests libraries

* [fix][jar/upgrade] Upgraded jars in core/lib.  -- fixed Junit Failures due to missing jaxb bindings.

* [fix] Added openjdk 13 to travis auto-builds

* [fix][unittest][java8] fixes automated java8 unittests

* [fix][build][jar] Upgraded logback libraries; moved to core/lib

* [fix][build][jar] removes unused jars: jaxb-jxc.*.jar

* [upgrade][build][jar] Upgrade the guice .jar libraries
 2020-03-06 08:52:20 -05:00
Daniel_M_Williams
32c612fb91 [upgrade] Updated ant build.xml to use java 1.8 2018-06-17 15:34:46 -04:00
Sampo Niskanen
487da3a3fc Merge remote-tracking branch 'upstream/master' into feature/scripting 
Conflicts:
	swing/.settings/org.eclipse.jdt.core.prefs
 2015-01-10 18:44:55 +02:00
kruland2607
9db83259dc Start using Java 1.7. 2015-01-09 21:33:16 -06:00
Sampo Niskanen
eb5321e82c Add script editor highlighting using RSyntaxTextArea 2014-12-27 20:20:32 +02:00
Craig Earls
4ed373b07a Changed startup class to OpenRocket 2014-12-21 11:51:18 -07:00
kruland2607
c40136e0f1 Update to MigLayout 4.0. 2013-11-11 09:51:53 -06:00
kruland2607
2a7cc37d25 Added in plain junit formatter to get output from travis. 2013-10-09 14:35:23 -05:00
kruland2607
393850a367 Change case in core jar name. 2013-09-30 12:03:15 -05:00
kruland2607
d692288f68 Added build.xml driver in root directory. Moved a few files around to support 
unittest.
 2013-09-30 11:38:54 -05:00
kruland2607
26fb295554 Rework source structure to separate swing gui code from core code. 
Separate swing application code from core code.  Moved a bunch of sources
and libraries around.  Created new eclipse project.

Further refinements to make it build.

Update gitignore.
 2013-09-27 11:34:46 -05:00