github.com/openrocket/openrocket commits | Ecosyste.ms: OpenCollective

Merge branch '13.09dev' into feature-configtab

1d36ab5eafe536b1655d032dc94462c2fa3c2f06 authored over 11 years ago

Rework the motor table entry.

86a273272b780212be254e998e471caeb0c2c9f6 authored over 11 years ago

When deleting a flight configuration, first change the configuration to

a different one.

6641f959c5a2baf4af1fc7fc41799874184ce69d authored over 11 years ago

Merge pull request #154 from kruland2607/13.09dev

Fixed integer test value. Thank goodness for unit tests.

8813f02ba0bd3ff14abc67b83904555ae7382d6a authored over 11 years ago

Fixed integer test value. Thank goodness for unit tests.

a601788dcdd244abd2d76b8dcebf67796b6bf708 authored over 11 years ago

Merge pull request #153 from kruland2607/13.09dev

Added in plain junit formatter to get output from travis.

0c2f4744ff85fd0255986c56727a7cbefcf0792a authored over 11 years ago

Added in plain junit formatter to get output from travis.

2a7cc37d255831b876d7468fb07e1fd8c9e964af authored over 11 years ago

Removed the old FlightConfigurationDialog.

1e0ac22592ba0808f04209acdd677ba4a30c731e authored over 11 years ago

Merge remote-tracking branch 'origin/13.09dev' into feature-configtab

e04478bb94cc6f9554291533c6c7b18336e8f7d9 authored over 11 years ago

Merge pull request #152 from kruland2607/13.09dev

Fixed jdk7 problem in Multislider and NPE when there is no motor in the ThrustCurveMotorSelectio...

9822088abfcc6f0ad7e1bde39798f463bd577591 authored over 11 years ago

Fixed jdk7 problem in Multislider and NPE when there is no motor in the

ThrustCurveMotorSelectionPanel.

e4afa7961e751b895478e0d473cb1446eeccb464 authored over 11 years ago

Add motor mount selection table to the Flight Configuration tab.

d6b19eb4b6eb317cfbed32790607858ddf0da0b8 authored over 11 years ago

Refactor MotorMountTable UI currently used in flight configuration

dialog in order to provide reuse.

e091f3341abc159bbb3871c838cfff1b67130a1f authored over 11 years ago

Update flight configuration buttons to have better names.

88ddb86758126061848e2d9bdd833ab6a2a39432 authored over 11 years ago

Merge remote-tracking branch 'upstream/13.09dev' into feature-configtab

4daebfde5a15bcdaa01b8cd8ab3810a76b566411 authored over 11 years ago

Final tweaking of motor filter in the MotorChooserPanel.

9420390ea8a2e21fc517ec9ff6add0c50d6699db authored over 11 years ago

Merge pull request #151 from kruland2607/feature-motorfilter

Improve MotorSelectionDialog box by having more sophisticated filtering.

7687568f81e7ec2eacf41afec7c0d1a625926b3e authored over 11 years ago

Merge remote-tracking branch 'upstream/13.09dev' into feature-motorfilter

fbc7cf69f598ef60d175ad510b30e2f11e075731 authored over 11 years ago

Merge pull request #150 from kruland2607/13.09dev

Fix eclipse classpath after moving the lib-test stuff.

2368455d2dc76442452e044cf0a2dc25a9804dd7 authored over 11 years ago

Updated the features.html page and added screenshot of the boosted dart

example rendered in 3D.

8df0b63ea32654fd0a62caa9ff7df2db45efa4be authored over 11 years ago

Wire up motor length filter using ChangeListener and DoubleModel.

2127908b2a2a3406fe1471f585c8bb020c46f30b authored over 11 years ago

Be smart about displaying decimals.

3e57ef205d9ee67b953658ea36c7fb5b342aeaf0 authored over 11 years ago

Rework the impulse and diameter to use a two thumbed slider.

e5679259faa5c79983086aaf2aec32b598c475b2 authored over 11 years ago

Added more details to releasing.txt

fb217b536145fd403b78fd8ac3c6287e64baa6ac authored over 11 years ago

Update web pages

824aa4420a29f849992d84a2d81be8e61eb1068c authored over 11 years ago

Change build.properties for development.

