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

2224 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ChrisMickelson
a91fbb0ab5
Splashscreen source file update for 2019 
Gzipped xcf file as well as png. Changed copyright year to 2019.
 2019-02-06 14:13:46 -06:00
Wes Cravens
3209e0201e
Merge pull request #437 from JoePfeiffer/fixSimulationLog 
Fix simulation log
 2018-08-07 18:21:31 -05:00
Joe Pfeiffer
7d2e4757e8 Also eliminate redundant "BasicEventSimulationEngine" in log lines 2018-08-06 17:21:24 -06:00
Joe Pfeiffer
39d961df56 Don't report timestep on thrust log line. First it was probably meant 
to be simulation time, not time step, and second it's already reported
elsewhere

Report altitude and event type at each simulation step
 2018-08-06 17:11:12 -06:00
Wes Cravens
e6612ddbe0
Merge pull request #430 from teyrana/fix_debug_window 
[fixes #428] DebugLogDialog // details Pane stays hidden (if toggled hidden)
 2018-08-01 10:49:32 -05:00
Daniel_M_Williams
6add0b396c [fixes #428] minor patch to fix behavior of toggling the details pane in the debug log window 2018-07-08 11:32:51 -04:00
Wes Cravens
3538d53c6d
Merge pull request #416 from JoePfeiffer/fixnewconfiguration 
Set current configuration before creating simulation
 2018-07-05 00:55:01 -05:00
Wes Cravens
5fcd62dc84
Merge pull request #420 from teyrana/fix_new_stage 
[fix][oneline] both Create Stage buttons now create stages with the same name
 2018-07-05 00:54:41 -05:00
Wes Cravens
a39f572c9a
Merge pull request #421 from teyrana/upgrade_java_8 
Upgrade java 8: ant, eclipse, travis. Resolves #414
 2018-07-05 00:54:31 -05:00
Wes Cravens
e3d1957f9a
Merge pull request #423 from teyrana/rm_duplicate_properties 
[fix] removed duplicate property keys in 'resources/l10n'
 2018-07-05 00:54:15 -05:00
Daniel_M_Williams
1e7e26b624 [upgrade] Upgrade travis configuration to Java 1.8 2018-06-17 15:34:55 -04:00
Daniel_M_Williams
82d5f871f0 [upgrade] Updated Eclipse buildfiles to use Java 1.8 2018-06-17 15:34:55 -04: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
14414d6279 [fix] removed duplicate property keys 2018-06-16 19:52:12 -04:00
Daniel_M_Williams
73db54ae7b [fix] removes obsolete l10n string 'RocketActions.ActBoosterstage' from 'core/resources/l10n/message.properties' 2018-06-09 20:22:32 -04:00
Daniel_M_Williams
a9efed4288 [fix] both Create Stage buttons now create stages with the same name 
- reads the value of `Stage.Stage` from 'core/resources/l10n/messages.properties'
- currently "Stage"
 2018-06-09 20:15:19 -04:00
Wes Cravens
f41f9c1ae4
Merge pull request #417 from teyrana/fix_pod_shoulders 
[fix] 2d figure - Transition Shoulders now rotate correctly
 2018-06-04 19:43:58 -05:00
Daniel_M_Williams
f15830fc3b [fix] 2d figure - Transition Shoulders now rotate correctly 2018-06-04 20:25:07 -04:00
Joe Pfeiffer
09123dd0ce Set current configuration before creating simulation 
createSimulationForConfiguration() assumed addConfiguration() and
copyConfiguration() would set the new configuration as selected, but
they didn't resulting in simulation based on old configuration, not new
one.  Fixed.

addConfiguration() and copyConfiguration() had enough common code that
consolidating them and createSimulationForConfiguration() seemed like a
good idea.

Let FlightConfiguration.copy() create new ID for consistency with
constructor.
 2018-06-04 12:37:40 -06:00
MadCompSci
aa300709f5 Refreshed from upstream 2018-06-01 13:19:03 -05:00
Wes Cravens
3d445c55b0
Merge pull request #412 from JoePfeiffer/fixconfigurationname 
Fix Configuration name in motor configuration panel.
 2018-06-01 11:44:41 -05:00
Joe Pfeiffer
f82fef44d7 Fix Configuration name in motor configuration panel. 
Formerly just used delay value directly, resulting in huge delay for
plugged motors; now uses motor.getDesignation so it translates to "P" as
expected.

Changed name of toMotorDesription method to toMotorDesignation to match
usage of getDesignation() in ThrustCurveMotor.java

Changed toMotorDesignation to use motor.getDesignation
 2018-06-01 09:27:08 -06:00
Wes Cravens
d8fb48ee4c
Merge pull request #407 from teyrana/fix_negative_inertia 
[fixes #406] SymmetricComponent no longer generates negative inertias
 2018-05-31 09:34:37 -05:00
Wes Cravens
9e63fa6398
Merge pull request #410 from ChrisMickelson/ChrisMickelson-patch-1 
Chris mickelson patch 1
 2018-05-31 09:34:06 -05:00
ChrisMickelson
5cf53f870f
Update JarInJarStarter.java 
#346 re-fix
change line 33 back to ClassLoader loader = new URLClassLoader(urlArray, null);
 2018-05-30 05:41:23 -05:00
ChrisMickelson
ced7005d53
Update compiler.xml 2018-05-30 05:15:00 -05:00
ChrisMickelson
86de232908
Update compiler.xml 
exclude test from compile
 2018-05-30 04:53:32 -05:00
ChrisMickelson
b143f0f30e
Merge pull request #28 from openrocket/unstable 
Unstable update 5-28-2018
 2018-05-28 12:31:58 -05:00
Daniel_M_Williams
b7ee926d6c [fix] change to SymmetricComponent no longer generates negative inertias 2018-05-28 12:28:59 -04:00
Wes Cravens
e5787f7e5c
Merge pull request #402 from JoePfeiffer/unstable 
Cleared up problem with blank combobox popups after adding flight configurations
 2018-05-25 09:30:54 -05:00
Joe Pfeiffer
2839dfd4dd Cleared up problem with blank combobox popups after adding flight 
configurations.

(1) Created new ConfigurationComboBox, extended from
JComboBox<FlightConfiguration>, with a listener for popup opens that
connects to a new ConfigurationModel.

(2) Removed some cruft from ConfigurationModel and made it a nested
class within ConfigurationComboBox.

(3) Updated ComponentAnalysisDialog, RocketPanel, and
SimulationEditDialog to use ConfigurationComboBox.
 2018-05-24 12:38:09 -06:00
ChrisMickelson
9c396f2f7b
Merge pull request #27 from openrocket/unstable 
Unstable
 2018-04-08 19:39:01 -05:00
Wes Cravens
08d47280ac
Merge pull request #399 from teyrana/hide_analysis 
Hide Buggy UI Dialogs
 2018-04-08 17:34:19 -05:00
Daniel_M_Williams
32aa32da15 [Workaround] Hides the Optimization Dialog until it can be fixed 2018-04-08 11:29:46 -04:00
Daniel_M_Williams
0b1e01137a [Resolves #397][Workaround] Hides the Component Analysis Dialog until it can be fixed. 2018-04-08 11:25:48 -04:00
Wes Cravens
79eaebe06e
Merge pull request #395 from teyrana/alpha7 
Alpha7 - Aggregate further bugfixes - #330, #378
 2018-03-27 15:24:34 -05:00
Daniel_M_Williams
786ca55c45 [fix][Resolves #378] Component Preset Dialog has an appropriately sized search bar 2018-03-03 17:03:27 -05:00
Daniel_M_Williams
28bdfac550 [fix][Resolves #330] Rocket size now updates on main screen after scaling rocket 2018-03-03 17:03:18 -05:00
Daniel_M_Williams
d859337e12 [fix] prevent a NPE if openrocket does not detect the example files 2018-03-03 17:03:10 -05:00
Daniel_M_Williams
1470a84673 [debug] removed unnecessary printlns in unit tests 2018-02-25 12:43:49 -05:00
ChrisMickelson
1c287b90be
Merge pull request #26 from openrocket/unstable 
Unstable update Feb 19
 2018-02-19 23:12:01 -06:00
Wes Cravens
1b60b23de4
Merge pull request #394 from teyrana/alpha6 
Alpha6 - Minor Fixes, as requested on the mailing lists.
 2018-02-10 14:08:21 -06:00
Daniel_M_Williams
20473dbf82 [fix] file version 108 now correctly loads angle-offsets for all ComponentAssemblies 2018-02-03 10:52:44 -05:00
Daniel_M_Williams
0ef72ec66d [Resolves #391] Localized description is displayed for relative positioning methods 2018-02-03 10:37:40 -05:00
Daniel_M_Williams
7017b0b2f0 [fix] removed Angle.Fixed and Radius.Surface positioning methods 2018-02-03 10:25:03 -05:00
Wes Cravens
de7f7b308b
Merge pull request #393 from ChrisMickelson/unstable_current 
Fix for issue #383
 2018-02-02 08:42:20 -06:00
ChrisMickelson
40f18d9125
Update RocketRenderer.java 
Fix depth test issues with transparent components
 2018-02-02 04:49:32 -06:00
ChrisMickelson
818fa911d9
Merge pull request #25 from openrocket/unstable 
Unstable
 2018-02-02 04:34:29 -06:00
Wes Cravens
82b78face9
Merge pull request #390 from teyrana/alpha5 
Alpha5
 2018-01-27 21:36:00 -06:00
Daniel_M_Williams
4a874b6ba9 [fix] Fixed OpenRocketSaverTest: minimum file version is now 108 2018-01-27 20:35:49 -05:00