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

46 Commits

Author SHA1 Message Date
JoePfeiffer
768e7380eb Move some meta-files from the .../core subdirectory to the root directory. 2022-02-10 08:59:59 -07:00
Daniel_M_Williams
32c612fb91 [upgrade] Updated ant build.xml to use java 1.8 2018-06-17 15:34:46 -04:00
Daniel_M_Williams
ce65463996 [fix] added several config changes to travis config 2017-08-20 20:21:28 -04:00
Kevin Ruland
e0c7c34cb0 Fixes from unit tests. 
Don't serializemotors during ci builds.  This will likely pound
thrustcurve.org too much.  Couple of bugs found by unittests :)
 2016-10-11 16:23:39 -05:00
Kevin Ruland
b415238a02 Changed Motor to support additional fields case info, prop info, and 
availability flag provided by Thrustcurve.org.  Change serialization
process to pull current files from Thrustcurve.org using the xml api,
use the corrected data for diameter and length, and use a consistent
motor designation.  Added fields to the Motor chooser - case info is a
column in the listing (replacing MotorType), the other info is in the
motor details tab.  Added toggle to hide motors which are OOP.
 2015-12-07 22:27:05 -06:00
kruland2607
9db83259dc Start using Java 1.7. 2015-01-09 21:33:16 -06:00
kruland2607
2a7cc37d25 Added in plain junit formatter to get output from travis. 2013-10-09 14:35:23 -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
kruland2607
152662613b Fixed build for new library version numbers. 2013-09-04 21:39:34 -05:00
soupwizard
845780a2bc Fixed unittest failure in LogLevelTest. Added config dir with logback 
config file that set logging to stdout and level to Error.  Modified
unittest target used by travis-ci to use new logback config file to
reduce clutter in unittest output.  Commented out superfluous
System.println's from various unit tests to also reduce clutter.
 2013-06-03 17:55:32 -07:00
kruland2607
f1aee31b5f Final refactoring. Changed names of a few startup classes. Move 
ComponentPresetEditor and RocksimComponentFileTranslator to utils.  Made
all the injected classes in GuiModule Singleton scope.
 2013-05-18 20:56:44 -05:00
kruland2607
15ecef0bd7 Repackage a bunch of stuff. Rework the GuiModule so it stands alone. 2013-05-13 09:46:56 -05:00
kruland2607
ae7b2b3af1 Startup cleanup. Moved the entire swing application startup into a 
single class.  Created BasicApplication as a simple way to initialize
little applications.  Pulled the dependency on WatcherService out from
DecalImage.
 2013-05-12 20:26:22 -05:00
kruland2607
65eeb0833b Button up some details. Only issue messages to console when 
-Dopenrocket.debug is defined.  Fixed the jar to include the slf4j and
logback jars.  Fixed source attachement for logback-core jar.
 2013-05-10 23:50:35 -05:00
Sampo Niskanen
bb916d1889 Fix "ant dist" build script 2013-05-04 21:10:39 +03:00
soupwizard
1cfdbf7e3f Added a build target "unittest-no-junit-report" to run unit tests and 
not create a junit report, but instead to show test run results in
the ant output stream. Modified .travis.yml to use
unittest-no-junit-report instead of unittest, and to change directory
to core before doing the build and unittest.
 2013-04-24 20:03:12 -07:00
kruland2607
3212beb27c Merge remote-tracking branch 'upstream/master' into kruland-integration 
Conflicts:
	core/.classpath
 2013-04-03 20:09:12 -05:00
kruland2607
dcacae5e75 Fix arguments to ant's tempfile task. 2013-03-26 15:19:48 -05:00
Sampo Niskanen
dd5a16802b Merge branch 'master' into kruland-integration-ui 
Conflicts:
	core/.classpath
 2013-03-21 09:16:35 +02:00
bkuker
00a17eb0e2 Merge remote-tracking branch 'plaa/master' into latest-jogl 
Conflicts:
	core/.classpath
 2013-03-02 11:08:49 -05:00
