AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-24 04:50:30 -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
47383b2132 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-06-10 17:05:59 +02:00
Florian Nücke
811300d1d8 Swapping hologram color byte order back to normal in save files for backwards compatibility. 2014-06-10 17:05:22 +02:00
Florian Nücke
2b709eee3c Refactored the hologram renderer a bit (split phases into separate functions - init [create common buffer], validate [check if dirty, rebuild as needed] and publish [do the actual rendering]). 
Also caching the buffer used for the color data and indexes to avoid spamming the GC with instances of those (can't hurt, right?)
 2014-06-10 16:54:47 +02:00
Florian Nücke
234b33f474 Merge branch 'VBO_hologram' of https://github.com/evg-zhabotinsky/OpenComputers 
Conflicts:
	src/main/resources/reference.conf
	src/main/scala/li/cil/oc/client/renderer/tileentity/HologramRenderer.scala
 2014-06-10 15:43:10 +02:00
Florian Nücke
0acc0b9aed Merge pull request #310 from Vexatos/patch-5 
Typo Wars, Episode V
 2014-06-10 14:47:53 +02:00
Vexatos
0156408a1e Update de_DE.lang 2014-06-10 14:44:57 +02:00
Florian Nücke
18507db303 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/Items.scala
	src/main/scala/li/cil/oc/client/renderer/WirelessNetworkDebugRenderer.scala
	src/main/scala/li/cil/oc/common/item/Delegate.scala
	src/main/scala/li/cil/oc/common/item/GraphicsCard.scala
	src/main/scala/li/cil/oc/common/item/InternetCard.scala
	src/main/scala/li/cil/oc/common/item/LinkedCard.scala
	src/main/scala/li/cil/oc/common/item/Microchip.scala
	src/main/scala/li/cil/oc/common/item/NetworkCard.scala
	src/main/scala/li/cil/oc/common/item/RedstoneCard.scala
	src/main/scala/li/cil/oc/common/item/UpgradeAngel.scala
	src/main/scala/li/cil/oc/common/item/UpgradeCrafting.scala
	src/main/scala/li/cil/oc/common/item/UpgradeExperience.scala
	src/main/scala/li/cil/oc/common/item/UpgradeGenerator.scala
	src/main/scala/li/cil/oc/common/item/UpgradeInventory.scala
	src/main/scala/li/cil/oc/common/item/UpgradeNavigation.scala
	src/main/scala/li/cil/oc/common/item/UpgradeSign.scala
	src/main/scala/li/cil/oc/common/item/UpgradeSolarGenerator.scala
	src/main/scala/li/cil/oc/common/item/WirelessNetworkCard.scala
 2014-06-10 14:34:27 +02:00
Florian Nücke
91cbd5fde1 More OpenGL error checking all over the place. 2014-06-10 14:29:19 +02:00
Florian Nücke
5c81f83688 Renamed capacitor upgrade to battery upgrade and introduced two additional tiers. Closes #280. 
Generalized rarity computation for items (less code per item, yay).
 2014-06-10 14:09:56 +02:00
evg-zhabotinsky
f480dca78d Reenable hologram lighting 2014-06-10 04:08:51 +04:00
Florian Nücke
5cb322abae Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-10 02:05:03 +02:00
Florian Nücke
5bcb888cba Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/gui/BufferRenderer.scala
	src/main/scala/li/cil/oc/server/component/robot/Player.scala
 2014-06-10 02:03:37 +02:00
Florian Nücke
84a6aa18d7 Pushing all attribs in font renderer, let's see if this helps... 
Also no tessellator in another display list.
 2014-06-10 02:02:49 +02:00
Florian Nücke
5e365572eb Error formatting. 2014-06-10 01:40:57 +02:00
Florian Nücke
51acb6046e Fixed robots using items. 2014-06-10 01:37:42 +02:00
Florian Nücke
61cb6115dc Merge pull request #303 from xbony2/patch-1 
Updated the mod ID of gregtech
 2014-06-10 01:15:57 +02:00
Florian Nücke
224881d03f Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/gui/Case.scala
	src/main/scala/li/cil/oc/client/gui/Robot.scala
	src/main/scala/li/cil/oc/client/renderer/MonospaceFontRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/WirelessNetworkDebugRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/gui/BufferRenderer.scala
 2014-06-10 01:13:29 +02:00
Florian Nücke
31636a1410 Sprinkled some OpenGL error checking over the render code. 2014-06-10 01:11:15 +02:00
Florian Nücke
84cdff345a More constants, less magic numbers! 2014-06-10 00:55:48 +02:00
Florian Nücke
52b269ea87 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/client/gui/Robot.scala
	src/main/scala/li/cil/oc/client/renderer/item/FloppyRenderer.scala
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
	src/main/scala/li/cil/oc/server/component/robot/Player.scala
 2014-06-10 00:53:39 +02:00
Florian Nücke
b4b7678c8a Fixed upgrade renderer being overwritten by floppy renderer. 
Ensure robot fake player is only created on the server.
 2014-06-10 00:39:34 +02:00
Florian Nücke
adb58e0ce7 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/server/component/robot/Player.scala

Also transitioned to apache logger.
Also fixed a couple of warnings from Forge.
 2014-06-10 00:02:53 +02:00
Florian Nücke
c38803cff0 Using FakePlayer as base class for robot base class... seems to work, although I remember some things breaking when I last tried... well, it's unstable right now anyway so let's do this. 2014-06-09 23:23:17 +02:00
Florian Nücke
eacaa45372 Also clean up component lookup map on client manually on chunk and world unload. 
Made the component lookup map use weak keys instead of weak keys, as originally intended.
 2014-06-09 23:08:41 +02:00
Florian Nücke
f288a02296 Added setting to control hologram flicker frequency. 2014-06-09 21:05:49 +02:00
Florian Nücke
f01ff4d76c Update forge version. 2014-06-09 19:26:19 +02:00
Florian Nücke
5b801a366b Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-09 19:25:54 +02:00
Florian Nücke
9d430b1869 Made oredict lookup for dyes more stable, triggered by 1.7 adding some alternative names for some dyes *before* the actual dyes, making the previous method fail. 2014-06-09 19:25:27 +02:00
Florian Nücke
89222fb118 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-09 18:16:52 +02:00
Florian Nücke
cabc6d0aeb Organized imports. 2014-06-09 18:09:19 +02:00
Florian Nücke
dbc4d38a4a Merge branch 'ScreenCrashFix' of git://github.com/evg-zhabotinsky/OpenComputers 2014-06-09 18:04:37 +02:00
Florian Nücke
70964e0e32 Make edit strip '\r's from line endings when opening files to avoid the '?'s. See #269. 2014-06-09 17:38:00 +02:00
Florian Nücke
b9ef707a2c Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-09 17:14:25 +02:00
Florian Nücke
9eb445b4aa oh ffs... 2014-06-09 17:13:32 +02:00
Florian Nücke
b89ea1f212 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-09 17:05:41 +02:00
Florian Nücke
3fdea0e2f0 Merge pull request #308 from Adaptivity/patch-1 
Update ru_RU.lang
 2014-06-09 17:05:02 +02:00
Florian Nücke
f79287e81e Made the palette indicator returned by gpu.setForeground/setBackground as well as gpu.get the actual index or nil instead of true/false. 2014-06-09 16:56:35 +02:00
Anton
4c3542ac2e Update ru_RU.lang 2014-06-09 18:53:59 +04:00
Florian Nücke
67b4ebf39d Looking palette of t3 gpu/screen when setting simple color for better matches. Closes #292. 2014-06-09 16:13:48 +02:00
Florian Nücke
8f969e5a64 Spaces. 2014-06-09 13:56:57 +02:00
Florian Nücke
b21df2462c Merge git://github.com/gamax92/OpenComputers 2014-06-09 13:55:15 +02:00
Florian Nücke
d8dbe8365d Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-08 23:47:29 +02:00
Florian Nücke
12ae22eb30 Updated native lib with a couple of bugfixes (for Windows for now, others will be recompiled and updated after it's confirmed that the fixes actually work). 2014-06-08 23:45:11 +02:00
gamax92
7d2e1c77fb Reduce memory usage 2014-06-08 11:34:14 -06:00
evg-zhabotinsky
2e00640839 Fixes #31 for current 1.3 upstream. 
Removed nested display lists from screen renderer.
 2014-06-08 16:25:18 +04:00
evg-zhabotinsky
29fdc07410 Fix "reverse" color component order for holograms. It is 0xRRGGBB again. 2014-06-08 14:25:44 +04:00
xbony2
34ba0e5218 Updated the mod ID of gregtech 
The mod ID of gregtech changed in 1.7, so I fixed it.
 2014-06-07 08:46:43 -04:00
evg-zhabotinsky
ebbd3c2ea6 Mimic screen text fading for holograms. 
Performance might be affected (definitely improved but I can't notice it)
 2014-06-07 02:36:04 +04:00
evg-zhabotinsky
c4105d5197 Compact hologram update code (decrease Java overhead). 
Also remove `dirty=true` on NBT read since privateBuf caching already takes care of it. (I hope so)
That is, d99bc5815c680198dfa7cd94eede40e5b4e66296 no longer affects hologram performance.
 2014-06-07 00:02:46 +04:00
evg-zhabotinsky
5e64a27a0d Now it really works. Need to read documentation more carefully. (#259) 2014-06-06 21:18:14 +04:00