1063 Commits

Author SHA1 Message Date
UnicornFreedom
c945eea226 Make node selector a bit darker to make it more readable 2023-10-14 16:02:25 +02:00
UnicornFreedom
4e7d00e90c Fix notification dialog icons 2023-10-14 16:02:07 +02:00
UnicornFreedom
08b5fff65d Move OpenAl exception to the audio package 2023-10-14 16:02:07 +02:00
UnicornFreedom
b00072b3bb Add a few links to About dialog 2023-10-14 16:02:07 +02:00
UnicornFreedom
5ba9e4c953 "Help" menu + "About" dialog 2023-10-14 16:02:04 +02:00
Fingercomp
4a3fd81352
Update ocelot-brain 2023-10-13 21:04:13 +07:00
IgorTimofeev
eecad424ff Removed "workspace" prefixes from NBT, restored original OC logic with NBT tricks in RAIDs, added some clarifications for DiskRealPathAware 2023-10-13 12:58:08 +03:00
Igor Timofeev
b910682aad Merge branch 'feature/raid' into 'develop'
Added RAIDs

See merge request cc-ru/ocelot/ocelot-desktop!72
2023-10-13 08:23:28 +00:00
Igor Timofeev
6e82da5d28 Added RAIDs 2023-10-13 08:23:28 +00:00
IgorTimofeev
09d6a56658 Fixed crash with EEPROM data loading from non-existing external file source 2023-10-12 14:10:10 +03:00
Igor Timofeev
4322fb92bb Merge branch 'feature/microcontrollers' into 'develop'
Microcontrollers & server racks fixes

See merge request cc-ru/ocelot/ocelot-desktop!71
2023-10-12 11:02:33 +00:00
Igor Timofeev
1421aabda1 Added microcontrollers & network activity visualization for racks 2023-10-12 11:02:33 +00:00
Igor Timofeev
0c47f0009d Merge branch 'feature/creative-ram' into 'develop'
Added magical memory card from Computronics

See merge request cc-ru/ocelot/ocelot-desktop!70
2023-10-10 14:33:57 +00:00
Igor Timofeev
0ed0a6a228 Added magical memory card from Computronics 2023-10-10 14:33:56 +00:00
Igor Timofeev
13ab7210cd Merge branch 'enhancement/native-look-and-feel' into 'develop'
Native look & feel for swing components

See merge request cc-ru/ocelot/ocelot-desktop!69
2023-10-03 11:58:40 +00:00
Igor Timofeev
9c6a69acde Native look & feel for swing components 2023-10-03 11:58:40 +00:00
Igor Timofeev
66ef9a0579 Merge branch 'fix/jfilechooser-z-index' into 'develop'
Fixed nasty non-topmost behaviour of JFileChooser

See merge request cc-ru/ocelot/ocelot-desktop!68
2023-10-02 18:15:28 +00:00
Igor Timofeev
7ca8550681 Fixed nasty non-topmost behaviour of JFileChooser 2023-10-02 18:15:28 +00:00
Dmitry Zhidenkov
870a3a3d00 Merge branch 'feature/custom-brain-conf' into 'develop'
Add system settings: custom `brain.conf` path

Closes #61

See merge request cc-ru/ocelot/ocelot-desktop!67
2023-10-02 17:57:38 +00:00
UnicornFreedom
1125a55991 Add system settings: custom brain.conf path 2023-10-02 19:46:28 +02:00
Igor Timofeev
609ab91eb0 Merge branch 'fix/spritepack' into 'develop'
I said SPRITEPACK BINARIES

See merge request cc-ru/ocelot/ocelot-desktop!66
2023-09-26 16:02:08 +00:00
IgorTimofeev
47e634efdd I said SPRITEPACK BINARIES 2023-09-26 18:58:55 +03:00
Igor Timofeev
14b8cfc08e Merge branch 'feature/rack-relay' into 'develop'
Added relay mode button & spritepack binaries

