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

2036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
b72ea5a241 Fixed a few recipes. v1.3.4 2014-09-05 15:10:16 +02:00
Florian Nücke
827f6ad4d8 Made edit create a temporary backup of the file being edited when saving, to avoid losing data when erroring while saving (e.g. out of memory). Closes #534. 2014-09-05 12:03:18 +02:00
Florian Nücke
07694cdb1f Added sanity check in player inventory layouting code for GUIs, fixes #541. 2014-09-05 11:41:39 +02:00
Florian Nücke
82d8fd8c51 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-09-04 16:59:32 +02:00
Florian Nücke
4f2b942f73 Improved parameter validation for internet.connect, closes #533. 2014-09-04 16:47:47 +02:00
Florian Nücke
9ae5fbc512 Throwing everything into main gradle file after all (sort of in preparation for submodules, since I expect it to be easier this way). 2014-09-04 16:45:12 +02:00
Florian "Sangar" Nücke
73dd99072a Merge pull request #531 from ViKaleidoscope/patch-2 
Update zh_CN.lang
 2014-09-02 16:58:12 +02:00
Crawling Mist
b36d3e46db Update zh_CN.lang 
Add translation for'Tablet Case', and change few things.
 2014-09-02 22:20:32 +08:00
Florian "Sangar" Nücke
6cf8a54cf8 Merge pull request #528 from logangorence/master 
Fixed a few small typos.
 2014-09-01 12:27:20 +02:00
Logan Gorence
26c47a6d8c Fixed a few small typos. 2014-08-31 20:44:39 -07:00
Florian Nücke
59e0191914 Fixed remote terminals being broken since a36a0b525ccaea10f27a6d3ae38f037d72c452c1. 
Fixed a race condition in tablet caching.
 2014-08-31 22:36:33 +02:00
