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

Merge pull request #85 from soupwizard/master

Fix github issue #84 "The CP & CG markers appear in the 2d rear view."

844ac9bc08ac69f8839899488bb477b054cf270d authored almost 12 years ago

fix github issue #84 "The CP & CG markers appear in the 2d rear view."

8f4d626a9a523ccb993c51de9be40c7d33fcd687 authored almost 12 years ago

Merge pull request #83 from kruland2607/master

Few changes from beta.

018aa36703ac1b4ae04403e98629782213397ec7 authored almost 12 years ago

Added two localization keys - appearance tab, and rocket panel, view

type.

d2822b5fc6717bdcf6afe19055d2e35b10203516 authored almost 12 years ago

Added release notes from changelog.

fee17f38781bcee025c43da19f916122dc7d78fe authored almost 12 years ago

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

793c7dd3bb6bb88c2de76e33df3e04edad28e186 authored almost 12 years ago

Merge pull request #80 from kruland2607/master

bump to v2

d66fe5701105b156e1de2da61c3275bf418f51cc authored almost 12 years ago

Bump revision number.

0607823f63264fe7bd5efbb27c0440649bdcd6ec authored almost 12 years ago

Merge pull request #78 from kruland2607/master

Load presets in foreground thread.

1d33f1db8c444a3f04bead754c2a7a0875f92266 authored almost 12 years ago

Load the components in the foreground thread so they are completely

loaded before trying to read an ork file from the command line.

8baf9e6676ec901455ea2574d989fa04423b7343 authored almost 12 years ago

Merge pull request #76 from kruland2607/master

Serialized preset database needs to translator and en locale.

3c8ffbf5b1a58513ce3e9b5a498a543d791f467f authored almost 12 years ago

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

1e2c64b6f0ac874a5b5c2e2b079dbe5cc52bd496 authored almost 12 years ago

Merge pull request #75 from kruland2607/master

Removed FIXME

a91e1973e4e49f540bdefd6dc99f2b7c03542d4d authored almost 12 years ago

Removed last FIXME after manually verifying all calls to the method.

f0228aa878c35021b77eb7ff724f6587106337fc authored almost 12 years ago

Merge pull request #71 from soupwizard/master

Update travis-ci config to run unit tests and show test results in ant output

3da320c24b2d76995caed7bc4ab407e75cd753ff authored almost 12 years ago

Merge pull request #74 from kruland2607/master

Fix for https://github.com/plaa/openrocket/issues/72

668a7c0722f289770c5be324a179763b712467b7 authored almost 12 years ago

Revert "Modified application startup to set the base translator the same way the"

This reverts commit 1ce951e635b8062864c94af73759034597bf8807.

dfd73c9a54c853f7d872755a27722dd053761831 authored almost 12 years ago

Fix the expectations in the PresetTests to account for changes in the

DebugTranslator for material names.

b5610b092690b849081cc8aca461fdd932fdb84e authored almost 12 years ago

Merge pull request #73 from bkuker/master-imagesrink

Shrink images in examples and textures

b05e882cd5887e6fbfdcaf0651b064ea83ac0f34 authored almost 12 years ago

Modified application startup to set the base translator the same way the

guice startup does - if the locale is set to 'xx' then the base translator
is the debug translato...

1ce951e635b8062864c94af73759034597bf8807 authored almost 12 years ago

Added a build target "unittest-no-junit-report" to run unit tests and

not create a junit report, but instead to show test run results in
the ant output stream. Modifie...

1cfdbf7e3f86ab50d7c0104cf172bd74e59e3c22 authored almost 12 years ago

Merge pull request #70 from kruland2607/master

Renamed base class in unit test framework.

38cb9323318ee1422b1a35ab08f1f2001ba3aaa6 authored almost 12 years ago

Renamed BaseApplicationAbstractTest to AbstractBaseApplication so it

wouldn't get executed by the unittest target.

6caca934214744c57a35e71285dededd41ff6821 authored almost 12 years ago

Reduce built-in image sizes

3e57b36ffb7fd35504f636deb6acf9eecc25838a authored almost 12 years ago

Smaller simple sample

a6496954230a452aa89bc96feb06ce7c5bb6285f authored almost 12 years ago

Smaller Examples

6d12d265ac0335b9cd01b0f1bb36e3aa324d02e6 authored almost 12 years ago

