Florian Nücke
|
bc7437769f
|
Merge branch 'master' of cil.li:oc
|
2013-10-07 03:03:13 +02:00 |
|
Florian Nücke
|
6544161d0d
|
fixed option stringness check in file:read; key up is now sent; much improved input handler, available as term.read, which supports side scrolling, arbitrary length history via a passable table, cursor movement to edit in-line, and general awesomeness; using that reader as the backend for stdin's chunk reader and using io.read() in sh
|
2013-10-07 03:02:54 +02:00 |
|
Johannes Lohrer
|
4489781e34
|
Merge branch 'master' of cil.li:oc
Conflicts:
li/cil/oc/Blocks.scala
|
2013-10-06 22:51:56 +02:00 |
|
Johannes Lohrer
|
35eae71b29
|
power calculation on merge splitting and removing nodes
|
2013-10-06 22:47:39 +02:00 |
|
Florian Nücke
|
d460fe9ced
|
properly returning nil when at eof when reading from files in lua; fixed binary read
|
2013-10-06 18:54:54 +02:00 |
|
Florian Nücke
|
d363d0322d
|
changed os.clock to be the actual cpu time of the computer and introduced os.uptime as the replacement of the old functionality; dofile now properly throws when loading fails; graphicscard now stores the screen its bound to in the component, which allows for the computer to display messages after it crashed (by sending a display request to neighbors -> graphicscards installed in it); fixed potential timeout in os.signal; wrappers for pcall and xpcall to enforce timeout when they return, too
|
2013-10-06 18:16:03 +02:00 |
|
Florian Nücke
|
a73ed001dd
|
fixed io.type
|
2013-10-06 15:10:28 +02:00 |
|
Florian Nücke
|
9886e646de
|
better lua default io lib emulation (with stdin and stdout); fixed idling to use infinite sleep instead of busy idling; some other small fixes on the lua side of things
|
2013-10-06 14:58:53 +02:00 |
|
Florian Nücke
|
9ca87bef2f
|
underped derped synchronized calls
|
2013-10-05 21:24:07 +02:00 |
|
Florian Nücke
|
4d7c96052d
|
minor renaming
|
2013-10-05 21:21:16 +02:00 |
|
Florian Nücke
|
5c29bd94bd
|
file system cleanup; access to total and used space for capped file systems
|
2013-10-05 20:50:29 +02:00 |
|
Johannes Lohrer
|
26dbecd80f
|
Merge branch 'master' of cil.li:oc
Conflicts:
javax/annotation/Nullable.java
|
2013-10-05 14:22:46 +02:00 |
|
Johannes Lohrer
|
26574bf9b6
|
basic computer network just registering for now
|
2013-10-05 14:21:46 +02:00 |
|
Florian Nücke
|
9805828195
|
allowing to return stuff from multi-receiver network messages again; capactiy for file systems and saving handles in fs node; some other minor fixes
|
2013-10-05 14:17:23 +02:00 |
|
Florian Nücke
|
0441f10a54
|
hard drive graphics
|
2013-10-04 11:45:17 +02:00 |
|
Florian Nücke
|
0b9be15189
|
buffered writing
|
2013-10-04 11:37:21 +02:00 |
|
Florian Nücke
|
25b9f28d02
|
not automounting rom; error message for invalid listdirs; autorun for automounted file systems
|
2013-10-04 01:57:12 +02:00 |
|
Florian Nücke
|
7ef9798cdd
|
made checkarg a kernel provided function again after all; cleaned up some
|
2013-10-04 01:31:58 +02:00 |
|
Florian Nücke
|
e85afe8518
|
hard drives. writable frikkin hardrives. next up: limiting their capacity...
|
2013-10-04 01:13:55 +02:00 |
|
Florian Nücke
|
0927f076ce
|
some more prep work for writable file systems based in save dir; reworked computer code structure a bit, moving more semi-internal stuff into the environment trait
|
2013-10-03 22:33:48 +02:00 |
|
Florian Nücke
|
2c14ec95b8
|
cleaned up file system stuff a bit and preparing for writable file systems
|
2013-10-03 17:58:16 +02:00 |
|
Florian Nücke
|
6689fdace0
|
fixed computer top texture when on; not sending item tag info to clients anymore (usually only the associated node's address. generally nothing the client needs to know); removed neighbor logic from item component nodes since that is taken care of in sentToVisible now; improved screen rendering performance a bit by caching the display list and updating it when the screen's display changes and not rendering at all when too far away or looking at the screen from a direction where it's impossible to see the text; added some classes that guava needs to compile in scala (only needed at compile time afaik)
|
2013-10-03 15:57:08 +02:00 |
|
Florian Nücke
|
17476c3b36
|
documentation
|
2013-10-03 00:07:30 +02:00 |
|
Florian Nücke
|
f1fd0637a6
|
Merge branch 'master' of cil.li:oc
|
2013-10-02 22:17:51 +02:00 |
|
Florian Nücke
|
f4f7bd50a5
|
fixed event.timer ids; fixed file __gc; fixed render glitch when calling up the interpreter history; fixed folders not being postfixed with "/" in file based filesystem; better error messages (no java class part in the message)
|
2013-10-02 22:17:11 +02:00 |
|
Florian Nücke
|
1a20aed18a
|
increased ram sizes by one bit shift (reading files - and loading them as scripts - takes quite a bit of ram); network fixes; filesystem fixes
|
2013-10-02 21:28:58 +02:00 |
|
Florian Nücke
|
90bbdc2633
|
more work on filesystem stuff
|
2013-10-02 15:11:49 +02:00 |
|
Johannes Lohrer
|
57c1b0f3a0
|
BC and UE support
|
2013-10-01 23:12:33 +02:00 |
|
Florian Nücke
|
59febb056f
|
network rewrite to use uuids as node addresses. this way we won't have to expect addresses to change on network merges, which make a lot of things a much easier (in particular on the Lua side)
|
2013-10-01 22:10:54 +02:00 |
|
Florian Nücke
|
06eac9254c
|
some import organizing (sorting); switched to converting all strings lua sends via messages to byte arrays instead of strings, since for lua strings are essentially just binary data. this means they have to be converted to strings where appropriate from now on (e.g. the graphics card will convert byte array to utf8 strings for gpu.set)
|
2013-10-01 15:04:57 +02:00 |
|
Florian Nücke
|
6f18353116
|
fixed picking of blocks (creative mode)
|
2013-10-01 11:02:51 +02:00 |
|
Florian Nücke
|
dff6cfa22b
|
removed some reflective calls and similar after making scalac a bit more verbose
|
2013-10-01 10:38:46 +02:00 |
|
Florian Nücke
|
1da52f8403
|
removed the overly generic component saving again, items just have to be saved by their inventories. way too many problems with figuring out when to save otherwise (e.g. world unload triggers for each "sub-world", so when going from overworld to nether clearing the cache didn't really make sense; quite the opposite)
|
2013-10-01 10:03:01 +02:00 |
|
Florian Nücke
|
814f49b0ec
|
Merge branch 'master' of cil.li:oc
|
2013-09-30 22:22:03 +02:00 |
|
Florian Nücke
|
4ef5e3a72b
|
removed methods that were only there to make it clear what the obfuscated ones were doing
|
2013-09-30 22:21:58 +02:00 |
|
Johannes Lohrer
|
b2093a9066
|
added energy net integration to powersupply
|
2013-09-30 22:18:48 +02:00 |
|
Johannes Lohrer
|
b5d1bef7d3
|
Merge branch 'master' of cil.li:oc
|
2013-09-30 21:56:46 +02:00 |
|
Johannes Lohrer
|
249ae147db
|
Merge branch 'master' of cil.li:oc
Conflicts:
li/cil/oc/common/tileentity/TileEntityComputer.scala
added energy net integration to powersupply
|
2013-09-30 21:55:39 +02:00 |
|
Florian Nücke
|
f2f6d0f2e8
|
some preparation for file system stuff; changed the way item components are stored (more generic, automatically save on world save, no more manual updating in node.address_=)
|
2013-09-30 21:42:09 +02:00 |
|
Johannes Lohrer
|
a4546d00de
|
updated to 1.6.4
|
2013-09-30 20:18:15 +02:00 |
|
Florian Nücke
|
b248174aba
|
added some textures for items; added german localization file; pulled resource pack name into a constant (may split later to natively support texture packs or something, but mainly for when the mod name changes)
|
2013-09-30 07:49:30 +02:00 |
|
Florian Nücke
|
b97f57813a
|
ensuring sleeping computers are resumed properly
|
2013-09-29 19:49:42 +02:00 |
|
Florian Nücke
|
88a65bd590
|
added middle mouse button pasting
|
2013-09-29 17:36:12 +02:00 |
|
Florian Nücke
|
41c1f40377
|
underped computer tileentity (no updates on client anymore); ram is now evaluated, computers start with none built-in
|
2013-09-29 17:24:32 +02:00 |
|
Florian Nücke
|
585d62f045
|
fixed util package
|
2013-09-29 15:01:04 +02:00 |
|
Florian Nücke
|
c1fd2c0144
|
refactor run for tile entities
|
2013-09-29 14:57:05 +02:00 |
|
Florian Nücke
|
bb491ecf04
|
some more minor refactoring; preparing memory items
|
2013-09-29 14:15:40 +02:00 |
|
Florian Nücke
|
92b8a28862
|
removed flicker for command "history"; little hello message on interpreter
|
2013-09-29 12:38:26 +02:00 |
|
Florian Nücke
|
abddfae2ea
|
some more refactoring; switched up driver loading a bit: they're now loaded from the kernel, by it requesting the list of drivers. this way they're loaded into the sandbox (with the network sending function available, in addition to what the normal sandbox can do); doing primary init of kernel in computer init to get a better idea of how much memory our os stuff needs, in particular the driver table; saving the kernel size now, since the baseline is primarily dependent on the kernel, not what we provide aside from that. this way the "user" memory that comes free is now limitable to 16k with much less variance (init takes around 9k, apparently, the rest is free)
|
2013-09-29 11:57:14 +02:00 |
|
Florian Nücke
|
d931b6c92f
|
massive refactoring
|
2013-09-28 18:33:28 +02:00 |
|