3826a07cee752e18acec0d908c96e9e08d1e29bc authored over 11 years ago

Make release of 13.09.1.

e549838863d5651c68967ecfe1c2bafd1fc41f21 authored over 11 years ago

Remove the show details button now that it's available in a tab.

afcedf90f127a7f64e6e556eebcd48d8d224ca68 authored over 11 years ago

More cleanup.

7221b6558e10c2506e273f9318e5d002df48b88d authored over 11 years ago

Rework the thrustcurve motor filter and information. They now share

tabs on the MotorSelectionPanel. Added Minimum Motor diameter to the
motor filter.

e6755e0e8475b5a00b16d4cb11994ea1de809a8c authored over 11 years ago

Merge pull request #149 from soupwizard/13.09dev

Swing build depends on core jar already being built, added dependency

cf08cd77b8fcf2817d8fe3de001c42e075c6e322 authored over 11 years ago

Swing build depends on core jar already being built, added that dependency.

71e3e76493038baed8e85a49f9a305c5939b91d1 authored over 11 years ago

Reworked the ThrustCurveMotorSelectionPanel so a single instance can be

reused for different searches. This means the MotorRowFilter has an
easier time remembering its ...

32817f2cb1c2f302f092de3c9735ff5403d2d876 authored over 11 years ago

Merge pull request #148 from kruland2607/master

Manual edits to the new AeroTech C3 and D2 eng files to correct mass and delays.

da1bf3242c963b07c355f0ad799756d077c3b1e0 authored over 11 years ago

Manual edits to the new AeroTech C3 and D2 eng files to correct mass and

delays.

24a011b1e8223350c8b6982c66eff01f37085784 authored over 11 years ago

Merge branch '13.09dev' into feature-motorfilter

5913fb2533cb532cf7baf324c1cdc3219b206242 authored over 11 years ago

Fix eclipse classpath after moving the lib-test stuff.

e44c87029b9ab2787715335c04f917b778c4ac10 authored over 11 years ago

scroll to selection on opening.

444035442f35c67ca806c08abcdaddef3f3a81f7 authored over 11 years ago

Merge branch '13.09dev' into feature-motorfilter

24bba56059179f03345310af84831fcc04d9f808 authored over 11 years ago

Rework BodyTubeConfig and InnerTubeConfig removing the motor

configuration stuff. The motormount checkbox and default ignition
configuration is now on the Ge...

59e75d5c83ba7a9cff9122e37ec770c399060e9a authored over 11 years ago

Move buttons to top.

ed0444a909aac74787abf89a126c1453991d4139 authored over 11 years ago

Don't show the sustainer stage in the stage configuration panel.

6abcda7abd80645ea75e2404d961268c4bde4827 authored over 11 years ago

Move ownership of the table to the base class.

dca6c31241a0ada09a3ab968382a843a53d101a3 authored over 11 years ago

Fix button layout.

60a7014ca32c4045be1e0eb6fa2407d44db0511c authored over 11 years ago

Fixed motor table so it only shows motor mounts. Extracted the table cell renderer code into abstract base class.

f433c640e27a1e17469a99b5f118a2230f859d99 authored over 11 years ago

Refactored the table models into a common base class FlightConfigurableTableModel.

c8f71fcc946213911909bfb89c37e0282388dffd authored over 11 years ago

Localized column heading and added rocket listener to update columns.

fa7916f7b0e66006636fdb941f1ddffa2b912ea0 authored over 11 years ago

Improved common base of configuration panels.

e36a90adfc25137f92d2ec54bad24bd8ee87cd05 authored over 11 years ago

Refactor Recovery and Separation panels to derive from

FlightConfigurablePanel. Added DefaultConfiguration listener to the
FlightConfigurablePanel to k...

9e01ff4e762eece6e890e1eb4f3b6efc54011c35 authored over 11 years ago

Implement Configuration tab in BasicFrame next to Design and Simulation tabs. Provides functionality to configure motors, recovery and stages. Todo - verify functionality, add listeners to the table contents change when the design is updated, add listener so the configuration is highlighed to reflect selection in RocketFigure.

43187b2b2c5179334ae87813573facf4daa40bb3 authored over 11 years ago

Change case in core jar name.

