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

Import cleanup

e11d48566e34f07a5eb9b24b3693d2d02a89c61f authored about 12 years ago

Fix the clamp message

c6bdd1ab7817ba0c5a6d899b7e418a5540ec8773 authored about 12 years ago

Better choice for zNear & zFar to fix some artifacts

903564687dfc073fb18130ee20d02263ea13f0d7 authored about 12 years ago

Set color to white on certain decal types

30562244c72e25f86e4dd7bb4d8e75b52eda234b authored about 12 years ago

Merge remote-tracking branch 'plaa/kruland-integration' into

kruland-integration-stickers

Conflicts:
core/src/net/sf/openrocket/appearance/SimpleAppearanceB...

7ead8bf977fc8cc4bce15edd16d5d508e8b14d56 authored about 12 years ago

Rework Decal byte handling code and DecalRegistry. Added interface

DecalImage which is used by the Decal object to retrieve the bytes for
the image. The DecalRegis...

acba62ce59c4ac817d10936814b92d7048b51e09 authored about 12 years ago

Merge branch 'master' into kruland-integration

e4f713196cd1f6604fb7bdd14e7e993a6e90b8bd authored about 12 years ago

Project-specific code style formatting

ff83f2bad81f9384b589c0807ba662188eeb49cf authored about 12 years ago

Remove FIXME

4560b8fd264e6c447b2fddede4e1fe512f4adb05 authored about 12 years ago

Merge branch 'master' into kruland-integration

Conflicts:
core/build.xml
core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader....

ef7c384f58a30365fc2e5261df7370661cda9cc6 authored about 12 years ago

Clamp shine parameter in range of 0..1

e4cda1c751ebd4ed11d698c2a70a08622207e21a authored about 12 years ago

Merge pull request #34 from bkuker/kruland-integration-unselect

Unselect component when figure is clicked outside the rocket

31f620d1bd25b1ab8d3e59c4762deebef3cea061 authored about 12 years ago

Merge pull request #33 from bkuker/kruland-integration-simple-appearance

Simplify the appearance UI, Model & File

532f02c391103e7aad11c21a3059e5f6090fe34d authored about 12 years ago

Add percent / permille unit selector to shine

26e38f80dc8bcd42dfa1ce87918b14c2d163de4d authored about 12 years ago

Display shine on 0-100 scale

7bda0bde1220bb186a4ceb0047ac9b9ba80326f0 authored about 12 years ago

Set null selection path when nothing is clicked.

Fix a bug that wasn't updating the 3d selection when unselecting

3fe7370e0854f2993f0b623037904e367bed9b4f authored about 12 years ago

Trigger componentClicked with an empty list if no component is picked by

a clock on the 3d model

62cfd2730e68dce022c061c8d4bed1e38a9e17e7 authored about 12 years ago

Update Apocalypse to use Shine & Paint

ab9dde913cce5cad9e53be832700eb87b05f6ccd authored about 12 years ago

Change "Shine" to a double in [0,1]

Add shine to OR import & export

c7ffc442a5ba86c542644d0d6a51d036061806fb authored about 12 years ago

Refactor convertStringToBytes method

011bcd27e2110a62a8893b2120ddc96a8136602a authored about 12 years ago

Merge pull request #25 from rodinia814/watcher

Directory/File Watcher

e2e509210cbfe67eff8bd54b2c1f2bc4ec7bab23 authored about 12 years ago

Merge pull request #31 from bkuker/osx-undo

Use platform default shortcut key in menus

e0738de2c06fb7f580c0043e921fd2954571b99f authored about 12 years ago

Use platform default shortcut key in menus

a8e39af85d9e27584cf9a3c7032dbf432ecc21c3 authored about 12 years ago

Stickers Example

5985dba36ab1bd4a308699e850579c511c079c98 authored about 12 years ago

Be more careful w/ my depth comparisons

e8bf775e56249c35d827aa8a3f58651b029a2354 authored about 12 years ago