See merge request cc-ru/ocelot/ocelot-desktop!65
2023-09-26 15:50:04 +00:00
Igor Timofeev
5f39265145 Added relay mode button & spritepack binaries 2023-09-26 15:50:04 +00:00
Fingercomp
eaf1e0369e
Update ocelot-brain
Closes #112
2023-09-15 23:22:37 +07:00
Fingercomp
39df37da03
Merge branch 'refactor/ocelot-card' into develop 2023-08-15 18:48:49 +07:00
Fingercomp
d9ebf0435b
Throw out particles after getting a log message 2023-08-15 01:43:20 +07:00
Fingercomp
89cbe32244
Scroll to the end automatically if requested 2023-08-15 00:23:05 +07:00
Fingercomp
84946e04fc
Allow to change the message limit 2023-08-14 23:32:50 +07:00
Fingercomp
219b536cd5
Add a log message limit 2023-08-14 22:20:45 +07:00
Fingercomp
1e4367d234
Don't spawn a widget for each log entry 2023-08-14 19:11:12 +07:00
Fingercomp
d35c736923
Ask for confirmation before saving to non-empty directory
See #96
2023-08-11 00:47:05 +07:00
Fingercomp
fd9b16acff
Back up workspace.nbt and make saving more robust in general
- We no longer update the `savePath` before we've successfully
  loaded/saved the workspace.
- If saving to the `savePath` failed, we clear it so the next attempt
  will ask to choose another path.
- Quicksave failures don't crash the emulator anymore.
2023-08-10 23:55:47 +07:00
Fingercomp
18b572e80e
Do log exceptions during loading/saving 2023-08-10 23:05:02 +07:00
Fingercomp
65f13b2cba
Set GLSL version to 1.40 in all shaders
And apparently Ocelot has required OpenGL 3.1 for a long time.
Clarified that in the README as well.

Closes #110
2023-08-03 19:05:50 +07:00
Fingercomp
2f126efb82
Merge branch 'master' into develop 2023-07-16 01:50:15 +07:00
Fingercomp
f157465e50
Merge branch 'develop' v1.9.1 2023-07-14 02:49:09 +07:00
Fingercomp
46aa1d502a
Version 1.9.1 2023-07-14 02:48:52 +07:00
Fingercomp
a631226725
Install git when doing a release
Apparently the reason releases did not have patch notes attached was
that git was not installed in the release-cli image at all.
2023-07-14 02:44:23 +07:00
Fingercomp
69101719c1
Spawn rack disk drives with an OpenOS floppy by default 2023-07-14 02:35:50 +07:00
Fingercomp
48cbea9d9b
Ignore shift-clicks in WindowedNode 2023-07-14 02:31:33 +07:00
Fingercomp
2d791b0ab8
Reliably deliver events to server components 2023-07-14 02:17:12 +07:00
Fingercomp
7873d9957e
Fix snapping of cables and chests 2023-07-14 01:52:52 +07:00
Fingercomp
d14beae7e7
Merge branch 'develop' v1.9.0 2023-07-13 20:39:49 +07:00
Fingercomp
e709eb412d
Version 1.9.0 2023-07-13 20:39:25 +07:00
Fingercomp
a5a5c69d32
Update the README 2023-07-13 20:26:08 +07:00
Fingercomp
82de79bdd1
Merge branch 'feature/ocelot-card' into develop 2023-07-13 19:43:20 +07:00
Fingercomp
ccd34c0f09
Update brain to 0.18.1 2023-07-09 21:24:31 +07:00
Fingercomp
3553aa7e6e
Adjust the fixUV translation constant
Now that the spritesheet size is 1024×1024, it has to use a different
denominator.
2023-07-09 05:25:30 +07:00
Fingercomp
d56697225b
Add an ocelot card icon, make the tooltip more colorful 2023-07-09 02:35:11 +07:00