esteldunedain
|
765ae4ee64
|
Merge branch 'master' into tabCleanup
Conflicts:
addons/explosives/functions/fnc_addClacker.sqf
addons/explosives/functions/fnc_detonateExplosive.sqf
addons/explosives/functions/fnc_getPlacedExplosives.sqf
addons/explosives/functions/fnc_openDetonateUI.sqf
addons/explosives/functions/fnc_openPlaceUI.sqf
addons/explosives/functions/fnc_openTransmitterUI.sqf
addons/explosives/functions/fnc_openTriggerSelectionUI.sqf
addons/explosives/functions/fnc_placeExplosive.sqf
addons/explosives/functions/fnc_place_Approve.sqf
addons/explosives/functions/fnc_setPosition.sqf
|
2015-04-07 15:00:56 -03:00 |
|
commy2
|
98f7125171
|
function to return light intensity recieved from another object
|
2015-04-07 18:54:53 +02:00 |
|
commy2
|
deabbcd840
|
add function that returns config properties of a vehicles light
|
2015-04-07 15:43:23 +02:00 |
|
commy2
|
5df25cf44d
|
function to return all turned on lights of any objects
|
2015-04-07 15:06:27 +02:00 |
|
commy2
|
0d126dc562
|
function to return object's lights
|
2015-04-07 14:44:34 +02:00 |
|
commy2
|
bb8762f4b9
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-07 13:55:09 +02:00 |
|
commy2
|
ad5aad60c7
|
fix: ambient brightness can return values greater 1
|
2015-04-07 13:54:33 +02:00 |
|
bux578
|
9ce2e38814
|
removed <orignal> language entry
|
2015-04-07 09:27:26 +02:00 |
|
KoffeinFlummi
|
8d5bdd2c01
|
Revert "fix shitty initSpeed definitions breaking SD mags, fix #182"
This reverts commit 55f49eaa1c .
|
2015-04-07 09:04:17 +02:00 |
|
jaynus
|
99008ac729
|
Merge pull request #332 from KoffeinFlummi/medicalBox
Added: Generic placeholder medical box.
|
2015-04-06 19:09:16 -07:00 |
|
jaynus
|
a744896b20
|
Fixed: jaynus fucked up.
|
2015-04-06 18:51:08 -07:00 |
|
jaynus
|
34444ebb32
|
Fixed: github merge error fixed.
|
2015-04-06 18:37:05 -07:00 |
|
jaynus
|
27caff5564
|
Fixed: Add platform velocity to FCS calculations; resolves #361
|
2015-04-06 18:36:39 -07:00 |
|
jaynus
|
446a30e4fc
|
Merge pull request #352 from KoffeinFlummi/comancheFixes
Goes along with FCS fixes, merging quickly due to overall fixes.
|
2015-04-06 15:07:09 -07:00 |
|
jaynus
|
4a8f24b59c
|
Merge pull request #356 from KoffeinFlummi/fcsMadness
Fcs madness
|
2015-04-06 15:00:24 -07:00 |
|
jaynus
|
e0605f9e81
|
Remove default hint for FCS but play sound, Resolves #317
|
2015-04-06 14:57:07 -07:00 |
|
jaynus
|
7fa8365d51
|
Remove debug, new Release build of extension.
|
2015-04-06 14:50:22 -07:00 |
|
esteldunedain
|
b20f3e5b81
|
Fix for the fcs
|
2015-04-06 18:43:32 -03:00 |
|
esteldunedain
|
09461d94ef
|
Rewritten changeProjectileDirection
|
2015-04-06 18:10:17 -03:00 |
|
esteldunedain
|
aec9962121
|
Fix changeProjectileDirection
|
2015-04-06 18:02:08 -03:00 |
|
esteldunedain
|
35129a7a41
|
Debug stuff for the velocity correction
|
2015-04-06 17:37:18 -03:00 |
|
Garth "L-H" de Wet
|
a7df723003
|
Merge pull request #353 from KoffeinFlummi/explosiveInteraction
Changed the tabs to 4 spaces. Hopefully.
|
2015-04-06 22:31:01 +02:00 |
|
Garth L-H de Wet
|
513ab25f54
|
Merge branch 'master' into explosiveInteraction
Conflicts:
addons/explosives/functions/fnc_placeExplosive.sqf
|
2015-04-06 22:30:27 +02:00 |
|
Garth L-H de Wet
|
9d7d71b1b1
|
Changed the tabs to 4 spaces. Hopefully.
|
2015-04-06 22:20:11 +02:00 |
|
Garth "L-H" de Wet
|
e0b4efd9f1
|
Merge pull request #280 from KoffeinFlummi/explosiveInteraction
Explosive interaction
|
2015-04-06 22:12:04 +02:00 |
|
Garth L-H de Wet
|
44c597f7c5
|
Explosives, 2 spaces to 4 space tab.
|
2015-04-06 22:10:00 +02:00 |
|
jaynus
|
acf683e621
|
Call every 10th of a second.
|
2015-04-06 12:58:53 -07:00 |
|
jaynus
|
906612f954
|
Fixed: Gunner FOV, explosive rounds and FPS drop.
|
2015-04-06 12:54:06 -07:00 |
|
esteldunedain
|
2dbe438bf3
|
Merge branch 'decimals' of github.com:KoffeinFlummi/ACE3 into decimals
Conflicts:
addons/common/functions/fnc_numberToString.sqf
|
2015-04-06 16:14:06 -03:00 |
|
esteldunedain
|
04e9f28734
|
Make function handle negative numbers
|
2015-04-06 16:12:38 -03:00 |
|
commy2
|
2ef05577c7
|
slightly improve nts function
|
2015-04-06 21:09:20 +02:00 |
|
commy2
|
c1799616c7
|
add function to convert numbers to string
|
2015-04-06 20:47:11 +02:00 |
|
jaynus
|
d6cf07a3b6
|
Changed: FCS update was not being delayed for laser. Delay of 0.5s added.
|
2015-04-06 11:44:17 -07:00 |
|
Glowbal
|
bdb5c8e728
|
Merge pull request #349 from KoffeinFlummi/medicalBugFixes
Exit displayPatientInformation PFH when a different selection is selected.
|
2015-04-06 19:49:12 +02:00 |
|
Glowbal
|
4c6dad69f9
|
Should fix #347. Could not reproduce but this at least fixes some issues (which most likely caused the error)
|
2015-04-06 19:43:27 +02:00 |
|
jaynus
|
1bb6be5654
|
Cleaning up of all tabs in source code files.
|
2015-04-06 09:22:43 -07:00 |
|
jaynus
|
bdcec243a8
|
Changed: Comanche Gatling HEDP effects and dispersion.
|
2015-04-06 09:14:56 -07:00 |
|
PabstMirror
|
c1abb2669d
|
#340 - Fix stringtables
|
2015-04-06 11:03:04 -05:00 |
|
jaynus
|
c3dbcf1351
|
increase frequency of laser update.
|
2015-04-06 07:40:20 -07:00 |
|
commy2
|
796a430292
|
Merge pull request #326 from KoffeinFlummi/VectorFOSfix
Fix for Vector Fall-of-Shot display
|
2015-04-06 16:20:13 +02:00 |
|
commy2
|
1e497c228c
|
switch sides of add/drop left/right
|
2015-04-06 16:18:59 +02:00 |
|
Glowbal
|
1c28e82725
|
Merge pull request #341 from KoffeinFlummi/medicalFixes
Fixes for bodybag and support for radio mods in medical
|
2015-04-06 16:17:08 +02:00 |
|
commy2
|
ebd1e555a3
|
fix: derp when switching control numbers
|
2015-04-06 16:07:52 +02:00 |
|
Glowbal
|
76ad6b8294
|
Added missing main actions
|
2015-04-06 15:46:50 +02:00 |
|
Glowbal
|
ce4cdd3722
|
staged bodybag fixes
|
2015-04-06 15:11:54 +02:00 |
|
Glowbal
|
661d93e82c
|
Working commit
|
2015-04-06 14:51:17 +02:00 |
|
Glowbal
|
8e176eff55
|
Fixed treatment locations
|
2015-04-06 14:32:37 +02:00 |
|
Glowbal
|
43b3190202
|
config fix
|
2015-04-06 14:14:00 +02:00 |
|
Glowbal
|
10a1108aae
|
Added support for customizable treatment location limitation
|
2015-04-06 14:11:10 +02:00 |
|
Glowbal
|
2657677bd8
|
Added support for TFR/ACRE on unconscious
|
2015-04-06 14:09:59 +02:00 |
|