Render stickers

1a6c721add87deea9344d3e71202340bf0ef3c2d authored about 12 years ago

Further refactre RenderStrategies into RocketRenderer subclasses

143a032728f91c0d1bb7215fa1c982ab4153ab8e authored about 12 years ago

Moving from RenderStrategies to RocketRenderer subclasses.

a857fb93be91917b16ce3b8293eaae5aa29dd1ea authored about 12 years ago

Add a sticker decal option

e8ac5d4dea856df25e51fbe938c8060416c161bd authored about 12 years ago

Simplified appearance. Is this really what we want?

cbb78cf09584b39ce85798429633ff31b0098b84 authored about 12 years ago

Merge pull request #30 from rodinia814/printing

Printing fixes; added Save As file to MRU

e31f94ed99c97b4bedb987f1a0e55fb5c70cd6fb authored about 12 years ago

UI improvements for flight configurations. Ellipsize the ignition

delay. Change to using row selection instead of cell selection. Change
the copy configuration t...

98db1885c27120995b17f3018ea9a01ab31e058c authored about 12 years ago

Printing fixes; added Save As file to MRU

45b337b9f440be1777c71c5465be65cbd4b01895 authored about 12 years ago

Merge pull request #29 from bkuker/master

Move System.err log capture to GuiceStartup

583b1a78e6ea09a224ba2b7690c3f8047968a1c2 authored about 12 years ago

Add Edit Decal dialog available from Appearance tab. Added preference

to control which editor is opened.

177d40104eb196cad6d1f72f41374e515e16ecf5 authored about 12 years ago

Move JOGL debug setup to GuiceStartup.

Always capture System.err to log.
Also write captured System.err to STDERR if the log is NOT bein...

ff7e5d5d04f0c870a3c8c42fdfd13c5b595bcf52 authored about 12 years ago

Merge branch 'master' of https://github.com/soupwizard/openrocket

92952316ed0e3508a42f44dd629119942e494fdf authored about 12 years ago

fixed 4 bugs found by FindBugs plugin in Eclipse

69130292f2edd7719f0b2dea9913796fa3d41461 authored about 12 years ago

Merge pull request #28 from bkuker/master

Capture JOGL debug information

02927d0f2de7b43394a270af83ee681c81203408 authored about 12 years ago

Try to quiet JOGL down a little by classifying indented lines as

verbose, not debug.

77374d39923220a0cfb0d8d7ed037d2ace9be3d2 authored about 12 years ago

if openrocket.debug then redirect stderr to log.debug().

003e6c35f149e4ac9a87f5ce32dbd59929146f7b authored about 12 years ago

Remove some overactive logging

bc2e759d86b794dbd0406d9b8a8cec19bead0bd4 authored about 12 years ago

Include JOGL implementation version in bug report

56c6d1b71492bd5e8e03ae37755f97fc5f4c628d authored about 12 years ago

Merge pull request #27 from bkuker/master

Fix Classpath-Jars value in build.xml

22c1d9938c58b98d653ba75235b6708e6cdb4602 authored about 12 years ago

Fix classpath jars

be9f6040ee0e72f2604a2c886e7c10d8cba99b2c authored about 12 years ago

Merge pull request #26 from bkuker/master

Remove "Attempted firing event..." log statement

9bb4e12c77bd46b189d97babda343f6d99de3ebd authored about 12 years ago

Remove log statement about ignored event if component not part of rocket

5a8fa640a28ac50695b283cdea086f2ff363ee6a authored about 12 years ago

Use anisotrophic texture filtering if available.

56be31cfd24db84b37b5a84e3d7e01d34cc45ecb authored about 12 years ago

File format introduced with 12.09

407052e89ecb24f8396a8adb5f95552097b09309 authored about 12 years ago

Build with java 6.

669c49caf207a32c2ad9987ea33d3a78c8f7b467 authored about 12 years ago

Make the thrustcurve series labels unique which is required in

jfreechart 1.0.14.

