hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,131 Commits 2 Branches 43 Tags
Commit Graph

3131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SiboVG
2c311ba3c3 [fixes #1101] Select motor mount in motor config table 2022-02-13 13:19:10 +01:00
Joe Pfeiffer
891ac0f4d6
Merge pull request #1117 from SiboVG/issue-1093 
[fixes #1093] Add back view for fin tabs
 2022-02-11 08:30:28 -07:00
Joe Pfeiffer
143308f946
Merge pull request #1091 from SiboVG/issue-1067 
[fixes #1067] Improve GitHub repository
 2022-02-11 08:21:12 -07:00
SiboVG
0c03f631ba
Merge pull request #1116 from SiboVG/fix-license-layout 
Fix layout issues license dialog
 2022-02-11 16:00:25 +01:00
SiboVG
c033530e35 Update misconduct communication 2022-02-11 05:04:03 +01:00
SiboVG
8fbd9e0f6c Move GitHub files to root 2022-02-11 04:22:58 +01:00
Sibo Van Gool
5b2a7f5595 Update fonts license & bug dialog 2022-02-11 01:15:31 +01:00
SiboVG
251e8e6a19 [fixes #1093] Add back view for fin tabs 2022-02-10 20:51:09 +01:00
SiboVG
0e7c088c94 Fix license layout issues 2022-02-10 20:18:11 +01:00
SiboVG
b94440cc10 Fix bug report layout issue 
Fixes an issue where some parts of the bug report would be formatted as HTML instead of plain text, e.g. in a stack trace '<init>' was previously recognized as an HTML tag.
 2022-02-10 20:12:42 +01:00
SiboVG
54e241a129
Merge branch 'unstable' into issue-1067 2022-02-10 17:39:32 +01:00
SiboVG
1a68225cf3
Merge pull request #1109 from JoePfeiffer/fix-1079 
Fix 1079
 2022-02-10 17:37:32 +01:00
JoePfeiffer
768e7380eb Move some meta-files from the .../core subdirectory to the root directory. 2022-02-10 08:59:59 -07:00
SiboVG
24f1f62b4e Delete license file 
Already present in the OR codebase
 2022-02-10 01:04:03 +01:00
Joe Pfeiffer
c63191c9e5
Merge pull request #1113 from SiboVG/issue-1111 
[fixes #1111] Update splash screen
 2022-02-09 14:42:22 -07:00
SiboVG
409755c320 [fixes #1111] Update splash screen 2022-02-09 20:43:36 +01:00
Joe Pfeiffer
6a3fa9820c
Merge pull request #1106 from SiboVG/issue-1055 
[fixes #1055] Improve OR's simulation behavior
 2022-02-08 18:56:46 -07:00
JoePfeiffer
44271711a6 When constructing a file name based on the name of a resource in a .jar file, if it has no extension give it an extension of .txt 2022-02-08 18:05:24 -07:00
JoePfeiffer
f8997d83f1 Cleanup license display 2022-02-08 10:04:32 -07:00
JoePfeiffer
78a66c24e8 Revised license text in accordance with more licenses found by H. Craig Miller 2022-02-07 19:14:19 -07:00
JoePfeiffer
d3f1144ef1 update copyright year 2022-02-07 15:25:49 -07:00
JoePfeiffer
e442d4605e Update license dialog 
Quit quoting entire GPL in dialog; insert hrefs pointing to it.
Add other licenses:

Apache license, for Dave's components library

DejaVu font license.  I wasn't able to find an "authoritative" source
for this license to point people at.

BSD 2-Clause license for commonmark-java library.  This license is so short I
left it in the dialog.  To my surprise, I also didn't find an "authoritative"
source for this license to point people at
 2022-02-07 15:25:49 -07:00
JoePfeiffer
326399fe85 Copy LICENSE from new database into presets directory when building 2022-02-07 15:25:49 -07:00
JoePfeiffer
1ae6a845d5 Add CommonMark library, and components and thrustcurve databases, to About dialog 
Convert all URLs in About dialog to hyperlinks
 2022-02-07 15:25:49 -07:00
JoePfeiffer
4734ea5e85 Modify DescriptionArea to make hyperlinks live. Hyperlinks other than jar 
resources just get sent off to the browser; jar resources get extracted into
temporary files, and those files' URLs get sent off to the browser.

I don't really like the handling of exceptions here, but I don't see a better
way around it. Trying to just declare hyperlinkUpdate() as throwing exceptions
fails because I'm overriding an abstract method that doesn't throw exceptions.
So, I need to throw a runtime exception when an exception happens; the stack
trace in the bug report shows that as the location of the exception so I
didn't want to just wrap all the code in the method in one big try/catch as
that reduces the information about where things broke.  So, bunch of try/catch
blocks around related operations.
 2022-02-07 15:25:49 -07:00
JoePfeiffer
7c8e8699ef intermediate commit so I can catch up to unstable 2022-02-07 15:25:49 -07:00
SiboVG
2350b5cbd6 Update example files with corrected launchRodDirection 
The launchRodDirection saved in these example files was wrong and caused an outdated status update when editing the sim or saving the file
 2022-02-06 18:49:02 +01:00
SiboVG
1876fb88df
Merge pull request #1085 from SiboVG/issue-1084 
[fixes #1084] Fix layout PhotoStudio Settings
 2022-02-05 01:01:27 +01:00
SiboVG
22e7941266 Update release notes link 2022-02-05 00:48:26 +01:00
SiboVG
3264c1ccb1
Merge pull request #1104 from JoePfeiffer/check-database 
Check for database submodule and give instructions for including it if not found
 2022-02-01 17:54:31 +01:00
Sibo Van Gool
1f5a2c3b5a Loaded sim should not be rerun in design report 2022-02-01 17:26:46 +01:00
JoePfeiffer
497f185790 Check for database submodule and give instructions for including it 
if not found
 2022-02-01 09:21:06 -07:00
Sibo Van Gool
7a778bf58d [fixes #1055] Save 'only figures' with status 'NOT_SIMULATED' 
Better suited than the previous 'OUTDATED'
 2022-02-01 16:52:49 +01:00
Sibo Van Gool
b52bcfa0eb [fixes #1055] Change 'LOADED' sim status look to 'UPTODATE' look 2022-02-01 15:40:56 +01:00
Sibo Van Gool
e4d852e46f [fixes #1055] If no databranch in XML, data = null + status = NOT_SIMULATED 2022-02-01 15:29:42 +01:00
Sibo Van Gool
1e5adf36eb [fixes #1084] Remove left gap of image credit 2022-02-01 15:24:12 +01:00
Sibo Van Gool
df1caaec03 [fixes #1084] Remove colon for 'image credit' 2022-02-01 07:40:08 +01:00
Sibo Van Gool
71f01ab66d [fixes #1084] Move credit content to second column 2022-02-01 07:35:32 +01:00
Sibo Van Gool
f81f5a4c45 [fixes #1084] Extend separator to title label 2022-02-01 07:33:26 +01:00
Joe Pfeiffer
8e50f5202e
Merge pull request #1103 from SiboVG/issue-1076 
[fixes #1076] Fix preset combobox not updating
 2022-01-31 18:09:01 -07:00
Joe Pfeiffer
d277dbb4ce
Merge pull request #1098 from SiboVG/issue-motors-layout 
Clean up motor configuration layout
 2022-01-31 18:05:17 -07:00
Sibo Van Gool
620b450e2d [fixes #1076] Fix layout issues ComponentPresetChooserDialog 2022-02-01 00:50:29 +01:00
Sibo Van Gool
3541899b0f [fixes #1076] Move PresetModel database listener internally 
setComponent() of ComponentConfigDialog called pack(), which triggered invalidate() in RocketComponentConfig, thus removing presetModel from the database listeners before the Component Preset window could even be called
 2022-02-01 00:39:22 +01:00
Sibo Van Gool
1ae589d864 [fixes #1076] Use Close button instead of Ok/Cancel 2022-01-31 23:41:43 +01:00
Sibo Van Gool
294dd4f73b Include extra license info 2022-01-31 21:00:04 +01:00
SiboVG
385587da2e
Merge branch 'unstable' into issue-motors-layout 2022-01-31 19:33:42 +01:00
Joe Pfeiffer
86260cc7c8
Merge pull request #1097 from SiboVG/issue-1088 
[fixes #1088] Select new motor config + others
 2022-01-31 10:56:17 -07:00
Joe Pfeiffer
6b24e0f58d
Merge pull request #1096 from SiboVG/issue-transition-clipped 
Fix transition 'Clipped' checkbox overlapping with comment
 2022-01-31 10:52:20 -07:00
Joe Pfeiffer
d459ba4bd8
Merge pull request #1095 from SiboVG/issue-1090 
[fixes #1090] Wrong FinSet tab position upon file opening
 2022-01-31 10:41:59 -07:00
SiboVG
6e4faa8b6a
Merge pull request #1077 from JoePfeiffer/fix-713 
Fix 713: Include legacy and new databases
 2022-01-31 18:40:33 +01:00