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

2031 Commits

Author SHA1 Message Date
bkuker
830fe96115 Make photo more suitable for launching from OR UI 2013-12-04 16:19:46 -05:00
bkuker
e9a75b1111 Add light from flame to smoke. 2013-12-04 12:33:35 -05:00
bkuker
ba037a1b2c Add spark concentration & weight options 
Weight does not work great, lines are not the right thing to use.
 2013-12-03 19:08:11 -05:00
bkuker
c83b16b385 Simplify flame functions by breaking settings into a separate interface 
Will also be cleaner to do per-motor flame someday.
 2013-12-03 18:31:16 -05:00
kruland2607
e2575bca12 Added new startup flag openrocket.debug.layout which when set, shows 
boxes around all the components in miglayout.  Hopefully this will help
fix various layout issues in the applicaiton.
 2013-12-01 21:07:46 -06:00
bkuker
909a12ef15 Slightly improved sparks 2013-11-30 22:39:47 -05:00
bkuker
9069277573 Give smoke quads random rotation to reduce artifacts from repitition 2013-11-27 19:36:43 -05:00
bkuker
857f978504 Fix GL invalid state error in sparks - can't change point size there! 2013-11-27 17:56:05 -05:00
bkuker
77d9d1745e Clear some warnings 2013-11-27 17:53:49 -05:00
bkuker
63570880e3 Photo-booth files copied to the split version of OR. 
I HOPE I didn't miss anything!
 2013-11-27 17:52:28 -05:00
kruland2607
d542a261a9 Protect against possible NPEs. 2013-11-15 16:09:52 -06:00
kruland2607
36d290a85e Fix layout issues. 2013-11-15 16:09:31 -06:00
kruland2607
ac4ecc9285 Remove unused imports 2013-11-15 15:16:04 -06:00
kruland2607
b64bcd791b Fix layout in plot dialog introduced with new MigLayout library. 2013-11-15 14:14:31 -06:00
kruland2607
b662cdc39f Save the excluded motor manufacturers in the preferences when they are 
changed.
 2013-11-15 10:41:03 -06:00
kruland2607
2ff7a587d7 Tighten up FlightConfigurablePanel to allow for column or row 
reordering.  However, just in case, the motor, recovery, and separation
panels explicitly disallow column reordering.
 2013-11-14 16:25:04 -06:00
kruland2607
e46cdfabc1 Move the motor mount configuration back into it's own tab to make the 
window slightly smaller.
 2013-11-11 21:19:13 -06:00
kruland2607
ed3e9b04b3 This file "escaped" during the code reorganization. I have no clue what 
I did wrong.  Anyway, now that it's back one can configure TubeCouplers
again.
 2013-11-11 21:09:56 -06:00
kruland2607
73ad41c04b Update .classpath to use the new miglayout library. 2013-11-11 15:41:20 -06:00
kruland2607
8da9f275d7 Reuse the MotorChooserDialog in the MotorConfigurationPanel so previous 
settings are remembered.
 2013-11-11 15:40:22 -06:00
kruland2607
6aab06fbe2 Fix the layout in the Comments panel. 2013-11-11 15:37:34 -06:00
kruland2607
c40136e0f1 Update to MigLayout 4.0. 2013-11-11 09:51:53 -06:00
kruland2607
c51d776c52 Merge branch 'master' of https://github.com/openrocket/openrocket 2013-11-07 21:24:08 -06:00
kruland2607
fbefcf65f1 Fix low limit on motor filter by impulse class to exclude motors at that limit. 
This prevents, for example, full C motors with 10Ns impulse from showing up as Ds.
 2013-11-07 21:04:46 -06:00
kruland2607
87d515971b Updated release information for 13.11. 2013-11-07 20:59:08 -06:00
kruland2607
932ba67dd2 Merge pull request #165 from kruland2607/master 
Updated jogl to 2.1.2.
 2013-11-05 13:11:31 -08:00
kruland2607
59f8f13b16 Update jogl to 2.1.2. 2013-11-05 14:52:57 -06:00
kruland2607
4449f824cc Move the gogl source from core to swing. 2013-11-05 10:03:30 -06:00
kruland2607
af2f3cbc07 Merge pull request #164 from kruland2607/master 
jdk 1.7.0_45 drag & drop fix and simulation panel tool tip fix.
 2013-11-04 12:55:19 -08:00
kruland2607
085445ab9c Fixed tool tip to accomodate sorting. 2013-11-04 14:45:48 -06:00
kruland2607
d1efbdf766 Merge pull request #163 from kruland2607/master 
Added sorting to simulation list.
 2013-11-04 11:40:46 -08:00
kruland
05da59e738 Added sorting to SimulationPanel. Extended the Column class to support 
defining a collator and built a special row sorter implementation
(ColumnTableRowSorter) to make it easier.
 2013-11-04 12:55:58 -06:00
kruland2607
abce7097cc Merge pull request #162 from kruland2607/master 
Bug fixes.
 2013-11-02 16:53:14 -07:00
kruland2607
0778f9117a Have the MotorMountTableModel listen to changes in the Rocket 
configuration to automatically update when the rocket is modified.
 2013-10-31 13:54:02 -05:00
kruland2607
8221dd7e06 Enable sorting in Simulation Table. 2013-10-31 13:53:12 -05:00
celeron533
5159d24afe zh_CN implementation 
update l10n properties, add logo
 2013-10-19 12:16:00 +11:00
kruland2607
0e8adeaf1f When deleting a flight configuration, delete corresponding simulations 
as well.
 2013-10-11 14:40:15 -05:00
kruland2607
e58a34040e Change alignment of lower buttons in configuration tab. 2013-10-11 14:07:12 -05:00
kruland2607
858291de7c Added limit diameter checkbox and preference. Refactored some code in 
MotorFilterPanel to make it nicer.
 2013-10-11 13:56:13 -05:00
kruland2607
42e70d3552 Added boolean preference to toggle if the motor filter automatically 
limits the length to the motor mount length.
 2013-10-10 20:53:48 -05:00
kruland2607
30b89a54cf Add a little fuzz to the motor diameter detection. 2013-10-10 19:30:54 -05:00
kruland2607
1d36ab5eaf Merge branch '13.09dev' into feature-configtab 2013-10-10 11:35:41 -05:00
kruland2607
86a273272b Rework the motor table entry. 2013-10-10 11:01:21 -05:00
kruland2607
6641f959c5 When deleting a flight configuration, first change the configuration to 
a different one.
 2013-10-09 16:06:30 -05:00
kruland2607
2a7cc37d25 Added in plain junit formatter to get output from travis. 2013-10-09 14:35:23 -05:00
kruland2607
1e0ac22592 Removed the old FlightConfigurationDialog. 2013-10-09 14:20:38 -05:00
kruland2607
e04478bb94 Merge remote-tracking branch 'origin/13.09dev' into feature-configtab 2013-10-09 14:03:50 -05:00
kruland2607
e4afa7961e Fixed jdk7 problem in Multislider and NPE when there is no motor in the 
ThrustCurveMotorSelectionPanel.
 2013-10-09 14:00:33 -05:00
kruland2607
d6b19eb4b6 Add motor mount selection table to the Flight Configuration tab. 2013-10-09 13:53:05 -05:00
kruland2607
e091f3341a Refactor MotorMountTable UI currently used in flight configuration 
dialog in order to provide reuse.
 2013-10-09 12:26:35 -05:00