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

1348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kruland2607
add194acf0 Merge pull request #94 from kruland2607/startup 
slf4j and startup
 2013-05-18 18:55:39 -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
plaa
f7f45fdeeb Merge pull request #95 from kruland2607/l10n-update 
Updated Italian translations.
 2013-05-18 01:00:25 -07:00
kruland2607
7e2f0966e5 Updated Italian translations. 2013-05-13 21:49:01 -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
d1ea73a455 Do all logback configuration in java so we can have stand alone 
applications use a different configuration.  Removed unneeded methods.
 2013-05-11 18:00:34 -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
kruland2607
9bb6a4933b Added STDERR log level and appropriate infrastructure to capture 
System.err.println().  This is reported in the debug dialog and in bug
reports.
 2013-05-10 12:56:42 -05:00
kruland2607
bd3c68131a Removed horrible static initialization of logging system and instead 
rely on magic - the fact we are using logback classic and the logger is
named "buffer".
 2013-05-10 10:39:35 -05:00
kruland2607
8c8b51fe24 Quiet JarInJarStarter unless openrocket.debug is set. 2013-05-10 10:33:17 -05:00
Sampo Niskanen
7fa1886837 Update technical documentation OpenRocket_technical_documentation-v13.05 2013-05-10 10:40:56 +03:00
Sampo Niskanen
be80579fd1 Merge branch 'doc-lower-stage' 2013-05-10 10:31:46 +03:00
kruland2607
96689c69e2 Use slf4j for all logging within the application. 2013-05-09 21:34:19 -05:00
kruland2607
487917b9c4 Merge remote-tracking branch 'bkuker/slf-client' into startup 
Conflicts:
	core/.classpath
	core/src/net/sf/openrocket/database/Database.java
	core/src/net/sf/openrocket/database/ThrustCurveMotorSetDatabase.java
	core/src/net/sf/openrocket/document/OpenRocketDocument.java
	core/src/net/sf/openrocket/document/Simulation.java
	core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java
	core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
	core/src/net/sf/openrocket/file/rocksim/export/RocksimSaver.java
	core/src/net/sf/openrocket/gui/customexpression/CustomExpressionDialog.java
	core/src/net/sf/openrocket/gui/customexpression/ExpressionBuilderDialog.java
	core/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java
	core/src/net/sf/openrocket/gui/customexpression/VariableSelector.java
	core/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java
	core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
	core/src/net/sf/openrocket/gui/figure3d/ComponentRenderer.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/print/visitor/CenteringRingStrategy.java
	core/src/net/sf/openrocket/gui/print/visitor/FinSetPrintStrategy.java
	core/src/net/sf/openrocket/gui/print/visitor/PageFitPrintStrategy.java
	core/src/net/sf/openrocket/gui/print/visitor/TransitionStrategy.java
	core/src/net/sf/openrocket/gui/util/OpenFileWorker.java
	core/src/net/sf/openrocket/motor/ThrustCurveMotor.java
	core/src/net/sf/openrocket/rocketcomponent/Rocket.java
	core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
	core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
	core/src/net/sf/openrocket/simulation/SimulationOptions.java
	core/src/net/sf/openrocket/simulation/customexpression/CustomExpression.java
	core/src/net/sf/openrocket/simulation/customexpression/CustomExpressionSimulationListener.java
	core/src/net/sf/openrocket/startup/ConcurrentLoadingThrustCurveMotorSetDatabase.java
	core/src/net/sf/openrocket/util/AbstractChangeSource.java
	core/src/net/sf/openrocket/util/Coordinate.java
 2013-05-08 15:14:55 -05:00
Sampo Niskanen
3f433c3b41 Change version number to 13.05dev 2013-05-04 21:27:45 +03:00
Sampo Niskanen
763f8dd753 Change source repository to point to GitHub 2013-05-04 21:19:17 +03:00
Sampo Niskanen
6b00c0a1e1 Version 13.05 release-13.05 2013-05-04 21:11:35 +03:00
Sampo Niskanen
d5e981af7e Fix failing unit test 2013-05-04 21:11:03 +03:00
Sampo Niskanen
bb916d1889 Fix "ant dist" build script 2013-05-04 21:10:39 +03:00
kruland2607
ae317f5270 Merge pull request #93 from kruland2607/master 
Fixed Preset Usage.ork
 2013-05-03 10:05:25 -07:00
kruland2607
c00a451704 Update the preset usage example. It has lost it's presets because it 
had been edited with a developer version of OR quite some time ago when
presets were broken.
 2013-05-03 12:06:00 -05:00
