Commit graph

564 commits

Author SHA1 Message Date
LemADEC
df594ab0c8 Laser lift fixes
Fixed laser lift support for sign right above or below it
Fixed laser lift still working with only 1 air block below it
Fixed laser lift 'down' moving entity below target
Fixed laser lift not consuming energy
Fixed laser lift moving entities without beam
2014-09-19 01:01:37 +02:00
LemADEC
0f08cc7162 Fixing the laser refactorisation... 2014-09-19 00:12:31 +02:00
LemADEC
96ec9c2eda Merging... 2014-09-18 23:07:35 +02:00
LemADEC
7b99c34054 Merge remote-tracking branch 'origin/master' into TDK
Conflicts:
	src/cr0s/WarpDrive/WarpDrive.java
2014-09-15 12:06:25 +02:00
LemADEC
6940f8e402 Fixed warpcore energy % display 2014-09-15 03:36:28 +02:00
LemADEC
1605f3ec7c Refactored beam packet sender 2014-09-15 03:30:44 +02:00
LemADEC
40086835b1 Laser refactoring & fixes
Fixed laser tile entity properties to be private
Fixed laser accessing world object from CC thread
Updated laserSend event to include beam's frequency and energy
Updated laser beam color to be more varied
Updated laser emitBeam to return true/false
Updated laser camFreq to return null unless it's a Laser+cam block
2014-09-14 17:27:12 +02:00
LemADEC
7b54cc48dd Refactored LaserTargetting packet sender 2014-09-14 17:12:06 +02:00
LemADEC
bca3975ad2 Debug log cleanup
Removed a few debug logs no longer needed
2014-09-14 05:59:52 +02:00
LemADEC
d5db813508 Tentative fix for lasercam 'invalid' camera 2014-09-14 05:59:15 +02:00
LemADEC
848ec406da Laser lift minor tweaks
Updated laser beam to go up when laser lift is moving up
Code cleanup
2014-09-14 05:58:01 +02:00
LemADEC
687ced4225 Better laserSend event
Added bream frequency and energy to laserSend event
2014-09-14 05:56:46 +02:00
LemADEC
a423c6d180 Fix scanner not accepting power 2014-09-14 05:55:18 +02:00
LemADEC
55519c4eb1 Code cleanup 2014-09-11 02:49:15 +02:00
LemADEC
0aaf13be20 Mainframe Robustness fixes 2014-09-11 02:48:56 +02:00
LemADEC
d988bd61a5 Fix mainframe initial boot failing with monitors 2014-09-07 20:52:10 +02:00
LemADEC
5c49207bec Merge remote-tracking branch 'origin/master' into TDK 2014-09-07 20:29:30 +02:00
LemADEC
35e3f04e64 Fixed mainframe script
Fixed warpcore support in mainframe script
Finalized radar map in mainframe script
2014-09-07 20:29:04 +02:00
LemADEC
7689e3b68c Fixed controller script showing ratio instead of % 2014-09-07 18:17:23 +02:00
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