Sampo Niskanen
|
ef7c384f58
|
Merge branch 'master' into kruland-integration
Conflicts:
core/build.xml
core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
core/src/net/sf/openrocket/gui/main/BasicFrame.java
core/src/net/sf/openrocket/gui/util/SaveFileWorker.java
core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
|
2013-01-06 19:18:46 +02: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
|
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
|
bd66cc9338
|
Use Serializable representation of system supplied motors in jar file.
this greatly improves startup performance.
|
2012-10-28 11:26:40 -05:00 |
|
Kevin Ruland
|
f5241b85cd
|
Updated motor files from thrustcurve download. Added correction files for Quest D5 and Micro_Maxx_II.
|
2012-09-12 02:33:21 +00:00 |
|
Kevin Ruland
|
3e92068515
|
Updated motor files from thrustcurve download. Added correction files for Quest D5 and Micro_Maxx_II.
|
2012-09-12 02:30:46 +00:00 |
|
Kevin Ruland
|
89a83d54fc
|
Updated motor files from thrustcurve download. Added correction files for Quest D5 and Micro_Maxx_II.
|
2012-09-12 01:53:50 +00:00 |
|
Kevin Ruland
|
487a9238de
|
Added Estes E12 data file found on The Rocketry Forum.
|
2012-07-12 02:50:54 +00:00 |
|
Kevin Ruland
|
31842af24e
|
Move datafiles/ into resources/.
|
2012-01-11 03:24:59 +00:00 |
|