Florian Nücke
|
a99f7f0136
|
computer gui
|
2013-09-21 01:49:51 +02:00 |
|
Florian Nücke
|
16ec4f6acd
|
display lists for screen gui and general performance improvement in monospace font renderer (not rendering spaces, just translate)
|
2013-09-20 23:34:25 +02:00 |
|
Florian Nücke
|
20028c99ed
|
fixes in monospace font renderer and gui for screen
|
2013-09-20 22:42:09 +02:00 |
|
Florian Nücke
|
93a38a3da0
|
minor cleanup in driver wrapping code
|
2013-09-20 19:19:01 +02:00 |
|
Florian Nücke
|
acd00aa84d
|
fixed driver callback persistence
|
2013-09-20 19:16:30 +02:00 |
|
Florian Nücke
|
5b817e3d99
|
couple of fixes here and there; tile entity renderers for computer (environment light independent "on" light) and screen (text, for testing / preparation for multiblock screens). hardly efficient at this time, display lists will come later.
|
2013-09-20 18:59:45 +02:00 |
|
Florian Nücke
|
8fed193702
|
screen block textures
|
2013-09-20 04:15:08 +02:00 |
|
Florian Nücke
|
551fd3bcbe
|
remembered that blocks' metadata is only four bit, so moved rotation logic to a tileentity base class and also made it more flexible (supporting all 6 facings via pitch/yaw); added block textures for for computer (different for on/off)
|
2013-09-20 02:31:24 +02:00 |
|
Florian Nücke
|
b98b029949
|
localization in file; fixed ascii font texture (was missed one char, 223 i think); switched from multiple "real" blocks to one proxy block with many sub-blocks, so we only need one block ID (todo: same for items, if possible)
|
2013-09-19 07:01:15 +02:00 |
|
Florian Nücke
|
ae0a865bb1
|
monospace font (mix of bitstream vera and andale mono) and renderer, renders at half scale for antialiased font
|
2013-09-16 21:24:19 +02:00 |
|
Florian Nücke
|
978e413233
|
gui refactoring
|
2013-09-16 12:14:52 +02:00 |
|
Florian Nücke
|
a88b4f5dab
|
merged renderer used for screen into screen gui class
|
2013-09-16 12:09:06 +02:00 |
|
Florian Nücke
|
c90d7d1865
|
renamed proxies to be symmetric
|
2013-09-16 11:45:10 +02:00 |
|
Florian Nücke
|
2b25bc2105
|
happy shuffling... let's see. moved textbuffer from graphicscard to screen on the server side, because it a) makes sense b) makes it much less painful to synchronize server and client screens. expanded networking a bit, with a sender and handler class for server and client. centralized for now, until I can think of an elegant, symmetric way of decentralizing it. initializing screens on client side when created. dynamically retrieving component instances when needed (not storing them anywhere) which *should* work around any issues related to installed block components living in unloaded chunks.
|
2013-09-16 11:42:02 +02:00 |
|
Florian Nücke
|
c5e3b7ea21
|
textbox tweaks
|
2013-09-14 17:42:36 +02:00 |
|
Florian Nücke
|
ae5a793a6b
|
cleanup and some fixes
|
2013-09-14 17:17:32 +02:00 |
|
Florian Nücke
|
75d8a52354
|
Merge branch 'master' of cil.li:oc
Conflicts:
li/cil/oc/common/components/IScreen.scala
li/cil/oc/server/components/Screen.scala
|
2013-09-14 16:49:43 +02:00 |
|
Florian Nücke
|
87892c32fa
|
basic 'write' implementation for lua (writing stuff to the screen); fixed/added array return value support (jnlua only supports tables -> java, not the other way around as it turns out)
|
2013-09-14 16:47:21 +02:00 |
|
Johannes Lohrer
|
677f0757bf
|
made display resolution dependent
only display text if within the textfield
|
2013-09-13 23:48:03 +02:00 |
|
Johannes Lohrer
|
95a15ede56
|
new ScreenGui.scala
|
2013-09-13 22:03:37 +02:00 |
|
Johannes Lohrer
|
e55dfe985f
|
Automatic linebreaks
|
2013-09-13 10:38:27 +02:00 |
|
Florian Nücke
|
ca16ac2ad5
|
resolved conflicts
|
2013-09-12 23:00:41 +02:00 |
|
Johannes Lohrer
|
3754ee1241
|
Merge branch 'master' of cil.li:oc
Conflicts:
li/cil/oc/gui/GuiComputer.scala
li/cil/oc/server/components/IComponent.scala
|
2013-09-12 22:48:42 +02:00 |
|
Johannes Lohrer
|
1fc8d00b54
|
own text field
|
2013-09-12 22:26:32 +02:00 |
|
Florian Nücke
|
2cabc85ab2
|
type constraint for tileentity reader in client packethandler
|
2013-09-12 22:06:11 +02:00 |
|
Florian Nücke
|
9e2c19adc1
|
fixed a lot of stuff regarding driver callbacks and wrapped exceptions to hide java part of them on the lua side; screen updates are properly sent to the client
|
2013-09-12 22:01:40 +02:00 |
|
Florian Nücke
|
2edb6145ef
|
cleaned up inventory code a little and made it so that item components are installed / uninstalled when added / removed from a computer
|
2013-09-12 04:10:57 +02:00 |
|
Johannes Lohrer
|
0360cc6703
|
Merge branch 'master' of cil.li:oc
|
2013-09-11 21:27:03 +02:00 |
|
Johannes Lohrer
|
c94488c081
|
Merge branch 'master' of cil.li:oc
Conflicts:
li/cil/oc/common/CommonProxy.scala
li/cil/oc/common/tileentity/TileEntityComputer.scala
|
2013-09-11 21:26:32 +02:00 |
|
Florian Nücke
|
54dbabb4bb
|
hooked up client packet handler
|
2013-09-11 21:25:56 +02:00 |
|
Johannes Lohrer
|
b373d95b9d
|
I dont know^^ to long ago most likely some tests for gui
|
2013-09-11 21:24:45 +02:00 |
|
Florian Nücke
|
2c6259b4a7
|
gpu item in list and extracted component cache for item components to be reusable (e.g. for hdds)
|
2013-09-11 21:20:25 +02:00 |
|
Florian Nücke
|
cb7d54c788
|
client packet handler is client anyway, so getting the world instance directly from the player object should work
|
2013-09-11 20:22:12 +02:00 |
|
Florian Nücke
|
92d58f70c9
|
component ids and installation/uninstallation of block components
|
2013-09-11 01:36:48 +02:00 |
|
Florian Nücke
|
a059183133
|
some groundwork for networking (e.g. for updating monitors on client when graphics card on server does something)
|
2013-09-10 19:26:41 +02:00 |
|
Florian Nücke
|
f9cd7fd3b6
|
working on drivers
|
2013-09-10 17:26:25 +02:00 |
|
Florian Nücke
|
baad2ebbda
|
another eris update
|
2013-09-09 20:18:45 +02:00 |
|
Florian Nücke
|
dca40c911f
|
updated libs to new eris version
|
2013-09-06 23:51:31 +02:00 |
|
Florian Nücke
|
28a54ae3d7
|
updated libs based on new eris version
|
2013-09-05 02:46:01 +02:00 |
|
Florian Nücke
|
c9136a6b96
|
updated libs based on newer eris version (has some more checks)
|
2013-09-02 18:27:42 +02:00 |
|
Johannes Lohrer
|
95bf07f46f
|
Added basic gui no texture yet
|
2013-09-01 01:38:10 +02:00 |
|
Florian Nücke
|
a5fdb98961
|
less deadlocks, more locks! isn't multi-threading fun?
|
2013-08-31 20:32:03 +02:00 |
|
Florian Nücke
|
87a420bdc3
|
trying to write libraries every start, to force updates if possible
|
2013-08-31 18:11:51 +02:00 |
|
Florian Nücke
|
0327cec937
|
resumable computers; signals appear to work; fixed bug in allocator in jnlua
|
2013-08-31 17:58:17 +02:00 |
|
Florian Nücke
|
4e820da1f2
|
switched to Lua 5.2 and JNLua 1.0.5; x64 libs (hopefully)
|
2013-08-29 22:34:41 +02:00 |
|
Florian Nücke
|
61f53b9955
|
init
|
2013-08-20 21:03:38 +02:00 |
|