e0b538651300ba106c9079c96996c130c77ddf05 authored about 12 years ago

Define Eclipse project settings to use Java 1.6 level

3e81033b04c4e155684436d301c172fb339aa6e4 authored about 12 years ago

Merge branch 'kruland-integration' of ssh://github.com/plaa/openrocket into kruland-integration

1c047131312ec75f1a2660e2d0cd98add325db0d authored about 12 years ago

Fix library references in build file

b29853e4164247ac232621fd8282c04177118877 authored about 12 years ago

Minor fixups and method renaming.

bd1e3ce83c436dda11b5903ebddd509f7f979ea6 authored about 12 years ago

Moved Rocksim saving condition to the top of save, since there is no

need to do all the decal name manipulation if we don't save decals in
Rocksim files.

618dd63b5cfaf0acba186bb2cf6d7d13735e025e authored about 12 years ago

Removed comments about possible caching, it really isn't necessary.

079ef2ba13a8055d326c2abfe0fc081c24c76293 authored about 12 years ago

Merge pull request #24 from rdgraham/openrocket-rdg

Openrocket rdg

0ef470b02eb2a78144030e8c809407e6b10bb33c authored about 12 years ago

Initial file watcher code.

ffca820860d90efc204b1b4f37762f39473b66e4 authored about 12 years ago

Fix build to use new jfreechart and jcommon jars.

728de34d8b428ffcb0d4aa5fc24ec8bbaa4c0865 authored about 12 years ago

Create README.txt

557073c0219e9c42f534e603bd3b7168d0b9d682 authored about 12 years ago

Merge pull request #20 from bkuker/kruland-integration-decal-ui

Kruland integration decal ui

54c160ad9c6b72e39148ab313b8282a32d66d5b7 authored about 12 years ago

Remove concept of material default for component

31c351c9d58a2d89ee770af1419f0e3678295051 authored about 12 years ago

Disable color choice when you have a texture selected.

f4a85993e60c8989e53c4af79d3f46e820d1c59d authored about 12 years ago

Clean out some comments

787ef8e3476e07b9d5dc6b489fd036dd86f2221d authored about 12 years ago

Rename texture unit and use it for offset too

d966973f7dc8d3d951b0e81d4e6da3255d35355b authored about 12 years ago

Smaller sliders

97b2c4002c3bcf47878781b02b0cf0b517573095 authored about 12 years ago

I10n for color label

86d07ca8b8161c4e0b1ec40ba33b75554594e930 authored about 12 years ago

Merge pull request #19 from soupwizard/master

Added support for Travis-CI hosted continuous integration to GitHub

e7e6dc2dd509603dc30129de68de8ed6f7c7a725 authored about 12 years ago

Added config file needed for travis-ci continuous integration hosting support. Fixed places in build.xml that had hardcoded path references to use relative references. Undid fix to build warning in MotorCompare.java, since the fix didn't work with java 1.7.

f667bb4bf5c96fd73f4a9cc6e91b8eca7e052d1f authored about 12 years ago

Removed custom expression debug message

df9ef0b98447d7be61362dc1d94e825ec3c294d7 authored about 12 years ago

Merge branch 'master' of https://github.com/plaa/openrocket.git

661e391654ff177d14563cc3882370e195ed9f67 authored about 12 years ago

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

a7e73f6485e2aad2bcaa67bd56f717e5cec39b6c authored about 12 years ago

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

e516f99a8fe42b4f3e66beaf9195e9f60e3ed04b authored about 12 years ago

Always save using .zip container format. Removed the "use compression"

option from the StorageOptionChooser.

7db51b9b65d69aa685b4916d0f6fc326cc0cc4e8 authored about 12 years ago

Merge pull request #16 from soupwizard/fix-150-build-warnings

fixed ~180 build warnings

dd6b417db2f78021b484e69c687894d21d240358 authored about 12 years ago

fixed ~150 build warnings