393850a367673f21cf4dbd03f3697073e540dc22 authored over 11 years ago

Update travis to use base build.

fc5faf2285a98a715cb6a08a7d57fe41d156a245 authored over 11 years ago

Added build.xml driver in root directory. Moved a few files around to support

unittest.

d692288f68b9462fa5bfbce3acb31c846ce7bdc4 authored over 11 years ago

Localize motor popup and new fields in ThrustCurveMotorSelectionPanel.

572b14de13c118e68bf074952ba931c78b8f955b authored over 11 years ago

Further refinements to motor filter. Moved diameter configuration into

popup. Added impulse class filters. Improved interface to CheckList and
removed the double-clic...

bae9d38a5172e95e0141fd00b0bdb59c4b34d494 authored over 11 years ago

Relocate the swing files into the swing/ project. They were misplaced with the rebase.

246b9a6823ded2e71edbc4acd7dd367877747059 authored over 11 years ago

Added manufacturer selection boxes and exclude motors currently used

filters.

ea6aa3e414af36d2f1c1ed57094d18dbeb86ac2d authored over 11 years ago

Refactor the api so the motor mount goes into the

ThrustCurveMotorSelectionPanel. This allows greater flexibility in
filter functionality.

64015d72bef565704426e6c7cb668dfdb8418923 authored over 11 years ago

Extract the MotorRowFilter out of the ThrustCurveMotorSelectionPanel to

facilitate adding more filters.

84af78ccf403b216724163f7cbc1bfa03bec7ca5 authored over 11 years ago

Added core/resources and swing/resources to classpath.

5e27ea578fe22b947875fc3b5d1406a8446e29aa authored over 11 years ago

Changed eclipse project name to OpenRocket Core.

f3bcdfcfc2cd3d359109e353f52735d45703b1f1 authored over 11 years ago

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. ...

26fb295554afd42b5a7f7f9cc6fe395b5dec682a authored over 11 years ago

Merge pull request #147 from kruland2607/master

Added some logging and an additional mechanism to try to find the jar file URL.

f300c3a6bee6e320bb484895a491859eb8ce068f authored over 11 years ago

Added some logging and an additional mechanism to try to find the jar

file URL.

d00e70c0a9fcb0c764c9cb5211afb7320211585d authored over 11 years ago

Merge pull request #146 from bkuker/bugfix-osx-java7

GL Preferences for compatibility - specifically with Java 7 on OSX.

0a4ca9fe543c10860a0455edd58e0728e9e76ac3 authored over 11 years ago

Reference the correct jogl sourcepath

6ba311d7ede527cfb995d8dbb4c6fa3c21591806 authored over 11 years ago

I10n for the GL preferences

de2e2e6bd5197827db6f5ed6134fde37a2098195 authored over 11 years ago

Wire in prefs dialog to Preferences and RocketFigure3d

321761cf0f41e3e4ee9198ed84c7b52089f3e561 authored over 11 years ago

Add a mocked out GL preferences tab

d16d1c4a133bf65c0857e746beeec6f6d9db0c02 authored over 11 years ago

Regenerate thrustcurve.ser again.

bba83fc795a267c6751aefcb0fb97c1e89d87637 authored over 11 years ago

Merge pull request #145 from kruland2607/master

Added C3 and D2 thrustcurves and fixed the Loki J175.

d9a32556dca144ead9c767f9a58a812d2d91ca89 authored over 11 years ago

Added preliminary thrustcurves for AT C3 and D2. Removed the

Loki_J175.rse provided by thrustcurve.org because it lists the wrong
type.

cece53c4761a97f9e1ee5a1f066db95904d1c7a1 authored over 11 years ago

Clean up calls to invoke / display.

I misread the JOGL javadoc and thought that these methods did not come
from a common superclass, ...

a4c0b3bb56f54fe2605171ba4d86eadfa78e3f2a authored over 11 years ago

Correct jogl sources p2

1db67037b12e5c4f07dc84b69658a389107b4d71 authored over 11 years ago

Choose between panel and canvas with hardcoded boolean

b2b05ce0b3568e869d47ea36ec25caddbabbe7f7 authored over 11 years ago

Correct version of sources for JOGL

2f39fab80c452c4bd78b5cc3e5fd31eb2ffa7e87 authored over 11 years ago

