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

1894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
richard
df9ef0b984 Removed custom expression debug message 2012-12-16 23:07:44 -08:00
richard
661e391654 Merge branch 'master' of https://github.com/plaa/openrocket.git 2012-12-16 23:04:01 -08:00
richard
a7e73f6485 Fix bug with custom expressions where old sub expressions remained in an 
expression after it was changed.

Fix bug to allow flight variables to be used inside index expressions.
 2012-12-16 22:58:02 -08:00
kruland2607
e516f99a8f Removed the "include decals" storage option - they will always be 
included when saving as ork file.  Fixed saving rocksim files - they are
just plain files and have no references to decals.
 2012-12-16 21:25:23 -06:00
kruland2607
7db51b9b65 Always save using .zip container format. Removed the "use compression" 
option from the StorageOptionChooser.
 2012-12-16 13:45:49 -06:00
plaa
dd6b417db2 Merge pull request #16 from soupwizard/fix-150-build-warnings 
fixed ~180 build warnings
 2012-12-16 08:54:14 -08:00
soupwizard
11c247135e fixed ~150 build warnings 2012-12-16 00:12:44 -08:00
plaa
58183fc2b6 Merge pull request #13 from soupwizard/fix-build-warnings-add-overrides 
fix about 100 build warnings by add @Override, couple other warning fixes
 2012-12-15 13:40:05 -08:00
kruland2607
1bbef243ac Merge pull request #14 from bkuker/kruland-integration-decals 
Decal UI Simplification & Fixes
 2012-12-14 08:21:27 -08:00
bkuker
9d065c90e7 Cleanup Apocalypse example: 
Better decals
Non-weird flips
Moved some couplers that seemed off.
 2012-12-14 09:53:35 -05:00
bkuker
efb05a554c Add a slider model to the IntegerModel, add a spinner to shine parameter 2012-12-14 09:36:43 -05:00
bkuker
591b05d867 Set up ligiting for figure 2012-12-14 09:36:40 -05:00
bkuker
aac5fb9451 Fix bug where selection outline stayed visible after a component is 
deleted
 2012-12-14 09:36:37 -05:00
bkuker
ee95d6998a Create a simpler appearance builder for a simplified UI. 2012-12-14 09:36:34 -05:00
bkuker
5a8833738c Allow batching several changes before firing a changeEvent 2012-12-14 09:36:32 -05:00
bkuker
e97ae2f4b0 If an absolute file is missing try resolving it in the directory the 
file was loaded from
 2012-12-14 09:35:53 -05:00
soupwizard
141decb4d3 fix about 100 build warnings by add @Override, a couple other warning fixes 2012-12-13 19:02:13 -08:00
kruland2607
a780b8da93 Added some FIXMEs for consideration when saving files with decals. 2012-12-13 11:01:16 -06:00
kruland2607
fbf5d3af03 Failed to add net.sf.openrocket.gui.plot.Util class to support 
SimulationPlot changes.
 2012-12-13 10:46:09 -06:00
kruland2607
2c7fcdb87c Regenerate the Apocalypse example file after changing the name of the 
ork file in the zip container.
 2012-12-12 22:27:04 -06:00
kruland2607
5d3bdd975c Forgot to remove FIXME comment in previous commit. 2012-12-12 22:23:56 -06:00
kruland2607
106a976655 Be a little smarter about generating the series names for the plot and 
drop down.  Extract algorithm into utility class for easier reuse.
 2012-12-12 22:23:11 -06:00
kruland2607
aeacbcfd18 When saving a zip file, save the main rocket ork file using the same 
filename.
 2012-12-12 22:22:11 -06:00
kruland2607
db45a48e08 Localized the Export Decal menu item. 2012-12-12 21:39:07 -06:00
kruland2607
e5ed9e166b Added localized strings for the dialog. Removed FIXME saying "add 
buttons" because there are buttons.
 2012-12-12 16:48:36 -06:00
kruland2607
1291574752 Added FIXME to indicate there are two example menu items one of which 
must be removed.
 2012-12-12 16:47:09 -06:00
kruland2607
1e51b171a4 Change FIXMEs relating to caching decal bytes to a TODO. The class 
functions correctly as is, but might benifit from caching.
 2012-12-12 16:45:59 -06:00
plaa
be0fe5c0f7 Merge pull request #11 from soupwizard/remove-uneccesary-supress-warnings 
removed unnecessary @SupressWarnings, to fix some build warnings
 2012-12-11 20:38:20 -08:00
kruland2607
474797748d Removed FIXME. The document properties are set in the OpenFileWorker. 2012-12-11 21:51:37 -06:00
kruland2607
a046a7969c Change appearance panel scale spinners to increment by tenths since it 
seemed better than whole units.
 2012-12-11 21:36:14 -06:00
kruland2607
b99a704eb6 Added simulation of tumble recovery. Has pretty major FIXME which needs 
addressing.
 2012-12-11 21:28:12 -06:00
kruland2607
fab85c2918 Replaced the alternate example menu item for consideration. 2012-12-11 20:46:08 -06:00
soupwizard
dd0a9a12d9 removed unnecessary @SupressWarnings, to fix some build warnings 2012-12-11 18:15:42 -08:00
plaa
c98f4ad21d Merge pull request #10 from bkuker/kruland-integration 
RocketRenderer fix
 2012-12-11 13:14:43 -08:00
Sampo Niskanen
041ec3b836 Remove stencil based drawing (from bkuker) 2012-12-11 23:07:30 +02:00
bkuker
5786cd1c49 Do not perform the stencil based drawing, it has been replaced by the Z 
version.
 2012-12-11 16:02:23 -05:00
Sampo Niskanen
5412b8255b Merge branch 'integration' of github.com:kruland2607/openrocket 
Conflicts:
	core/.classpath
	core/3d-Test-Junk/net/sf/openrocket/startup/Quick3dMain.java
	core/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java
	core/src/net/sf/openrocket/gui/main/BasicFrame.java
 2012-12-11 08:38:59 +02:00
kruland2607
011c21f54e Updated changelog. 2012-12-10 21:47:57 -06:00
Sampo Niskanen
49858f589f Update thrust curve files 2012-12-10 23:30:56 +02:00
Sampo Niskanen
ff22040df0 Refactor motor serialization/loading code 2012-12-10 22:44:06 +02:00
Sampo Niskanen
cffb77530e Merge branch 'master' of ssh://git@github.com/plaa/openrocket.git 2012-12-10 22:08:32 +02:00
plaa
399fa4e0a7 Merge pull request #8 from bkuker/no-stencil 
Replace stencil buffer with z-buffer to draw outline of selected items
 2012-12-10 12:08:14 -08: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
6a073af40b Reorder the zoom buttons. Added zoom reset icon and button. Fixed 
spacer in SimulationPlotDialog so close button is always properly
located.
 2012-11-14 21:14:39 -06:00
kruland2607
e6fe93c2ac Added right-click & drag zoom control contributed by Richard. 2012-11-14 21:11:56 -06:00
kruland2607
14ae26dda8 Clean up imports. 2012-11-14 09:35:02 -06:00
kruland2607
809113740b Modified event display logic so only events for the selected stage are 
displayed.
 2012-11-09 13:04:17 -06:00
kruland2607
45cabaaddf Fix condition used to display the stage combo box. 2012-11-09 11:56:52 -06:00
kruland2607
a06acb7b43 Change time limit used to make events show on the same line from .01s to 
.05s.
 2012-11-08 21:02:45 -06:00
kruland2607
c2ac8204b1 Always have the delay spinner enabled just like in the recovery tab of 
the component configuration.
 2012-11-08 20:56:55 -06:00