|
|
1dcff94ec7
|
Remove hitpart from bandage action name
Since the context of the interaction menu makes it clear what body part
you mean anyways, this is unnecessary.
|
2015-04-08 07:35:31 +02:00 |
|
|
|
5bd1ee7ecd
|
Do not use a treshold for unassigned damage.
|
2015-04-08 07:21:34 +02:00 |
|
|
|
ed3ac637d2
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2015-04-07 19:19:46 -03:00 |
|
|
|
2f4335d3c2
|
#344 - Ignore missing ace_serverconfig on client
|
2015-04-07 17:14:27 -05:00 |
|
|
|
d1b8595c0e
|
light intensity from object: handle campfires
|
2015-04-07 23:02:54 +02:00 |
|
|
|
d060b13bbe
|
#86 - Stretch gps info box to support 8 digits
|
2015-04-07 15:47:12 -05:00 |
|
|
|
6b0fb84f65
|
Cleanup / Headers
|
2015-04-07 15:01:44 -05:00 |
|
|
|
88a5519465
|
cache the frames
|
2015-04-07 21:42:08 +02:00 |
|
|
|
2ad9193475
|
Use DrawIcon for map tools
|
2015-04-07 14:38:35 -05:00 |
|
|
|
14718eb5b4
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-07 21:22:21 +02:00 |
|
|
|
d825505aa0
|
cache light config properties
|
2015-04-07 21:22:00 +02:00 |
|
|
|
14906c68c0
|
Merge pull request #374 from KoffeinFlummi/medicalImprovements
Medical improvements
|
2015-04-07 21:07:28 +02:00 |
|
|
|
ffbe9f0c71
|
Setting for getting rid of hitpoint damage after adv medical damage
|
2015-04-07 21:06:48 +02:00 |
|
|
|
ba618a69ec
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-07 20:54:45 +02:00 |
|
|
|
722c2af4dc
|
lightIntensity, handle soldier flashlights
|
2015-04-07 20:54:25 +02:00 |
|
|
|
c823826f17
|
Merge branch 'master' into medicalImprovements
|
2015-04-07 20:53:24 +02:00 |
|
|
|
2b341c2a8b
|
left over CSE function calls removed
|
2015-04-07 20:50:44 +02:00 |
|
|
|
545014b073
|
missing return value
|
2015-04-07 20:47:36 +02:00 |
|
|
|
ac3bda3135
|
improvements to displayPatientInformation. Bandaged wounds should be more clear now
|
2015-04-07 20:19:32 +02:00 |
|
|
|
04d94bb7be
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2015-04-07 15:01:53 -03:00 |
|
|
|
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 |
|
|
|
526e24f133
|
formatting
|
2015-04-07 19:56:54 +02:00 |
|
|
|
3d82cb8eac
|
Removed deprecated onTreatmentCompleted event
|
2015-04-07 19:54:24 +02:00 |
|
|
|
d34cfdb003
|
fix: day laser when being captured
|
2015-04-07 19:38:19 +02:00 |
|
|
|
7fb3ac6740
|
Added _x_ca suffixes to all item pictures
|
2015-04-07 19:16:56 +02:00 |
|
|
|
98f7125171
|
function to return light intensity recieved from another object
|
2015-04-07 18:54:53 +02:00 |
|
|
|
deabbcd840
|
add function that returns config properties of a vehicles light
|
2015-04-07 15:43:23 +02:00 |
|
|
|
5df25cf44d
|
function to return all turned on lights of any objects
|
2015-04-07 15:06:27 +02:00 |
|
|
|
0d126dc562
|
function to return object's lights
|
2015-04-07 14:44:34 +02:00 |
|
|
|
bb8762f4b9
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-07 13:55:09 +02:00 |
|
|
|
ad5aad60c7
|
fix: ambient brightness can return values greater 1
|
2015-04-07 13:54:33 +02:00 |
|
|
|
9ce2e38814
|
removed <orignal> language entry
|
2015-04-07 09:27:26 +02:00 |
|
|
|
8d5bdd2c01
|
Revert "fix shitty initSpeed definitions breaking SD mags, fix #182"
This reverts commit 55f49eaa1c.
|
2015-04-07 09:04:17 +02:00 |
|
|
|
99008ac729
|
Merge pull request #332 from KoffeinFlummi/medicalBox
Added: Generic placeholder medical box.
|
2015-04-06 19:09:16 -07:00 |
|
|
|
a744896b20
|
Fixed: jaynus fucked up.
|
2015-04-06 18:51:08 -07:00 |
|
|
|
34444ebb32
|
Fixed: github merge error fixed.
|
2015-04-06 18:37:05 -07:00 |
|
|
|
27caff5564
|
Fixed: Add platform velocity to FCS calculations; resolves #361
|
2015-04-06 18:36:39 -07:00 |
|
|
|
12493f8595
|
Improved wounds configuration (missing maxDamage values added)
|
2015-04-07 00:57:05 +02:00 |
|
|
|
c7549a13a4
|
Improved pain reduction
|
2015-04-07 00:41:53 +02:00 |
|
|
|
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 |
|
|
|
4a8f24b59c
|
Merge pull request #356 from KoffeinFlummi/fcsMadness
Fcs madness
|
2015-04-06 15:00:24 -07:00 |
|
|
|
e0605f9e81
|
Remove default hint for FCS but play sound, Resolves #317
|
2015-04-06 14:57:07 -07:00 |
|
|
|
7fa8365d51
|
Remove debug, new Release build of extension.
|
2015-04-06 14:50:22 -07:00 |
|
|
|
09461d94ef
|
Rewritten changeProjectileDirection
|
2015-04-06 18:10:17 -03:00 |
|
|
|
aec9962121
|
Fix changeProjectileDirection
|
2015-04-06 18:02:08 -03:00 |
|
|
|
35129a7a41
|
Debug stuff for the velocity correction
|
2015-04-06 17:37:18 -03:00 |
|
|
|
513ab25f54
|
Merge branch 'master' into explosiveInteraction
Conflicts:
addons/explosives/functions/fnc_placeExplosive.sqf
|
2015-04-06 22:30:27 +02:00 |
|
|
|
9d7d71b1b1
|
Changed the tabs to 4 spaces. Hopefully.
|
2015-04-06 22:20:11 +02:00 |
|
|
|
e0b4efd9f1
|
Merge pull request #280 from KoffeinFlummi/explosiveInteraction
Explosive interaction
|
2015-04-06 22:12:04 +02:00 |
|
|
|
44c597f7c5
|
Explosives, 2 spaces to 4 space tab.
|
2015-04-06 22:10:00 +02:00 |
|