Florian Nücke
c130594124 Some more housekeeping and a bit of recipe tweakery. 2014-08-31 08:40:42 +02:00
Florian Nücke
ce1f33c141 Housekeeping. 2014-08-31 07:21:24 +02:00
Florian Nücke
ace495ebea Added tablet template for assembler and fixed a couple of small issues related to that and tablets in general. 2014-08-30 19:59:54 +02:00
Florian Nücke
89072101f4 Fixed some slots being invisible due to the last commit. 2014-08-29 21:50:34 +02:00
Florian Nücke
0224fa262d Cleaned up a bit. 2014-08-29 21:40:39 +02:00
Florian Nücke
f6f97e0d3f Made robots have a fixed (high) number of supported components instead of basing it on the CPU, so it's fully based on the complexity when assembling now. 2014-08-29 19:16:28 +02:00
Florian Nücke
1176e7b3f0 Reworked how complexity is computed when assembling robots. Cases now only provide a base level, CPUs control the max complexity in more detail (and don't contribute to complexity themselves anymore). Closes #522. 2014-08-29 18:59:15 +02:00
Florian Nücke
3d5029caa0 Implemented template system for assembler. 2014-08-29 18:22:31 +02:00
Florian Nücke
e2365d498d Also highlight slots for items hovered in NEI. 2014-08-28 08:27:42 +02:00
Florian Nücke
6761983cd6 Highlighting slots to indicate which items can go where in most GUIs. 2014-08-28 07:54:14 +02:00
Florian Nücke
75c7318784 Fffff. 2014-08-28 00:16:57 +02:00
Florian Nücke
5e53d832af Made cables render a little socket / plug when connected to blocks and some other stuff. 2014-08-28 00:05:25 +02:00
Florian "Sangar" Nücke
a7de0a237a Merge pull request #519 from logangorence/master 
Added a few Doctor Who robot names
 2014-08-27 19:59:34 +02:00
Florian Nücke
f24c1ff170 Switched to extracting the native library into the game directory (instead of the temp directory), configurable. 2014-08-27 19:04:13 +02:00
Florian Nücke
43977a682b Avoiding (harmless) IC2 log spam on world unload. 2014-08-27 17:38:14 +02:00
Florian Nücke
82ec88fadb Avoiding potential race condition in tablets. I think. 2014-08-27 17:37:46 +02:00
Florian Nücke
7464e38302 Made holograms rotatable (only along the Y axis for now) by whacking them with a wrench. 2014-08-27 17:36:26 +02:00
Logan Gorence
b2503de177 Added a few Doctor Who robot names 
Specifically:
- Dalek Sec
- K-9
 2014-08-26 21:49:06 -07:00
Florian Nücke
02b96e5eb2 Changed robot name file parsing to allow inline # to mark rest of the line as comment (<3 Scala) and cleaned up the robot name file. 2014-08-26 19:52:34 +02:00
Florian Nücke
ac40670c4a Merge branch 'patch-1' of https://github.com/jecowa/OpenComputers 2014-08-26 19:09:11 +02:00
Florian Nücke
637fdc3c72 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-08-26 18:29:41 +02:00
Florian Nücke
fe7e743f55 Made cables dyeable and made them not connect when of different colors (except for light gray, the default color, which connects to all other colors). Closes #517. 2014-08-26 18:29:26 +02:00
Florian "Sangar" Nücke
d8076fdd0a Merge pull request #516 from ViKaleidoscope/patch-1 
Update zh_CN.lang
 2014-08-26 16:04:18 +02:00
Princess
197f084b09 Update zh_CN.lang 2014-08-26 17:46:11 +08:00
jecowa
bafed0777b Update robot.names 2014-08-26 02:37:03 -05:00
Florian Nücke
cc9c38c16d Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-25 22:04:27 +02:00
Florian Nücke
adbab1125d Fixed memory leaks in the Lua sandbox when creating proxies and when creating coroutines. Closes #479. 2014-08-25 22:03:38 +02:00
Florian Nücke
d3d6fddff1 Back to the land of ifs instead of trying all libs to make sure that's not what's causing rare native lib related issues. 2014-08-25 20:32:18 +02:00
Florian Nücke
0787f56f72 -.- 2014-08-25 20:04:46 +02:00
Florian Nücke
d9aa7f5bd1 Potential fix for IC2 issues. 2014-08-25 19:55:07 +02:00
Florian Nücke
ca9d28dfd6 Documented IGlyphProvider and cleaned up settings a little, making it easier to add additional glyph providers in the future. 
Also moved debug related stuff from computer.debug into top level category debug in settings, merged some other stuff into that.
 2014-08-24 20:44:35 +02:00
Florian Nücke
44f2e7ab1c Handling missing external save data more gracefully. 2014-08-24 13:03:44 +02:00
Florian Nücke
32af871971 Made all blocks 'harvestable' bare handed. 2014-08-24 12:30:12 +02:00
Florian Nücke
7e67db13b1 Externalized saved data for holograms. 2014-08-23 23:26:38 +02:00
Florian Nücke
08e203a36f Externalized saved tmpfs contents. 2014-08-23 22:46:19 +02:00
Florian Nücke
a36a0b525c Accumulating screen updates per tick and sending them as a batch packet, reducing overall net traffic quite a bit due to the reduced overhead (target info only has to be sent once). 
Also compressing the multi-packet, since the data is usually written in the worker threads the additional CPU overhead is negligible.
Doing some basic testing, the potential danger of packets getting too big seems irrelevant.
Some simple testing shows bandwidth reduction down to ~50% when spamming random simple `set()`s, and even down to ~15% for well compressible updates (`while true do print(string.rep(os.date(), 4)) end` for example).
 2014-08-23 22:26:03 +02:00
Florian Nücke
9f92698254 Added configurable keybinds for edit and cleaned up a a little. 2014-08-22 23:47:49 +02:00
Florian Nücke
4c7c3c4399 Merge branch 'WazWaz' of https://github.com/WazWaz/OpenComputers 2014-08-22 20:24:40 +02:00
Florian Nücke
6769e72efd Improved adapter behavior some, trying to differentiate compound driver environments to avoid re-using saved data where inappropriate. Should close #510. 
Fixed potential magical NPE in Keyboard (seemed to only happen when unloading a world by leaving the game).
 2014-08-22 14:56:06 +02:00