924 Commits

Author SHA1 Message Date
Fingercomp
13b5609b9b
Correct the weird wording in CONTRIBUTING.md 2023-10-19 13:14:06 +07:00
Fingercomp
2e02af98a3
Merge branch 'master' into develop 2023-10-19 00:12:35 +07:00
Fingercomp
8be35b72f0
Merge branch 'develop' v1.10.2 2023-10-18 23:52:00 +07:00
Fingercomp
f7355a3af4
Version 1.10.2 2023-10-18 23:51:49 +07:00
Fingercomp
7e77d3c2f7
Merge branch 'feature/tape-drive-playback' into develop 2023-10-18 23:29:23 +07:00
Fingercomp
c65503c440
Update ocelot-brain 2023-10-18 23:28:58 +07:00
Fingercomp
2dc43433aa
Stop the rewinding sound when the tape drive node is disposed of 2023-10-18 22:41:26 +07:00
IgorTimofeev
04c99ffeb0 ! 2023-10-18 18:38:04 +03:00
IgorTimofeev
7c2680a0d2 Added positional sound checkbox in audio settings 2023-10-18 18:37:32 +03:00
Fingercomp
664bf825bb
Merge branch 'develop' into feature/tape-drive-playback 2023-10-18 20:29:22 +07:00
Fingercomp
2f55145299
Update ocelot-brain 2023-10-18 20:24:06 +07:00
Fingercomp
33f7669a27
Update ocelot-brain 2023-10-18 19:39:47 +07:00
Fingercomp
8bb2abb150
Stop playback when requested and fix the volume 2023-10-18 18:50:14 +07:00
IgorTimofeev
adf844930b )) 2023-10-18 13:47:00 +03:00
IgorTimofeev
9031a83e17 Where. Is. My. Brain COMMIT HASH 2023-10-18 13:32:08 +03:00
IgorTimofeev
a95600cc8c Merge branch 'develop' into feature/tape-drive-playback
# Conflicts:
#	lib/ocelot-brain
2023-10-18 13:31:04 +03:00
IgorTimofeev
fb8381ece0 Wtf, was it really that easy? xd 2023-10-18 02:31:29 +03:00
Fingercomp
66377186dd
Add CONTRIBUTING.md
I've decided to exclude information on the architecture of Ocelot
Desktop and its main concepts from this document — that should go into
another document to keep this one more focused.

Closes #90.
2023-10-18 02:51:42 +07:00
IgorTimofeev
15ef1a8c85 Added label for TapeDriveNode 2023-10-17 18:32:12 +03:00
IgorTimofeev
96ad0f0294 Added missing icon for "Instrument" context menu entry for NoteBlockNode 2023-10-17 18:27:07 +03:00
IgorTimofeev
bbfc8f6c1b Added "records" sound category from Minecraft & made sound cards, note blocks and tape drives to work with it instead of "beep" 2023-10-17 18:07:31 +03:00
IgorTimofeev
1a00d41df7 Added "positional sound" feature. For now, it's implemented only in TapeDriveNode for testing 2023-10-17 17:26:50 +03:00
IgorTimofeev
f7b77ef9f9 Implemented "better" stop button & "nicer" sizes for TapeDriveWindow 2023-10-17 16:45:36 +03:00
IgorTimofeev
75e551ca3b Added correct visualization of filesystem address for DiskDriveNode & RaidNode 2023-10-17 16:21:25 +03:00
IgorTimofeev
4eabafbce2 Fixed missing FileSystemActivityEvent processing for Raid node (WE. NEED. SOUND.) 2023-10-17 16:06:39 +03:00
Fingercomp
b40fd28a1c
Update brain 2023-10-17 19:47:35 +07:00
Fingercomp
cc1e1bbb41
Merge branch 'develop' into feature/tape-drive-playback 2023-10-17 19:19:17 +07:00
Fingercomp
cdee25704b
Play the DFPWM audio 2023-10-17 19:18:52 +07:00
Fingercomp
c28cb8924c
Update brain
Closes #114.
2023-10-17 19:18:03 +07:00
Fingercomp
1cc1a69fad
Don't use getProperty for something that isn't a property name
SystemUtils.USER_HOME is the home path itself.

See #114.
2023-10-17 19:17:38 +07:00
IgorTimofeev
4c69cc02ad Hm, there's definitely something wrong with label/storageName combo 2023-10-17 03:57:40 +03:00
IgorTimofeev
dda9b9d2f7 Added cassette insert/eject sounds & "no tape" status text 2023-10-17 03:43:22 +03:00
IgorTimofeev
1bf9c1d60b Added playback buttons, status bar & custom sounds for TapeDriveWindow, added tape floppy 2023-10-17 03:21:39 +03:00
Fingercomp
489850a7da
Merge branch 'master' into develop 2023-10-16 22:26:59 +07:00
Fingercomp
5cc802efc7
Merge branch 'develop' v1.10.1 2023-10-16 22:10:52 +07:00
Fingercomp
2bfbeb8413
Version 1.10.1 2023-10-16 22:10:31 +07:00
Fingercomp
01de8a8173
Update brain 2023-10-16 22:10:13 +07:00
Igor Timofeev
d97cbf05f3 Merge branch 'feature/adduser-presence-check' into 'develop'
Added "online check" for player nickname in computer.addUser()

See merge request cc-ru/ocelot/ocelot-desktop!77
2023-10-16 11:32:12 +00:00
Igor Timofeev
3ca65be14d Added "online check" for player nickname in computer.addUser() 2023-10-16 11:32:12 +00:00
Igor Timofeev
718c6cddf2 Merge branch 'refactoring/extracting-paths' into 'develop'
Moved everything (except ocelot.jar) to AppData/home

See merge request cc-ru/ocelot/ocelot-desktop!76
2023-10-16 10:34:59 +00:00
Igor Timofeev
dc253bc85c Moved everything (except ocelot.jar) to AppData/home 2023-10-16 10:34:58 +00:00
IgorTimofeev
d107ce1d82 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	lib/ocelot-brain
2023-10-16 02:12:37 +03:00
IgorTimofeev
7285034b98 Fixed nasty bug with repeated UUID regeneration in DiskManaged on every Ocelot load 2023-10-16 02:11:57 +03:00
IgorTimofeev
ac1832753a Fixed nasty bug with repeated UUID regeneration in DiskManaged on every Ocelot load 2023-10-16 02:02:55 +03:00
Fingercomp
73f2e9f3f5
Merge branch 'master' into develop 2023-10-15 23:15:59 +07:00
Fingercomp
e62bceb3eb
Merge branch 'develop' v1.10.0 2023-10-15 23:14:36 +07:00
Fingercomp
8d483b0748
Version 1.10.0 2023-10-15 23:13:59 +07:00
Fingercomp
d96cfca38f Merge branch 'feature/tape' into 'develop'
Add tape drives

See merge request cc-ru/ocelot/ocelot-desktop!75
2023-10-15 15:16:52 +00:00
Fingercomp
765c6afe06
Update brain 2023-10-15 22:14:36 +07:00
Fingercomp
0d029443eb Merge branch 'feature/extract-opencomputers-config' into 'develop'
Add an option to extract OpenComputers config copy

See merge request cc-ru/ocelot/ocelot-desktop!74
2023-10-15 15:13:30 +00:00