Merge pull request #67 from soupwizard/master

Update travis-ci config, fix non-ascii char in FinRenderer, Add new unit tests for Configuration...

3dec7ec154811e5813b01c0b83937fda73d21518 authored almost 12 years ago

Merge pull request #69 from kruland2607/master

Fix for https://github.com/plaa/openrocket/issues/68

89552e9c6a5ba87e424aec1d7c6173082558187f authored almost 12 years ago

Set Spill hole in rocksimTestRocket3.rkt to 1.0 so the loader will

generate the warning. I had changed generation of the SpillHole warning
to only be issued if the...

8a31d358d4a89802bc152c5ddf16ba91c69cf2c7 authored almost 12 years ago

Update travis-ci config file run unittests. Add new unittest ConfigurationTest.java. Fix FinRenderer.java to not have non-ascii character in a comment.

448d2e606cf182fa46f63357cac560f61d36ea1e authored almost 12 years ago

Merge remote-tracking branch 'upstream/master'

bc282a0e6c430fa89fc63c67d5f5fcf99e2e1c43 authored almost 12 years ago

Revert "Create README.txt"

This reverts commit 557073c0219e9c42f534e603bd3b7168d0b9d682.

c17c4fa9b2858b016b68a00dbea1a51cbebef5c4 authored almost 12 years ago

Merge pull request #66 from kruland2607/master

Fix for issue #60

daf98cb81034a2b5d8ca4dea7bc167eebd381e73 authored almost 12 years ago

Fix PluginTest by creating the PluginModule as a child of the

ApplicationModule. Unfortunately, ApplicationModule requires a
preference provider to be set.

1f109acf41ec3ea55868afea64dd848b3aa4aac3 authored almost 12 years ago

Merge pull request #64 from kruland2607/master

Fix various unit tests.

1b90acf49626760943b84ab21dbbb14d3b4873dd authored almost 12 years ago

Allow setAppearance to accept a null Appearance parameter without

throwing NPE.

173108c1a8417518e5c9126a74e267a461ae506b authored almost 12 years ago

Fixed RocksimDocumentDTOTest by having RocksimTestBase extend

BaseApplicationAbstractTest to create a more complete Application
object.

f899b9fb2ecddd6807e39b1d8d0ece0cd5941272 authored almost 12 years ago

Added BaseApplicationAbstractTest base class which will use Guice to

create the application framework. It is roughly equivalent to the first
step of bootstrapping wi...

2738f30489ed45d24e2231f677a4daa3ae0339dc authored almost 12 years ago

Fix initialization in constructors so all constructors initialize the

motorConfigurations and ignitionConfiguration. This fixes unit tests.

c1ad923d93c04749bf090b71ff379dfd77c5dac8 authored almost 12 years ago

Ignore changes to ignition, stage separation, and motor configuration.

2bad65410db82186435285562e36b837ad26e20f authored almost 12 years ago

Merge remote-tracking branch 'upstream/master'

c8c172ac87fff5a1c3e9c819ade6a5adc9e2d9c1 authored almost 12 years ago

Revert "fixed 4 bugs found by FindBugs plugin in Eclipse"

This reverts commit 69130292f2edd7719f0b2dea9913796fa3d41461.

0acc9595c87b55e69aeaadc165aeede6cdc76ccd authored almost 12 years ago

Merge pull request #55 from plaa/kruland-integration

Kruland integration

90bc49a9fe023a92e4411ae118ebd6910cde9408 authored almost 12 years ago

Updated ja & pt localization files for changed keys. Updated ChangeLog

and fileformat files.

a6a8a949868b46de18667d49901871d6a76d7fd7 authored almost 12 years ago

Added footnotes for configurable parameters.

50e37d747f0c0ce3429de35cc1c39d1815cb925b authored almost 12 years ago

Update copyright year

c55ad71fd5f36fbf932161fc65fc262878479810 authored almost 12 years ago

Update splashscreen copyright

74d5ffdcb738e461894d16cd213f8a0e260b2274 authored almost 12 years ago

Merge remote-tracking branch 'upstream/master' into kruland-integration

Conflicts:
core/resources/l10n/messages_fr.properties
core/src/net/sf/openrocket/gui/dialogs/p...

701b8966a26fa51675bc3da9be1ccf93a6273e91 authored almost 12 years ago

