Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,145 Commits 73 Branches 88 Tags 752 MiB
e3f96b6594
Commit Graph

8374 Commits

Author SHA1 Message Date
Glowbal
fc241479fe Merge pull request #3924 from voiperr/remove_attached_chemlights 
On Detach, Delete Used Chemlights
 2016-06-16 15:02:29 +02:00
Glowbal
66450ad36a Merge pull request #3755 from acemod/add-mine-detector 
Add mine detector port from ACE2
 2016-06-16 14:59:35 +02:00
Glowbal
05aac2d223 Add store new helper object 
Fixes an issue were you end up with many helper objects that are not cleaned up
 2016-06-16 14:57:26 +02:00
PabstMirror
81c8ea54c3 getVehPos - Tweak heli width, and put at eye level 2016-06-14 23:30:58 -05:00
PabstMirror
cfc046ce71 Fix Merge 2016-06-14 19:37:22 -05:00
PabstMirror
d46c596cc4 Merge remote-tracking branch 'refs/remotes/origin/master' into vehicleInteractionDistance 2016-06-14 19:36:45 -05:00
PabstMirror
2bcc82cea7 Fix Line Of Sight check for wire cutter helper 
Fix #2976
 2016-06-14 19:32:30 -05:00
ViperMaul
99d08d988a Merge branch 'master' of https://github.com/acemod/ACE3 into use-proper-undefs 2016-06-14 08:27:47 -07:00
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
voiper
b69aa8571e Chemlights no longer re-add to inventory on remove. 
Items are detached prior to being deleted, to avoid objNull attaches.
 2016-06-13 18:06:05 -07:00
esteldunedain
a12d9dc2fb Attempt aof fixing the placement of spotting scopes on slopes 2016-06-13 16:51:28 -03:00
commy2
11dc3bd71a Merge pull request #3911 from acemod/gunbagCleanup 
Gunbag cleanup
 2016-06-13 20:39:46 +02:00
