Commit Graph

8108 Commits

Author SHA1 Message Date
ViperMaul
d5750a6c40 Remove Tab 2016-06-14 08:12:29 -07:00
ViperMaul
b79a00d8d1 These 2 can be removed, since they are in CBA since 2.4.0 as Note from jonpas 2016-06-14 08:11:28 -07:00
ViperMaul
2242f7c622 Fix for MikeRo Tools strict requirement for #undef usage 2016-06-13 09:20:09 -07:00
commy2
24ce8b7753 Merge pull request #3880 from acemod/spotting_scope_animated_reticle
Update Spotting Scope
2016-06-07 19:41:09 +02:00
commy2
5d0e257cd8 center interaction point, add gunner shadows 2016-06-07 19:36:03 +02:00
BaerMitUmlaut
bce92e8d42 Merge pull request #3567 from BaerMitUmlaut/microdagr-microoverhaul
MicroDAGR Microoverhaul
2016-06-07 09:58:18 +02:00
commy2
f14a1b990b simplify optics config 2016-06-07 07:38:01 +02:00
Nicolás Badano
527db2bd07 Merge pull request #3884 from acemod/fixShowWindInfoControlsText
Fix wind info keybind string
2016-06-06 21:39:54 -03:00
jonpas
89db8bef5a Fix wind info keybind string 2016-06-07 02:22:53 +02:00
jonpas
9287214781 Move Defuse action to main action 2016-06-07 00:51:06 +02:00
commy2
5135d3bedd delete duplicate files 2016-06-07 00:36:41 +02:00
commy2
3ee10a8c2f add gunner proxy to FIRE GEO LOD and add it to a component 2016-06-07 00:28:09 +02:00
commy2
f5a96ac2fc add editor stuff for spotting scope 2016-06-07 00:17:04 +02:00
commy2
12ab4e9fa6 match controls at boarder 2016-06-06 23:33:00 +02:00
commy2
6a5c9cfca7 black periphery 2016-06-06 23:14:19 +02:00
commy2
36d0b78811 coeficient handling interface sizes was inverted 2016-06-06 21:36:29 +02:00
commy2
cd43c17f80 animate the scope 2016-06-06 19:22:24 +02:00
commy2
be260e896b animated reticle for spotting scope 2016-06-06 17:22:17 +02:00
commy2
fe03272dc6 Merge pull request #3874 from acemod/cleanup_nightvision
code cleanup fnc_blending
2016-06-06 12:23:42 +02:00
jonpas
e779bc0cb2 Merge pull request #3877 from acemod/fixUIerror
Fix selective UI in FFV slots
2016-06-05 14:04:49 +02:00
jonpas
021a123fc6 Fix selective UI in FFV slots, Properly fix config name check 2016-06-05 14:02:55 +02:00
Glowbal
2ad3f57414 Merge pull request #3872 from acemod/fixUIerror
Fix selective UI script error when changing certain other settings
2016-06-05 13:44:22 +02:00
commy2
e776306295 Merge pull request #3876 from acemod/cleanupMovement
Cleanup movement and improve debugging
2016-06-05 12:57:34 +02:00
jonpas
2cc1252f81 Remove unused CfgInventoryGlobalVariable in movement and improve debugging 2016-06-05 12:45:53 +02:00
commy2
0424f5db73 cleanup fnc_blending 2016-06-05 10:12:05 +02:00
commy2
8ed2dd11d2 Merge pull request #3871 from acemod/magRepackImprovements
Add size parameter to displayTextPicture, Improve parameter checking …
2016-06-05 00:05:07 +02:00
commy2
a9a0cfc001 Merge pull request #3873 from voiperr/nvgthrowfix
Fix NVG overbright when player throws grenades
2016-06-04 23:43:53 +02:00
voiper
354e84e058 Cleanup. 2016-06-04 12:26:38 -07:00
jonpas
b541b0b4f0 Fix selective UI script error when changing certain other settings 2016-06-04 21:20:10 +02:00
voiper
a10b6ee8e2 Fix thrown blink. 2016-06-04 12:05:47 -07:00
jonpas
8ff4a2ecaf Add size parameter to displayTextPicture, Improve parameter checking in displayText functions, Cleanup magazine repack (privates, deprecated macros, style) 2016-06-04 20:40:55 +02:00
jonpas
03a56b1f7d Fix goKneeling changing animation inside vehicle (1.60) 2016-06-04 19:58:53 +02:00
Jonathan Pereira
b64b7e431e Translated remaining strings 2016-06-03 23:11:40 -03:00
BaerMitUmlaut
11f1518220 Fix spottingscope interaction point, add to misc. box (#3862) 2016-06-03 10:21:47 -05:00
jonpas
f90b3b5c54 Merge pull request #3770 from tbeswick96/IRAttachLeftShoulder
Moved IR Strobe to left shoulder when attached.
2016-06-03 16:33:57 +02:00
jonpas
46b12bd6c3 Merge pull request #3861 from acemod/unify-deployables
Unify deployables
2016-06-03 16:32:52 +02:00
PabstMirror
77baeda976 Merge branch 'master' into huehuehue 2016-06-03 00:01:13 -05:00
jonpas
c110121b1a Merge pull request #3811 from acemod/abolishExecRemoteFnc
Replace execRemoteFnc with events
2016-06-02 17:08:01 +02:00
PabstMirror
b6aaba7f90 Integrate 1.60 marker shape color map interface (#3860)
1.60 adds ability to set color and marker type from the map interface
Luckily they use the same values and indexes as ACE,
This PR connects the two systems,
Selecting a color from the 1.60 map display will set the color in the
ace marker display and vice versa
2016-06-02 09:28:52 -05:00
PabstMirror
637b5e02e9 Update 3den attributes to use 1.60 scaling (#3857) 2016-06-02 09:26:57 -05:00
PabstMirror
675214cfb9 Allow drivers of vehicles to show microDagr (#3808) 2016-06-02 09:26:43 -05:00
PabstMirror
68d6c1969b Cleanup transistion to CBA's waitAndExec (#3858) 2016-06-02 09:22:40 -05:00
jonpas
4c995d4c5c Improve selective UI API (#3805)
* Improve selective UI API, Disable ammo count when reload component is loaded, Fix stance UI

* Upgrade Selective UI framework for controls that share IDCs for gunner and soldier

* Separate more soldier and gunner settings sharing same IDCs, Remove vehicle gunner weapon which has no effect anymore

* Separate more soldier and gunner IDC sharing elements, Fix typo, Fix API setting not being respected in case where selective type is not the same on load

* Rework Selective UI using ACE_UI config, Cleanup, Add ACE_UI to FCS component to mark it (is already disabled due to other necessary settings for FCS to function)

* Do location check in function, Rename condition to location, change to number

* Use macros in ACE_UI location
2016-06-02 14:32:39 +02:00
jonpas
590d4fa70b Merge branch 'master' into abolishExecRemoteFnc 2016-06-02 14:28:43 +02:00
Glowbal
5c7148de1f Merge pull request #3851 from acemod/huntIR-multipara-fix
Fixed HuntIR deployment
2016-06-02 10:38:37 +02:00
BaerMitUmlaut
cc83bf64d6 Moved all deployables to equipment submenu 2016-06-02 10:35:33 +02:00
PabstMirror
b949440eb1 Goggles - Fix script error from CBA_fnc_waitAndExecute 2016-06-01 17:27:55 -05:00
jonpas
95573ee711 Stringtable URL (#3855)
* Move url into stringtable to display it properly, Add some missing author and url entries

* Fix main

* Remove duplicate author
2016-06-01 23:45:51 +02:00
jonpas
ba27c8f914 Fix WEB_URL end of line error (#3854)
* Fix WEB_URL end of line error

* Change location of quote macro

* Fix medical_menu VERSION_CONFIG error
2016-06-01 14:41:33 +02:00
commy2
9d61dd6159 Merge pull request #3850 from acemod/fixCfgPatchesAuthor
Fix CfgPatches author/ is not a value
2016-06-01 14:24:17 +02:00