AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-25 22:14:09 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,519 Commits 29 Branches 143 Tags
Commit Graph

1519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
59c257d641 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-05-11 17:16:13 +02:00
Florian Nücke
0b47150e4b Merge pull request #250 from SpiritedDusty/patch-3 
fixes #249
 2014-05-07 16:28:44 +02:00
SpiritedDusty
ccacfc430a fixes #249 2014-05-06 20:11:06 -07:00
Florian Nücke
6d8e5dd841 Merge pull request #246 from bananagram/patch-1 
Fix a typo in the wget usage summary.
 2014-05-05 12:53:40 +02:00
bananagram
25ed64221a Fix a typo in the usage summary 2014-05-04 19:03:39 -05:00
Florian Nücke
366fb98b10 Merge pull request #243 from Vexatos/patch-4 
Created `note` API to allow note name based use of `computer.beep()`.
 2014-04-30 17:59:29 +02:00
Vexatos
9dc2d2833b Update note.lua 2014-04-30 17:57:08 +02:00
Vexatos
9de638e884 Some tweaks 2014-04-30 17:50:26 +02:00
Vexatos
20c1c1ac0a Created note API 
Functionality:
* `note.midi(n: number or string)`: Converts a note in string form (e.g. A#4 or Gb3, will be documented on the wiki) or a given frequency into the respective MIDI code
* `note.freq(n: number or string)`: Converts a note in string form (e.g. A#4) or a given MIDI code into the respective frequency
* `note.get(n: number)`: Converts a MIDI value back into a string; if you have a frequency to convert, just use note.get(note.midi(frequency))
* `note.ticks(n: number)`: Converts note block ticks (0-24) into MIDI code (34-58, respectively) and vice-versa. Useful for use with note blocks and OpenComponents
* `note.play(tone: string or number,duration: number)`: Plays a note from a string or MIDI code via computer.beep
 2014-04-30 17:28:15 +02:00
Florian Nücke
a6a6c5e009 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	build.properties
 2014-04-30 12:56:37 +02:00
Florian Nücke
90279bc2a4 Fixed robots derping around with tools. Seems I only tested them *without* tools recently... go me -.- 
Updated Forge dependency info in mcmod.info.
 2014-04-30 12:56:07 +02:00
Florian Nücke
bb7dd9e966 Merge branch 'master' of github.com:MightyPirates/OpenComputers v1.2.9 2014-04-30 12:54:27 +02:00
Florian Nücke
09911a8d2d Bumping version number for MC1.7 hotfix, to keep version numbers synchronized. 2014-04-30 12:54:01 +02:00
Florian Nücke
bbff237d9d Merge pull request #240 from Techokami/master 
Further improved irc.lua, better display for actions, computer.beep() when nick is mentioned.
 2014-04-29 21:13:03 +02:00
Techokami
1e3e0db7ce More irc.lua cleanup 
OC doesn't like to render tabs! Use spaces instead :)
 2014-04-29 15:08:17 -04:00
Techokami
3090f95a11 Further improved irc.lua 
Proper displaying of /me commands, and audio notification if your name
is said in chat (using the computer.beep() command)
 2014-04-29 14:57:33 -04:00
Christopher Trumbour
ed9c9f7a2c Merge pull request #2 from MightyPirates/master 
Syncronization
 2014-04-27 19:24:34 -04:00
Florian Nücke
b5b038aa5b Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-04-28 00:22:17 +02:00
Florian Nücke
3b10f7d6f7 Fixed incorrect result for %I in os.date. Closes #238. v1.2.8 2014-04-28 00:21:46 +02:00
Florian Nücke
9588f8dd62 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
 2014-04-26 21:02:55 +02:00
Florian Nücke
0bf212f731 Fixed placement of blocks when using the angle upgrade near water(like) blocks. Closes #235. 
Fixed potential error when saving buffered filesystems, introduced with properly seekable file handles.
Robots now make a 'splash' noise when moving through water/fluids, instead of a block breaking one.
 2014-04-26 20:26:01 +02:00
Florian Nücke
d2ebedbb42 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-04-26 01:55:46 +02:00
Florian Nücke
6a5d139130 Added (as of yet untested!) native library for FreeBSD. 2014-04-26 01:55:15 +02:00
Florian Nücke
2a70333391 Fixed gradle build. 2014-04-26 00:51:06 +02:00
Florian Nücke
c819ab4e82 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/PacketHandler.scala
	src/main/scala/li/cil/oc/client/Sound.scala
	src/main/scala/li/cil/oc/common/tileentity/Case.scala
	src/main/scala/li/cil/oc/common/tileentity/Screen.scala
	src/main/scala/li/cil/oc/server/PacketSender.scala
 2014-04-25 16:52:56 +02:00
Florian Nücke
4809a336c7 Screens of the same tier will now only form a multi-block screen if they are dyed in the same color. Closes #231. 2014-04-25 15:59:15 +02:00
Florian Nücke
54cc679c37 Make shell stop parsing options at --. 2014-04-25 15:45:14 +02:00
Florian Nücke
9d87cdbcb4 Merge pull request #233 from gamax92/master 
Modify option parsing to ignore - and --, add support for equal sign
 2014-04-25 15:08:11 +02:00
Florian Nücke
9b00d73abf Nerfed tier one server a bit but buffed tier two and three servers by making them have 3 and 4 card slots, respectively. Closes #133. 2014-04-25 15:04:13 +02:00
Robert Gadzerfraud
501e82411d convert indentation to spaces 2014-04-24 18:39:27 -06:00
Robert Gadzerfraud
9afeb024d1 Modify option parsing to ignore - and --, add support for equal sign 2014-04-24 18:37:37 -06:00
Florian Nücke
30106ba4f5 Simplified OpenAL stuff for computer speaker a little (less get(0)). 2014-04-24 22:53:15 +02:00
Florian Nücke
23b3590c46 Merge pull request #232 from Wobbo/master 
Small fixes to make besh work again
 2014-04-24 22:08:29 +02:00
Wobbo
70faea9516 Small fixes to make besh work again 2014-04-24 22:06:10 +02:00
Florian Nücke
d5bd34b76d Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-04-24 21:35:35 +02:00
Florian Nücke
a9cf5b2da3 Somewhat less broken besh, but something's still not right... 2014-04-24 21:35:17 +02:00
Florian Nücke
8978280e3c Changed name of computer.bell to computer.beep and added option for frequency (20 - 2000Hz) and duration (0.05 to 5 seconds). 
Forcing computer to sleep for the duration of the sound.
This is uncomfortably close to what should go into a sound card, but... it's just too nice not to have it in by default.
 2014-04-24 21:28:22 +02:00
Christopher Trumbour
15fe592c08 Merge pull request #1 from MightyPirates/master 
Update irc.lua
 2014-04-24 13:56:13 -04:00
Florian Nücke
d9d7ad217f Merge pull request #229 from JoshTheEnder/patch-1 
Support actions in irc client.
 2014-04-24 14:31:56 +02:00
Josh
65be8856fb Update irc.lua 
fixed up formatting
 2014-04-24 13:26:07 +01:00
Josh
b22af6a55b Update irc.lua 2014-04-24 11:05:10 +01:00
Josh
40cc1be25a Update irc.lua 2014-04-24 10:59:07 +01:00
Josh
892c6f1588 Update irc.lua 
Should add in support for /me commands; untested though
 2014-04-24 10:33:55 +01:00
Florian Nücke
7105cd132a Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	build.properties
 2014-04-23 15:20:19 +02:00
Florian Nücke
9c05dd7e40 Added computer.bell() method to trigger the audible bell, automatically triggered when a string containing \a is processed by term.write(), closes #75. 
Bumped version number.
 2014-04-23 13:20:26 +02:00
Florian Nücke
d503db63fd Added missing implementation for os.time(table), i.e. parsing a timestamp from a table, closes #223 
Cleaned up, fixed and standardized formatting/os.date() a little.
 2014-04-22 04:21:39 +02:00
Florian Nücke
0025fc19b0 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/OpenComputers.scala
	src/main/scala/li/cil/oc/server/fs/CC15FileSystem.scala
 2014-04-21 16:48:00 +02:00
Florian Nücke
90c89c2d35 Loading all additional textures in one go, seems to prevent issue described in #216. 2014-04-21 16:37:17 +02:00
Florian Nücke
b982c218a3 Updated to new Froge version. 2014-04-21 14:41:47 +02:00
Florian Nücke
fc96037ed9 Got rid of the Java 1.7 interface. 
Avoid duplicate listing of file system entries in compound file systems if one is a file and the other a directory, closes #219.
 2014-04-21 13:39:59 +02:00