PabstMirror
a6766b611f Always add finger keybind so it is changeable (#3914) 2016-06-13 12:14:35 -05:00
ViperMaul
2242f7c622 Fix for MikeRo Tools strict requirement for #undef usage 2016-06-13 09:20:09 -07:00
jonpas
6644a89fbf More isModLoaded 2016-06-13 15:58:42 +02:00
Glowbal
295ad3b037 Merge branch 'medical-impr' into merge-basic-and-advanced 2016-06-13 14:32:15 +02:00
Glowbal
38cdd523f0 Clean up medical function private declares 2016-06-13 14:27:43 +02:00
Glowbal
fd108478fe Clean up medical menu privates 2016-06-13 12:49:35 +02:00
Glowbal
58f43f8a51 Remove unneeded and deprecated functions from medical 2016-06-13 12:24:28 +02:00
Glowbal
d568041838 Change medical menu to work with basic medical injury overhaul 2016-06-13 12:19:19 +02:00
Glowbal
6657bde921 Change basic medical to use advanced medical injury system 2016-06-13 12:18:56 +02:00
Glowbal
792dbcd009 Change clean up privates in handleDamage code 2016-06-13 11:05:21 +02:00
Glowbal
8e59993d7a Change clean up medical code 2016-06-13 10:55:19 +02:00
Glowbal
73bd684b65 Change formatting and private keywords in medical 2016-06-13 02:34:56 +02:00
Glowbal
3ba2396db7 Change minor clean up of handleUnitVitals 2016-06-13 02:11:21 +02:00
jonpas
b80b7e5265 Shorten more GVARs 2016-06-13 00:08:28 +02:00
jonpas
323555d9a4 Prefix model, Fix indentation of model.cfg, Remove redundant CLASSNAME macro 2016-06-13 00:03:33 +02:00
jonpas
b40915dd12 Cealnup quotes, capitalization, function headers 2016-06-12 23:56:00 +02:00
Glowbal
f0b0b49f3c Merge pull request #3908 from acemod/funBag 
Only do gunbag things when target has a gunbag
 2016-06-12 23:25:55 +02:00
Glowbal
43a2b0ea29 Merge pull request #3909 from acemod/fix-bandaging-configuration 
Adjust bandage configuration
 2016-06-12 23:25:16 +02:00
PabstMirror
1997cb5199 Add maxDam for medium velocity wounds 
Ensures that velocity wounds from a major hit will use the "Large" type
of wound
 2016-06-12 14:47:59 -05:00
Glowbal
fa1282406f Change bandage configurations 
- Field dressing is average treatment
- Packing bandage is average treatment, higher reopen change, longer reopening delay
- Elastic bandage is higher treatment, higher reopen change, shorter reopen delay
- QuikClot is lower treatment, lower reopen change, longer reopening delay
 2016-06-12 20:40:45 +02:00
PabstMirror
e8a403a9ad Only do gunbag things when target has a gunbag 2016-06-12 12:58:39 -05:00
VKing
d5f8d965f3 Change ace_time to cba_missionTime 2016-06-12 17:22:44 +02:00
VKing
6b62436cfb Delete unused animation files 2016-06-12 16:29:00 +02:00
VKing
fe18107077 Fix cfgPatches entries 2016-06-12 16:28:42 +02:00
commy2
3c6de5ad6f remove misc box from gunbag CfgPatches 2016-06-12 14:00:55 +02:00
commy2
000e4a68e6 gunbag improvements 2016-06-12 13:51:23 +02:00
VKing
7f3aacb4d6 Add mass to metal detectors 
Based on values from the manufacturer's pamphlet (vallon.de)
 2016-06-12 12:41:59 +02:00
commy2
7a0b9a1a16 Merge branch 'gunbag' of https://github.com/ir0n1e/ACE3 into ir0n1e-gunbag 2016-06-12 11:02:23 +02:00
commy2
7b49855e89 Merge pull request #3902 from acemod/tanoaWindDAta 
Tanoa Weather Data
 2016-06-12 10:26:56 +02:00
VKing
12130c8c3a Add description string 2016-06-12 10:19:06 +02:00
VKing
3c85398d87 Clean up the sound config 2016-06-12 10:17:02 +02:00
commy2
813b584acf Merge pull request #3900 from acemod/pipFlicker 
Optics - Create PIP camera only when needed
 2016-06-12 10:11:04 +02:00
PabstMirror
8aa5e53bdd movement - Handle objNull in virtualMass 2016-06-12 02:01:49 -05:00
PabstMirror
5e3d4866a6 Prepare camera when optic equipped 2016-06-12 01:53:03 -05:00
bux578
a2124a6b45 add tanoa wind dir data, add comments 2016-06-12 07:30:38 +02:00
bux578
68e2531af3 Merge remote-tracking branch 'origin/master' into tanoaWindDAta 2016-06-12 07:01:14 +02:00
PabstMirror
d14392c35c Optics - Create PIP camera only when needed 2016-06-11 23:08:55 -05:00
commy2
ec01ae0d0b Merge pull request #3897 from acemod/tanoaMapData 
Tanoa map data
 2016-06-11 23:03:22 +02:00
SilentSpike
931ccf8a46 Merge pull request #3796 from acemod/zeusModuleUiExample 
Add more zeus modules
 2016-06-11 21:41:55 +01:00
bux578
2a667a322d init WindData --- missing directions 2016-06-11 22:37:03 +02:00
bux578
950cdb1ee3 fix missing values 
was using an incomplete regex
 2016-06-11 22:05:44 +02:00
SilentSpike
242876fa83 Merge remote-tracking branch 'origin/master' into zeusModuleUiExample 2016-06-11 21:02:16 +01:00
PabstMirror
ddf9e0b5cc CBA Events 2016-06-11 14:57:04 -05:00
Glowbal
e8ba309765 Merge pull request #3887 from gpgpgpgp/patch-2 
add a line to get rid of 4 first aid kits in the invisible fast roping helper
 2016-06-11 21:53:34 +02:00
Glowbal
1632cb9105 Merge pull request #3878 from acemod/fastroping-sounds-fix 
Only play fastroping sounds for player
 2016-06-11 21:53:00 +02:00
PabstMirror
00e5cef145 Merge remote-tracking branch 'refs/remotes/origin/master' into add-mine-detector 2016-06-11 14:49:12 -05:00
commy2
250e27bfd2 Merge pull request #3864 from acemod/removeLineDrawing 
Remove line drawing
 2016-06-11 21:38:56 +02:00
Butt4cak3
151d13244b Improved misleading translation of german bandages (#3810) 
* Improved misleading translation of german bandages

* Further improved german bandage names
 2016-06-11 21:35:22 +02:00
PabstMirror
d57754a7cd Private/Formatting 2016-06-11 14:34:14 -05:00
PabstMirror
4f73ead80c Fix alt/lat for maps not defined in getMapData 2016-06-11 14:32:36 -05:00
bux578
c268572649 add Tanoa mapData 2016-06-11 21:14:05 +02:00
bux578
18d864e950 split mapData into separate function 2016-06-11 21:13:51 +02:00
Glowbal
7f9257716e Merge pull request #2331 from acemod/323bloodyoverlay 
remove BI blood overlay
 2016-06-11 20:49:54 +02:00
VKing
589ad4d2e7 Remove attachments from mine detectors 
When WeaponSlotsInfo was added, rifle attachments could be added to the mine detectors.
 2016-06-11 20:47:53 +02:00
commy2
a4bd6ea80f Merge pull request #3893 from acemod/virtualMasDiv0 
virtualMass - Fix div0 error when naked
 2016-06-10 10:27:36 +02:00
commy2
e55881e1ef Merge pull request #3894 from acemod/fixNametagsUAV 
Fix nametag error when assignedTeam is nil
 2016-06-10 10:20:16 +02:00
PabstMirror
dc6d5f1367 Temp fix for change to handleDamage in dev branch 
Fix #3892
 2016-06-09 21:26:50 -05:00
PabstMirror
5ecc09d78c Fix nametag error when assignedTeam is nil 2016-06-09 20:42:30 -05:00
PabstMirror
e8f7f6ea24 virtualMass - Fix div0 error when playing as rabbit 2016-06-09 20:30:45 -05:00
PabstMirror
d7d87be32b Merge remote-tracking branch 'refs/remotes/origin/master' into removeLineDrawing 2016-06-09 17:20:39 -05:00
jonpas
f1ae73967d Normalize leftovers 2016-06-09 14:28:31 +02:00
jonpas
b97ba4990d Normalize 2 more files 2016-06-09 14:25:57 +02:00
jonpas
bd5f6107a0 Merge branch 'master' into eol-lf 2016-06-09 14:24:45 +02:00
Glowbal
8c9b31b1c7 Merge pull request #3815 from acemod/cbaEventSystem 
Deprecate ACE events framework
 2016-06-09 14:20:26 +02:00
gpgpgpgp
0c28cd4413 add a line to get rid of 4 first aid kits in the invisible helper 
The helper "ace_fastroping_helper" inherits from Helicopter_Base_F, and here's chain of inheritance.
class CfgVehicles
{
	class AllVehicles;
	class Air: AllVehicles
	{
		class TransportItems
		{
			class _xx_FirstAidKit
			{
				name = "FirstAidKit";
				count = 4;
			};
		};
	};
	class Helicopter: Air
	{
	};
	class Helicopter_Base_F: Helicopter
	{
	};
	class ace_fastroping_helper: Helicopter_Base_F
	{
		class TransportItems {};	// now overrides the first aid kits
	};
};
Was a happy and funny surprise to pick up some decent medical supplies from one end of a cut rope.
 2016-06-08 17:26:23 +08: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
PabstMirror
1be926f3db Make rotation key a client setting 
Improve compatibility with other addons
 2016-06-07 11:52:28 -05:00
PabstMirror
aea086b75e Merge branch 'cbaEventSystem' into removeLineDrawing 2016-06-07 11:12:52 -05: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
a61e4b3a4e remove BI blood overlay 2016-06-06 14:14:45 +02:00
commy2
fe03272dc6 Merge pull request #3874 from acemod/cleanup_nightvision 
code cleanup fnc_blending
 2016-06-06 12:23:42 +02:00
BaerMitUmlaut
27c347eec8 Only play fastroping sounds for player 2016-06-05 19:39:12 +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
jonpas
3124270254 Quote the unquoted 2016-06-04 21:07:24 +02:00
voiper
a10b6ee8e2 Fix thrown blink. 2016-06-04 12:05:47 -07:00
jonpas
5a20f1286b Change internal event framework names to contain prefix and be as short as possible 2016-06-04 21:05:26 +02: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
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
SilentSpike
1b6bbff139 Revert event names for synced events framework 
Keeping these names as short as possible for network traffic purposes.
 2016-06-04 09:46:50 +01:00
Jonathan Pereira
b64b7e431e Translated remaining strings 2016-06-03 23:11:40 -03:00
SilentSpike
9e4fd77745 Update common event names to meet new standard 2016-06-03 22:39:43 +01:00
SilentSpike
5b8fa4d4f1 Update common status effect framework 
Instead of changing the event names to match the new standards and also changing every single call to `FUNC(statusEffect_set)`/`FUNC(statusEffect_get)` I figured it made sense to only change the event names and the internal workings of `FUNC(statusEffect_sendEffects)` to automatically add the appropriate prefix.
 2016-06-03 20:53:43 +01:00
SilentSpike
bd985d57ff Run event renaming script for new additions 2016-06-03 20:53:43 +01:00
Glowbal
694503c01b Fix medical events 2016-06-03 20:57:21 +02:00
Glowbal
fa2cf55156 Fix medical related events 2016-06-03 20:22:34 +02:00
PabstMirror
39456003ee Merge branch 'cbaEventSystem' into removeLineDrawing 2016-06-03 12:55:37 -05: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
PabstMirror
4915637601 Few more in common 2016-06-02 20:13:09 -05:00
PabstMirror
59ffff406e Fix missing ; 2016-06-02 20:05:03 -05:00
PabstMirror
240cf4f0b5 Fix merge 2016-06-02 20:02:16 -05:00
PabstMirror
db78dd53a8 Cleanup Merge and remoteFnc events 2016-06-02 19:59:18 -05:00
PabstMirror
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
PabstMirror
7970979a18 Fix removed var in Map Gestures 2016-06-02 15:04:03 -05:00
PabstMirror
73215b707d Remove Line Drawing from MapTools 
And change map tools key to ALT from CTRL
 2016-06-02 14:36:25 -05:00
jonpas
c110121b1a Merge pull request #3811 from acemod/abolishExecRemoteFnc 
Replace execRemoteFnc with events
 2016-06-02 17:08:01 +02:00
jonpas
b0352fdeb9 Merge branch 'master' into eol-lf 2016-06-02 17:02:09 +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
603d07ddc2 Fix incorrect indentation 
Should be using 4 spaces instead of a tab.

Quick, before flummi sees this.
 2016-06-02 10:53:09 +02:00
Glowbal
2e54310ff4 Merge pull request #3844 from acemod/fixShowHud 
Fix showHud if set before display loaded
 2016-06-02 10:39:46 +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
jonpas
1354826d56 Put semi-colon to the correct place 2016-06-01 14:11:32 +02:00