10 Commits

Author SHA1 Message Date
Sampo Niskanen
82af205e3e Merge remote-tracking branch 'upstream/master' into feature/simulationextensions
Conflicts:
	core/src/net/sf/openrocket/simulation/SimulationStatus.java
2014-12-23 21:01:48 +02:00
kruland2607
12c47442f3 Renamed the cg-marker.png to cg-override.png. 2014-05-08 09:08:27 -05:00
kruland2607
33af46a105 Added mass-override.png icon. 2014-04-24 09:42:00 -05:00
kruland2607
ae64f7a7f9 CG & Mass override indicators in component tree. 2014-04-23 21:22:43 -05:00
Sampo Niskanen
b6e3a57b47 Implement simulation extensions
Squashed commit of the following:

commit 058f603c23accbcdbe9110645f19164da7d57c85
Author: Sampo Niskanen <sampo.niskanen@iki.fi>
Date:   Sat Apr 12 10:52:21 2014 +0300

    Implmenent simulation extensions

commit a1ca913c7d7793a9209a5f98235336270db6ce10
Author: Sampo Niskanen <sampo.niskanen@iki.fi>
Date:   Fri Apr 11 19:45:12 2014 +0300

    WIP

commit 916f0bc8961360c0906b413485ca4e3700033740
Author: Sampo Niskanen <sampo.niskanen@iki.fi>
Date:   Tue Apr 1 20:23:25 2014 +0300

    WIP
2014-04-12 10:54:17 +03: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
Sampo Niskanen
723539619c Component preset updates 2012-06-18 19:48:57 +00:00
Richard Graham
16eed9a30b Added new feature : user configurable custom expression evaluation for the simulation, driven by exp4j. 2012-06-02 17:58:47 +00:00
Sampo Niskanen
88f359c25f Fixing various issues 2012-02-19 08:23:22 +00:00
Kevin Ruland
af15aeee70 Moving pix/ into resources/. 2012-01-11 03:23:49 +00:00