Work with GLCanvas or GLJPanel. Picking broken with Panel

e9e98e36343e0430ff99694619bc4e0fe6691a19 authored over 11 years ago

Improve pick()'s debuggability

Let you call it with a null point without dying.
Trace out the picked color.

9c607dfb03dc79d88a812e8a85b721b5981f5da5 authored over 11 years ago

Texparameters need to be set while texture is bound.

This was causing the GLSL Fast-flip code in GLJPanel to die, I think it
was trying to mipmap the ...

a3c44f220b295eef3f4467589cbbf44d1ea93613 authored over 11 years ago

Merge pull request #144 from kruland2607/master

Fix for Issue #143. Null pointer in warnings dialog when there is no simulation data.

7d289b3daad5d34a31dfae5eaeb8a7d99bcf3ec0 authored over 11 years ago

Fix for Issue #143. Null pointer in warnings dialog when there is no

simulation data.

ac6623aa3286ba3cb40355a94ec4bb1a4c86312e authored over 11 years ago

Merge pull request #142 from kruland2607/master

Added more protection around getDesktop calls. First test Desktop.isDesktopSupported() and fail...

1931a6f11e0b4d138b5d66934856213741fbac23 authored over 11 years ago

Added more protection around getDesktop calls. First test

Desktop.isDesktopSupported() and fail fast.

4421b0ef859e2f786ddb4b11077f6576b71f5879 authored over 11 years ago

Merge pull request #141 from kruland2607/master

Fix the "Simulate & Plot" button in the Simulation Dialog when multiple simulations are selected.

12b2f5e72caa8a0cba895ebba0d6ae2d4c15c1d9 authored over 11 years ago

Fix the "Simulate & Plot" button in the Simulation Dialog when multiple

simulations are selected. In this case, it now says "Simulate" and the
dialog closes when finished.

ee38ef2d3d06e3c5cd9bcdadcb5cca72353112b3 authored over 11 years ago

Added little l10n properties analysis tool, and fixed some obvious

errors in cs & it localizations.

7763af389e026f26b71fb2ed3af0bc602767f71d authored over 11 years ago

Merge pull request #139 from kruland2607/master

Updated russian translations.

c3a7b80a3eb6e465b43ce33659eb400da1954250 authored over 11 years ago

Updated russian translations.

790c61810123bf51d2cd7cbc88833ec0e56de34a authored over 11 years ago

Seems one of my merges blew away the SimExpPan.border.Stage.

e8dad716b380431302c89be8118ed02056ad64e7 authored over 11 years ago

Merge pull request #138 from kruland2607/master

Seems one of my merges blew away the SimExpPan.border.Stage.

d61d4f7f2b0249802fba7a3e45904a7736858b12 authored over 11 years ago

Update release instructions

6aa55a2c238c1bb8e35bf8f5fbef9d7ce0cd7cf2 authored over 11 years ago

Update version to 'dev'

e8ebb916d2b5d3738da671cedde511ae60576e6e authored over 11 years ago

Release 13.09

f59c8012fb9bacade4f43a4a1bcb2409f0562328 authored over 11 years ago

Remove unnecessary FIXMEs

10dbc856eebdeae6c439b7095ff2f0909f5536b0 authored over 11 years ago

Update wiki URL

fcfa53ac05295490a9db97f67d60753a2cbb793c authored over 11 years ago

Merge pull request #135 from kruland2607/simexport

Added ability to export different branches from simulations. Change the ok button text based on...

788301be81a41d08c1f0276d51cdd64d235564ee authored over 11 years ago

Change the ok button text to "Plot" or "Export" based on selected tab.

3538a3ac9a511e8b2bcfef1ccde26fc18a032ba2 authored over 11 years ago

Added ability to export different branches from simulations.

0bba32fb5999fbd8ba944956d95d653175b7d3d8 authored over 11 years ago

Merge pull request #134 from kruland2607/master

Doh! forgot to add the new jfreechart libs.

3088ee08aac6893bc4e7dc621d7b4456576e6038 authored over 11 years ago

Doh! forgot to add the new jfreechart libs.

7285ce0f6e3ec8f2f75872577779214a47c13799 authored over 11 years ago