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 |
|
Florian Nücke
|
c26fc9791a
|
analyzable is expected to return a node now and doesn't extend environment any more, allowing more flexible use (e.g. also for sided environments); checking for sided environment in analyzer for blocks with no analyzable interface; rendering power level of robots in their gui now; screens now consume more or less power, depending on the number of lit pixels (non ' ')
|
2013-11-22 21:43:00 +01:00 |
|
Florian Nücke
|
d4c1934565
|
fixed open port saving (missing '='... grrr); fixed a deadlock; updating positions of wireless cards in robots; improved/fixed rtree. a lot; debug renderer for rtree
|
2013-11-22 17:58:22 +01:00 |
|
Florian Nücke
|
17c8c96f3d
|
also initializing disk drive and keyboard networks via one block tick; removed another false assert; underped network initialization
|
2013-11-22 04:46:00 +01:00 |
|
Florian Nücke
|
7f40926102
|
router works, apparently; changed network api to take a tile entity instead of world + coords which were just used to fetch a tile entity anyway; cable and router block use a block tick when validated to initialize their nodes, so they don't need tile entity updates (less unnecessary spamming of the tile entity list, yay!)
|
2013-11-22 03:28:19 +01:00 |
|
Florian Nücke
|
0f0418b887
|
sided environments (a la sided inventory) to allow blocks to not connect to the network on some sides (e.g. screens on the front) or to provide different nodes to different sides (e.g. for - wip - routers); fixed state stack saving in computers... bloody stacks saving their values in the inverse bloody order;
|
2013-11-22 02:15:14 +01:00 |
|
Florian Nücke
|
5aa9ad4ac7
|
removed wrong assert in computer executor post-processing (became invalid after some recent changes)
|
2013-11-22 01:12:57 +01:00 |
|
Florian Nücke
|
71cfa6104a
|
general cleanup, making stuff a bit more uniform; cleaned up term lib a bit; fixed redstone. again -.-; small network fix and renamed signal to 'modem_message'; converting tabs to align to properly instead of just replacing them with two spaces; word wrapping when writing to term with wrap enabled
|
2013-11-22 00:33:57 +01:00 |
|
Florian Nücke
|
413a4ede2a
|
removed the cullface hack for robot equipment rendering, don't know why but it seems not to be necessary anymore
|
2013-11-21 19:15:22 +01:00 |
|
Florian Nücke
|
39f05f0a0e
|
"closing" robots while they're not running
|
2013-11-21 19:03:25 +01:00 |
|
Florian Nücke
|
4cf0ff58b7
|
custom block renderer to get models that are purely tile entity renderer driven to render in the inventory (cables and robots); fixed some flipped sides on cables that were only noticeable in inventory renderer (when not at 90 degrees angles); multi-pass rendering of items held by robots; cleaned up delegator/delegates a little
|
2013-11-21 18:20:21 +01:00 |
|
Florian Nücke
|
36eb340ec7
|
redirecting player drop requests to robot fake player through own item spawn method (that adds less velocity to the dropped item entity)
|
2013-11-21 15:21:32 +01:00 |
|
Florian Nücke
|
d4deb91bd9
|
added sucking from inventories. this has an optional count parameter to limit the number of items sucked from any given stack; not discarding surplus items from sucked item stacks anymore... thought this was for player, too, but kinda missed the creative mode check there the first time I had a look at it -.-
|
2013-11-21 15:07:42 +01:00 |
|
Florian Nücke
|
b3a5521dc1
|
sided inventory for robots; drop can now place stuff from the robots inventory into some other inventory, if present
|
2013-11-21 14:37:16 +01:00 |
|
Florian Nücke
|
76efda0a7a
|
aaand telling forge to load us after mfr if possible
|
2013-11-21 04:08:17 +01:00 |
|
Florian Nücke
|
50cddc21ee
|
minefactory reloaded rednet interop: logically treated like bundled redstone from redlogic, though it needed some reworking of due to the different architectural approach (based on blocks, not tile entities)
|
2013-11-21 04:02:58 +01:00 |
|
Florian Nücke
|
d936caba2d
|
two new block categories (two new delegators) for normal and special blocks with redstone, to make sure stuff doesn't render as connected to non-redstone blocks (they only check canProvidePower, apparently); obviously a world breaker, so sorted order of blocks while at it; some render fixes for robots with redstone cards (only render as connecting when card is actually in the card slot)
|
2013-11-21 02:27:18 +01:00 |
|
Florian Nücke
|
0e5b55553e
|
limiting clipboard size when pasting; multiline pasting by splitting pasted text into multiple lines and generating one signal per line; dropping an actual robot block when breaking a robot by breaking its afterimage
|
2013-11-21 00:59:23 +01:00 |
|