11c247135e78a2d059ec09af53ab88417c02098d authored about 12 years ago

Merge pull request #13 from soupwizard/fix-build-warnings-add-overrides

fix about 100 build warnings by add @Override, couple other warning fixes

58183fc2b6f4316bf2a2425e1bd9fab04e98681f authored about 12 years ago

Merge pull request #14 from bkuker/kruland-integration-decals

Decal UI Simplification & Fixes

1bbef243ac4b673e12d67439fc304c90f1c87770 authored about 12 years ago

Cleanup Apocalypse example:

Better decals
Non-weird flips
Moved some couplers that seemed off.

9d065c90e71b4c7ecb1da8472183834e9367f425 authored about 12 years ago

Add a slider model to the IntegerModel, add a spinner to shine parameter

efb05a554cad20a3a3022ddea43b219a1227a649 authored about 12 years ago

Set up ligiting for figure

591b05d867d891faa0da5d6112394a1a89c43b9f authored about 12 years ago

Fix bug where selection outline stayed visible after a component is

deleted

aac5fb9451f1fe88a06eecc25e7166db5fa8cd73 authored about 12 years ago

Create a simpler appearance builder for a simplified UI.

ee95d6998a2e721c54c40126254ca6e34762c4a3 authored about 12 years ago

Allow batching several changes before firing a changeEvent

5a8833738cd2fd996962b2040a016114e302b496 authored about 12 years ago

If an absolute file is missing try resolving it in the directory the

file was loaded from

e97ae2f4b0cd1aab6b4422dab519c648ab9663f2 authored about 12 years ago

fix about 100 build warnings by add @Override, a couple other warning fixes

141decb4d3cd781a4b963dfe1ba6c2b47a923aac authored about 12 years ago

Added some FIXMEs for consideration when saving files with decals.

a780b8da9328234c6ca6e1c07844980e3f20ad52 authored about 12 years ago

Failed to add net.sf.openrocket.gui.plot.Util class to support

SimulationPlot changes.

fbf5d3af03b0710e7a8bd0e8a0db8ba7723bc49f authored about 12 years ago

Regenerate the Apocalypse example file after changing the name of the

ork file in the zip container.

2c7fcdb87cd9588f157dc76ef297c5243fbba71b authored about 12 years ago

Forgot to remove FIXME comment in previous commit.

5d3bdd975cf39b2e3659ff96ed482d6e8fe45128 authored about 12 years ago

Be a little smarter about generating the series names for the plot and

drop down. Extract algorithm into utility class for easier reuse.

106a976655240ef89cece9504102752250e035b0 authored about 12 years ago

When saving a zip file, save the main rocket ork file using the same

filename.

aeacbcfd185159cafd741e204686df14e8dd34e3 authored about 12 years ago

Localized the Export Decal menu item.

db45a48e0832c787d9614b3db3d4a586d2827e57 authored about 12 years ago

Added localized strings for the dialog. Removed FIXME saying "add

buttons" because there are buttons.

e5ed9e166b2a4b90c04c0402db0bad85f3502e94 authored about 12 years ago

Added FIXME to indicate there are two example menu items one of which

must be removed.

1291574752df79c43d3b40a1bb9fa332f71ce737 authored about 12 years ago

Change FIXMEs relating to caching decal bytes to a TODO. The class

functions correctly as is, but might benifit from caching.

1e51b171a47fb36d66143e2845d91e6256d7631e authored about 12 years ago

Merge pull request #11 from soupwizard/remove-uneccesary-supress-warnings

removed unnecessary @SupressWarnings, to fix some build warnings

be0fe5c0f7638ec270b91838a0cd2fb41c6e0d36 authored about 12 years ago

Removed FIXME. The document properties are set in the OpenFileWorker.

474797748d2628afb2580e485955a6ae9713476a authored about 12 years ago

Change appearance panel scale spinners to increment by tenths since it

seemed better than whole units.

a046a7969c19291a1e60b039200922fb236c4f54 authored about 12 years ago