Display language names in the preference drop down in both the localized

and unlocalized form. This makes switching for non-native speakers
easier.

15c1cffde6cb329efd7f55875fd60c39015fe613 authored almost 12 years ago

Merge in l10n changes.

8f9dc9370534a78744fd2daa399113101edab56d authored almost 12 years ago

When importing from RockSim, don't complain about spill holes in

parachutes when the hole has radius 0.

8d90c8aae4d77b97d88f1d0d7f3e837b78fab7ba authored almost 12 years ago

When importing from RockSim, ignore texture specs which are empty.

44e0274ab2362946467aa79d6f5c3fd2aa0561ca authored almost 12 years ago

bump revision number to 12.04beta1

b157d31748f3c389ba2832f289473e17dd15fbaf authored almost 12 years ago

Added extra help message about configuring the default editor in

preferences.

c9c75248cf44eee2e688d6c2dd1b5b27067b27b0 authored almost 12 years ago

Correct casts used in reset action on radial position tab.

1d3d860864116e5f3f1c51d58eb7841732b27932 authored almost 12 years ago

Removed some printlns.

abb2a7c22af29bcadd3440b77e48343f1bd7ae53 authored almost 12 years ago

Fixed issue with 3d view now updating when an edited texture is saved.

The Configuration object did not propagate the underlying Texture
Changed ComponentChangeEvent ob...

52772674d28289b7e6ad4b45d14c3607b1b66fb9 authored almost 12 years ago

commented out extraneous println.

faac6d2537f42822f1194196f91034f23628bc21 authored almost 12 years ago

Fix for issue #45, set the appearance on the freeform finset when

chaning a finset to freeform.

0477c3edfdeace1f9433b5db771dfe7271b24539 authored almost 12 years ago

get motor from MotorMount with non-deprecated method

6f72662ea842a19990f42e2ffd9b8399c6f956ea authored almost 12 years ago

Pretty confident I should be clearing textures on dispose()

d7b46d6058175a75f0283124fa752a92051ac87c authored almost 12 years ago

Fix the order of init() calls to fix brightness problem on paint vs

texture.
Clean up the setType method, but it is still not great.

381cab468cf6b0b355005a912b681806e6c6f66a authored almost 12 years ago

Dirty fix for problem switching to 3d rendering the first time.

9b96dabb1625011a865eeb05c4016ede3353f1ae authored almost 12 years ago

Added source packages to jogl and gluegen libraries.

8189da9de1591a0052bc71587e65235c3ca4974b authored almost 12 years ago

Added .gitignore which should have been part of the merge from master.

d02bf71ce1d08e63dc252da0852d21544c9b80d4 authored almost 12 years ago

Merge remote-tracking branch 'upstream/master' into kruland-integration

Conflicts:
core/.classpath

3212beb27cdf270cd92a9e9abe006b7679b5334f authored almost 12 years ago

Merge pull request #49 from kruland2607/master

Updated motor thrust curves and databases.

26cfe854f5f0ee34a254748c2a118c37b0399c0c authored almost 12 years ago

Merge pull request #42 from kruland2607/l10n-updates

Updated translation files from Boris du Reau.

d9a3f7ab135636bb14b4adb568c440f690d89d0e authored almost 12 years ago

Updated apocalypse by moving motor tube to end of tail cone and adding

rear centering right with appearance. Added a motor and simulation.

e25bb9b0799e1498134f83a683862c5c5f54d1e3 authored almost 12 years ago

Fix flash of paint without decals when switching between default and

custom appearance

b20076f2484d9ab3582bcf97c9d6a4a253cc537e authored almost 12 years ago

Merge pull request #52 from bkuker/kruland-integration-transition-fix

Fixes and improves 3d rendering of transitions

f1ef2f39d0a7588197ac7a4ae934fc16811260a9 authored almost 12 years ago

Draw inside surface of transition offset by transition thickness.

Note the offset is perpendicular to the axis of the rocket, not normal
to the transition surface,...

9fd739b4a88ad6aac59df7be71b2100b59f3399f authored almost 12 years ago

Render edges of a transition with thickness

c9652d851cdeb43b230066980a275ef673810bd6 authored almost 12 years ago

Do not render shoulders if zero length

4ff3b0291695fea9617fc4e48d9187fba9c87c43 authored almost 12 years ago

