LemADEC
2f887cd8c5
Reformating
2014-09-07 18:10:38 +02:00
LemADEC
d053d6d0ce
Reintegrated experimental blocks (continuated)
2014-09-07 18:08:02 +02:00
LemADEC
cbb42d46d5
Reintegrated experimental blocks
2014-09-07 18:03:16 +02:00
LemADEC
0a7ca1fdd9
Merge remote-tracking branch 'origin/master' into TDK
...
Conflicts:
src/cr0s/WarpDrive/WarpDrive.java
2014-09-07 18:01:00 +02:00
LemADEC
95cbc782a4
Code cleanup
...
Removing dead code (remains from untested features or not wanted in main
branch)
2014-09-07 17:47:13 +02:00
LemADEC
3d1125175b
Merge pull request #10 from Cr0s/beta
...
preparing next pull request
2014-09-07 17:34:47 +02:00
LemADEC
91f90f0526
Removed copy-paste mistake from mcmod.info
2014-09-07 17:26:08 +02:00
LemADEC
aadc23605b
Merge remote-tracking branch 'origin/master' into TDK
2014-09-07 17:20:18 +02:00
LemADEC
8696fae011
Mainframe wip
...
Added dedicated monitor for radar in mainframe script
Integrated radar into mainframe
Fixed confirmation question blocking events handling in mainframe script
Refactored mainframe script
2014-09-07 17:19:20 +02:00
LemADEC
492fb6f18e
Fixed protocol controller with invalid texture
...
Fixed protocol controller APIs to check parameters range
Updated protocol controller API to return current values instead of -1
when out of range (making easier LUA scripts)
2014-09-07 17:12:04 +02:00
LemADEC
c81e6ce89c
Radar API fix
...
Fixed radar getResultsCountto return -1 while scanning so we can
actually poll for scan progression
2014-09-07 17:09:27 +02:00
LemADEC
69a01f00e6
Fixed energy exploit
...
Fixed energy gain when using negative distance in jump core
2014-09-06 19:32:52 +02:00
LemADEC
cff8ed8c7e
Mainframe wip
...
Added support for numeric keypad in main menu
Added prototype radar support in mainframe
Fixed jump distance reset to 0 before changing it
Added configuration page for mining offset
Added prototype redstone support
Removed default value when previous one is 0
2014-09-06 19:28:42 +02:00
LemADEC
43653c9edd
Warp sound synchronisation fix
...
Fixed warp sound playing out of sync when toggling long/short jumps (and
other side effects)
Removed debug logs for that investigation
Fixed short jump warmup improperly divided by 3
Code cleanup
2014-09-05 01:56:47 +02:00
LemADEC
0ea114910b
Merge remote-tracking branch 'origin/master' into TDK
2014-09-04 03:40:27 +02:00
LemADEC
8b2a9499cb
Radar isolation revamp
...
Improved radar scan speed slightly on server side
Added configuration for radar isolation feature
Refactored isolation blocks handling
Updated isolation blocks scan to center 1 block above core (for better
buildings)
Added isolation level to right click on warpdrive core (and made it more
robust)
Removed isolation during warpdrive core cooldown
Reduced log spam in debug mode
2014-09-04 03:39:36 +02:00
LemADEC
050ce62004
Merge remote-tracking branch 'origin/master' into TDK
2014-09-04 02:43:12 +02:00
LemADEC
1a01d877fa
Logs cleanup
2014-09-03 02:18:21 +02:00
LemADEC
f0a21c2ff1
Camera registry fixes
...
Fixed camera registering 60s late
Fixed frequency packets spam
Refactored camera network sending
2014-09-03 01:09:39 +02:00
LemADEC
3b218f6503
Merge remote-tracking branch 'origin/master' into TDK
2014-09-02 00:43:03 +02:00
LemADEC
ff9c4a629c
Fixed reactor explosion condition & log
2014-09-02 00:31:51 +02:00
LemADEC
53082abc1e
Stabilisation fixes
...
Fixed lasercam failing to return result to Computer
Added particle booster fail safe mode on right click and jump when
invalid tile entity found
Added a few logs to investigate jump client/server desync
2014-09-02 00:28:53 +02:00
Cr0s
e958db34f2
Removed copy-paste mistake from mcmod.info
2014-08-30 03:41:10 +04:00
LemADEC
5c595e39b1
Integrated last changes
2014-08-29 19:22:39 +02:00
LemADEC
d70ce8c5b1
Merge remote-tracking branch 'origin/master' into TDK
2014-08-29 18:12:31 +02:00
LemADEC
c73f68569f
Disabling get_energy_max to keep client/server sync
2014-08-29 18:10:33 +02:00
LemADEC
832649b868
Fixing core support in mainframe
2014-08-29 17:52:56 +02:00
LemADEC
cdb2d3badd
Better support for core max energy
...
Added get_energy_max method to protocol to support related configuration
option
Code cleanup (magic numbers)
2014-08-29 16:09:43 +02:00
LemADEC
3ff59754d4
Fix crash with CC accessing registry during jump
...
Fixed a concurrent access to cores registry between CC and an ongoing
jump
Code cleanup
2014-08-29 16:08:32 +02:00
LemADEC
d68ceb0774
Merge pull request #9 from LemADEC/master
...
Merge
2014-08-29 05:33:17 +02:00
LemADEC
ddf25d308d
Fixed RF energy handling
...
Improved energy handling readability
Fixed RF energy receiving storing ~16x too much power
Fixed RF energy output consumming ~4x too much power
2014-08-29 04:39:45 +02:00
LemADEC
347be0d809
Power reactor fix
...
Fixed number entries not working in reactor LUA script
Code cleanup
2014-08-29 04:30:54 +02:00
LemADEC
8aa3fe71e1
Merge pull request #8 from LemADEC/master
...
Merging
2014-08-28 22:14:59 +02:00
LemADEC
36544fa1d5
Removing cloaking logs
2014-08-28 21:43:33 +02:00
Cr0s
ce3b6cca7f
Merge pull request #41 from LemADEC/master
...
IC2 reactor dup bug fix, more cloaking fixes
2014-08-28 17:16:03 +04:00
LemADEC
e1afb2822d
Fixing lost client proxy
2014-08-28 15:15:35 +02:00
LemADEC
de24ae7f7c
Cloaking fixes
...
Fixed cloak transitions between 2 cloaks
Fixed (un)cloaking placing block above/below world limit
Code cleanup
2014-08-28 15:07:20 +02:00
LemADEC
ce6aa1e99a
Another dup bug gone
...
Fixed dup bug with IC2 reactor chambers
Code cleanup
2014-08-27 22:10:21 +02:00
Cr0s
fa7c6dedd6
Removed experimental stuff: fixed NPE on launch
...
java.lang.NullPointerException
at net.minecraft.item.ItemStack.<init>(ItemStack.java:86)
at net.minecraft.item.ItemStack.<init>(ItemStack.java:81)
at cr0s.WarpDrive.WarpDrive.initIC2Recipes(WarpDrive.java:573)
at cr0s.WarpDrive.WarpDrive.postInit(WarpDrive.java:324)
2014-08-27 23:57:06 +04:00
Cr0s
5181537059
Merge pull request #40 from LemADEC/master
...
All fixes and stable/tested stuff
2014-08-27 20:20:07 +04:00
LemADEC
d6c78d3b49
Forgot that
2014-08-27 17:54:01 +02:00
LemADEC
2d2a8a12c4
Revert "Removing experimental/unstable/untested/debug stuff"
...
This reverts commit b76ec1d361
2014-08-27 17:52:47 +02:00
LemADEC
b76ec1d361
Removing experimental/unstable/untested/debug stuff
2014-08-27 17:36:43 +02:00
LemADEC
a026367d3c
Let's merge...
2014-08-27 16:40:13 +02:00
LemADEC
ebd2f81ac6
Merge branch 'Cr0s-master2'
2014-08-27 16:30:22 +02:00
LemADEC
37b0141393
Merge branch 'master' of https://github.com/Cr0s/WarpDrive into Cr0s-master2
...
Initial merge
Conflicts:
client/ClientProxy.java
src/assets/warpdrive/lang/en_US.lang
src/assets/warpdrive/lua/cloakingdevicecore/cloak1
src/assets/warpdrive/lua/cloakingdevicecore/cloak2
src/assets/warpdrive/lua/radar/ping
src/assets/warpdrive/lua/radar/scan
src/assets/warpdrive/textures/blocks/transporterTop.png
src/cr0s/WarpDrive/BlockAirGenerator.java
src/cr0s/WarpDrive/BlockLift.java
src/cr0s/WarpDrive/BlockRadar.java
src/cr0s/WarpDrive/BlockReactor.java
src/cr0s/WarpDrive/CloakChunkWatcher.java
src/cr0s/WarpDrive/EntityJump.java
src/cr0s/WarpDrive/GravityManager.java
src/cr0s/WarpDrive/PacketHandler.java
src/cr0s/WarpDrive/SpaceEventHandler.java
src/cr0s/WarpDrive/TileEntityLaser.java
src/cr0s/WarpDrive/TileEntityShipScanner.java
src/cr0s/WarpDrive/WarpDrive.java
src/cr0s/WarpDrive/WarpDriveConfig.java
src/cr0s/WarpDrive/WorldGenStation.java
src/cr0s/WarpDrive/api/IBreathingHelmet.java
src/cr0s/WarpDrive/block/BlockAir.java
src/cr0s/WarpDrive/block/BlockGas.java
src/cr0s/WarpDrive/command/DebugCommand.java
src/cr0s/WarpDrive/command/GenerateCommand.java
src/cr0s/WarpDrive/command/JumpgateCommand.java
src/cr0s/WarpDrive/data/CamRegistry.java
src/cr0s/WarpDrive/data/CloakManager.java
src/cr0s/WarpDrive/data/JumpgatesRegistry.java
src/cr0s/WarpDrive/data/TransitionPlane.java
src/cr0s/WarpDrive/data/WarpCoresRegistry.java
src/cr0s/WarpDrive/item/ItemWarpComponent.java
src/cr0s/WarpDrive/machines/BlockCamera.java
src/cr0s/WarpDrive/machines/BlockCloakingCoil.java
src/cr0s/WarpDrive/machines/BlockCloakingDeviceCore.java
src/cr0s/WarpDrive/machines/BlockLaserCam.java
src/cr0s/WarpDrive/machines/BlockMonitor.java
src/cr0s/WarpDrive/machines/BlockParticleBooster.java
src/cr0s/WarpDrive/machines/BlockPowerLaser.java
src/cr0s/WarpDrive/machines/BlockPowerReactor.java
src/cr0s/WarpDrive/machines/BlockShipScanner.java
src/cr0s/WarpDrive/machines/BlockTransporter.java
src/cr0s/WarpDrive/machines/TileEntityAbstractMiner.java
src/cr0s/WarpDrive/machines/TileEntityAirGenerator.java
src/cr0s/WarpDrive/machines/TileEntityCamera.java
src/cr0s/WarpDrive/machines/TileEntityCloakingDeviceCore.java
src/cr0s/WarpDrive/machines/TileEntityLaserReactorMonitor.java
src/cr0s/WarpDrive/machines/TileEntityLaserTreeFarm.java
src/cr0s/WarpDrive/machines/TileEntityLift.java
src/cr0s/WarpDrive/machines/TileEntityMiningLaser.java
src/cr0s/WarpDrive/machines/TileEntityParticleBooster.java
src/cr0s/WarpDrive/machines/TileEntityPowerLaser.java
src/cr0s/WarpDrive/machines/TileEntityPowerReactor.java
src/cr0s/WarpDrive/machines/TileEntityProtocol.java
src/cr0s/WarpDrive/machines/TileEntityRadar.java
src/cr0s/WarpDrive/machines/TileEntityReactor.java
src/cr0s/WarpDrive/machines/TileEntityTransporter.java
src/cr0s/WarpDrive/machines/WarpChunkTE.java
src/cr0s/WarpDrive/machines/WarpEnergyTE.java
src/cr0s/WarpDrive/machines/WarpTE.java
src/cr0s/WarpDrive/render/CameraOverlay.java
src/cr0s/WarpDrive/render/ClientCameraUtils.java
src/cr0s/WarpDrive/render/EntityCamera.java
src/cr0s/WarpDrive/world/EntitySphereGen.java
src/cr0s/WarpDrive/world/HyperSpaceWorldGenerator.java
src/cr0s/WarpDrive/world/SpaceProvider.java
src/cr0s/WarpDrive/world/SpaceWorldGenerator.java
src/cr0s/WarpDrive/world/WorldGenStructure.java
2014-08-27 16:29:30 +02:00
LemADEC
060b907b44
Reactor fix at chunloading
...
Updated Reactor script to restore its parameters at boot
Updated Reactor script to support warpcore (partial)
2014-08-27 15:34:57 +02:00
Cr0s
97df0feb29
Fixed regression that broke IC2 reactors and some machines
...
IC2 reactors was fixed in 86e96a43ee
2014-08-27 16:53:59 +04:00
LemADEC
da93b5c2b2
Reactor recipe fix
2014-08-26 22:10:51 +02:00
LemADEC
72ed352b89
Code cleanup
2014-08-26 22:10:39 +02:00
