Commit Graph

46 Commits

Author SHA1 Message Date
397d77e5b5 Remove special goggles treatment of vehicle units
The condition to disable the overlay for gunners introduces more problems (and inconsistencies for that matter) than it was worth. Vehicle gunners using camera based weapons should probably consider not wearing a pair of glasses/goggles before doing so.
2015-08-31 15:25:40 +01:00
543e829278 Fix goggles overlay for FFV seats
When aiming down sights, view is considered to be "gunner" and so the overlay would be disabled. Introduces addition canUseWeapon check if view is "gunner" to differentiate FFV seats from regular gunner seats
2015-08-31 14:56:51 +01:00
b3741f4036 Capitalization for macro CBA_fnc_addPerFrameHandler 2015-08-04 02:34:38 -05:00
fba457999e #1899 - Remove AV_ESS_blk config 2015-07-25 14:32:24 -05:00
d934c25b78 Merge branch 'master' into macroSTR
Conflicts:
	addons/interact_menu/ACE_Settings.hpp
2015-05-30 19:54:32 +02:00
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
236ae767b5 Goggles - Cache Surface Dust 2015-05-28 00:18:45 -05:00
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
SAM
31adb5a9fc Second batch of settings files 2015-05-14 20:59:25 +02:00
b859956604 rename category ace <blank> to ace common 2015-05-01 10:19:47 +02:00
b472292b20 Remove tabler comments.
sed is awesome.
2015-04-26 21:05:41 +02:00
caef5c105f More Privates 2015-04-17 22:40:37 -05:00
8b915380b7 Merge branch 'hungarian-merge' 2015-04-15 13:55:02 +02:00
ebcdafe610 Fix spelling of "isClientSetable" 2015-04-14 21:43:19 +02:00
3c3f6ba4c3 Translation: A to I
Some parts filled out, other parts corrected or stylized.
2015-04-13 19:28:58 +02:00
614afa8537 Merge https://github.com/Kllrt/ACE3 into czech-merge
Conflicts:
	addons/attach/stringtable.xml
	addons/captives/stringtable.xml
	addons/common/stringtable.xml
	addons/dragging/stringtable.xml
	addons/explosives/stringtable.xml
	addons/goggles/stringtable.xml
	addons/grenades/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/kestrel/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/logistics_uavbattery/stringtable.xml
	addons/logistics_wirecutter/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/maptools/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/nametags/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/reload/stringtable.xml
	addons/reloadlaunchers/stringtable.xml
	addons/weaponselect/stringtable.xml
	addons/wep_javelin/stringtable.xml
	addons/winddeflection/stringtable.xml
2015-04-12 14:27:59 +02:00
c6efd4e546 Merge https://github.com/EpMAK/ACE3 into russian-merge 2015-04-12 05:39:46 +02:00
21abff3713 Revert "Revert "Russian Translation""
This reverts commit ea04f4ab3e.
2015-04-11 21:33:34 +03:00
ea04f4ab3e Revert "Russian Translation"
This reverts commit 17a552bb80.
2015-04-11 21:33:07 +03:00
38adfbcb70 Added missing CZ strings and made little revision 2015-04-11 16:33:00 +02:00
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
eec5f458db Count the commander camera as a 3rd person camera 2015-04-10 20:05:33 +02:00
17a552bb80 Russian Translation
Russian translation of stringtables: new lines + old lines fixed a bit,
realistic names for armory are not yet filled.
2015-04-10 19:55:57 +03:00
68d08b8c7b Revert "Translation"
This reverts commit fab5605ad5.
2015-04-10 19:46:18 +03:00
fab5605ad5 Translation
Russian translation of the texts
2015-04-10 17:51:48 +03:00
1bb6be5654 Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
7173037cb0 Fix 2 broken keybinds 2015-03-10 12:45:08 -05:00
4018742f26 Return False on keyUp Code 2015-03-05 02:51:24 -06:00
0919e59719 Key Bind Redo (except vector) 2015-03-05 01:32:26 -06:00
18fa6f9850 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into aceSettings 2015-02-03 17:48:24 -03:00
173169bc3d Fix in goggles 2015-02-03 00:44:06 -03:00
7acd7854b7 Updated headers of the goggles to be as required. 2015-02-02 11:04:53 +02:00
96b7c0d30c ACE_Settings: replace all ACE_Options 2015-01-30 19:19:45 -03:00
9631154926 Set ADDON variable in XEH_preInit 2015-01-29 01:38:46 -06:00
c407553d49 Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
c07120c439 Fix Googles Macros 2015-01-25 00:55:35 -06:00
8a27a49d31 #84 - goggles option error 2015-01-22 16:58:11 -06:00
cb561a2d93 Convert Old Ace_Options 2015-01-21 18:19:10 -06:00
2fe155f990 Converted a couple PFHs to use the waitAndExecute function as that is what they were doing.
Fixed a couple bugs.
2015-01-19 10:34:49 +02:00
ef19ffad0c Glasses conditions are local to each unit. No longer global scope on each client. 2015-01-19 01:38:54 +02:00
b499cc9a1d Rain effect is working as expected. 2015-01-19 01:12:45 +02:00
10cdbeb4dd Made the glasses effects slowly fade (not completely away) over 30 seconds. 2015-01-19 01:04:32 +02:00
49e19610c2 Removed a bunch of spawns and used PFH's in their place. 2015-01-19 00:57:39 +02:00
fc18cb443f Converted Goggles to use ACE/CBA macros. 2015-01-18 23:50:45 +02:00
0f04d0dfb1 Moved goggles to addons folder and renamed all occurances of AGM to ACE. 2015-01-18 21:43:51 +02:00