Implemented optimization for FlightConfigurableParameters. Added back

support optimization of deployment delay, deployment altitude, and
ignition delay. GeneralOptimi...

ec8248fd1061741a631d67d237a3e433a4db54d2 authored almost 12 years ago

Decorate the bottoms of all examples.

af7ef8360fb825a6ed31aa8b0519f79da29fde26 authored almost 12 years ago

Make the appearance dialog work better when switching between default

texture and custom. Also ensure that default texture names do not
appear in the texture drop down.

e254ff0e94657bac8f219207c369836fa93ee175 authored almost 12 years ago

Have Simulation.duplicateSimulation copy the configuration id as well.

fe8cc22f6b5bfa07bc1e42630215bfe9f51d843e authored almost 12 years ago

Make SimulationOptions.copyFrom prefer matches based on exact match of

the configuration id.

ea3aeedf1bdc97edcbab36acd01bea6439519686 authored almost 12 years ago

Have Rocket.setFlightConfigurationName honor the DEFAULT_NAME.

4cc3485fa04c5000a0d25f00612698279ba208dc authored almost 12 years ago

Removed FlightConfigurationModelRemoveMe.

161caceba0b924cc610061489db6b7202c8b7c3a authored almost 12 years ago

Added localization to remove FIXME.

e7189bd41520a3e8c7f3306275e7ba48ba78707f authored almost 12 years ago

Merge branch 'kruland-integration-ui' into kruland-integration

Conflicts:
core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.j...

2db59086ddfc2efe5ecc2df31115442c75537d75 authored almost 12 years ago

Flight configuration dialogs

5b93c923f596b50cda22f26788fca7471ea82b34 authored almost 12 years ago

Added default/override buttons to SeparationSelectionDialog. In

SeparationSelectionDialog, IgnitionSelectionDialog, and
DeploymentSelectionDialog, added code whi...

8bd5098b73f4f779374f2874b62633a601ac1032 authored almost 12 years ago

Fixed the deployment of the booster chute and named the recovery

devices.

43628961392a9e54352687d24dce301b1dd9f653 authored almost 12 years ago

Removed FIXME comment since the localization issue was resolved in

previous commit.

96cba8ed02b703bb4bdc289b9e50e4a66124cde4 authored almost 12 years ago

Added some localized messages when exporting and editing decals.

7db0c17c56814b1d40c8d7e030ea53f47f54a6db authored almost 12 years ago

More fixes to displayed text when default has delay.

9bf9e55428a830e03ac5ea391d498323a559711d authored almost 12 years ago

When the selected configuration changes, update all the panel contents.

31241bc0b9d85524e3f667d6a78872fe3a776ee0 authored almost 12 years ago

Update button states with every selection and corrected display of

separation configuration.

5dbb723736e97b4634d3fbecee67b7ac3e123914 authored almost 12 years ago

Double clicking on ignition cell opens select ignition dialog. Removed

FIXME.

9916a98ccbda3233ea2b22e9eb43e59b4efd85ad authored almost 12 years ago

Removed the FIXME comment since it's not so important to change the

names of the methods.

594638bf0224bd6906b3bffa3810551cd430b6c2 authored almost 12 years ago

Corrected implementation of reset motor ignition to default.

56edaeff77f42feccfb1d313c97e5dce1078c185 authored almost 12 years ago

Forgot to remove comment when correcting fixme.

f6d4ce4a9b82d96a055c2c323e7a18035dfaf5ec authored almost 12 years ago

Corrected FIXME for localization.

b034eccd4370d38a8ba2e6da3d19f6e2557f5234 authored almost 12 years ago

Change FIXME - compute deal size to a TODO. It would be nice but not

necessary. Fixed FIXME to test for flight configurations while
determining file format version.

05b43a2f419485c2a2d0184d7a55f9844595162a authored almost 12 years ago

Added size() method to FlightConfiguration and FlightConfigurationImpl

to determine if a component has any flight configurations other than
default.

8dea8f9395585c2798d92181f3332fc38706e4a7 authored almost 12 years ago

Removed fixme comment since it was unreachable.

8b6541284c013bce6362b0a7b3b5667d29d03431 authored almost 12 years ago

Fix arguments to ant's tempfile task.

dcacae5e7567be8f0a699f44d1024accc5f4e78f authored almost 12 years ago