Commit graph

240 commits

Author SHA1 Message Date
Cr0s
f02ca71a70 Revert "Merging DarkholmeTenk & my branches back to main" 2014-08-08 15:29:16 +04:00
Cr0s
0a30aa3858 Merge pull request #36 from LemADEC/master
Merging DarkholmeTenk & LemADEC to Cr0s/WarpDrive/master
2014-08-08 15:04:36 +04:00
LemADEC
a2ce74e228 Merge pull request #3 from LemADEC/Cr0s-master
Merge the merge, back on master
2014-08-07 11:37:12 +02:00
LemADEC
da53d13792 Merge branch 'master' of https://github.com/Cr0s/WarpDrive into Cr0s-master
Conflicts:
	README.md
	src/assets/warpdrive/textures/blocks/camOverlay.png
	src/assets/warpdrive/textures/blocks/lasercamOverlay.png
	src/cr0s/WarpDrive/BlockAir.java
	src/cr0s/WarpDrive/CloakChunkWatcher.java
	src/cr0s/WarpDrive/CloakManager.java
	src/cr0s/WarpDrive/EntityCamera.java
	src/cr0s/WarpDrive/EntityJump.java
	src/cr0s/WarpDrive/JumpGatesRegistry.java
	src/cr0s/WarpDrive/PacketHandler.java
	src/cr0s/WarpDrive/SpaceEventHandler.java
	src/cr0s/WarpDrive/TileEntityMiningLaser.java
	src/cr0s/WarpDrive/TileEntityProtocol.java
	src/cr0s/WarpDrive/TileEntityRadar.java
	src/cr0s/WarpDrive/TileEntityReactor.java
	src/cr0s/WarpDrive/WarpCoresRegistry.java
	src/cr0s/WarpDrive/WarpDrive.java
	src/cr0s/WarpDrive/WarpDriveConfig.java
	src/cr0s/WarpDrive/machines/BlockCloakingCoil.java
	src/cr0s/WarpDrive/machines/BlockCloakingDeviceCore.java
	src/cr0s/WarpDrive/machines/BlockProtocol.java
	src/cr0s/WarpDrive/machines/BlockReactor.java
	src/cr0s/WarpDrive/machines/BlockShipScanner.java
	src/cr0s/WarpDrive/machines/TileEntityCloakingDeviceCore.java
	src/cr0s/WarpDrive/machines/TileEntityLaser.java
	src/cr0s/WarpDrive/machines/TileEntityShipScanner.java

Removed dead files
Fixed registry check for overlapping field
2014-08-07 11:31:39 +02:00
LemADEC
3433b3ad9a Merge last transporters fixes 2014-08-07 02:46:40 +02:00
LemADEC
d4f1459eb7 Reactor explosion revision
Nerfed block deletion around reactor explosion
Added TnTs to reactor explosion for a more (minecraft) natural feeling
Updated reactor laser explosion resistance
2014-08-07 02:46:00 +02:00
LemADEC
54a116a977 Merge pull request #1 from LemADEC/develop
Let's merge...
2014-08-07 02:37:51 +02:00
LemADEC
11621b6e50 Fixed reactor recipes 2014-08-06 00:53:47 +02:00
LemADEC
3b69bf2a0b Reactor balance in 'off' state + various fixes
Updated reactor to remain active after chunk (un)loading
Fixed reactor energy output too low at high instability
Reduced reactor initial production
Adjusted number of laser packets per cycle
Improved reactor robustness (protection for negative energy, etc.)
Fixed reactor API so computer gets current parameters
Fixed reactor API returning output rate per cycle instead of per tick
Refactored reactor mekanism (mode encoding, random number,  energy
generation & side textures refresh)
2014-08-06 00:53:21 +02:00
LemADEC
0f8bc14dec Configuration cleanup
Fixed AtomicScience support following its integration into
ResonantInduction
Extended Deuterium support when silk-touch mining (untested)
Added reactor recipes for IC2/TDK
2014-08-05 22:55:09 +02:00
LemADEC
ff65382235 Reactor balance & fixes
Updated reactor to increase power with instabilities so players want to
take the risk
Updated reactor offline state to remain unstable and loose its inerty
Fixed reactor texture glitches when exceeding limits (too unstable,
etc.)
Added reactor effective energy output for easier monitoring
Removed reactor usage as a battery (wip)
Minor fixes
2014-08-04 10:35:43 +02:00
LemADEC
b633953e51 Drowning nerf
Removed drowning air display (not working)
Updated drowning damage back to 2 in all cases
2014-08-04 10:32:48 +02:00
LemADEC
923ab61b9d oups...
Fixed reactor texture glitch
2014-08-03 20:32:46 +02:00
Cr0s
38872dab25 Merge pull request #35 from drpepper240/lasers
scanner laser improvement
2014-08-03 18:02:26 +04:00
LemADEC
8d919739dd Merge & cleanup, better oxygen
Merged Reactor & latests fixes
Updated a few functions to static
Removed dead code (casts, imports, etc.)
Fixed overlapped properties with local variables/parameters
Fixed parameters modifications
Added a few null-check
Added missing @Override