bkuker
e7a7a5fbc9 JOGL 2.0-rc11 2013-01-27 15:01:15 -05:00
Sampo Niskanen
8c0c9bb10d Plugin system 2013-01-23 08:32:09 +02:00
Sampo Niskanen
ef7c384f58 Merge branch 'master' into kruland-integration 
Conflicts:
	core/build.xml
	core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
	core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
	core/src/net/sf/openrocket/gui/main/BasicFrame.java
	core/src/net/sf/openrocket/gui/util/SaveFileWorker.java
	core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
	core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
 2013-01-06 19:18:46 +02:00
bkuker
be9f6040ee Fix classpath jars 2012-12-24 15:33:34 -05:00
kruland2607
669c49caf2 Build with java 6. 2012-12-22 15:30:06 -06:00
Sampo Niskanen
b29853e416 Fix library references in build file 2012-12-22 13:28:37 +02:00
soupwizard
f667bb4bf5 Added config file needed for travis-ci continuous integration hosting support. Fixed places in build.xml that had hardcoded path references to use relative references. Undid fix to build warning in MotorCompare.java, since the fix didn't work with java 1.7. 2012-12-16 23:26:04 -08:00
Sampo Niskanen
ff22040df0 Refactor motor serialization/loading code 2012-12-10 22:44:06 +02:00
Sampo Niskanen
42b4eeac31 Merge branch 'feature-improvepresetloading' of 
github.com:kruland2607/openrocket

Conflicts:
	core/build.xml
	
Optimize motor loading further
 2012-12-06 12:49:00 +02:00
kruland2607
bd66cc9338 Use Serializable representation of system supplied motors in jar file. 
this greatly improves startup performance.
 2012-10-28 11:26:40 -05:00
Sampo Niskanen
4670a010be Startup system using Guice and plugin loading 2012-10-14 17:51:10 +03:00
kruland2607
7f6c542e5d Try to use Java Serializable to improve loading of included 
ComponentPresets.
 2012-10-09 09:07:18 -05:00
Kevin Ruland
ead406e852 Exploded the exp4j source into our src/ directory. This allows us to more easily modify changes we make to the source. I inlined one call to Arrays.copyOf. 2012-08-10 19:13:50 +00:00
Kevin Ruland
3cc439e490 Removed the old exp4j-0.2.9.jar and corrected the build.xml to use the new exp4j-rdg.jar. 2012-08-08 02:38:18 +00:00
Bill Kuker
26329cedec Include OSX UI elements. 
"OrangeExtensions" jar provides stubs for compilation and linking on other OSs.
 2012-06-24 19:22:07 +00:00
Bill Kuker
8babd54f4f Update to the latest 2.0 release candidate of JOGL (Build 57). 
Move JOGL Libraries from lib/native to lib/jogl, which is less misleading.
Update .classpath and build.xml with new directory name.
 2012-06-20 00:34:02 +00:00
Bill Kuker
6695f92ab1 JOGL Based support for a 3D view of the rocket. 
Change to RocketPanel to add 3D option.
Change to build process to use a Jar-in-Jar technique, not Fat Jar, using the Eclipse projects jar-in-jar loader. (Does not require eclipse!)
 2012-06-11 20:25:41 +00:00
Sampo Niskanen
9552b2de86 Expression parser updates 2012-05-22 04:11:25 +00:00
Kevin Ruland
fea3e6e61a Fix giantleaprocketry's TCData.csv, added it to the build.xml and committed the generated orc file. 2012-04-29 02:43:55 +00:00
Kevin Ruland
9ea9c4b53b Added build target which translates rocksim component directories in resources-src into ORC format in resources. 2012-04-26 21:12:35 +00:00
Kevin Ruland
6de0ea7083 Initial work on BodyTube ComponentPresets. 2012-03-29 02:47:49 +00:00
Sampo Niskanen
db47952192 Fix build script 2012-03-17 20:34:44 +00:00
Sampo Niskanen
dabfa28b9d Fix tests 2012-03-10 21:12:33 +00:00
Kevin Ruland
b066c4d714 Creating resources/ source directory to hold l10n, pix, and datafiles. Changes to build.xml to support it. The directory moves will be done in separate svn move operations. 2012-01-11 03:15:10 +00:00
Kevin Ruland
53152b1dc5 moving to core/ 2012-01-08 02:44:09 +00:00