kruland2607
2f0e636489 Merge pull request #92 from kruland2607/master 
synchronize the drop down with the file name in chooser.
 2013-05-02 07:36:46 -07:00
kruland2607
bf6de6db66 Update the file name in the chooser to match the selected decal name. 2013-05-02 09:35:50 -05:00
kruland2607
7567bbf5e9 Merge pull request #91 from kruland2607/master 
Save windspeed preference
 2013-05-01 12:39:16 -07:00
kruland2607
77b78c4cb8 Windspeed units wasn't being saved in the preferences. 2013-05-01 14:37:46 -05:00
Bill Kuker
871f30a942 Merge pull request #89 from bkuker/master-issue81 
Remove the fancy fin-edge rendering
 2013-04-30 14:15:58 -07:00
bkuker
3cad3405ff Remove the fancy fin-edge rendering, it can't deal with the real world 
well enough yet.
 2013-04-30 17:12:41 -04:00
Sampo Niskanen
6f2ee27eec Add space before/after footnote marker 2013-04-30 20:29:53 +03:00
kruland2607
fac58f8adf Merge pull request #87 from kruland2607/master 
Updated spanish file and bumping to beta3.
 2013-04-29 11:00:03 -07:00
kruland2607
3ab8616e0c Bump to beta3 2013-04-29 12:59:56 -05:00
kruland2607
41031a0936 Updated Spanish translations. 2013-04-29 12:59:29 -05:00
kruland2607
157074b139 Merge pull request #86 from kruland2607/master 
Updates to fr, en & ru localized strings.
 2013-04-29 08:40:32 -07:00
kruland2607
e8b38b7398 Updated es, fr & ru translations. 2013-04-29 09:56:21 -05:00
kruland2607
844ac9bc08 Merge pull request #85 from soupwizard/master 
Fix github issue #84 "The CP & CG markers appear in the 2d rear view."
 2013-04-29 06:51:19 -07:00
soupwizard
8f4d626a9a fix github issue #84 "The CP & CG markers appear in the 2d rear view." 2013-04-28 20:50:49 -07:00
kruland2607
018aa36703 Merge pull request #83 from kruland2607/master 
Few changes from beta.
 2013-04-28 16:16:29 -07:00
kruland2607
d2822b5fc6 Added two localization keys - appearance tab, and rocket panel, view 
type.
 2013-04-28 18:15:38 -05:00
kruland2607
fee17f3878 Added release notes from changelog. 2013-04-27 21:23:16 -05:00
kruland2607
793c7dd3bb Prevent NPEs by disabling the Export menu item when no decals are on the 
model.  Also have the Edit button in AppearancePanel be enabled only by
the addition of an image on the AppearanceBuilder.
 2013-04-27 20:59:36 -05:00
kruland2607
d66fe57011 Merge pull request #80 from kruland2607/master 
bump to v2
 2013-04-27 06:23:55 -07:00
kruland2607
0607823f63 Bump revision number. 2013-04-27 08:18:53 -05:00
kruland2607
1d33f1db8c Merge pull request #78 from kruland2607/master 
Load presets in foreground thread.
 2013-04-26 19:31:27 -07:00
kruland2607
8baf9e6676 Load the components in the foreground thread so they are completely 
loaded before trying to read an ork file from the command line.
 2013-04-26 21:28:21 -05:00
kruland2607
3c8ffbf5b1 Merge pull request #76 from kruland2607/master 
Serialized preset database needs to translator and en locale.
 2013-04-25 19:52:58 -07:00
kruland2607
1e2c64b6f0 Fixed major problem with preset serialized database. They need to have 
a translator set correctly or else the material types will not match and
presets used in models will be cleared when the document is loaded.
 2013-04-25 21:51:43 -05:00
kruland2607
a91e1973e4 Merge pull request #75 from kruland2607/master 
Removed FIXME
 2013-04-25 11:59:19 -07:00
kruland2607
f0228aa878 Removed last FIXME after manually verifying all calls to the method. 2013-04-25 13:58:34 -05:00
kruland2607
3da320c24b Merge pull request #71 from soupwizard/master 
Update travis-ci config to run unit tests and show test results in ant output
 2013-04-25 10:51:48 -07:00
kruland2607
668a7c0722 Merge pull request #74 from kruland2607/master 
Fix for https://github.com/plaa/openrocket/issues/72
 2013-04-25 10:51:12 -07:00