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

1665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
1694c10dfb Some more work on userdata, allowing @Callback annotations and such, following same calling conventions as components. 
Made internet card's HTTP request return a userdata value that wraps the request and can be polled using read().
 2014-04-28 20:27:53 +02:00
Florian Nücke
17c31591dd Adjusted default palette for 4 bit so that component.gpu.setForeground(colors.green, true) works as expected. 
Fixed some scripts setting colors not saving the palette flag of the old color.
 2014-04-28 14:17:57 +02:00
Florian Nücke
31ad516c25 Palette fixes and making the palette mutable (can set palette colors from Lua). 2014-04-28 14:04:13 +02:00
Florian Nücke
e0b35d4729 Basic implementation for new color system (6x8x5 for 8 bit, 16 grayscale palette, pure 16 color palette for 4 bit). 2014-04-28 03:38:49 +02:00
Christopher Trumbour
ed9c9f7a2c Merge pull request #2 from MightyPirates/master 
Syncronization
 2014-04-27 19:24:34 -04:00
Florian Nücke
f36835511a Merge branch 'master' of github.com:MightyPirates/OpenComputers into one-three 2014-04-28 00:24:23 +02: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
416735e32c New API for fetching items and blocks provided by OpenComputers, abstracting things away a bit more and making it more easily extendable. 2014-04-27 21:05:25 +02:00
Florian Nücke
05c63c6a8d Removed deprecated method from API. 2014-04-27 19:09:11 +02:00
Florian Nücke
2fd08248b4 Merge branch 'master' of github.com:MightyPirates/OpenComputers into one-three 
Conflicts:
	src/main/resources/assets/opencomputers/lua/kernel.lua
	src/main/scala/li/cil/oc/server/component/machine/LuaJLuaArchitecture.scala
	src/main/scala/li/cil/oc/server/component/machine/NativeLuaArchitecture.scala
 2014-04-27 18:52:10 +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
Florian Nücke
59d7c75428 Fixed options not being passed along properly by shell.execute. 2014-04-20 22:19:12 +02:00
Florian Nücke
d0d4f502ba Made files opened in read mode seekable more reliably. 2014-04-20 22:12:00 +02:00
Florian Nücke
bbe80bc5de Fixed Abstract Bus Card in servers (broke in recent cleanup). 
Updated SGT2 API.
 2014-04-20 20:53:48 +02:00
Florian Nücke
50ddf683d2 Getting rid of tessellator, maybe that'll fix the ATI crash... read somewhere that ATI drivers derp when VBOs are used inside display lists. 2014-04-19 03:06:49 +02:00
Florian Nücke
1961d0101b Revert "Splitting up rendering of text on screens with a vertical resolution > 25 into separate display lists to see it if might help with the ATI driver crash." 
This reverts commit 774ca1268b84664fac3167b1d1972de13386b817.
 2014-04-19 02:56:23 +02:00
Florian Nücke
774ca1268b Splitting up rendering of text on screens with a vertical resolution > 25 into separate display lists to see it if might help with the ATI driver crash. 2014-04-18 14:33:04 +02:00
Florian Nücke
b3ea58c96b Fixed NPE in robot.use(). 
Fixed undirected robot commands leading to unexpected results (in particular place, which can place blocks in "adjacent" blocks if the block is replaceable), always testing into the primary facing direction first now.
 2014-04-18 14:06:45 +02:00
Florian Nücke
1bb2c76bd5 Merge pull request #211 from infinikiller64/master 
allow system to catch too long without yielding
 2014-04-17 16:42:21 +02:00