Commit Graph

2181 Commits

Author SHA1 Message Date
Raymix
1b19df0cba another math issue, hopefully last 2017-10-22 18:49:47 +01:00
Raymix
25528b59c3 revert location changes + fix math in rads calc 2017-10-22 18:39:29 +01:00
Raymix
faa26dfe5a remove diag_log, oops 2017-10-22 17:39:18 +01:00
Raymix
a6aade38b9 disable geiger by default 2017-10-22 17:28:51 +01:00
Raymix
a3ff403d2c change back 2017-10-22 17:18:52 +01:00
Raymix
a7f5f1ea8f Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-10-22 17:16:30 +01:00
Raymix
e996d78695 Radioactive sickness calc 2017-10-22 17:15:58 +01:00
DESKTOP-UH65DCE\MusTanG
3e7a62560a cfglocations setVariable correction 2017-10-22 09:41:00 -05:00
vbawol
1bf1df28f2 Merge pull request #943 from morgoth0/patch-10
Fix path for geiger buttons
2017-10-22 09:27:24 -05:00
Grahame
81855104e9 Fix path for geiger buttons 2017-10-22 10:15:30 -04:00
He-Man
bf4cd25dcd Readded lost changes 2017-10-22 16:05:57 +02:00
Raymix
02e4b822e4 conflicts 2017-10-22 00:10:45 +01:00
Raymix
8b5f896424 Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-10-21 23:52:37 +01:00
Raymix
a893e7aa74 Geiger counter GUI release 2017-10-21 23:35:53 +01:00
He-Man
d3acc2683b Merge pull request #940 from morgoth0/patch-9
Add code to handle enable/disable vehicle TIE
2017-10-21 23:13:22 +02:00
He-Man
00447e38f6 Merge pull request #941 from morgoth0/patch-8
Add variable to control accelerated HTA Loss
2017-10-21 23:11:45 +02:00
Grahame
0ff57e294e Variable handling of accelerated HTA loss 2017-10-21 16:41:31 -04:00
Grahame
035ff7aa09 Added variable handling of accelerated HTA loss 2017-10-21 16:40:44 -04:00
Grahame
4fb7b9df98 Add variable to control accelerated HTA loss 2017-10-21 16:38:58 -04:00
Grahame
6851716f1b Add code to handle enable/disable vehicle TIE 2017-10-21 15:37:01 -04:00
Grahame
d896c57af9 Add code to handle enable/disable vehicle TIE 2017-10-21 15:35:28 -04:00
Grahame
e951b12fe7 Add code to handle enable/disable vehicle TIE 2017-10-21 15:34:41 -04:00
Grahame
867da0aa91 Add code to handle enable/disable vehicle TIE 2017-10-21 15:33:50 -04:00
Grahame
e4ec7b1d87 Add code to handle enable/disable vehicle TIE 2017-10-21 15:32:35 -04:00
Grahame
0e168564fa Add new var to enable/disable vehicle TIE
Default is true
2017-10-21 15:27:21 -04:00
vbawol
414013497c increase loot bias for bunkers 2017-10-21 06:08:39 -05:00
DirtySanchez
555e350b5d dynamic trader brain marker corrections
old marker handlers removed and replaced with global marker sets
2017-10-20 23:45:14 -05:00
vbawol
2ce47c3a3f comment 2017-10-20 17:05:01 -05:00
vbawol
ae581880a4 fix possible random var collisions 2017-10-20 17:04:32 -05:00
vbawol
e14a730eda make sure this only runs once 2017-10-20 16:44:30 -05:00
He-Man
2d1835d455 SnapPoints for Floors 2017-10-20 23:15:17 +02:00
vbawol
2a1c909068 bunker updates
reduce bunker size a tad
2017-10-20 14:39:06 -05:00
vbawol
4003e6d49c bunker update
revert to normal object for first spawn
inrease size by 10
2017-10-20 14:38:00 -05:00
vbawol
c51b21bd24 revert back to simple object 2017-10-20 14:19:50 -05:00
DirtySanchez
5427db38fe mapOnZoomSetMarkerSize upgrades to maintain preset size scaling
all markers now scaled based on sizing desired in the cfgMarkerSets.
Adjustment of 2.25 to the mapScale was added to achieve smaller markers sooner and maintain non cluttered map markers
2017-10-20 13:49:16 -05:00
vbawol
3307fdc54c move bunker spawn to server init 2017-10-20 12:03:43 -05:00
vbawol
eee45dc682 use atl for spawning 2017-10-20 11:29:09 -05:00
DirtySanchez
6857111a02 remove comments, edit high value 2017-10-20 11:17:42 -05:00
DirtySanchez
9297fa539e onZoomMarkerScaling upgrade
use better mapScale value management and calculation
2017-10-20 11:15:09 -05:00
vbawol
f202217f46 removed static BarbedWire_EPOCH from BE filter
not needed as client should now be spawning ghost preview or sim
2017-10-20 10:14:55 -05:00
vbawol
27ef146313 make use of config based snap points 2017-10-20 10:08:52 -05:00
vbawol
ec756c3134 test using normal object for first spawn 2017-10-20 10:03:32 -05:00
vbawol
7c3ea0e936 convert memory points to config 2017-10-20 10:03:06 -05:00
vbawol
760547789f item interaction fixes
Allow eating of all seeds
Fixed no effect from nanite injector, nanite cream, nanite pills, iodide
pills
Provide feedback when attempting to use morphine when you dont need it.

NOTE:
when using Default as parent class InteractAction defaults to ammo
repack = 0
interactActions 1,2 ,6,7,8,9 are all do the same thing via
_unifiedInteract function
2017-10-20 08:06:41 -05:00
DirtySanchez
2148634c58 add barbed wire sim and ghost 2017-10-20 08:04:58 -05:00
vbawol
f9e4e51d55 add looting of Satellite with sledge hammer 2017-10-20 07:30:12 -05:00
vbawol
0bb4c7f985 fix ah error 2017-10-20 06:51:09 -05:00
DirtySanchez
2f6e0bf4c6 snapping corrections and direction lock for similar constructions
Add direction lock.
If direction lock it only allows 0 and 180 degrees adjustment.
Will force 90 to 180 an 270 to 0
This keeps all snaps in proper order during tests
2017-10-20 00:50:22 -05:00
DirtySanchez
834d8bcb40 admin panel update
single out LandVehicle, Air, Ship and Tanks only for vehicle markers.
much better performance toggling vehicle markers on
2017-10-19 22:39:52 -05:00
DirtySanchez
ca2a7acfa3 2nd correction 2017-10-19 21:58:07 -05:00