Florian Nücke
|
c52e18a87b
|
cleaned up synchronization in connector/distributor, i think; pausing computer in save to make sure it won't continue running until the whole world finished saving; started work on charger (robot loading block); reworked connector interface, changeBuffer now returns the delta that could not be applied and added new method tryChangeBuffer that will only apply the full delta or nothing, and return true if it worked, false otherwise
|
2013-11-26 14:35:14 +01:00 |
|
Florian Nücke
|
f5e1f09af3
|
fixed distributor reassignment; split redstone into bundled and normal redstone traits (and two cards, bundled will only be used if either redlogic or mfr is available)
|
2013-11-26 10:32:07 +01:00 |
|
Florian Nücke
|
45ba7b00f6
|
pageup/pagedown support for edit
|
2013-11-26 03:32:02 +01:00 |
|
Florian Nücke
|
113aa37f6d
|
fixed energy redistribution bug on connector removal
|
2013-11-26 03:25:49 +01:00 |
|
Florian Nücke
|
22901d5494
|
fixed energy disappearing from capacitors with adjacency bonus after loading
|
2013-11-26 03:14:40 +01:00 |
|
Florian Nücke
|
9af202331b
|
small method rename and checking for ownership before starting a computer
|
2013-11-26 03:05:16 +01:00 |
|
Florian Nücke
|
34033966da
|
playing with power numbers; fixed some converter bugs; added setting for a factor to apply to computer's running energy cost when they are sleeping (so they need less when they os.sleep(a long time); capacitor adjacency bonus and capacitor doesn't tick anymore; removed internal buffer form converter
|
2013-11-26 01:34:10 +01:00 |
|
Florian Nücke
|
ac5fe3c87c
|
added capability to send http requests with wireless network cards, if allowed in the config (with domain white and black list); fixed nil printing when ls-ing an invalid dir, returning an error message instead; config doesn't support backslashes and since it might disappear in the future, anyway, I decided to switch to the typesafe config library; renamed config class to Settings to avoid name conflicts with typesafe config
|
2013-11-25 21:54:59 +01:00 |
|
Florian Nücke
|
69048a92c4
|
fixed directory creation not checking capacity limit
|
2013-11-25 14:36:12 +01:00 |
|
Florian Nücke
|
5f0f5d79ff
|
configurable robot names; showing robot name and owner in analyzer result
|
2013-11-25 14:24:07 +01:00 |
|
Florian Nücke
|
ad8ff5d646
|
made the shortened tooltip localizable; swinging item when clearing it
|
2013-11-25 00:46:22 +01:00 |
|
Florian Nücke
|
a014507beb
|
cleaned up stupid naming from way back then (parameters item: ItemStack -> stack: ItemStack); displaying shortened address on *all* item components now; only showing shortened / no tooltips per default now, hold shift to see the full tooltip; shift rightclick with an item component selected to "reset" it (clearing its address and data - this wipes disks!); removed the one item stacking limit on items, the documentation of the item(stack?) class was a bit irritating here, making me believe items that could potentially have tag compound must not be stackable - apparently that was a misunderstanding, yay! only trick bit are robots, that have to enforce the one-stacksize thing in their component slots... superfluous items are now first moved to the robots inventory, then dropped to the ground if that's full, too
|
2013-11-25 00:37:57 +01:00 |
|
Florian Nücke
|
b4335ad995
|
unbroke my test world (item creation order, will sort later); formatting
|
2013-11-24 22:45:39 +01:00 |
|
Florian Nücke
|
08ed375c55
|
Merge branch 'master' of cil.li:oc
|
2013-11-24 22:33:02 +01:00 |
|
Florian Nücke
|
9a366673cd
|
tooltipocalypse! that has to be enough for now...
|
2013-11-24 22:32:53 +01:00 |
|
Johannes Lohrer
|
111f444164
|
Merge branch 'master' of cil.li:oc
Conflicts:
li/cil/oc/common/Proxy.scala
|
2013-11-24 21:59:14 +01:00 |
|
Johannes Lohrer
|
94d0dc6e58
|
added some crafting recipes
|
2013-11-24 21:58:38 +01:00 |
|
Florian Nücke
|
b751fe0e0b
|
tooltips via localization files, with support for custom formatting (colors and text formats)
|
2013-11-24 21:36:31 +01:00 |
|
Florian Nücke
|
eb2778d7aa
|
keyboard rendering in inventory now respects block bounds, making it look a little nicer; reworked keyboard texture to use same color theme as other blocks; fixed keyboard pop-off logic
|
2013-11-24 18:29:50 +01:00 |
|
Florian Nücke
|
b203059ffa
|
moar tooltippery
|
2013-11-24 17:12:06 +01:00 |
|
Florian Nücke
|
da7e638e60
|
shuffling in proxy
|
2013-11-24 16:33:45 +01:00 |
|
Florian Nücke
|
f6b4acb966
|
itemstack "factory" in delegate blocks and items
|
2013-11-24 16:25:15 +01:00 |
|
Florian Nücke
|
3fa660acb7
|
activating keyboards activates the screen they're attached to
|
2013-11-24 16:18:58 +01:00 |
|
Florian Nücke
|
33583dd52d
|
cleanup; fixed keyboards not being rendered when there's a block in front of them
|
2013-11-24 16:01:38 +01:00 |
|
Florian Nücke
|
ec1d708b56
|
Merge branch 'master' of cil.li:oc
|
2013-11-24 15:55:03 +01:00 |
|
Florian Nücke
|
94f7c3a6c9
|
moar tooltips; extending entityplayer directly instead of fakeplayer
|
2013-11-24 15:54:52 +01:00 |
|
Johannes Lohrer
|
f6b366035f
|
Merge branch 'master' of cil.li:oc
|
2013-11-24 15:35:40 +01:00 |
|
Johannes Lohrer
|
1e3a14a0f9
|
keyboard rendering
|
2013-11-24 15:35:32 +01:00 |
|
Florian Nücke
|
8f5cc77247
|
popping keyboards when their screen is broken
|
2013-11-24 15:17:05 +01:00 |
|
Florian Nücke
|
987a056036
|
fixed keyboard not being rendered correctly on client after loading
|
2013-11-24 15:09:51 +01:00 |
|
Johannes Lohrer
|
55f9f33842
|
Merge branch 'master' of cil.li:oc
|
2013-11-24 14:39:16 +01:00 |
|
Johannes Lohrer
|
ac2c493864
|
Merge branch 'master' of cil.li:oc
Conflicts:
li/cil/oc/common/block/Keyboard.scala
|
2013-11-24 14:39:08 +01:00 |
|
Florian Nücke
|
4d8ae19f1b
|
only activate screens when they have a keyboard and only connect keyboards to the screen they're attached to
|
2013-11-24 14:35:16 +01:00 |
|
Florian Nücke
|
0325cbb61d
|
only allow placing keyboards on screens
|
2013-11-24 14:19:26 +01:00 |
|
Florian Nücke
|
4623641fd6
|
proper bounds for keyboards and allow placing on top/bottom of blocks
|
2013-11-24 13:52:32 +01:00 |
|
Johannes Lohrer
|
917d0f2fb1
|
Merge branch 'master' of cil.li:oc
|
2013-11-24 13:27:44 +01:00 |
|
Johannes Lohrer
|
8fa4f394c6
|
Merge branch 'master' of cil.li:oc
Conflicts:
li/cil/oc/Config.scala
li/cil/oc/client/Proxy.scala
li/cil/oc/common/block/Keyboard.scala
|
2013-11-24 13:27:37 +01:00 |
|
Florian Nücke
|
a2a6dd5824
|
getter for world info
|
2013-11-24 13:27:10 +01:00 |
|
Johannes Lohrer
|
27739bb827
|
keyboard test
|
2013-11-24 13:18:43 +01:00 |
|
Florian Nücke
|
a6541d4ecc
|
added an exception for robot placements so they face away from the player instead of towards him (unlike *all* other blocks)
|
2013-11-24 03:28:27 +01:00 |
|
Florian Nücke
|
1996332dc3
|
fixed last char in a row disappearing when it should have been shifted to the right in term.read and editor; fixed computers not properly reporting errors that occur if kernel is crashing during startup; added simple serialize/unserialize methods to text lib to make networking easier
|
2013-11-24 03:19:34 +01:00 |
|
Florian Nücke
|
26c04f1ce9
|
made ram and disk sizes for the three tiers configurable and generalized their localization method (not one per tier but one for all that gets extended based on the tier); more informative status bare messages for text editor
|
2013-11-24 01:54:15 +01:00 |
|
Florian Nücke
|
594dffdd61
|
proper clipboard pasting in editor and fixed no-arg check
|
2013-11-23 23:33:13 +01:00 |
|
Florian Nücke
|
f7f75d55ff
|
added a "status bar" for the editor and reduced some surplus copying
|
2013-11-23 23:20:01 +01:00 |
|
Florian Nücke
|
175f0706f3
|
fixed a display error when scrolling in editor lead to a horizontal scroll due to the new line being shorter than the previous one
|
2013-11-23 22:52:57 +01:00 |
|
Florian Nücke
|
4bc0b891f8
|
cleaned up term some more and reused most of the logic by expanding it to multiple lines to create a... dun dun dun... basic file editor!
|
2013-11-23 22:40:48 +01:00 |
|
Florian Nücke
|
374d66d39e
|
moved string.trim to text.trim; made some more Lua functions use get/set prefix after all (got too used to dropping it from Scala, but since most callbacks will use this, too, I'd like to keep it uniform); major cleanup of term's readline implementation
|
2013-11-23 18:10:45 +01:00 |
|
Florian Nücke
|
e674f4905b
|
localized power tooltip in robots
|
2013-11-23 02:01:51 +01:00 |
|
Florian Nücke
|
ffd3ff493e
|
made it so that robots only accept floppies (no hard drives) and added background icon for floppy slots
|
2013-11-23 01:58:19 +01:00 |
|
Florian Nücke
|
cb4c439d41
|
allowing robots to use items for specifiable durations. this allows robots to use bows or throw flasks. can be disabled; exhaustion is now converted into energy cost. one to one per default for now, will need some testing/calculations; fixed render glitch in nei when hovering power tooltip; showing absolute power value in power tooltip; made robot buffer configurable; made moves and turns cost energy and the amount configurable
|
2013-11-23 01:24:58 +01:00 |
|