jaynus
|
4188893839
|
Move spatial model translations to ace_common
|
2015-04-10 14:23:55 -07:00 |
|
commy2
|
11ad74735c
|
Merge pull request #458 from Tenga/master
Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera
|
2015-04-10 22:12:55 +02:00 |
|
PabstMirror
|
adc7db9ae9
|
#456 - Fix AI rotating while dead (disableAI func)
Still some small head movements, but I don't know how to fix that.
|
2015-04-10 15:02:40 -05:00 |
|
commy2
|
2a72e183b1
|
Merge pull request #450 from Tenga/master
Count the commander camera as a 3rd person camera
|
2015-04-10 21:54:52 +02:00 |
|
Tenga
|
229590ed20
|
Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera
|
2015-04-10 21:54:47 +02:00 |
|
Tenga
|
c8cff6e91c
|
- Added isFeatureCameraActive to ace_common
- ace_goggles_fnc_externalCamera now checks for cameras made by a BI feature
|
2015-04-10 21:48:24 +02:00 |
|
PabstMirror
|
661ddc3562
|
#441 - Crash with no model on ace_fakeweapon
|
2015-04-10 14:35:08 -05:00 |
|
esteldunedain
|
d6e70cfe6b
|
Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3
Conflicts:
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/frag/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/medical/stringtable.xml
|
2015-04-10 16:20:18 -03:00 |
|
commy2
|
5d097c4dd9
|
add comment explaining why isNumber is used
|
2015-04-10 19:11:51 +02:00 |
|
commy2
|
c03ee8e9c6
|
lowercase gps
|
2015-04-10 18:34:26 +02:00 |
|
commy2
|
dc49f2c71e
|
rewrite assigned item fix
|
2015-04-10 18:31:43 +02:00 |
|
Jo David
|
33a14076fc
|
Merge branch 'master' of https://github.com/acemod/ACE3 into translations
Conflicts:
addons/captives/stringtable.xml
addons/medical/stringtable.xml
|
2015-04-10 09:01:24 +02:00 |
|
commy2
|
d5f190dff8
|
fix: getGunner returns null object when throwing grenades, planting explosives
|
2015-04-10 06:47:31 +02:00 |
|
commy2
|
105184ce88
|
fix: getGunner returns null object if pilot uses manual fire if no gunner is present
|
2015-04-10 06:36:09 +02:00 |
|
Legolasindar
|
5f5ce47bec
|
Update stringtable.xml
fixed one term in spanish
|
2015-04-10 01:26:06 +02:00 |
|
Legolasindar
|
65b3566d41
|
Update stringtable.xml
fixed spanish terms.
|
2015-04-10 01:24:37 +02:00 |
|
Legolasindar
|
cef9a6454a
|
Update stringtable.xml
Updated spanish terms, on moved english to first raws.
|
2015-04-10 00:38:24 +02:00 |
|
KoffeinFlummi
|
3a871eed58
|
Merge branch 'master' into tools-cleanup
|
2015-04-09 13:37:19 +02:00 |
|
commy2
|
c5b38c8942
|
manual merge
|
2015-04-08 21:51:42 +02:00 |
|
commy2
|
1ae69d56ff
|
Merge pull request #377 from KoffeinFlummi/142light
142 directional light for map effects
|
2015-04-08 21:46:48 +02:00 |
|
commy2
|
7346c194f4
|
Merge pull request #306 from KoffeinFlummi/optics
Taosenai's Animated Optics req 1.42
|
2015-04-08 21:41:12 +02:00 |
|
commy2
|
01a9374a26
|
Merge pull request #382 from KoffeinFlummi/disablebs
disable cursor showing map position
|
2015-04-08 10:48:31 +02:00 |
|
commy2
|
4834facccf
|
moving it to map
|
2015-04-08 00:30:36 +02:00 |
|
KoffeinFlummi
|
ce45237989
|
Report full version number in RPT for debugging
|
2015-04-08 00:27:00 +02:00 |
|
commy2
|
50dbbda8eb
|
disable cursor showing map position
|
2015-04-08 00:20:43 +02:00 |
|
PabstMirror
|
2f4335d3c2
|
#344 - Ignore missing ace_serverconfig on client
|
2015-04-07 17:14:27 -05:00 |
|
commy2
|
2e66e57535
|
manual merge
|
2015-04-07 23:08:17 +02:00 |
|
commy2
|
d1b8595c0e
|
light intensity from object: handle campfires
|
2015-04-07 23:02:54 +02:00 |
|
commy2
|
96268b6407
|
directional light for map effects
|
2015-04-07 22:19:03 +02:00 |
|
commy2
|
88a5519465
|
cache the frames
|
2015-04-07 21:42:08 +02:00 |
|
commy2
|
d825505aa0
|
cache light config properties
|
2015-04-07 21:22:00 +02:00 |
|
commy2
|
ba618a69ec
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-07 20:54:45 +02:00 |
|
commy2
|
722c2af4dc
|
lightIntensity, handle soldier flashlights
|
2015-04-07 20:54:25 +02:00 |
|
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
|
92da20ce62
|
translations
#367
|
2015-04-07 10:02:33 +02:00 |
|
bux578
|
9ce2e38814
|
removed <orignal> language entry
|
2015-04-07 09:27:26 +02: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
|
04e9f28734
|
Make function handle negative numbers
|
2015-04-06 16:12:38 -03:00 |
|
commy2
|
c1799616c7
|
add function to convert numbers to string
|
2015-04-06 20:47:11 +02:00 |
|
jaynus
|
1bb6be5654
|
Cleaning up of all tabs in source code files.
|
2015-04-06 09:22:43 -07:00 |
|
PabstMirror
|
c1abb2669d
|
#340 - Fix stringtables
|
2015-04-06 11:03:04 -05:00 |
|
Glowbal
|
befb52e855
|
Merge pull request #260 from KoffeinFlummi/serverConfig
Server Config support
|
2015-04-06 01:42:33 +02:00 |
|
jaynus
|
e3ad83e109
|
Merge pull request #286 from KoffeinFlummi/lasers
Self designating lasers, Javelin Guidance, DAGR laser guidance, Comanche updated HUDS
|
2015-04-05 13:26:54 -07:00 |
|