Updated WarpDrive block description to WarpDriveCore (players were
confused)
Updated cloaking core (removing frequency, add enable state)
Fixed Peripheral.equals checks
Fixed Camera falling
Added dirty fix for IC2 support in new reactor
Disabled oxygen for creative players and dead/invulnerable entities
Added tentative oxygen level display, increased drown damage
2014-08-03 14:05:04 +02:00
drPepper
2d191efb91 scanner laser improvement 2014-08-03 14:03:39 +04:00
Cr0s
ba6f35cce0 Merge pull request #34 from drpepper240/patch-1
shipscanner output fix
2014-08-02 17:35:07 +04:00
drpepper240
bb0af7baad ShipScanner output fix 2014-08-02 16:48:55 +04:00
Cr0s
72dde31aba Merge pull request #33 from drpepper240/master
BOLON fix
2014-08-02 14:54:49 +04:00
ZLOFENIX
0e74aae516 Merge pull request #9 from drpepper240/master
BOLON fix
через жопу и нулевую мету от капсулы воздуха
2014-08-02 14:49:09 +04:00
drPepper
43e7bc034e BOLON fix 2014-08-02 13:18:56 +04:00
drPepper
bb06233b24 Merge remote-tracking branch 'upstream/master' 2014-08-02 11:46:10 +04:00
drPepper
9658d0187e Merge branch 'ScannerFix' 2014-08-02 11:41:27 +04:00
Cr0s
a1ff2a7a3c Merge pull request #32 from ZLOFENIX/master
Merge pull request #8 from drpepper240/cameraFix
2014-07-31 20:42:57 +04:00
ZLOFENIX
0696551989 Merge pull request #8 from drpepper240/cameraFix
Camera fix
2014-07-31 20:36:27 +04:00
Cr0s
601daf192f Merge pull request #31 from drpepper240/cameraFix
Camera fix
2014-07-31 19:34:50 +04:00
drPepper
180371cda2 fixed buttons and GUI 2014-07-31 19:13:37 +04:00
drPepper
a98429e24a changed controls 2014-07-31 18:21:16 +04:00
Cr0s
c0b8825090 Merge branch 'pr/30' 2014-07-31 18:08:44 +04:00
Cr0s
a79341916e Removed ClientProxy.java 2014-07-31 18:08:33 +04:00
ZLOFENIX
08f5082900 Merge pull request #7 from drpepper240/ScannerFix
Scanner fix
пеппер нерфорцикач
2014-07-31 17:39:44 +04:00
ZLOFENIX
b9d3660527 Merge pull request #6 from drpepper240/patch-1
scanning laser fix
2014-07-31 16:59:37 +04:00
drPepper
0cf81874b4 camera aiming fix 2014-07-26 22:07:45 +04:00
drPepper
b1e31a1218 nerfocircus 2014-07-26 18:55:58 +04:00
LemADEC
4252ba7b1c Energy IC2/RF conversion fix, mining laser cleanup, radar initial fix
- Fixed RF consumption giving ~16x more energy than expected (core &
cloaks energy usage are back on track)
- Fixed RF consumption leak when block was almost full
- Fixed particle booster not updating it's side texture (energy level)
- Fixed mininglaser loosing items when chest is full (it'll now drops
the extras and stop the mining)
- Fixed mininglaser & radar exceptions on bad arguments from
ComputerCraft scripts
- Fixed radar to actually scan
- Fixed mininglaser logic & timings, added a warm-up phase
- Fixed mininglaser ignoring glowstone in ore-only mode
- Improved beam FX to be generic, static (missed merge) and without log
spam
- Improved laser lift to go through signs
- Improved mininglaser to show its state with right clicking and
textures
- Improved air propagation lag (20 -> 40 ticks rate)
- Updated radar to detect all cores (previously you had to have a
controller connected)
- Updated mininglaser to match BuildCraft quarry speed and power usage
- Updated mininglaser to scan in spirals instead of stripes and show the
current layer scan
- Updated mininglaser to evaporate all liquids and stop on forcefields
- Updated mininglaser to retry same layer until it's done, notably
flowing liquids
- Added integration with AdvancedRepulsionSystem
- Added mininglaser mine & stop scripts, including support for LAN wire
connected laser (just place a advanced computer next to a mining laser
and wire all others to that one)
- Added radar ping & scan scripts, very basic for now
2014-07-26 16:21:48 +02:00
LemADEC
3eaad47212 Bug fixing and cleanup after massive merge
- Fixed air generation & rendering
- Merged translation support and other changes since initial merging
- Improved performances (linkedlist vs arraylist, etc.)
- Fixed memory leaks (cloaking notably)
- Fixed cloaking coils remaining visible, etc.
- Fixed oxygen not required in space
- Fixed entity respiration corrupting world blocks
- Fixed ship 'deleted' when jumping too high in space or hyperspace
- Fixed /space command from command blocks and console
- Fixed no collision when jumping below bedrock or above sky limit
- Fixed controller lua script to get size after jump
- Fixed insane collision damages
- Improved logs spam & readability (partial)
- Improved performance on Moon/gaz world generation, gaz/air rendering,
cloaked players, etc.
- Improved uncloaking special effect
- Updated moons to be more frequent
- Updated collision damages to be done at target on multiple points
- Updated asteroid fields to be more frequent, use more height and have
a spheric shape
- Updated asteroids to be twice more corrupted
- Updated ship and cloaking size limit from 100 to 127
- Added overworld world border, initial TransitionPlane support
and more...
2014-07-26 16:18:43 +02:00
LemADEC
0a1ab5d9a1 assets merging
Merged assets from all known branches
Added custom lua script preloaded on computers
Added custom warp sounds 10 & 30s by Deadalus Project (previous was only
4s)
Added debug texture for air propagation
Cleaned up client overlays for cameras
etc.
2014-07-26 16:10:04 +02:00
LemADEC
52fe90efa1 Adding mcmod.info 2014-07-26 15:58:02 +02:00
LemADEC
195a2f2be8 Initial commit
Merged known branches of WarpDrive
2014-07-26 15:56:47 +02:00
drPepper
3c63085eef kostylee 2014-07-26 17:10:42 +04:00
drPepper
e22dd05dac scanning laser minor fix 2014-07-26 16:25:29 +04:00
drpepper240
7401f87b8b scanning laser fix 2014-07-25 21:34:29 +04:00
ZLOFENIX
21756cb26e Mudaque 2014-07-20 23:02:20 +04:00
ZLOFENIX
c135e46691 Mudilou2 2014-07-20 22:47:08 +04:00
ZLOFENIX
65cd2bbf2b Mudilou1 2014-07-20 22:43:54 +04:00
ZLOFENIX
81332822e9 Merge pull request #5 from drpepper240/patch-2
Explosives deploying restriction
2014-07-20 21:20:49 +04:00
drpepper240
44b5f242dc deployer fix 2014-07-20 21:20:14 +04:00
drpepper240
013d85453e deployer fix
Duplicated CC computers and turtles can make ComputerCraft unusable until the server restarts.
2014-07-20 16:09:23 +04:00
drpepper240
d51b8b23f0 small fix 2014-07-17 17:00:37 +04:00
ZLOFENIX
6a39fe5863 Merge pull request #4 from drpepper240/patch-1
ShipScanner fix
2014-07-17 16:59:48 +04:00