575 Commits

Author	SHA1	Message	Date
SquidDev	54e1dafa3f	Merge pull request #517 from SquidDev-CC/ComputerCraft/feature/ore-dict ... Add ore dictionary support to all recipes	2018-02-04 20:06:34 +00:00
SquidDev	3ac76bc05b	Add ore dictionary support to all recipes	2018-02-04 20:02:12 +00:00
SquidDev	83030df3ee	Add computer performance monitor	2018-02-02 13:34:27 +00:00
SquidDev	3298efe652	Prevent computer dump command sending too much information	2018-01-20 11:07:09 +00:00
SquidDev	01d9919a3e	Merge pull request #508 from SquidDev-CC/ComputerCraft/hotfix/turtle-speaker-model ... Fix turtle speaker upgrade's missing texture	2018-01-19 13:10:20 +00:00
SquidDev	80b1170b63	Extract required textures from models instead ... This ensures we will not get missing texture errors in the future, and allows resource pack artists to use additional textures.	2018-01-19 13:04:50 +00:00
SquidDev	2e7302e654	Fix turtle speaker upgrade's missing texture ... The sprite was not registered into the atlas, meaning it rendered the missing texture instead.	2018-01-19 12:42:32 +00:00
SquidDev	ca7fb8a0b4	Cache turtle family within the tile ... This means one can call .getFamily() in a thread-safe manner, ensuring turtle.getFuelLimit() does not cause issues. As we use a specialist TE class for each family this does not require any specialist caching.	2018-01-18 13:06:34 +00:00
SquidDev	c9b0894f26	Cache direction of modems within the tile ... This ensures the world is not accessed from another thread. Closes #410	2018-01-18 13:06:11 +00:00
SquidDev	c3454a195d	Merge branch 'master' of https://github.com/dan200/ComputerCraft	2018-01-15 17:18:48 +00:00
Wojbie	0d28c67534	Fix advanced monitor recipe. ... Fix recipe to create 4 monitors.	2018-01-14 23:03:14 +01:00
Daniel Ratcliffe	3e265c27ff	Merge pull request #455 from Wilma456/fileread ... Add read() to Filehandle	2018-01-13 00:58:19 +00:00
Daniel Ratcliffe	8d356f50c4	Merge pull request #440 from Wilma456/iomulti ... Make io.write() accept multiple args	2018-01-13 00:48:07 +00:00
Daniel Ratcliffe	f30c4f16c0	Merge pull request #411 from Wilma456/copyfixup ... Fix Bug in copy.lua, mkdir.lua and rename.lua (updated)	2018-01-13 00:32:55 +00:00
Daniel Ratcliffe	8bb8caa315	Merge pull request #448 from Wilma456/writecheck ... Fix check of write()	2018-01-13 00:28:08 +00:00
SquidDev	0f17a3d72e	Merge branch 'master' of https://github.com/dan200/ComputerCraft	2018-01-12 14:15:22 +00:00
Daniel Ratcliffe	7647369e2d	Merge pull request #446 from Wilma456/moduledir ... Add folder /rom/modules	2018-01-12 14:10:50 +00:00
Daniel Ratcliffe	4b4208e724	Merge pull request #476 from SquidDev-CC/hotfix/printer-clear ... Fix the printer overwriting the current page	2018-01-12 13:59:51 +00:00
Daniel Ratcliffe	2a16a1df85	Merge pull request #486 from Wilma456/extensionfix ... Fix Bug in Paint and Edit	2018-01-12 13:59:15 +00:00
Daniel Ratcliffe	25f7c58400	Merge pull request #494 from SquidDev-CC/hotfix/collision-aabb ... Fix getCollisionBoundingBox not using all AABBs	2018-01-12 13:57:50 +00:00
Daniel Ratcliffe	c3db91f11f	Merge pull request #485 from Luca0208/patch-1 ... Removed the "the" that was too much(In /rom/help/cd.txt)	2018-01-12 13:56:48 +00:00
Daniel Ratcliffe	8c66ce03d4	Merge pull request #475 from Wilma456/ioline ... Fix io.lines()	2018-01-12 13:56:21 +00:00
Daniel Ratcliffe	2be2a0625e	Merge pull request #502 from SquidDev-CC/hotfix/missing-overlay ... Fix turtle overlay not being rendered in items	2018-01-12 13:54:59 +00:00
SquidDev	632762768e	Add workaround for incorrect overload of getDrops being overridden ... Closes #2	2017-12-30 19:03:32 +00:00
SquidDev	c69ba205f8	Merge pull request #502 from SquidDev-CC/ComputerCraft/hotfix/missing-overlay ... Fix turtle overlay not being rendered in items	2017-12-24 21:49:01 +00:00
SquidDev	019f4dbea9	Fix turtle overlay not being rendered in items	2017-12-24 21:44:55 +00:00
SquidDev	259ea41ce3	Merge pull request #499 from SquidDev-CC/ComputerCraft/hotfix/null-network ... Fix ComputerCraftAPI.getWirelessNetwork() failing	2017-12-10 15:39:59 +00:00
SquidDev	11290f7204	Fix ComputerCraftAPI.getWirelessNetwork() failing ... I've got to admit, it is super embarrassing that a) I didn't notice this when testing and b) no one else has noticed until now.	2017-12-10 15:37:40 +00:00
SquidDev	abd06133fb	More binary compatibility stubs for ILuaAPI	2017-12-07 09:24:44 +00:00
SquidDev	29a3a0c48f	Bump version	2017-12-07 09:08:15 +00:00
SquidDev	2728c63512	Add back ILuaAPI ... This ensures binary compatibility with all those evil mods (Plethora) which CC internals.	2017-12-07 09:06:47 +00:00
SquidDev	f3b11bc1c2	Copy over CCTweaks's command system ... This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.	2017-12-06 15:51:51 +00:00
SquidDev	04590befb3	Add support for viewing arbitrary computers in a GUI ... Important terminal (such as terminal size) is packed into the the coordinate fields.	2017-12-06 15:43:25 +00:00
SquidDev	4e9034f910	Make http.websocket call synchronous in bios.lua ... I thought I'd done this already, but it's possible it got lost during a rebase.	2017-12-06 09:28:38 +00:00
SquidDev	341e3e2f89	Merge pull request #497 from SquidDev-CC/ComputerCraft/feature/pocket-map ... Add map-like rendering for pocket computers	2017-12-01 19:41:07 +00:00
SquidDev	3f70ca5192	Merge pull request #492 from SquidDev-CC/ComputerCraft/feature/fun-turtle-rendering ... Improve vertex transformation system	2017-12-01 19:39:33 +00:00
SquidDev	f11bfc53ee	Use IComputer instead of ServerComputer on the client	2017-12-01 19:32:15 +00:00
SquidDev	61e3967b8e	Merge pull request #494 from SquidDev-CC/ComputerCraft/hotfix/collision-aabb ... Fix getCollisionBoundingBox not using all AABBs	2017-12-01 19:19:17 +00:00
SquidDev	add86ea100	Merge pull request #491 from SquidDev-CC/ComputerCraft/feature/api-api ... Provide an API for registering custom APIs	2017-12-01 19:18:40 +00:00
SquidDev	dd51c89278	Add map-like rendering for pocket computers	2017-12-01 11:28:15 +00:00
SquidDev	788d783745	Fix getCollisionBoundingBox not using all AABBs ... Closes #493	2017-11-22 10:52:28 +00:00
SquidDev	35da60543e	Improve turtles by 200% ... Every other mod has some fun feature, so should we. And yes, this was worth the 400 lines it took to implement.	2017-11-21 00:34:35 +00:00
SquidDev	ce7923d248	Improve vertex transformation system ... This migrates TurtleMultiModel's current vertex transformation system into something more powerful and "correct". Namely, it has the following improvements: - Handles all position formats (float, byte, etc...) - Correctly translates normals of quads - Reorders faces if the winding order is reversed	2017-11-21 00:18:03 +00:00
SquidDev	55847460c5	Provide an API for registering custom APIs ... ILuaAPI has been moved to dan200.computercraft.api.lua. One creates a new API by registering an instance of ILuaAPIFactory. This takes an instance of IComputerSystem and returns such an API. IComputerSystem is an extension of IComputerAccess, with methods to access additional information about the the computer, such as its label and filesystem.	2017-11-19 18:23:38 +00:00
SquidDev	893524b0a8	Mark computers as changed when changing on state ... Previously they were not marked as such, meaning computer state was not broadcast to the client until blinking state changed.	2017-11-19 15:23:12 +00:00
SquidDev	aa447ec101	Fix term.getTextScale() not using the main monitor	2017-11-19 14:03:48 +00:00
SquidDev	d7301ff15e	Merge pull request #412 from Wilma456/ComputerCraft-1/textfix ... Add Check to textutils.tabulate/pagedTabulate	2017-11-15 16:58:13 +00:00
SquidDev	1cf10c5c47	Merge pull request #490 from zardyh/ComputerCraft/master ... Propagate errors arising from API loading	2017-11-15 16:51:26 +00:00
SquidDev	6691ec8e3a	Merge pull request #390 from Wilma456/ComputerCraft-1/errormsg ... Show fs error in paint and edit	2017-11-15 16:39:37 +00:00
SquidDev	a9f77221ff	Merge pull request #469 from Wilma456/ComputerCraft-1/newrecipe ... Add more Recipes to Recipebook	2017-11-15 16:35:27 +00:00
SquidDev	dd3b69a633	Rebranding! ... I feel kinda guilty about this, but it's probably a good idea to make it clear that this isn't "actual, proper, stable" ComputerCraft.	2017-11-15 16:25:10 +00:00
hydraz	d766f8b34e	Propagate errors arising from API loading	2017-11-15 14:22:36 -02:00
SquidDev	2ae6fb47e7	Move CommandComputer into a child package ... Means we can be a little more organised where we put the additional commands.	2017-11-15 15:57:10 +00:00
SquidDev	dd5698241b	Add support for running multiple computers at the same time ... - ComputerThread constructs multiple threads instead of just one, depending on a config options. - The synchronized blocks of PeripheralAPI.PeripheralWrapper have been shifted a little to ensure no deadlocks occur.	2017-11-15 13:30:40 +00:00
SquidDev	ed8e9d7817	Add support for enabling Lua's debug library ... Whilst I'm pretty sure this is safe for general use, I'm disabling this by default for now. I may consider enabling it in the future if no issues are found.	2017-11-15 12:18:10 +00:00
SquidDev	6c29b44c3c	Merge pull request #440 from Wilma456/ComputerCraft-1/iomulti ... Make io.write() accept multiple args	2017-11-15 11:47:33 +00:00
SquidDev	0caa133089	Merge pull request #454 from SquidDev-CC/ComputerCraft/hotfix/lazy-computer-peripheral ... [WIP] Only instantiate ServerComputer on tile ticks	2017-11-15 11:42:54 +00:00
SquidDev	a8b08bd971	Remove apis.HTTPRequest ... I evidently duplicated this during some rebase, more fool me.	2017-11-15 11:39:48 +00:00
SquidDev	c9181a121f	Merge pull request #395 from SquidDev-CC/ComputerCraft/feature/websocket ... Websocket support	2017-11-15 11:39:02 +00:00
SquidDev	30f4e0829f	Add websocket support to HTTP API ... This uses Netty's websocket functionality, meaning we do not have to depend on another library. As websockets do not fit neatly into the standard polling socket model, the API is significantly more event based than CCTweaks's. One uses http.websocket to connect, which will wait until a connection is established and then returns the connection object (an async variant is available). Once you have a websocket object, you can use .send(msg) to transmit a message. Incoming messages will fire a "websocket_message" event, with the URL and content as arguments. A convenience method (.receive()) exists to aid waiting for valid messages.	2017-11-15 11:32:17 +00:00
SquidDev	2155fce036	Merge pull request #486 from Wilma456/ComputerCraft-1/extensionfix ... Fix Bug in Paint and Edit	2017-11-14 23:55:14 +00:00
SquidDev	27602ec8fc	Merge pull request #485 from Luca0208/ComputerCraft/patch-1 ... Removed the "the" that was too much(In /rom/help/cd.txt)	2017-11-14 23:54:54 +00:00
SquidDev	66f683d9c9	Merge pull request #475 from Wilma456/ComputerCraft-1/ioline ... Fix io.lines()	2017-11-14 23:53:50 +00:00
SquidDev	ac08a52323	Merge pull request #480 from Wilma456/ComputerCraft-1/monitorscale ... Add getTextScale() to Monitor	2017-11-14 23:53:04 +00:00
SquidDev	fe0f998c27	Merge pull request #448 from Wilma456/ComputerCraft-1/writecheck ... Fix check of write()	2017-11-14 23:50:12 +00:00
Wilma456	bcf79165f9	Merge pull request #455 from Wilma456/ComputerCraft-1/fileread ... Add read() to Filehandle	2017-11-14 23:48:38 +00:00
Steven Dirth	9b2a50cdfc	Merge pull request #362 from KingofGamesYami/ComputerCraft/featurecommand-event ... Command Event	2017-11-14 23:27:11 +00:00
Wilma456	c5d99db654	Merge pull request #411 from Wilma456/ComputerCraft-1/copyfixup ... Fix Bug in copy.lua, mkdir.lua and rename.lua (updated)	2017-11-14 23:24:11 +00:00
SquidDev	5253ab3e58	Merge pull request #463 from josephcsible/ComputerCraft/notnull ... Remove some unnecessary null checks	2017-11-14 22:58:36 +00:00
SquidDev	11d8253d9c	Merge pull request #464 from josephcsible/ComputerCraft/unnecessary ... Remove unnecessary code	2017-11-14 22:57:36 +00:00
SquidDev	bc2b481918	Merge pull request #289 from Wojbie/ComputerCraft/Speaker-pocket-computer-light ... Add pocket computer light support to Speaker.	2017-11-14 22:46:01 +00:00
SquidDev	540e2e25aa	Merge pull request #163 from SquidDev-CC/ComputerCraft/feature/cobalt ... Replace LuaJ with Cobalt	2017-11-14 21:48:47 +00:00
SquidDev	845118e9e2	Merge pull request #218 from SquidDev-CC/ComputerCraft/feature/new-computer-thread ... Rewrite the computer thread system	2017-11-14 21:33:20 +00:00
SquidDev	b2b8753ee7	Merge pull request #227 from SquidDev-CC/ComputerCraft/feature/improved-cable ... Improving cable/wired modem interactions	2017-11-14 21:32:53 +00:00
SquidDev	060fb21bdb	Merge pull request #298 from SquidDev-CC/ComputerCraft/feature/luaj-bit32 ... Replace BitAPI with a LuaJ implementation of bit32	2017-11-14 21:32:19 +00:00
SquidDev	ef008709c7	Merge pull request #402 from SquidDev-CC/ComputerCraft/feature/shell-resolution ... Tweak shell program resolution slightly	2017-11-14 21:31:10 +00:00
SquidDev	09da119f27	Merge pull request #451 from SquidDev-CC/ComputerCraft/hotfix/disk-drive-stop ... Use custom packet to play records, instead of using block events	2017-11-14 21:30:52 +00:00
SquidDev	f8487d1e1c	Merge pull request #453 from SquidDev-CC/ComputerCraft/hotfix/eager-remove-te ... Remove tile before calling destroy	2017-11-14 21:15:47 +00:00
SquidDev	b6f773ffce	Merge pull request #457 from SquidDev-CC/ComputerCraft/hotfix/computer-reload ... Turn on ServerComputer instances if they have timed out	2017-11-14 21:14:49 +00:00
SquidDev	c8673473ef	Merge pull request #476 from SquidDev-CC/ComputerCraft/hotfix/printer-clear ... Fix the printer overwriting the current page	2017-11-14 21:14:10 +00:00
SquidDev	3829815756	Merge pull request #479 from SquidDev-CC/ComputerCraft/feature/network-optimisations ... Only send terminal state to interacting players	2017-11-14 21:13:17 +00:00
SquidDev	0bd0f4d313	Prefix all loaded strings with "=" ... Whilst this is not consistent with normal Lua, this is required in order to remain compatible with LuaJ.	2017-11-14 18:41:01 +00:00
SquidDev	73873eb8cb	Change timeout system to occur on instructions instead of API calls ... This means loops which do not touch CC specific methods will still produce an error, rather than terminating the computer.	2017-11-14 18:41:00 +00:00
SquidDev	0420b6c831	Remove string metatable protection ... The string metatable and environment are no longer shared, so this sandboxing is no longer required.	2017-11-14 18:41:00 +00:00
SquidDev	bb741975b7	Migrate LuaJLuaMachine to use Cobalt	2017-11-14 18:41:00 +00:00
Wilma456	9e19dd7070	Fix Bug in Paint and Edit	2017-11-02 20:14:34 +01:00
Luca S	aba0e3d2d4	Removed the "the" that was too much	2017-10-29 19:06:34 +01:00
SquidDev	d9d025e33b	Add simple JEI integration ... - Ensure pocket computers and turtles are distinguished by upgrades and computer family. - Ensure disks are distinguished by colour. - Hide treasure disks from the list	2017-10-25 13:40:35 +01:00
Wilma456 (Jakob0815)	1fe29ab098	Add getTextScale() to Monitor	2017-10-13 12:37:55 +02:00
SquidDev	53f16782ab	Only send terminal state to interacting players ... This splits the computer state (blinking, label, etc...) and terminal state into two separate packets. When a computer changes, the computer state is sent to all players and the terminal state is sent to players who are curerntly using the computer. This reduces network usage by a substantial amount.	2017-10-12 10:45:38 +01:00
SquidDev	bfb4f88304	Fix the printer clearing the previous page ... When printing on top of an already printed page, the previous contents should be preserved. However, this did not occur as the stack had been shrunk and so the item was no longer considered a printout. Closes SquidDev-CC/ComputerCraft#2	2017-10-06 12:04:49 +01:00
SquidDev	fb6d65ec23	Invalidate the network when the peripheral is removed ... Fixes #83	2017-10-04 21:49:41 +01:00
SquidDev	6b364052c7	Only render breaking animation on the part being hit	2017-10-04 21:49:40 +01:00
SquidDev	7169abcd7b	Ensure the modem's peripheral is incorrectly invalidated when changed	2017-10-04 21:49:40 +01:00
SquidDev	75ccfbdb3d	Migrate cable core block state to an enum ... This allows us to render the cable "core", as was done pre-1.8.	2017-10-04 21:49:40 +01:00
SquidDev	728644c104	Initial attempt at improving cable/wired modem interactions ... - Cable and modem can be broken individually - Ray tracing will go through "holes" in the cable. - Pick block will determine which part you are looking at. - Selection box will only highlight the region you are looking at: modem or cable.	2017-10-04 21:49:37 +01:00
Wilma456 (Jakob0815)	999351e667	Fix io.lines()	2017-10-04 18:51:48 +02:00
Wilma456	11e879db41	Removce Bow Upgrade Recipe	2017-09-29 18:56:52 +02:00
Wilma456	a4a774fcdf	Add more Recipes to Recipebook	2017-09-27 20:08:48 +02:00
Wilma456	4fb0240a36	Changes suggested by SquidDev and update help file	2017-09-24 17:36:20 +02:00