9399 Commits

Author	SHA1	Message	Date
PabstMirror	749425dfb7	Settings Category, Minor Cleanup	2016-02-16 12:58:42 -06:00
PabstMirror	f1797feead	Make wound assignment consistent for dll/sqf ... Dll now exits on first match for threshold damage (exitWith) Remove random wound in sqf to match dll Fix backblast threshold order Add lower vehiclecrash threshold Add dll version logging	2016-02-16 12:19:18 -06:00
commy2	1bc73af1c9	remove ace fake weapon from 3den cargo editor	2016-02-16 16:11:18 +01:00
PabstMirror	5c9dfd7dc5	Handle enemy causing veh explode, fix revive unload ... Fix #3269	2016-02-15 22:23:37 -06:00
PabstMirror	9441b548be	Fix vehicle crashes not being fatal to non-drivers ... Fix #3306	2016-02-15 17:11:04 -06:00
PabstMirror	d88f10b8e0	Merge pull request #3318 from acemod/restricMagPass ... Don't allow passing mags when not in same veh	2016-02-15 11:41:18 -06:00
PabstMirror	4a8b032c1f	Don't allow passing mags when not in same veh	2016-02-14 14:53:04 -06:00
PabstMirror	985af4502c	Merge pull request #3313 from ivankrouglyi/patch-1 ... Update fnc_treatment_success.sqf	2016-02-14 13:27:08 -06:00
VKing	74d410688f	Add check so vanilla magazines can't be unloaded	2016-02-14 14:10:28 +01:00
VKing	560c509a3a	Changed to using playerVehicleChanged.	2016-02-14 13:51:44 +01:00
Glowbal	ff86359247	Merge branch 'master' into medical-focus-feature	2016-02-13 19:51:45 +01:00
Nicolás Badano	7bbdcbc054	Merge pull request #3280 from acemod/unifiedFiredEH ... Unified fired event handler	2016-02-13 15:13:18 -03:00
esteldunedain	e2ed38609d	Replace driver by effectivCommander on EFUNC(common,getGunner) and EFUNC(common,firedEH)	2016-02-13 15:04:43 -03:00
Ivan Krouglyi	0a226b5ee9	Update fnc_treatment_success.sqf ... Error at 84 line - you forget ";"	2016-02-13 03:29:42 +03:00
PabstMirror	54b350a6c0	Only get passenger actions for selected unit ... Fix #1690 #3309	2016-02-12 15:57:16 -06:00
Githawk	17cba965c3	Deactivate laser_sefldesignate on Comanche	2016-02-11 20:27:46 +01:00
Githawk	c38b028c3a	Fixing driver gun ... Magazines from driver gun don't get removed	2016-02-11 19:06:37 +01:00
Githawk	9619fc7fb5	Changes to DAGR ... Allow laserLock, set weaponLockSystem to Laser and move class ADDON to ACE_Hydra70_DAGR	2016-02-11 16:39:53 +01:00
PabstMirror	ff4ba98e68	Pre-load again on mission load (save game)	2016-02-10 11:50:30 -06:00
licht-im-Norden87	5577a1b4bb	Merge pull request #31 from licht-im-Norden87/patch-42 ... trenches	2016-02-10 18:15:14 +01:00
licht-im-Norden87	4fb705e0f9	Update stringtable.xml ... Eigentlich ist Graben ja das falsche Wort, da es in Arma gar nicht möglich ist in die Tiefe zu graben....	2016-02-10 18:14:51 +01:00
licht-im-Norden87	020deb4407	Update stringtable.xml	2016-02-10 18:14:03 +01:00
licht-im-Norden87	adbfa378b1	Update stringtable.xml	2016-02-10 18:12:36 +01:00
licht-im-Norden87	a5597ade89	Merge pull request #30 from licht-im-Norden87/patch-41 ... spectator	2016-02-10 18:06:13 +01:00
licht-im-Norden87	e8a35f3c20	spectator ... Bitte einmal z. 259,268,377 überprüfen!	2016-02-10 18:05:51 +01:00
licht-im-Norden87	0c268b90dc	Merge pull request #29 from licht-im-Norden87/patch-39 ... overheating	2016-02-10 17:35:56 +01:00
licht-im-Norden87	9419e7daf3	overheating	2016-02-10 17:35:36 +01:00
licht-im-Norden87	7bed10d14b	Merge pull request #28 from licht-im-Norden87/patch-38 ... optionsmenu	2016-02-10 17:32:32 +01:00
licht-im-Norden87	51b57b962b	Update stringtable.xml	2016-02-10 17:32:19 +01:00
licht-im-Norden87	cabbc4b6a9	optionsmenu	2016-02-10 17:31:26 +01:00
licht-im-Norden87	c663feed49	Merge pull request #27 from licht-im-Norden87/patch-37 ... nightvision	2016-02-10 17:26:23 +01:00
licht-im-Norden87	864ae484d4	nightvision	2016-02-10 17:26:08 +01:00
licht-im-Norden87	b352b9b024	Merge pull request #26 from licht-im-Norden87/patch-36 ... captives	2016-02-10 17:20:13 +01:00
licht-im-Norden87	39e26b0f11	captives	2016-02-10 17:19:42 +01:00
licht-im-Norden87	ffb3367a50	Merge pull request #25 from licht-im-Norden87/patch-35 ... common	2016-02-10 17:17:47 +01:00
licht-im-Norden87	b9083f1712	common	2016-02-10 17:17:26 +01:00
licht-im-Norden87	c806bfb721	Merge pull request #24 from licht-im-Norden87/patch-34 ... flashlight	2016-02-10 17:14:37 +01:00
licht-im-Norden87	d52c6cb984	flashlight	2016-02-10 17:13:52 +01:00
licht-im-Norden87	a725553a95	commy2	2016-02-10 17:11:24 +01:00
licht-im-Norden87	b617dee302	Merge pull request #23 from licht-im-Norden87/patch-33 ... cargo	2016-02-10 17:09:05 +01:00
licht-im-Norden87	b1990b1586	Update stringtable.xml	2016-02-10 17:08:48 +01:00
licht-im-Norden87	3583e95e1f	cargo	2016-02-10 17:07:05 +01:00
licht-im-Norden87	35b0b11fff	Merge pull request #22 from licht-im-Norden87/patch-32 ... Gestures	2016-02-10 17:03:21 +01:00
licht-im-Norden87	6481a0fbb8	Gestures	2016-02-10 17:02:54 +01:00
licht-im-Norden87	71682bc2f3	Merge pull request #21 from licht-im-Norden87/patch-31 ... headless	2016-02-10 16:58:21 +01:00
licht-im-Norden87	c0a9d6a0e8	headless	2016-02-10 16:57:56 +01:00
licht-im-Norden87	3eaf466994	Merge pull request #20 from licht-im-Norden87/patch-30 ... hearing	2016-02-10 16:57:24 +01:00
licht-im-Norden87	99f6c79573	Update stringtable.xml	2016-02-10 16:57:12 +01:00
licht-im-Norden87	8971f4db1e	Update stringtable.xml	2016-02-10 16:56:15 +01:00
licht-im-Norden87	a9252c1b5d	Merge pull request #19 from licht-im-Norden87/patch-29 ... Interact menu	2016-02-10 16:49:46 +01:00
licht-im-Norden87	61bd04a390	Interact menu	2016-02-10 16:49:00 +01:00
licht-im-Norden87	e2d4589bb0	Merge pull request #18 from licht-im-Norden87/patch-28 ... Hunt IR	2016-02-10 16:42:35 +01:00
licht-im-Norden87	8ef2905e99	Hunt IR	2016-02-10 16:42:03 +01:00
licht-im-Norden87	53f8b14a7c	Merge pull request #17 from licht-im-Norden87/patch-27 ... Adv. ballistic	2016-02-10 16:41:00 +01:00
licht-im-Norden87	17a16d1bad	Adv. ballistic	2016-02-10 16:40:07 +01:00
licht-im-Norden87	49ee49a5b7	Merge pull request #16 from licht-im-Norden87/patch-26 ... magazine repack	2016-02-10 16:29:32 +01:00
licht-im-Norden87	ed1047e199	magazine repack	2016-02-10 16:26:03 +01:00
licht-im-Norden87	03b4a0e8fb	Update German Stringtable	2016-02-10 16:24:18 +01:00
commy2	82086efca0	manual merge	2016-02-10 10:11:33 +01:00
PabstMirror	e1b83b8172	Manually pre-load for StaticWeapons and Car ... Fix #3168	2016-02-09 22:43:38 -06:00
SzwedzikPL	388b00f58c	remove unnecessary code, aesthetic tweak	2016-02-10 01:38:14 +01:00
SzwedzikPL	0c80551fd8	ace attribute category, lower case classes	2016-02-10 01:17:18 +01:00
gienkov	d5dd718b8d	fix endlines	2016-02-09 12:01:13 +01:00
gienkov	fafd25dee7	pl translation	2016-02-09 11:50:35 +01:00
gienkov	8048b2ecbd	lazy evaluation fix	2016-02-09 09:35:16 +01:00
esteldunedain	b02a67605c	Revert to normal testing for units on foot	2016-02-09 00:19:18 -03:00
esteldunedain	0f41c5bf13	Only test the GEOM LOD for visibility	2016-02-09 00:01:51 -03:00
esteldunedain	d4eda6d4ec	Show tags for units inside the player vehicle. Close #538.	2016-02-08 22:54:24 -03:00
esteldunedain	cebc8a2d07	Slightly reduce the distance for which the LOS check is skipped. Fix #3270	2016-02-08 19:19:10 -03:00
esteldunedain	4c938a050b	Fix for combination of "Only Cursor + Keypress" and "Always Show Sound Waves"	2016-02-08 17:57:24 -03:00
esteldunedain	a47f7b8162	Fix cursor mode	2016-02-08 17:18:03 -03:00
esteldunedain	c43b3bd5c1	Switch	2016-02-08 17:14:18 -03:00
esteldunedain	b2e9dd0149	Fix _vecy	2016-02-08 17:03:18 -03:00
esteldunedain	73499489e0	Revert "Optimized EFUNC(common,cachedCall)" ... This reverts commit b358c4a8af.	2016-02-08 16:45:16 -03:00
esteldunedain	1b912cdca0	Switch back to modelToWorldVisual. Perf is about the same and it moves smoothly with the model.	2016-02-08 16:38:26 -03:00
esteldunedain	b358c4a8af	Optimized EFUNC(common,cachedCall)	2016-02-08 16:09:14 -03:00
esteldunedain	62fb26200f	Nametags optimization	2016-02-08 15:36:56 -03:00
esteldunedain	94977ffe5c	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into nametagsOptimization	2016-02-08 12:52:49 -03:00
SzwedzikPL	94ea26c7b9	typo fix	2016-02-08 00:14:55 +01:00
SzwedzikPL	3bfac35b65	ace repair and medical attributes	2016-02-07 23:56:45 +01:00
Glowbal	e754c89c73	Remove non functional event driven handleDamage	2016-02-07 13:18:19 +01:00
Glowbal	575f362fb6	Add setting for limiting usage of Epinephrine in basic medical #1792 ... Part of focus feature medical #3134. Default settings are inline with old default.	2016-02-07 13:10:38 +01:00
VKing	f92b798586	Switch to select (is even slightly faster)	2016-02-07 13:09:01 +01:00
VKing	f1cc2ddd51	Change to apply in fcs	2016-02-07 13:08:31 +01:00
Glowbal	bfd90cd5d3	Add Adenosine to replace atropine #1573	2016-02-07 12:54:23 +01:00
Glowbal	39cf11367f	improve medical bandage configuration	2016-02-07 12:37:00 +01:00
Glowbal	84878c3d8b	Merge branch 'master' into medical-focus-feature	2016-02-07 12:11:25 +01:00
esteldunedain	2b1c312d13	Make explosion reflections optional, default off	2016-02-06 23:46:40 -03:00
esteldunedain	b6058242c8	Fix frag fired EH name	2016-02-06 22:20:08 -03:00
esteldunedain	e4122cf42f	Fix winddeflection fire eh	2016-02-06 21:00:42 -03:00
esteldunedain	8fbb6cd72e	Fixed event parameters	2016-02-06 20:49:18 -03:00
esteldunedain	a51372a6b3	Add the TRACE_10 macro	2016-02-06 20:28:16 -03:00
esteldunedain	b7d94f5363	Apply the ufeh to ACE_Advanced_Ballistics	2016-02-06 18:48:26 -03:00
esteldunedain	94ef0c5659	Apply the ufeh to ACE_WindDeflection	2016-02-06 18:36:20 -03:00
PabstMirror	1e66cd406b	Use location hash for ace events	2016-02-06 15:27:53 -06:00
esteldunedain	25b767a16b	Apply the ufeh to ACE_WeaponSelect	2016-02-06 18:27:43 -03:00
esteldunedain	cdfdfffff6	Apply the ufeh to ACE_Scopes	2016-02-06 18:24:48 -03:00
esteldunedain	12d7a171e5	Apply the ufeh to ACE_Recoil	2016-02-06 18:21:43 -03:00
esteldunedain	69dea087ca	Apply the ufeh to ACE_Overpressure	2016-02-06 18:17:27 -03:00
esteldunedain	5aa763f0c6	Apply the ufeh to ACE_Overheating	2016-02-06 17:59:54 -03:00
esteldunedain	5b3df2bcf7	Apply the ufeh to ACE_Optics	2016-02-06 17:50:35 -03:00
esteldunedain	33bcd6d9f9	Fix	2016-02-06 17:44:34 -03:00
esteldunedain	45b6b8467d	Apply the ufeh to ACE_Nightvision	2016-02-06 17:42:44 -03:00
esteldunedain	7ace1738c0	Apply the ufeh to ACE_HuntIr	2016-02-06 17:29:05 -03:00
esteldunedain	0b9695ce70	Apply the ufeh to ACE_Grenades	2016-02-06 17:20:30 -03:00
esteldunedain	ac3f75c8b4	Apply the ufeh to ACE_Goggles	2016-02-06 17:16:10 -03:00
esteldunedain	b70ae9207c	Apply the ufeh to ACE_Frag	2016-02-06 17:12:28 -03:00
esteldunedain	fe66d93275	Added ignore private warnings + trace	2016-02-06 17:07:05 -03:00
esteldunedain	37bc67c951	Create a _vehicle variable	2016-02-06 16:55:36 -03:00
esteldunedain	efbff8cc23	Pass the turret path too	2016-02-06 16:49:53 -03:00
esteldunedain	59cbc6da10	Remove unneeded test in FCS fireEH	2016-02-06 16:49:27 -03:00
esteldunedain	a084373574	Apply the ufeh to ACE_Disposable	2016-02-06 16:39:08 -03:00
esteldunedain	b2bd11ed77	Apply the ufeh to ACE_FCS	2016-02-06 16:29:58 -03:00
esteldunedain	6d9068e306	gunner to lowercase	2016-02-06 16:26:57 -03:00
esteldunedain	72b262f634	Simplified parameter names	2016-02-06 16:22:23 -03:00
esteldunedain	588f76b3f1	Learning to count	2016-02-06 16:12:18 -03:00
esteldunedain	89354e25c8	Unified fired event handler	2016-02-06 16:09:48 -03:00
esteldunedain	698b934801	Increase the volume of the residual woosh when ringing is disabled	2016-02-06 14:49:56 -03:00
esteldunedain	9a8dd3e2ad	Fix stringtable	2016-02-06 14:49:28 -03:00
esteldunedain	354ed0cab2	Trace instead of sideChat	2016-02-06 14:11:18 -03:00
esteldunedain	2f1e96ae4f	Overhaul ACE_Hearing and change default settings.	2016-02-06 13:59:31 -03:00
commy2	baf979064a	remove old ragdoll tweaks	2016-02-06 17:45:47 +01:00
commy2	0a9048815b	simlify some select CODE statements	2016-02-06 14:59:31 +01:00
commy2	ac007e6995	replace more map with apply	2016-02-06 12:08:04 +01:00
commy2	41e39c9c3a	replace more filter with select	2016-02-06 11:58:31 +01:00
commy2	2ebd2f9046	replace filter and map with select and apply	2016-02-06 11:42:35 +01:00
PabstMirror	d69af47030	Merge branch 'master' of https://github.com/acemod/ACE3	2016-02-05 16:49:39 -06:00
PabstMirror	e3e9d19ca1	Fix "key" capitalization for Interaction_GetOut	2016-02-05 16:49:36 -06:00
commy2	ec4a4ef67f	correct capitalization for German translation	2016-02-05 22:21:27 +01:00
commy2	7f6b17cdbc	correct name for wheeled apc 01 cannon	2016-02-05 22:19:27 +01:00
commy2	0032e7aa9a	Merge pull request #3267 from acemod/removeSwagWalkFix ... Remove Swag Walk Fix	2016-02-05 21:59:57 +01:00
PabstMirror	9b3ca2822f	Change german stringtable	2016-02-05 14:46:30 -06:00
commy2	f33beb9865	update movement config comments	2016-02-05 21:31:08 +01:00
commy2	d89c93de22	setAllGear - abort function and print warning when used on remote units,	2016-02-05 21:14:20 +01:00
PabstMirror	deac4395c1	Deadman switch - trigger explosives in inventory ... Also allow manual triggering of the deadman device	2016-02-05 11:40:11 -06:00
Nicolás Badano	027de27e33	Merge pull request #3268 from acemod/fix3140 ... Document the locality requirements of fnc_setAllGear.	2016-02-05 10:19:57 -03:00
esteldunedain	dbe7e294a5	Document the locality requirements of fnc_setAllGear. Close #3140	2016-02-05 10:18:36 -03:00
esteldunedain	b2d050afca	Close #3188, Close #3260	2016-02-05 09:46:51 -03:00
Nicolás Badano	d26fc4614f	Merge pull request #3266 from SzwedzikPL/overheatingStringtableFix ... Fix overheating stringtable	2016-02-05 09:35:29 -03:00
Thomas Kooi	0850ab35e3	Merge pull request #3262 from acemod/nozzleFixes ... fix some issues with Fuel Nozzle	2016-02-05 09:15:27 +01:00
Thomas Kooi	f47b51c0cb	Merge pull request #3070 from dixon13/newCivInteraction ... Changes to civilian interaction	2016-02-05 09:14:45 +01:00
dixon13	a0e6f97125	Updated condition for ACE_GetOut	2016-02-05 00:32:56 -07:00
SzwedzikPL	270b557084	fix overheating stringtable	2016-02-05 04:55:05 +01:00
SzwedzikPL	5f0a2b1945	use event system, polish translation	2016-02-05 04:26:54 +01:00
Nicolás Badano	dadec15948	Merge pull request #2104 from acemod/trenches ... Trenches	2016-02-04 23:43:06 -03:00
SzwedzikPL	374b015ee4	major cleanup	2016-02-05 03:41:18 +01:00
SzwedzikPL	ab297ff97e	more readable macro	2016-02-05 02:03:25 +01:00
SzwedzikPL	a9d57e0d1c	fnc_switchLamp cleanup	2016-02-05 02:02:46 +01:00
SzwedzikPL	7b8be590b4	Merge branch 'acemod/master' into interactions_lamps	2016-02-05 01:43:06 +01:00
esteldunedain	b6581cf5ef	Fix #3264	2016-02-04 21:00:40 -03:00
esteldunedain	2577992dfc	Progress bar localization	2016-02-04 20:43:32 -03:00
esteldunedain	7da6e2a35f	Reduce the placement distance	2016-02-04 18:47:30 -03:00
esteldunedain	8c187cbf07	Adjust big trench height	2016-02-04 18:47:17 -03:00
esteldunedain	4cd0028794	Add animation and progresive digging	2016-02-04 18:43:47 -03:00
esteldunedain	3d47156547	Rename some variables	2016-02-04 17:42:12 -03:00
esteldunedain	2d45a28863	Merge branch 'master' into trenches	2016-02-04 17:04:09 -03:00
jokoho48	dc3026366a	remove unneeded files ... fix hard edge in model add LOD	2016-02-04 20:52:28 +01:00
Glowbal	8c0472bbeb	Merge branch 'master' of github.com:acemod/ACE3	2016-02-04 20:35:15 +01:00
VKing	f652db1d2f	Add Loadout box for easy conversion	2016-02-04 20:35:00 +01:00
Glowbal	f1ce133d32	Merge branch 'release' ... Conflicts: addons/refuel/functions/fnc_connectNozzle.sqf	2016-02-04 20:34:32 +01:00
Thomas Kooi	653f6567cc	Fix french translation refresh marker interval ... As per @alganthe's comment on #3114	2016-02-04 20:30:51 +01:00
Thomas Kooi	543d54d37e	Merge pull request #3114 from Luigium/master ... Fixed and added French Translation	2016-02-04 20:28:00 +01:00
Glowbal	376b611b89	Merge branch 'master' into Mortar_interact	2016-02-04 20:21:03 +01:00
Thomas Kooi	727cb38be6	Merge pull request #3218 from SzwedzikPL/fix3202 ... Fix laser_selfdesignate does not measure the distance	2016-02-04 20:17:06 +01:00
PabstMirror	54870f872a	Disable Debug	2016-02-04 13:16:41 -06:00
Nicolás Badano	c967bd1ace	Merge pull request #3259 from acemod/fix3denGoggles ... Fix ACE_goggle changing the tint on the 3den camera	2016-02-04 16:08:02 -03:00
Nicolás Badano	cbafe05f76	Merge pull request #3082 from acemod/deterministicOverheatingX ... Deterministic overheating (updated)	2016-02-04 16:03:30 -03:00
Thomas Kooi	dd3613c357	Merge pull request #3190 from acemod/fcs_enableGMG ... Add FCS to more things	2016-02-04 20:03:19 +01:00
Thomas Kooi	893040b08a	Merge pull request #3102 from buddytex/SandbagEditor ... Add Sandbag to editor	2016-02-04 20:00:51 +01:00
Thomas Kooi	f26fb9e9da	Merge pull request #3107 from jonpas/headless ... Add Dynamic AI Group Tranferring to Headless Clients	2016-02-04 20:00:16 +01:00
Thomas Kooi	a3f80dbc30	Merge pull request #3230 from acemod/draggingStuff ... Fix dragging moving object to random location	2016-02-04 19:58:56 +01:00
Thomas Kooi	ce27575de3	Merge pull request #3244 from acemod/fixScopesCapturingKeys ... Fix ace_scopes capturing native adjustment keys for the PSO scope.	2016-02-04 19:58:21 +01:00
Thomas Kooi	508f6a16ae	Merge pull request #3162 from acemod/Refuel_Fuelbladders ... Refuel - Add refuel actions to fuel bladder objects	2016-02-04 19:57:50 +01:00
Thomas Kooi	8c9523e36b	Merge pull request #3151 from acemod/explosives_cleanup_plus_minetriggers ... Various explosives enhancements	2016-02-04 19:56:27 +01:00
Thomas Kooi	e0946c3fc5	Merge pull request #3106 from acemod/explEvents ... Explosive events, fix #3104	2016-02-04 19:52:10 +01:00
PabstMirror	35333cbe9d	Merge branch 'cargoCleanup'	2016-02-04 12:51:52 -06:00
Thomas Kooi	3e5908faf8	Merge pull request #3018 from jonpas/fixFuelHoseExceededAfterDisconnect ... Fix refuel PFH not exiting on nozzle disconnect	2016-02-04 19:47:52 +01:00
Thomas Kooi	038befbce0	Merge pull request #3191 from acemod/cargoCleanup ... Cargo Cleanup, Add makeLoadable	2016-02-04 19:44:27 +01:00
Thomas Kooi	324edbde6d	Merge pull request #3192 from acemod/getTargetDistance_to_LIS ... Rewrite ace_common_fnc_getTargetDistance to use LineIntersectsSurfaces.	2016-02-04 19:42:32 +01:00
Thomas Kooi	6cf02bd06b	Merge pull request #3193 from acemod/fcs_rewriteRangeFunctions ... Cleaning up the FCS code	2016-02-04 19:39:32 +01:00
Thomas Kooi	d68c79efb1	Merge pull request #3204 from acemod/m67_dns ... Fix Handgrenade DisplayNameShort	2016-02-04 19:37:20 +01:00
Thomas Kooi	69746a133b	Merge pull request #3254 from ProfessorCZ/master ... Czech Translation - Update	2016-02-04 19:36:28 +01:00
Thomas Kooi	8034d91d76	Merge pull request #3249 from GitHawk/refuel_nozzle ... Added a real nozzle	2016-02-04 19:32:17 +01:00
Thomas Kooi	d72c73dc25	Merge pull request #3257 from acemod/flashbangUnderwater ... Flashbangs - pass pos instead of obj reference	2016-02-04 19:31:11 +01:00
Thomas Kooi	dc8e7e2994	Merge pull request #3255 from acemod/tourniquetMedications ... Tourniquets block medication until released	2016-02-04 19:30:40 +01:00
PabstMirror	336184dfaa	Change medication removal from array	2016-02-04 10:00:33 -06:00
esteldunedain	c87f19c8da	Fix #3258	2016-02-04 10:04:26 -03:00
PabstMirror	2cf2cb0e59	Fix statusEffect error in refuel	2016-02-04 01:31:12 -06:00
PabstMirror	7fc84c60dd	Flashbangs - pass pos instead of obj reference ... Fix #3205	2016-02-03 17:53:24 -06:00
PabstMirror	3cc10a27ce	Tourniquets block medication until released ... Close #2704	2016-02-03 14:40:26 -06:00
ProfessorCZ	61611d0ec7	Czech Translation - Update ... Update	2016-02-03 18:31:31 +01:00
PabstMirror	397a12056a	Merge branch 'master' into deterministicOverheatingX	2016-02-02 17:11:00 -06:00
Githawk	979ceb7ad7	Fixed rearm unholster macro	2016-02-02 16:04:50 +01:00
Githawk	cbeac7f154	params stuff	2016-02-02 15:47:05 +01:00
Githawk	4d403d21aa	Fixes ... Moved models into data fixed vehicle attach for certain angles	2016-02-02 15:45:57 +01:00
Githawk	5e103ba398	Added nozzle ... Added code for nozzle object Params and private update	2016-02-02 15:03:06 +01:00
Githawk	475351fcfa	Some bracket errors	2016-02-01 20:21:20 +01:00
Githawk	cc624f58dd	Fixes and updates	2016-02-01 20:05:53 +01:00
esteldunedain	f744e164d3	Fix #3238 even if ACE_ScopeAdjust_Vertical = 0 or ACE_ScopeAdjust_Horizontal = 0	2016-02-01 14:58:01 -03:00
PabstMirror	46d6e92bca	Add quick debug defines to all script_components	2016-01-28 23:26:02 -06:00
PabstMirror	af6b084ba3	Don't allow carrying with injured legs ... Fix #2644	2016-01-28 23:05:55 -06:00
PabstMirror	c0eccc67c3	Change all SCALAR to NUMBER in headers	2016-01-28 18:19:15 -06:00
PabstMirror	3f1d6ffeb7	Fix dragging sending objects to random location ... attachTo seems to have weird getpos results for a few frames. also don't show mouse wheel option for carrying man and always use 0 offset for dragging man	2016-01-28 17:11:05 -06:00
PabstMirror	d9eafbdf0f	Privates / Headers	2016-01-28 12:52:53 -06:00
PabstMirror	84e76efc7f	Not needed on CfgMagazines	2016-01-27 15:54:45 -06:00
esteldunedain	2eb91cf2b4	Delete spare models	2016-01-27 18:23:04 -03:00
PabstMirror	7a7e0d689a	Improve underwater cargo unloading	2016-01-27 14:56:25 -06:00
esteldunedain	d2d7e46401	Align trench to ground surface to avoid having to lower them too much on slopes	2016-01-27 17:54:40 -03:00
esteldunedain	b20a2f338b	Replace trench models: bigger and opaque	2016-01-27 17:54:10 -03:00
PabstMirror	17a882fe4d	Add findUnloadPosition integration	2016-01-26 18:01:01 -06:00
esteldunedain	f8a1215264	Align trenches to ground	2016-01-26 11:03:11 -03:00
esteldunedain	0358b10298	Bigger trenches	2016-01-26 11:02:55 -03:00
PabstMirror	b15716860d	Remove VehicleLock Items from Virtual Arsenal ... Close #3215	2016-01-25 14:29:27 -06:00
SzwedzikPL	03fca3c372	fix fcs keyup/down forced params #3202	2016-01-25 09:49:47 +01:00
esteldunedain	3e25f9c5f0	Cache drawIcon3D parameters	2016-01-24 17:12:25 -03:00
esteldunedain	351d20ec32	Cache near object CAManBase that are on LOS instead of recomputing each frame	2016-01-24 17:12:06 -03:00
PabstMirror	276aea04c1	Changes for CBA 2.3	2016-01-24 11:41:10 -06:00
PabstMirror	78729e96ff	Fix bad forceWalk params	2016-01-24 11:39:59 -06:00
esteldunedain	0fd6981809	Don't allow placing is standig above the terrain level	2016-01-23 22:05:29 -03:00
esteldunedain	4970423cd7	Cancel placing if position is no longer suitable	2016-01-23 22:04:49 -03:00
esteldunedain	8ff8204905	Initial code implementation of ace_trenches	2016-01-23 20:45:59 -03:00
esteldunedain	1d886ac624	Merge branch 'master' into trenches ... Conflicts: AUTHORS.txt	2016-01-23 17:39:54 -03:00
esteldunedain	dec9235810	Periodically test all tags on objects for corner cases	2016-01-23 16:47:00 -03:00
esteldunedain	431a21044a	Tabs be damned.	2016-01-23 16:37:30 -03:00
esteldunedain	74b6036f3e	Handle destruction of tags placed on objects that don't support handledamage.	2016-01-23 16:24:55 -03:00
esteldunedain	e31636539a	Allow tagging wrongly configured static objects.	2016-01-23 16:21:43 -03:00
esteldunedain	b020d88963	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into taggingX	2016-01-23 15:14:32 -03:00
esteldunedain	758611d230	Restrict temp update to current weapon, and only primary or handgun	2016-01-23 11:48:23 -03:00
PabstMirror	3a62956e24	Fix wind display angle being reversed	2016-01-22 20:43:22 -06:00
PabstMirror	5df211c586	Merge pull request #3126 from acemod/weatherCleanup ... Weather cleanup, fix wind inversion, add non-color based wind speed indicator	2016-01-22 14:56:21 -06:00
PabstMirror	73b29085e2	Merge pull request #3200 from acemod/moreCache ... Hearing - Cache Weapon/Ammo loudness	2016-01-22 14:56:00 -06:00
PabstMirror	45138aea18	Merge pull request #3163 from acemod/unifiedStatusEffects ... Unified status effect handler	2016-01-22 14:55:25 -06:00
VKing	9501c54530	Fix #3203 IEDs magically changing shape	2016-01-22 14:21:25 +01:00
VKing	68531bd4a9	Merge branch 'master' into explosives_cleanup_plus_minetriggers	2016-01-22 14:15:45 +01:00
VKing	1cf7fc727d	Fix Handgrenade DisplayNameShort	2016-01-22 13:12:20 +01:00
PabstMirror	1a98726716	Add makeLoadable sync module	2016-01-21 22:12:54 -06:00
VKing	999d8ac2ce	Use max	2016-01-22 00:01:13 +01:00
esteldunedain	ad96617d3a	- Tagging cleanup. ... - Replaced "Tag wall" and "Tag ground" for a single "Tag" action. - Added more reliable checks before placing the tag - Allowed non-player units to tag (via API). - Replaced execRemoteFnc by events	2016-01-21 19:59:27 -03:00
esteldunedain	a22203a02a	Replace player for ACE_player	2016-01-21 14:39:20 -03:00
VKing	8482d45d8b	Add FCS to gunner and commander RCWS types for MRAPs, APCs, and arty. ... Lower max range to 5500m (9990 is too damn high!)	2016-01-21 16:00:55 +01:00
VKing	299baf1e4a	Fix shotbullet checking (lost in merge)	2016-01-21 15:56:53 +01:00
VKing	fedfa94dcd	Clean up	2016-01-21 15:01:41 +01:00
VKing	4406f270e2	Fix infantry rangefinders (again)	2016-01-21 14:44:23 +01:00
esteldunedain	91b7c7de61	Change the varname of the weapon data cache to be consistent with other modules	2016-01-20 22:22:53 -03:00
esteldunedain	41f8628917	Change cache location type to ACE_HashLocation	2016-01-20 22:20:16 -03:00
esteldunedain	f7cfbebc49	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into deterministicOverheatingX	2016-01-20 22:19:11 -03:00
VKing	bf5eb78788	Merge branch 'fcs_fixWeaponInitspeed' into fcs_rewriteRangeFunctions ... # Conflicts: # addons/fcs/functions/fnc_keyUp.sqf	2016-01-21 02:14:51 +01:00
VKing	b83be88571	Enhance ranging. ... KeyDown will now apply a static range calculation. KeyUp calculates the target movement and reapplies the calculation as normal. Sorry in advance for the merge conflicts	2016-01-21 02:02:50 +01:00
VKing	7d3044a5c2	Move display update stuff to fnc_getRange	2016-01-21 00:20:21 +01:00
PabstMirror	be8afe507c	Few more privates	2016-01-20 17:19:08 -06:00
PabstMirror	3dac426bc6	Merge pull request #3132 from acemod/interactionMenuCleanup ... Cleanup Interaction Menu	2016-01-20 17:04:10 -06:00
PabstMirror	abb01e0653	Merge pull request #3129 from acemod/frag-cacheIfWillFrag ... Frag - only run addPfhRound on ammo that will frag (for master)	2016-01-20 17:03:55 -06:00
VKing	43ab126c1f	Add FCS to botes RCWS	2016-01-20 23:06:06 +01:00
esteldunedain	e113853395	Merge branch 'master' into tagging	2016-01-20 18:51:41 -03:00
VKing	5f14d17f98	Another fix for BIS' inconsistent implementations	2016-01-20 22:30:22 +01:00
Thomas Kooi	232fe62d8d	Merge pull request #3195 from acemod/fix3194 ... Fix typo in ACE_hearing config	2016-01-20 22:26:13 +01:00
esteldunedain	9d13cc6f60	Move the weapon caching code to a different function. Add compatibility for legacy overheating properties. Add some comments.	2016-01-20 15:19:46 -03:00
esteldunedain	851615a234	Inherit custom gesture classes.	2016-01-20 13:44:51 -03:00
esteldunedain	7860f375c2	Better func description	2016-01-20 13:07:51 -03:00
esteldunedain	89106f6953	Replace addPerFrameHandler for waitAndExecute	2016-01-20 13:05:47 -03:00
esteldunedain	80b9a8961a	Improve reload animations	2016-01-20 12:48:39 -03:00
PabstMirror	a140f29784	Remove inherited classes that were not used	2016-01-20 09:45:03 -06:00
esteldunedain	bce572e1df	Derp	2016-01-20 12:15:25 -03:00
esteldunedain	19ccf52425	MRBS to mrbs	2016-01-20 12:05:35 -03:00
VKing	43c9444fb8	Didn't need that isNil check, anyway	2016-01-20 15:51:07 +01:00
esteldunedain	1a115e7f9c	Fix #3194	2016-01-20 11:48:12 -03:00
esteldunedain	6b4b8b707c	Prefix new configs for consistency	2016-01-20 11:42:05 -03:00
esteldunedain	2f7cac68a5	Small fixes	2016-01-20 10:59:58 -03:00
VKing	a9511936fd	LayZ evaluation	2016-01-20 12:35:53 +01:00
Glowbal	34613b42f2	Increase heart rate increase speed #3134	2016-01-20 11:49:10 +01:00
VKing	05ce4f824c	Rewrite fnc_getRange to work with specified minimum and maximum ranges ... Also cleaning up fnc_keyUp a bit	2016-01-20 00:10:27 +01:00
VKing	757436140b	fnc_getTargetDistance rewritten to use LineIntersectsSurfaces. ... Turns out it wasn't really needed after all, but better is better :p	2016-01-20 00:06:06 +01:00
PabstMirror	3d4fc66bb1	Cargo Cleanup, Add makeLoadable	2016-01-19 14:51:58 -06:00
esteldunedain	c78f2f8479	Gotcha travis	2016-01-19 17:29:58 -03:00
esteldunedain	5b90fd8b81	Set default particle effect on for the local player, as per current and historic behaviour.	2016-01-19 17:25:14 -03:00
esteldunedain	9bcabd081b	Reorder the fireEH function to allow particle effects for nearby remote players. Add a setting for that (default off).	2016-01-19 17:24:01 -03:00
VKing	968f7c000b	Simplify	2016-01-19 21:16:41 +01:00
SilentSpike	ca5f6df3d0	Merge pull request #3147 from acemod/spectatorBandAid ... Restart specatator display if player in unitList	2016-01-19 20:15:24 +00:00
VKing	c8bcf44561	Increase M307 FCS range	2016-01-19 21:08:03 +01:00
esteldunedain	8b7ed38990	Add a PFH to cool down all player weapons at (infrequent) regular intervals	2016-01-19 17:04:51 -03:00
esteldunedain	0313e7b322	Divide the weapon state variable into two: a temp variable, and a time variable. Only broadcast the temp part and only approximately	2016-01-19 17:03:47 -03:00
esteldunedain	782934c4b2	Add the setApproximateVariablePublic function to common	2016-01-19 16:58:07 -03:00
VKing	ae576e57e3	Fix the magazine name being broken in later code	2016-01-19 20:21:37 +01:00
esteldunedain	3792acd7f7	Merge branch 'master' into deterministicOverheatingX	2016-01-19 15:57:38 -03:00
VKing	59923710b7	Fix FCS not taking weapon initSpeed into account in some circumstances	2016-01-19 19:52:18 +01:00
VKing	838945c1db	Add FCS for the M307 GMG	2016-01-19 18:53:42 +01:00
PabstMirror	04bccf47d7	Replace all use of deprecated commands	2016-01-19 09:39:07 -06:00
esteldunedain	8e2d489312	Add warnings to deprecated functions	2016-01-19 09:39:06 -06:00
PabstMirror	7e84a9d9b0	Add getter, readd old public funcs, add blockSprint	2016-01-19 09:39:06 -06:00
PabstMirror	d2e006397d	cleanup, don't setVar public if no change	2016-01-19 09:39:05 -06:00
PabstMirror	9a3972de76	Unified Status Effect Handler	2016-01-19 09:39:05 -06:00
Thomas Kooi	b99be6122b	Merge pull request #3187 from acemod/fixFCS ... Add missing FUNC to FCS key (Rangefinders)	2016-01-19 16:05:56 +01:00
PabstMirror	6d6cbec5ef	Add missing FUNC to FCS key (Rangefinders) ... #3160	2016-01-19 09:02:51 -06:00
Thomas Kooi	c439036abe	Deprecate execPersistentFnc 3.7.0 ... Remove functions the second update after deprecation.	2016-01-19 15:55:33 +01:00
Thomas Kooi	a612bdecf2	Deprecate execRemoteFnc in 3.7.0 ... Remove functions the second update after deprecation.	2016-01-19 15:54:59 +01:00
PabstMirror	69771d531d	Merge pull request #3173 from acemod/fixInvintoryLock ... Fix Vehicle inventory is not locked	2016-01-19 08:37:58 -06:00
PabstMirror	0ea1c0c03f	Cleanup non-working code, and documentation	2016-01-19 08:31:52 -06:00
Thomas Kooi	e083e60e8c	Merge pull request #3142 from acemod/switchUnitsCleanup ... Cleanup SwitchUnits, Possible fix for #3122	2016-01-19 09:40:24 +01:00
Thomas Kooi	33479ffcae	Merge pull request #3146 from acemod/Explosives_DetonateTrigger ... Function to detonate explosives via script	2016-01-19 09:38:43 +01:00
Thomas Kooi	aa535c9167	Merge pull request #3177 from acemod/fixJavelinZeus ... Javelin - Fix zeus RC after switchCamera	2016-01-19 09:36:08 +01:00
Thomas Kooi	4ee338c57e	Merge pull request #3178 from acemod/scopes_hideNonAdjustments ... Scopes: Don't show adjustment or play click sound if the adjustment doesn't happen	2016-01-19 09:35:01 +01:00
Thomas Kooi	5c1f55a0f1	Merge pull request #3181 from acemod/leaveMyPlugsAlone ... Do not add or remove earplugs if gear should be preserved	2016-01-19 09:34:38 +01:00
Thomas Kooi	46f832379a	Merge pull request #3120 from acemod/explosives_actionmenu_cleanup ... Clean up explosive interaction menu	2016-01-19 09:32:26 +01:00
Thomas Kooi	f5d71ca03c	Merge pull request #3183 from acemod/codeCleanupGforces ... Code cleanup of Gforces module V2	2016-01-19 09:31:16 +01:00
Thomas Kooi	fbb358233b	Merge pull request #3172 from acemod/overpressureCleanup ... Overpressure cleanup and fix distance check	2016-01-19 09:30:43 +01:00
esteldunedain	f599542b8e	gforces cleanup. Close #2130	2016-01-19 00:18:01 -03:00
commy2	8731e8e338	Merge pull request #3133 from acemod/gottaCacheEmAll ... Use Function Caching in CBA	2016-01-18 20:27:39 +01:00
esteldunedain	0a91dfa7b2	Do not add or remove earplugs if gear should be preserved. Fix #3180.	2016-01-18 13:23:55 -03:00
VKing	2af3d9e769	Don't show adjustment or click sound if the adjustment doesn't happen	2016-01-18 16:16:53 +01:00
PabstMirror	67087d7c88	Capitalization	2016-01-18 00:27:19 -06:00
PabstMirror	a5c6c5579f	#3175 - Javelin - Fix zeus RC after switchCamera	2016-01-17 12:12:05 -06:00
Glowbal	86158ac45b	Stage improvements bandage effectiveness	2016-01-17 14:09:22 +01:00
Glowbal	7de1a7bc6c	add initial implementation of drowning and collision damage handling	2016-01-17 13:21:18 +01:00
Glowbal	209d10065b	Fix missing event log entries #3134	2016-01-17 12:28:37 +01:00
Glowbal	6e42a10d47	Add selectionDamage implementation	2016-01-17 12:28:08 +01:00
PabstMirror	48a1ddd401	#3166 - Fix Vehicle inventory is not locked	2016-01-16 21:58:59 -06:00
PabstMirror	35e6a181b5	opps	2016-01-16 17:48:58 -06:00
PabstMirror	893c6658a5	Fix debug msg order, re-add local check on eh	2016-01-16 17:29:57 -06:00
PabstMirror	a875d6a870	Overpressure cleanup and fix distance check	2016-01-16 15:53:28 -06:00
Glowbal	ee9a620a63	Merge branch '340handledamage' into medical-focus-feature	2016-01-16 22:03:28 +01:00
Thomas Kooi	c8c91d2af7	Merge pull request #3138 from acemod/increaseTrainingInLocations ... Medical Locations Boost Training	2016-01-16 21:59:45 +01:00
VKing	e3123b3f56	Local check before setPosition	2016-01-16 01:13:01 +01:00
SilentSpike	dbcf94153d	Merge pull request #3155 from acemod/spectatorFix ... Fix some spectator errors	2016-01-15 15:43:45 +00:00
VKing	17aaf477fe	Standardize displayName for the M26/Mk26/M152/whatever this is	2016-01-15 11:47:40 +01:00
VKing	cfea80bec8	Animate preplaced bottom attack SLAMs	2016-01-15 10:49:22 +01:00
VKing	248eb2143b	Fix inconsistent detonator pictures for some IEDs	2016-01-15 10:20:49 +01:00
VKing	0078ad862a	Remove redundant entries. ... Not removing them as it can be useful to have a reminder that those classes exist.	2016-01-15 09:33:01 +01:00
Thomas Kooi	e38a80a712	Merge pull request #3119 from acemod/explosives_detonateAll ... Add action to detonate all explosives on a detonator	2016-01-15 08:22:16 +01:00
VKing	4e8ea4f8e6	Fix detonate action pictures	2016-01-15 00:25:02 +01:00
PabstMirror	1affbd7d2f	Move littler syncedEH install to after settingInit	2016-01-14 17:06:46 -06:00
VKing	05c80c2368	Gah stop that you jerk!	2016-01-15 00:04:12 +01:00
VKing	ed8b437a8f	Prep function	2016-01-14 23:58:31 +01:00
VKing	32b33d7792	How the feck did this happen	2016-01-14 23:58:07 +01:00
VKing	8bdb2cb7f7	GVAR it.	2016-01-14 23:05:56 +01:00
VKing	575f37c8fd	Add fnc_connectExplosive to add editor explosives to unit triggers	2016-01-14 23:05:26 +01:00
VKing	195f0a6874	GVAR it	2016-01-14 20:07:53 +01:00
VKing	1da2b69de4	Make fuel bladders work	2016-01-14 20:07:32 +01:00
VKing	099648b6b6	Russian translation as suggested	2016-01-14 18:51:14 +01:00
VKing	7158a89de9	Start	2016-01-14 18:48:16 +01:00
VKing	74435ba777	Style guide formatting	2016-01-14 18:47:51 +01:00
VKing	73e093ec07	Make stringtable a little more translatable	2016-01-13 22:39:37 +01:00
VKing	2c26d3836b	Some fixes for the zeus modules	2016-01-13 22:39:14 +01:00
SilentSpike	49c814ccb3	Merge branch 'master' into spectatorUpdates	2016-01-13 19:19:00 +00:00
SilentSpike	d870a1f448	Fix nil spectator Draw3D event handler index ... Minor oversight introduced in pabst's fix for #2989, the icon handler is a mission event handler that isn't self terminating so the index needs to be preserved until after it is removed via `removeMissionEventHandler`. It is safe to let the `onUnload` event take care of that (and preferable so that icons disappear while temporarily closed).	2016-01-13 19:03:24 +00:00
SilentSpike	65e981373b	Store spectator display in a uiNamespace variable ... This allows me to explicitly close the right display and hopefully fix the interface staying open upon mission end. @Commy2's theory is that perhaps the main display `46` is killed upon mission end, meaning that `findDisplay` can't find the spectator display to close it because the game thinks it doesn't exist.	2016-01-13 18:38:51 +00:00
VKing	1ae21ad354	Change SLAM bottom attack ammo to be more bottom attacky	2016-01-13 15:41:20 +01:00
VKing	b87a6327ee	Fix Zeus modules not showing up	2016-01-13 15:40:39 +01:00
VKing	058ea4e8f4	Actual editor mines	2016-01-13 01:03:50 +01:00
VKing	f90dd9fed8	Allow SLAMs to use long range transmitter	2016-01-13 00:14:17 +01:00
VKing	46643d44d0	Add editor/zeus modules for different trigger options	2016-01-13 00:13:56 +01:00
VKing	a07d456476	Change small IEDs to use smaller pressure plates	2016-01-12 23:17:10 +01:00
VKing	61f288c9cc	Rename custom classes with ACE_ prefix	2016-01-12 23:16:49 +01:00
esteldunedain	455c53a084	Nerf the amount of backblast received by the firer via reflection. Fix #2890.	2016-01-12 13:09:41 -03:00
PabstMirror	091c807708	Restart specatator display if player in unitList ... Possible fix for #2677	2016-01-12 00:30:03 -06:00
PabstMirror	8cbf31a375	Fix undefined variable error in FUNC(debug) ... possibly related to #2677 - threw error from switchToGroupSide	2016-01-11 23:37:44 -06:00
VKing	4fc7c3065e	Rename to fnc_scriptedExplosive	2016-01-11 23:41:33 +01:00
VKing	01dd663337	Add fnc_detonateExplosiveTrigger	2016-01-11 23:36:34 +01:00
bux	ec0ece059f	use Killed event, fix missing public setVar ... add more text, don't delete dead unit	2016-01-10 20:58:54 +01:00
bux	09e4a6a76e	cleanup SwitchUnits	2016-01-10 19:08:28 +01:00
PabstMirror	c2f780e95f	#1259 - Medical Locations Boost Training	2016-01-09 23:54:48 -06:00
PabstMirror	dd979676fd	Remove use of CAManBase for all mans ... End use of bandaid from #1294	2016-01-09 22:05:40 -06:00
PabstMirror	82179636f3	Cache hearing firedNear	2016-01-09 18:51:41 -06:00
PabstMirror	63a79b9920	Use Function Caching in CBA	2016-01-09 01:36:19 -06:00
PabstMirror	a161008eb7	Fix count/forEach	2016-01-09 01:15:09 -06:00
PabstMirror	ed4cc42897	Cleanup Interaction Menu	2016-01-08 23:29:32 -06:00
commy2	62f589ac84	remove deprecated functions	2016-01-08 15:56:32 +01:00
PabstMirror	54397abaa2	AB - Handle subsonic ammo when not defined ... Fix #3062 - Add basic AB configs for subsonic russian bullets. - When building ab ammo cache, if round is subsonic and does not have AB configured attempt to use the parent's config, scaled down to the subsonic's round speed.	2016-01-07 15:06:12 -06:00
PabstMirror	066976766f	Show beaufort dots on wind display -for color Blind ... Show dots on the wind display so color blind can still determine wind level Replace PR #1308	2016-01-07 10:34:31 -06:00
PabstMirror	9d14ff8b03	Merge branch 'master' into deterministicOverheatingX	2016-01-06 23:25:24 -06:00
commy2	de13518177	explode macro to params	2016-01-06 22:49:22 +01:00
commy2	e56e18bff3	Code cleanup 1.54	2016-01-06 22:42:02 +01:00
VKing	9985988987	Change ACE_Player to _unit	2016-01-06 18:05:06 +01:00
jokoho48	daf2fc2669	remove ccp issue in settings ... prevent setCaptive if unit is wake up	2016-01-06 18:01:24 +01:00
jokoho48	6d49bbda28	add delay to Unconsciousness Captivity(posible fix for #3121)	2016-01-06 17:46:59 +01:00
commy2	abf516aeb1	manual merge	2016-01-06 15:57:09 +01:00
PabstMirror	4c229c92f5	Add Stringtable Entry	2016-01-05 17:29:01 -06:00
PabstMirror	b6dce03c90	Fix Header	2016-01-05 17:16:47 -06:00
VKing	1706ca0adc	Move detonate actions from "Detonate" layer to "Explosives" layer. ... Remove inconsistent ">>" from explosive actions.	2016-01-06 00:06:06 +01:00
VKing	cc8ac69feb	Add function and action to detonate all explosives on a detonator	2016-01-05 23:47:01 +01:00
Glowbal	c042703786	Merge branch 'release'	2016-01-05 22:55:34 +01:00
Glowbal	509e142de8	bump version 3.4.2	2016-01-05 22:42:37 +01:00
PabstMirror	175624620c	Fix inverting wind direction each sync update ... Fix #1052 (and maybe #1708)	2016-01-05 15:29:52 -06:00
commy2	7eaa55f9df	Merge pull request #3022 from acemod/bodybagevent ... add event for placing units in body bags	2016-01-05 21:59:47 +01:00
commy2	74f78c2dd1	Merge pull request #3010 from acemod/cargoboxfilters ... Add more filters to ammo boxes	2016-01-05 21:55:24 +01:00
commy2	279b48f112	Merge pull request #3110 from acemod/gogglesfiredBIS ... fix usage of deprectated fired XEH, fix #3088	2016-01-05 21:52:53 +01:00
commy2	3854a5c989	Merge pull request #3109 from acemod/ThingX ... fix ThingX capitalization, fix #3076	2016-01-05 21:52:42 +01:00
PabstMirror	e2c08d2c26	Privates, Headers, Merge 4 PFEH into one	2016-01-05 01:39:29 -06:00
PabstMirror	46cb90254a	Add ACE_HashLocation to common	2016-01-04 21:48:26 -06:00
Luigi	7f9c766770	Fixed and added French Translation	2016-01-04 16:47:15 +01:00
Luigi	a079f213c0	Fix French translation ... Fix an error in a French translation	2016-01-04 16:19:23 +01:00
PabstMirror	a72e07fcaa	Goggles - change some events to be client only ... all these events have `if (_unit != ACE_player) exitWith {true};`	2016-01-03 11:01:14 -06:00
Alessandro Foresi	bafde22c71	Fix: Indentation	2016-01-03 16:47:41 +01:00
commy2	3974c255a0	fix usage of deprectated fired XEH, fix #3088	2016-01-03 15:27:16 +01:00
commy2	427628045c	fix ThingX capitalization, fix #3076	2016-01-03 15:21:38 +01:00
commy2	ecad63e34d	integrate filters pbo into inventory pbo	2016-01-03 14:47:37 +01:00
jonpas	b93183fef9	Shorten if check	2016-01-03 14:05:50 +01:00
Alessandro Foresi	2d152675fc	Add: IT small translations, DE removed duplicate	2016-01-03 13:02:01 +01:00
Alessandro Foresi	c16d97cad0	Merge branch 'master' into translation/15bn/alef	2016-01-03 12:23:27 +01:00
Braxton Williams	ce069c8f3c	Change Sandbag category	2016-01-02 18:25:48 -06:00
jonpas	6edd7ab093	Change ACE_HeadlessClientJoined event to be global and always triggered	2016-01-02 14:42:05 +01:00
jonpas	a1866a561b	Add Headless	2016-01-02 14:23:14 +01:00
bux	977bda83e5	add 2 new events, add unit to place event ... defuse and explodeOnDefuse	2016-01-01 21:47:39 +01:00
Braxton Williams	99e2ee6110	Add sandbag to editor	2016-01-01 13:09:11 -06:00
PabstMirror	76c9e1560d	Frag - only run addPfhRound on ammo that will frag ... If spall is not enabled (default) then calculate which ammo types will actually cause a frag event, cache and then only track those.	2016-01-01 02:33:08 -06:00
PabstMirror	79a7bb54aa	Kill Spectator PFEH when exiting spectator ... Should fix #2989 There is a race condition between these 4 PFEH and the "onUnload" event in handleInterface. If the PFEHs run first they will use nil variables and throw a script error. This sets them to nil immediately when exiting spectator	2016-01-01 00:14:48 -06:00
PabstMirror	5f74daec42	Fix dupe german stringtable entry	2015-12-31 22:28:35 -06:00
jonpas	33f91b2ee7	Remove duplicated line caused by merge	2016-01-01 03:52:37 +01:00
jonpas	ebf1321c0b	Merge branch 'release' into fixFuelHoseExceededAfterDisconnect	2016-01-01 03:51:44 +01:00
PabstMirror	fb0738bd30	Merge branch 'master' into release	2015-12-31 20:27:26 -06:00
PabstMirror	32b4416c29	Merge pull request #3064 from GitHawk/refuel ... Adaptation of fnc_makeJerryCan to new interact_menu	2015-12-31 20:12:43 -06:00
VKing	222b15634f	Increase prep time for guided projectiles	2015-12-31 22:26:04 +01:00
PabstMirror	586449eef9	Merge pull request #3084 from acemod/cbaZeusIntegration ... CBA zeus integration	2015-12-31 15:15:23 -06:00
PabstMirror	19f54071f1	Merge pull request #3052 from acemod/isPlayerRemoteZeus ... Add support for non local Zeus RC in common-isPlayer	2015-12-31 15:14:44 -06:00
PabstMirror	62a94759c4	Merge pull request #3092 from acemod/minorSittingCleanup ... Sitting Cleanup	2015-12-31 14:50:31 -06:00
PabstMirror	8bdd5d0597	Merge remote-tracking branch 'brGuy/Translations-December' into fixStringtablesMerge	2015-12-31 14:30:29 -06:00
licht-im-Norden87	2d64d54d98	Update German Stringtable ... Iam sure there was a translation some time ago. Someone must have deleted it. spelling mistake Update Stringtable 100% some of them already existed in german language Update stringtable.xml spelling mistake Update stringtable.xml Iam not sure if SSWT is a Scharfschützenzweibein. However, it was used before, i just adpated it. Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Handelt es sich bei dem Modell den auch um das Produkt von Sharpshooters® http://shop.centermassinc.com/Sharpshooters-Sniper-Weapon-Tripod-Kit-764737932766.htm bzw ist ads erkennbar. Ich persönlich halte die Bezeichnung SSWT-Kit für ein wenig ungünstig. Update stringtable.xml	2015-12-31 14:17:13 -06:00
PabstMirror	cf27571b5a	Merge pull request #3007 from dudakov/master ... Russian Translations - Update	2015-12-31 14:11:45 -06:00
PabstMirror	7b077c5f19	Merge pull request #3078 from acemod/fixGoggles3rd ... Fix Third Person Goggle Effect Not Displaying	2015-12-31 10:24:23 -06:00
Thomas Kooi	40afa45417	Merge pull request #3058 from freghar/isturnedout ... fix inverted isTurnedOut for map lighting	2015-12-31 13:03:42 +01:00
bux	23bec6d9a8	Merge master into branch	2015-12-31 10:20:47 +01:00
PabstMirror	2e211c5a04	Fix Medical Triagecard Macro ... Fix #3087	2015-12-31 01:46:24 -06:00
PabstMirror	f11c2af921	Update XEH_clientInit.sqf	2015-12-30 14:55:25 -06:00
PabstMirror	d372111d3f	Sitting Cleanup ... - Add modern privates - Don't add actions, canInteractWith, or EH if not enabled	2015-12-30 12:23:35 -06:00
bux	0e8eb5fac4	Remove obsolete hotkey entries	2015-12-30 11:23:52 +01:00
bux	d6c5643790	improve code style	2015-12-30 09:43:19 +01:00
bux	2a6042bf61	add interaction position and defuse object position ... and reduce interaction distance	2015-12-30 09:11:57 +01:00
PabstMirror	72fe95c797	Add "isNotInZeus" to canInteractWith ... Re-fix #1951 (CTRL+V from climb blocking paste in zeus)	2015-12-30 01:48:43 -06:00
PabstMirror	1e29c0286f	Remove Keybinds/Events for Zeus now handeld in CBA ... Close #2937	2015-12-30 01:07:55 -06:00
bux	112c002b0b	remove ace_offset entry ... Ported from AGM and simply renamed. It wasn't even used in AGM.	2015-12-29 20:57:55 +01:00
dixon13	356bd36728	Changed action name ... - Changed display name for extraction action on civilians to match the new action name 'Get Out'. - Changed class name for extracting civilians out of vehicles to match the action name	2015-12-29 09:27:43 -07:00
dixon13	f2b3275538	Changed action name ... Changed extraction action to 'Get Out' to match other civilian actions.	2015-12-29 09:25:33 -07:00
dixon13	d410fe42d9	Fixed misspell ... '_targe' is suppose to be '_target'	2015-12-28 22:00:08 -07:00
PabstMirror	462e37e6d1	Update Heating / Cooling physics numbers ... Attempting to update numbers based on real physics. Effects will increase heat generated per shot and decrease cooling - ~1.333x increased heating - ~1.45x less cooling	2015-12-28 21:01:56 -06:00
PabstMirror	415402b5ad	Cleanup and debug ... Fix missing weapon configs Fix Dispersion (Radians / Degrees) Fix comment	2015-12-28 16:08:32 -06:00
PabstMirror	42b350a40c	Cache Weapon Configs	2015-12-28 16:04:56 -06:00
PabstMirror	e587a6e6e3	Modernize code	2015-12-28 16:04:56 -06:00
PabstMirror	3020023f58	setVariablePublic - Use waitAndExecute	2015-12-28 16:04:55 -06:00
esteldunedain	c1e8b3dba9	Fix temperature bar color	2015-12-28 16:04:55 -06:00
esteldunedain	f132955d9f	Reenable refraction fx but make it optional for the moment.	2015-12-28 16:04:55 -06:00
esteldunedain	d001131314	Tweak and optimize the smoke effect to increase smoke and reduce performance impact	2015-12-28 16:04:54 -06:00
esteldunedain	3c74c4bada	Fix temperature indicator to max out red at half the bar	2015-12-28 16:04:54 -06:00
ulteq	4122d68684	Adjusted temperature display (red above 600°C)	2015-12-28 16:04:54 -06:00
ulteq	a1ee99cc8a	Remove debug code	2015-12-28 16:04:53 -06:00
ulteq	7858b65fde	Fixed misspelled function name	2015-12-28 16:04:53 -06:00
ulteq	0a27c309cb	Added missing variable definitions	2015-12-28 16:04:52 -06:00
commy2	f83206353d	jamming	2015-12-28 16:04:52 -06:00
Nicolás Badano	4264789631	Refactored code so the weapon temperature is correctly updated when checking it	2015-12-28 16:04:52 -06:00
Nicolás Badano	ac67e45098	overheating: sync weapon temperature across the net, deterministic pseudo-random bullet dispersion	2015-12-28 16:04:51 -06:00
Nicolás Badano	932e17cea4	fix	2015-12-28 16:04:51 -06:00
Nicolás Badano	fb56350217	small fixes	2015-12-28 16:04:51 -06:00
Nicolás Badano	de902ca4fd	Modify setVariablePublic so it published inmediately if the variable hasn't being publishes recently. Then establish an embargo time before it can be published again.	2015-12-28 16:04:50 -06:00
jonpas	c0aaf05eaf	Prevent interaction if unit(s) climbing the ladder, Disable tilting, Split adjust string into adjust and tilt	2015-12-27 19:28:29 +01:00
PabstMirror	dc60860421	Fix Third Person Goggle Effect Not Displaying ... #3074	2015-12-26 23:31:49 -06:00
dixon13	a4781a20d3	Authors	2015-12-23 19:27:55 -07:00
dixon13	2a98aa57ed	Delete fnc_canInteractWithCivilianVehicle.sqf ... No need to create another funciton	2015-12-23 11:54:41 -07:00
dixon13	d3a1110250	Removed a portion of the condition	2015-12-23 11:52:23 -07:00
dixon13	5f7e833d43	Removed "PREP(canInteractWithCivilianVehicle)" ... Function is being removed	2015-12-23 11:51:19 -07:00
dixon13	21daa331dc	Changes to ACE_Unload ... - added semi-colon - changed the condition - changed the statement	2015-12-23 11:49:17 -07:00
dixon13	1aa192f7e0	Extract civilans from vehicles, rmeoved actions from civilians in vehicles	2015-12-23 00:19:41 -07:00
Githawk	2432ac3319	Changed scope for carried objects	2015-12-22 17:54:16 +01:00
Githawk	d16417a00b	Changed scope on nozzle	2015-12-22 17:49:58 +01:00
Githawk	ebb28177b1	More fixes to make jerryCan work	2015-12-21 17:54:52 +01:00
Glowbal	c1fa81f28b	Fix tabs in sqf files	2015-12-21 17:05:48 +01:00
Githawk	d9e7a43bf7	Fixes error with new interact_menu	2015-12-21 16:53:25 +01:00
jokoho48	0addb592d3	remove Unused Varaible in AB ... fix private in AB	2015-12-21 02:29:10 +01:00
VKing	38fb97aeac	Fixed init problem; added mortar ammo boxes	2015-12-20 20:51:44 +01:00
VKing	73720f9313	Too hasty	2015-12-20 18:20:34 +01:00
VKing	b7bd468fdd	That ought to not have worked before	2015-12-20 18:18:33 +01:00
freghar	a383da5b2d	fix inverted isTurnedOut for map lighting ... According to the comment, the idea is to provide unobscured map when inside an enclosed vehicle (!isTurnedOut). Signed-off-by: freghar <freghcz@gmail.com>	2015-12-20 11:53:08 +01:00
PabstMirror	9b0641c06f	Add nil return for count	2015-12-19 21:17:36 -06:00
PabstMirror	74aec45921	Fix medical menu not closing on range, litter dir ... - Medical Menu didn't close when target moved out of range - Litter was always created in the same direction	2015-12-19 20:50:57 -06:00
VKing	450a18e13a	Forgot to disable in case the setting's set to "no" (but why would you ever want to	2015-12-19 21:29:37 +01:00
VKing	f75311917c	Upped mortar round mass	2015-12-19 20:49:09 +01:00
VKing	b4cb5c2ba7	Changed mortar initialization to getIn; Zeus-controlled AI will not trigger the init.	2015-12-19 19:54:45 +01:00
VKing	85270e4521	Fix init issue	2015-12-19 18:22:54 +01:00
VKing	a37d97103f	Erk	2015-12-19 16:37:30 +01:00
VKing	a336707623	Fixed initialization, added exclude variable to prevent initialization of individual guns (for e.g. AI mortars)	2015-12-19 16:30:01 +01:00
VKing	dfe7c07936	Fix fnc_mortarInit, fnc_loadMagazine, some other stuff	2015-12-19 12:10:12 +01:00
VKing	2c4a25a6c0	Mortar init functions	2015-12-19 02:18:35 +01:00
PabstMirror	4d041c3c94	Merge pull request #3049 from acemod/fixlaserdesignator ... Remove undefined laser selfdesignate macro	2015-12-18 12:09:04 -06:00
Jonathan Pereira	ad48f51ec7	Added PT-BR translations ... All remaining translations of gestures, hearing, interact_menu, interaction, nightvision, rearm, refuel, viewdistance were done!	2015-12-18 15:14:19 -02:00
PabstMirror	c53a0541a4	Add support for non local Zeus RC in common-isPlayer	2015-12-18 11:08:10 -06:00
Jonathan Pereira	db7074b6cf	Removed duplicated German entry	2015-12-18 14:45:20 -02:00
commy2	e3ecc64771	remove undefined macro	2015-12-18 13:53:25 +01:00
VKing	579f861b8f	Unload to player inventory	2015-12-17 19:25:22 +01:00
VKing	27890a8dab	First try at some module control	2015-12-17 11:00:46 +01:00
VKing	a0fdc58ed7	Remove unused variables, spaces	2015-12-17 09:13:23 +01:00
VKing	d8c8d02177	Port inventory picture and model	2015-12-17 00:21:54 +01:00
VKing	e0a21ce144	Completed code porting and interaction	2015-12-16 23:47:14 +01:00
VKing	3e6fc52733	First working iteration. ... Todo: Implement in module (Choose new or old/don't break old missions) Magazine UI+model Add preparing delay Fix function readmes Cleanup in functions? Credits MP Testing	2015-12-16 20:22:18 +01:00
PabstMirror	43a9865fa2	Use isNil for better future compatiblity	2015-12-16 12:10:53 -06:00
PabstMirror	360bdcb50e	Optics - Don't modify camera for ThreeDen Editor ... Fix broken ThreeDen Camera when returning to editor from preview. PIP will still work in preview. Will have to take a look at 1.56 RC to see if command exists and eventually cleanup.	2015-12-16 11:28:43 -06:00
PabstMirror	ff3ddbe287	Building Interact - Dummy object instead of hiding ... Fix #3038 InteractiMenu now checks `isObjectHidden`, So now use dummy object instead of hiding a real one	2015-12-15 12:04:03 -06:00
PabstMirror	7258a0084a	Merge pull request #2995 from acemod/repairThreshholdToolkit ... Fix PostRepairDamage and toolkit consumtion setting	2015-12-14 19:30:19 -06:00
PabstMirror	f2bcd66784	Toolkit also consumed on fullRepair	2015-12-14 19:28:31 -06:00
PabstMirror	886c13f6a9	Merge pull request #3013 from acemod/bloodyLitter ... Fix litter for adv - Add bloody p3d for Pack/qClot	2015-12-14 19:23:51 -06:00
PabstMirror	0b5b11c966	Merge pull request #3014 from acemod/fixNameSanatize ... Sanitize less/greater-than symbol to square	2015-12-14 19:23:07 -06:00
PabstMirror	e5abb59f1d	Merge pull request #3011 from acemod/rhsMergeERA ... RHS Compat - Combine all ERA Hitpoints	2015-12-14 19:22:51 -06:00
commy2	e6be1537cd	replace more private with private keyword in common	2015-12-14 13:17:48 +01:00
commy2	bfa29246be	replace private with private keyword in other half of common	2015-12-14 13:08:19 +01:00
PabstMirror	9064579a65	Send string to serverLog instead of strucText ... Fix `Performance warning: SimpleSerialization::Read 'ace_common_remoteFnc' is using type of ,'TEXT' which is not optimized by simple serialization, falling back to generic serialization, use generic type or ask for optimizations for these types`	2015-12-13 13:27:46 -06:00
VKing	170095ae35	Initial commit for mortar ammunition handling.	2015-12-13 18:27:13 +01:00
commy2	bd3c79f739	add function to retrieve the control of the stamina bar	2015-12-12 20:25:42 +01:00
commy2	7f63d51ccb	add event for placing units in body bags	2015-12-12 18:21:11 +01:00
commy2	2839cff753	common code fixes	2015-12-12 17:26:47 +01:00
commy2	3d5ea74c7e	replace private with private keyword in first half of common	2015-12-12 16:48:54 +01:00
jonpas	4c2d92d360	Negate fuel hose connected condition	2015-12-12 15:12:50 +01:00
PabstMirror	a501c7e1c3	Remove new models and just combine existing litter	2015-12-11 19:47:40 -06:00
jonpas	e5f64bcdc1	Fix refuel PFH not exiting on nozzle disconnect	2015-12-11 22:45:28 +01:00
PabstMirror	24d77d1b7c	Fix Typo	2015-12-11 12:17:05 -06:00
PabstMirror	db50b5313d	getName can return raw or sanatized html tags	2015-12-11 12:01:50 -06:00
commy2	ff95aab100	remove helmets from items filter	2015-12-11 15:05:43 +01:00
commy2	ee7f8f82f5	remove debug	2015-12-11 14:24:54 +01:00
commy2	5d9a057165	add more filters to ammo boxes	2015-12-11 14:18:11 +01:00
commy2	2b63b2efa8	add more filters to ammo boxes	2015-12-11 13:14:58 +01:00
PabstMirror	c7b6375092	Sanitize less/greater-than symbol to square ... Fix #2912 The raw `&lt;` showed up in nametags and anything besides strucText `[ / ]` is fairly close and will work in either text mode.	2015-12-10 23:29:05 -06:00
PabstMirror	e9be05209a	Fix litter for adv - Add bloody p3d for Pack/qClot ... Fix #2950 Get correct bloodLossOnSelection for both basic and advanced Adds bloody versions of packing bandage and quickClot	2015-12-10 22:58:44 -06:00
PabstMirror	ee0812ad15	RHS Compat - Combine all ERA Hitpoints ... Put all ERA hitpoints (up to 46 of them) onto a single point and put that point on the main interaction point	2015-12-10 20:57:23 -06:00
commy2	68388bc976	add more filters to ammo boxes	2015-12-11 01:02:15 +01:00
bux	8e6a057f52	fix common stringtable	2015-12-10 18:48:00 +01:00
kaban	fd06472f4d	Russian Translations - Update	2015-12-10 20:32:16 +03:00
[OMCB]kaban	aec2c3fef2	HotFix: removed duplicated key. ... Removed duplicated German key for STR_ACE_Common_DoNotForce. It caused Tabler.exe couldn't read stringtable files.	2015-12-10 18:24:28 +03:00
PabstMirror	f3b7b3b94f	Merge pull request #2994 from acemod/microDagrListBoxKeyblock ... MicroDagr - Prevent Home Key being blocked	2015-12-10 09:20:06 -06:00
PabstMirror	a71cce1981	Merge pull request #2987 from acemod/gesturesCleanup ... Setting For Gestures - Fix BI* gestures	2015-12-10 09:19:35 -06:00
commy2	077b9827e8	code cleanup fcs	2015-12-10 16:00:14 +01:00
commy2	7748131e73	code cleanup markers	2015-12-10 15:32:31 +01:00
commy2	a08cf69149	tweak size of laserpointer, fix #2975	2015-12-09 22:56:14 +01:00
havena	6f0568c370	fix Unexpected stringtable format ... Unexpected stringtable format inside <Text ID="STR_ACE_Common_CheckPBO_Action_WarnPerm"><German>	2015-12-09 20:18:15 +01:00
PabstMirror	3ae7cd15bd	cleanup stringtable phrasing	2015-12-09 12:27:47 -06:00
PabstMirror	3d560108a3	Setting For Gestures - Fix BI* gestures	2015-12-08 23:08:09 -06:00
PabstMirror	0eed4799af	MicroDagr - Prevent Home Key being blocked ... Fix #2974	2015-12-08 21:31:03 -06:00
PabstMirror	e964b2c135	Fix PostRepairDamage and toolkit consumtion setting ... Fix #2982	2015-12-08 20:31:40 -06:00
PabstMirror	cae9f436f6	Merge branch 'release'	2015-12-08 15:14:33 -06:00
Glowbal	0599b35fc6	Bump version to 3.4.1	2015-12-08 14:47:48 +01:00
PabstMirror	38bf869f07	Also Fix Rearm	2015-12-07 14:07:03 -06:00
PabstMirror	cd68f9b320	Fix refuel unconc error - Man unloading for air	2015-12-07 13:54:41 -06:00
Thomas Kooi	05c56f73b5	Change disable NVG with sights by default ... As discussed on Slack, we are changing the default behaviour infavor of excepted gameplay.	2015-12-07 18:33:20 +01:00
PabstMirror	39edd205f0	Merge pull request #2942 from acemod/CzechTables ... Czech Translations - Update	2015-12-07 09:32:00 -06:00
bux578	fbde1dd794	Merge pull request #2941 from acemod/DieStringtables ... Update German Stringtables	2015-12-07 10:27:11 +01:00
bux578	821ccf5726	fix medical menu stringtable name	2015-12-07 10:21:48 +01:00
bux578	af31d43567	fix german typos	2015-12-07 10:20:35 +01:00
PabstMirror	358228f5bb	Cleanup De Stringtables	2015-12-06 15:03:15 -06:00
commy2	9fa62c6d2a	clean up vehicles config	2015-12-06 11:18:07 +01:00
gienkov	56e919dccc	nozzle additonal check condition	2015-12-06 06:47:19 +01:00
gienkov	1132efaf48	ceil number of wounds	2015-12-06 02:57:21 +01:00
gienkov	f6e7cad678	remove Original entries	2015-12-05 22:08:39 +01:00
PabstMirror	b13656e54b	addDamageToUnit - Disable debug / testing code	2015-12-05 12:19:34 -06:00
Thomas Kooi	761d6e28d8	Merge pull request #2939 from acemod/fixMicroDagrDefines ... MicroDagr - Add #undef to config for pboProject	2015-12-05 11:29:25 +01:00
Thomas Kooi	8e88740730	Merge pull request #2924 from acemod/woundReopeningArray ... Don't update openWounds if not bandaged	2015-12-05 11:28:56 +01:00
ProfessorCZ	cf41ac5fba	Czech Translations - Update	2015-12-04 22:28:10 -06:00
licht-im-Norden87	291f4df072	Update German Stringtables ... Update stringtable.xml Update stringtable.xml Update stringtable.xml kommas........................................................................................................................................................... Rallypoint Update stringtable.xml slideshow, not finished yet Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml What does Curator mean in this context? l. 294, l 302 cargo Update stringtable.xml Update stringtable.xml I left a few things out. I'd like if someone gives me advice Z.698 Pionier oder Instandsetzer o.Ä. Was genau ist die deutsche Bezeichung der Klasse in ACE bzw Arma? Z.707 Ich habe mich einfach mal auf Mechatroniker festgelegt, da Reperaturspezialist sich doch ein wenig ungelenk anhört... Update stringtable.xml Habe engineer als Pionier übersetzt (halte es selbst für etwas unpassend) Der specialist ist bei mir zum Mechatroniker geworden. Update stringtable.xml Update stringtable.xml Update stringtable.xml Fix Mistakes from merge Fix Empty Entries Fix Mistake Fix	2015-12-04 22:06:44 -06:00
PabstMirror	f5aae81465	MicroDagr - Add #undef to config for pboProject ... #2936	2015-12-04 20:08:30 -06:00
PabstMirror	43a168f0b9	Flashbangs - Make event radius match effect radius	2015-12-04 15:16:17 -06:00
commy2	e418cfcf11	Merge pull request #2935 from acemod/fixbinoculars2 ... Fix binocular related bugs	2015-12-04 21:27:53 +01:00
commy2	5d43fa93c6	fix FUNC(binocularMagazine), fix #2916, fix #2917, fix #2918, fix #2922, fix #2928, fix #2933	2015-12-04 19:37:37 +01:00
PabstMirror	875b3980ac	Don't update openWounds if not bandaged ... Fix #2921	2015-12-03 15:23:38 -06:00
PabstMirror	91ace4fc9b	Fix whitelist string -> array error in checkPbo ... Fix #2913 Use splitString instead of call compile to convert string into an array	2015-12-02 23:58:41 -06:00
PabstMirror	c928a0d6cb	Remove Sleep/WaitUntil from checkPBO ... Fix #2910	2015-12-01 22:50:28 -06:00
PabstMirror	46c43b56db	Merge branch 'release'	2015-12-01 15:54:57 -06:00
PabstMirror	419af195e9	#2902 - Remove error and don't exit if veh has no hit points ... B_UAV_01_F has no hitpoints and would throw error Don't exit so "fullRepair" action still gets added	2015-12-01 13:43:27 -06:00
Glowbal	dacfe4d6cb	Bump version to 3.4.0	2015-12-01 17:05:08 +01:00
commy2	861262e41c	revert false captitalization change	2015-11-30 17:56:25 +01:00
commy2	411a8d58f3	fix more setVariable and getVariable capitalization	2015-11-30 17:53:57 +01:00
commy2	5a1aae6028	manual merge	2015-11-30 17:44:15 +01:00
commy2	e422388484	fix waitUntil capitalization	2015-11-30 17:28:01 +01:00
commy2	a9ebcf8543	fix setVariable and getVariable capitalization	2015-11-30 17:27:09 +01:00
commy2	d037f00a92	fix forEachIndex capitalization	2015-11-30 17:25:16 +01:00
commy2	b3950bd7f0	fix forEach capitalization	2015-11-30 17:23:48 +01:00
commy2	a8228f60c2	fix configFile capitalization	2015-11-30 17:23:02 +01:00
commy2	2b05f6f451	fix isNil capitalization	2015-11-30 17:22:16 +01:00
commy2	5e41643cff	fix pushBack capitalization	2015-11-30 17:21:28 +01:00
commy2	d9b90258bc	fix typeOf capitalization	2015-11-30 17:19:57 +01:00
commy2	34d351c652	fix exitWith capitalization	2015-11-30 17:14:05 +01:00
commy2	0b84bb514b	fix Cfg capitalization	2015-11-30 17:09:26 +01:00
commy2	dcf0a68b80	Revert "fix Cfg capitalization" ... This reverts commit 43bda9c462.	2015-11-30 17:00:32 +01:00
commy2	43bda9c462	fix Cfg capitalization	2015-11-30 16:52:20 +01:00
commy2	ca9b909e75	fix CBA_fnc capitalization	2015-11-30 16:45:20 +01:00
commy2	ae1f35c042	remove superfluous private	2015-11-29 16:55:44 +01:00
commy2	caa5585044	simplify getRandomAnimation in sitting	2015-11-29 16:50:08 +01:00
commy2	ff4406e411	manual merge, more selectRandom command useage	2015-11-29 16:48:23 +01:00
commy2	e5c4d35969	1.55 use new selectRandom command	2015-11-29 16:33:25 +01:00
Thomas Kooi	02eee05cf4	Merge pull request #2884 from acemod/speedLimiterUGVFix ... fix that in UGV dont work speedLimiter	2015-11-29 12:41:13 +01:00
Thomas Kooi	081106d6a3	Merge pull request #2892 from acemod/TheHidden ... Remove nametags and actions on hidden units	2015-11-29 12:38:27 +01:00
bux578	35ecef454f	Merge pull request #2825 from gienkov/pl-translation ... pl translation	2015-11-29 07:35:04 +01:00
PabstMirror	8d2b612570	Remove nametags and actions on hidden units ... Fix #2596	2015-11-28 21:35:25 -06:00
SilentSpike	c426bfc9c1	Merge pull request #2888 from acemod/repairPositions ... Define custom repair points for a few vehicles	2015-11-28 20:09:37 +00:00
Thomas Kooi	5282e95668	Merge pull request #2876 from acemod/medicalTranslateHP ... Medical Fixes	2015-11-28 20:58:08 +01:00
Thomas Kooi	ced94d73a7	Merge pull request #2797 from ColdEvul/RoadBarrierRoadCone ... [REMADE] RoadCone_F and its inhered RoadBarrier_F intractable	2015-11-28 20:51:39 +01:00
Thomas Kooi	d7a19cf0a6	Merge pull request #2882 from acemod/fixUGVNametag ... fix UGV Nametag issue	2015-11-28 20:50:23 +01:00
Thomas Kooi	7dd0af33b4	Merge pull request #2871 from acemod/cleanupLaserpointer ... cleanup laserpointer	2015-11-28 20:43:31 +01:00
Thomas Kooi	c132ef86cf	Merge pull request #2133 from jonpas/dynamicViewDistance ... Mk 1 eyeballs Integration	2015-11-28 20:40:29 +01:00
Thomas Kooi	e669f3e2cb	Merge pull request #2699 from BaerMitUmlaut/disable-nvgs-in-sight ... Disable nvgs in sight	2015-11-28 20:37:30 +01:00
gienkov	f25a181d8e	fix my error	2015-11-28 20:37:29 +01:00
Thomas Kooi	cef01baf0b	Merge pull request #2856 from acemod/isEqualTypeRepalcement ... 1.54 - Replace typeName with isEqualType	2015-11-28 20:36:07 +01:00
Thomas Kooi	b807d1db48	Merge pull request #2886 from acemod/bandageReopen ... Add all wound types to bandage treatment configs	2015-11-28 20:32:13 +01:00
SilentSpike	a8cf9c6f48	Fix missing boolean inversion	2015-11-28 13:58:56 +00:00
gienkov	2c83fe4a11	refuel translation fixes	2015-11-28 13:45:59 +01:00
gienkov	a906c180ce	remove alpha entries	2015-11-28 13:34:54 +01:00
PabstMirror	a42c2153cc	Error handling for bad setting values array	2015-11-28 01:57:15 -06:00
PabstMirror	f676e6d9c9	Add some more typeNames replacements	2015-11-27 21:23:27 -06:00
PabstMirror	5850f78c1f	Merge branch 'master' into isEqualTypeRepalcement	2015-11-27 21:08:21 -06:00
gienkov	adae379445	fixes	2015-11-27 21:55:05 +01:00
gienkov	b091b73e24	fixes	2015-11-27 21:54:04 +01:00
gienkov	3250245587	3.4.0 translations and fixes	2015-11-27 21:50:57 +01:00
PabstMirror	6031eb8c6e	Add all wound types to bandage treatment configs ... Fix by adding all config entries; instead of trying to modify classname	2015-11-27 14:19:26 -06:00
gienkov	7eecff4296	Merge remote-tracking branch 'origin' into pl-translation ... Conflicts: addons/captives/stringtable.xml addons/map_gestures/stringtable.xml addons/zeus/stringtable.xml	2015-11-27 21:19:25 +01:00
SilentSpike	0ffb9ea5ad	Define custom repair points for a few vehicles ... Some helicopters have the main rotor point on the tip of a single blade which can be problematic depending on the orientation of the helicopter so those have been moved to the center (to match others). The tail rotor is also in the complete wrong position for some.	2015-11-27 20:06:57 +00:00
ViperMaul	8d4364350c	Fix for "double semicolon detected" error	2015-11-27 10:43:30 -08:00
jokoho48	76435ec228	posible fix for overlapping Speedlimiters	2015-11-27 15:48:03 +01:00
PabstMirror	e51f658ce0	Try base wound class in bandage treatment configs ... Gets the correct wound for the bandage treatment config Used for selecting most effective bandage and reopening _className was something like "velocityWoundMedium" but configs only had base class "velocityWound"	2015-11-26 23:18:39 -06:00
jokoho48	f364c2a5c3	fix some stuff i mixed up	2015-11-26 23:44:42 +01:00
jokoho48	5f2840bf39	fix that in UGV dont work speedLimiter	2015-11-26 23:39:17 +01:00
jokoho48	5df7eba1eb	remove debug Code	2015-11-26 22:27:46 +01:00
jokoho48	59708ec2f7	fix UGV Nametag RPT Issue #2873	2015-11-26 22:24:06 +01:00
jokoho48	52a6eddb44	fix missing PBOPREFIX	2015-11-26 20:53:14 +01:00
PabstMirror	4aeeefdfe8	Fix UBC and increase Heli_04 Pod interaction distance	2015-11-26 11:47:25 -06:00
PabstMirror	a5c45c137f	Medical - addDamageToUnit Helper	2015-11-26 09:53:12 -06:00
Thomas Kooi	581f71f8a1	Merge pull request #2141 from GitHawk/refuel ... Adding vehicle refueling	2015-11-26 16:16:13 +01:00
Thomas Kooi	bba0e999ff	Merge pull request #2164 from GitHawk/rearm ... Adding vehicle rearming	2015-11-26 16:15:09 +01:00
Thomas Kooi	81ab280cb4	Merge pull request #2670 from acemod/simplifyFragConfig ... Simplify frag config	2015-11-26 16:13:21 +01:00
Thomas Kooi	15267c0433	Merge pull request #2219 from acemod/handSignals ... Hand signals enhancement	2015-11-26 16:04:41 +01:00
PabstMirror	ca0cfc9bbf	Merge pull request #2861 from acemod/repairRebass ... Repair Overhaul	2015-11-25 17:00:32 -06:00
PabstMirror	988a5c76bb	Medical - 1.54 Changes ... 1.54 Armor Translate selectiosn to hitpoints Calc newDamage using hitIndex (because sel is translated) Fix isFalling never being reset Cache hitpointIndex to reset damage Normalize Limb Armor to 1.54 Cleanup Cleanup	2015-11-25 11:49:20 -06:00
PabstMirror	0b9044e3c7	Merge pull request #2753 from acemod/showHudSetter ... Showhud setter	2015-11-25 11:16:21 -06:00
PabstMirror	ac6390c0b3	Add array info to header	2015-11-25 11:07:56 -06:00
PabstMirror	185cae2fe5	Remove Old Gestures from interaction	2015-11-25 11:00:45 -06:00
PabstMirror	095252ef76	Cleanup ... revert `format ["'%1'", QGVAR()];` as it crashes the game	2015-11-25 10:16:37 -06:00
SilentSpike	c731d83642	Merge pull request #2848 from acemod/fixForEachDeleteAt ... fix Issue with forEach Loops and deleteAt Index	2015-11-25 14:00:37 +00:00
Thomas Kooi	08c5374a99	Merge pull request #2390 from BaerMitUmlaut/pass-magazine ... Added interaction to quickly pass a magazine	2015-11-25 14:04:07 +01:00
PabstMirror	36bf2d9cb5	Merge pull request #2803 from BaerMitUmlaut/remove-team-synching ... Remove manual team synching	2015-11-24 21:37:50 -06:00
PabstMirror	20bf90f3e9	Medical - Fix Hitpoints Macro when building	2015-11-24 16:30:09 -06:00
PabstMirror	575fabb69d	#2872-Map time support for subclasses of ItemWatch	2015-11-24 16:17:06 -06:00
jokoho48	fd1c38c612	Merge branch 'master' of https://github.com/acemod/ACE3 into handSignals	2015-11-24 22:44:32 +01:00
jokoho48	352db4cb66	remove some crap code ... replace some variables with macros	2015-11-24 22:43:42 +01:00
PabstMirror	cfefb1c40e	Cleanup spotting scope configs	2015-11-24 15:24:14 -06:00
PabstMirror	2c6cfcf294	Merge pull request #2832 from p1nga/Spotting-Scope-Update ... Updated spotting scope model.	2015-11-24 15:23:12 -06:00
PabstMirror	9ecffcd133	Merge pull request #2746 from acemod/fixFlashlightPrivates ... fix privates in Map module	2015-11-24 15:18:38 -06:00
IngoKauffmann	f9266764fb	Moved module to ACE_Logistics	2015-11-24 21:33:38 +01:00
IngoKauffmann	1a6730340c	Move module to ACE_Logistics category, removed single interact point	2015-11-24 21:30:08 +01:00
PabstMirror	2c76bc3b10	Merge pull request #2605 from TheNiner/master ... Fixed Laser Update Position Bug	2015-11-24 13:43:53 -06:00
BaerMitUmlaut	818466d296	Added ACE setting to hide interaction	2015-11-24 19:07:17 +01:00
PabstMirror	51a463de24	Fix tap shoulder msg display ... Missing efunc on displayTextStructured Calculate a shoulder side when using keybind	2015-11-24 11:25:56 -06:00
IngoKauffmann	8fc52a4dfb	Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel	2015-11-24 17:57:21 +01:00
PabstMirror	86f7ee2ad2	Merge pull request #2834 from acemod/addEarPlugsLoudness ... Hearing - Add earplugs based on loudness and give to MGs and fix respawn issues	2015-11-24 10:52:11 -06:00
IngoKauffmann	d4c708e731	Missing ;	2015-11-24 17:33:33 +01:00
PabstMirror	ddc8b16db2	Merge pull request #2857 from acemod/invResize154 ... Inventory Resize UI - changes for 154 GL-Mags	2015-11-24 10:24:06 -06:00
PabstMirror	4ae209ab44	Merge pull request #2865 from acemod/154UBC ... Fix UBC for 1.54	2015-11-24 10:23:48 -06:00
jokoho48	773b30df33	Merge branch 'master' of https://github.com/acemod/ACE3 into handSignals	2015-11-24 15:14:30 +01:00
PabstMirror	7981faad64	private -> local	2015-11-23 17:47:58 -06:00
PabstMirror	0273dd1d4d	Merge branch 'master' into fixFlashlightPrivates	2015-11-23 17:45:41 -06:00
commy2	1d315bee6f	cleanup laserpointer	2015-11-23 20:52:04 +01:00
IngoKauffmann	fd2fd3241e	Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm	2015-11-23 19:37:10 +01:00
IngoKauffmann	cbe8d98f86	Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel	2015-11-23 19:29:05 +01:00
IngoKauffmann	931c6830fc	Added reset ... It's now possible to reset a fuel truck by console command: [fuel_truck] call ace_refuel_fnc_reset	2015-11-23 19:28:51 +01:00
IngoKauffmann	763df43fbc	Added possibility to disallow rearm ... > vehicle setVariable ["ace_rearm_disabled", true, true]; Also added ammo compatibility for RHS Mi24 with turret	2015-11-23 17:08:06 +01:00
commy2	3be60a2f6e	Merge pull request #2842 from acemod/fcsUpdateDisplay ... Update FCS display after distance adjust	2015-11-23 16:34:09 +01:00
SilentSpike	d2538c6ff2	Add spectator text chat ... Turns out custom radio channels are kind of a pain to work with. However this should work fine assuming the radioChannelAdd commands will work on client machines.	2015-11-22 20:03:10 +00:00
IngoKauffmann	113ac0f370	Minor improvements ... fnc_reset is still WIP	2015-11-21 23:24:24 +01:00
SilentSpike	f07f06c843	Merge pull request #2760 from acemod/spectatorUpdates ... Spectator updates	2015-11-21 15:00:44 +00:00
PabstMirror	c2564de5ef	Fix UBC for 1.54 ... Soldiers no longer inherit hitpoints from CaManBase Adds a macro to deal with them	2015-11-20 23:27:29 -06:00
PabstMirror	ab769757d9	Skip Depends Hitpoints - Use HitPoints selPos for wheels ... Stuff Normalize Depends - Skip Glass Repair Fix spawned wheel/track not having correct damage getHitpointString robustness, hatchback fuelHitpoint, fix count errors - Formatting local -> private Fix Stuff	2015-11-20 21:11:50 -06:00
SilentSpike	839c022b84	Fix broken repair point selection code ... Only valid hit selection + hit point combinations are usable for repair points: - Empty hit points mean there isn't enough information to display to the user - Empty hit selections mean that the hit point doesn't actually exist	2015-11-20 21:11:23 -06:00
PabstMirror	4e93b9c72d	2307 - Repair sub-turrets ... Privates Cleanup debug Add repair actions for sub turrets Cleanup Fix Header Error Handling Cleanup setHitpointDamage Fix common ACE_isEngineer to handle scalar or bool Claim and release repair objects (wheel/track) Repair sub-turrets	2015-11-20 21:11:05 -06:00
Glowbal	d0cb09196d	Merge branch 'master' of github.com:acemod/ACE3	2015-11-20 23:29:33 +01:00
Glowbal	67345b0178	Fix incorrect variable ... _items was the old variable name.	2015-11-20 23:28:52 +01:00
PabstMirror	979ff8b479	Local -> private	2015-11-20 16:13:20 -06:00
PabstMirror	0f62168250	Merge pull request #2840 from acemod/fixOverpressure ... Overpresure - Misc fixes	2015-11-20 15:38:24 -06:00
PabstMirror	08813c1b75	Convert local keywords to private	2015-11-20 15:36:37 -06:00
Thomas Kooi	801120fb39	Merge pull request #2841 from acemod/medicalAiBandage ... Move bandage log before basic exit	2015-11-20 22:28:55 +01:00
Thomas Kooi	4a19fcc5a5	Merge pull request #2771 from BaerMitUmlaut/inWater-deprecation ... inWater -> isUnderwater	2015-11-20 22:28:43 +01:00
Thomas Kooi	a652be8248	Merge pull request #2847 from BaerMitUmlaut/cleanup-moduleAmbianceSound ... Cleanup ambient sounds module	2015-11-20 22:27:57 +01:00
PabstMirror	063042cb36	Merge pull request #2777 from acemod/interactionAnimationSetting ... Interaction Menu Animation Setting And PreExpand First Level	2015-11-20 14:56:37 -06:00
PabstMirror	7b526a99a3	Cleanup	2015-11-20 14:53:16 -06:00
PabstMirror	c4117e1283	Merge branch 'master' into settingsErrorChecking ... Conflicts: addons/map_gestures/stringtable.xml	2015-11-20 14:37:23 -06:00
PabstMirror	69b53af1d3	1.54 - Replace typeName with isEqualType	2015-11-20 11:40:31 -06:00
PabstMirror	9a9029fa49	Merge pull request #2839 from acemod/abFixTwist ... AB - Fix ACE_twistDirection	2015-11-20 10:32:28 -06:00
PabstMirror	e81dd0729e	Inventory Resize UI - changes for 154 GL-Mags	2015-11-19 15:54:43 -06:00
SilentSpike	f8e293d04d	Localise spectator hotkeys in help window	2015-11-18 15:18:21 +00:00
SilentSpike	0567d1c2a1	Fix spectator unit list key press handling ... By setting maxHistroyDelay really high, the unit list shouldn't be messed with via key press very often.	2015-11-18 15:02:17 +00:00
SilentSpike	0110ada1b5	Fix zeus waypoint formation actions	2015-11-18 14:54:17 +00:00
SilentSpike	d1dff4a24a	Merge branch 'master' into fixForEachDeleteAt ... # Conflicts: # addons/common/XEH_postInit.sqf	2015-11-18 13:27:04 +00:00
SilentSpike	49d4f233d9	Revert commit a718c82780	2015-11-18 13:19:12 +00:00
bux578	3b2b7fd78d	Merge pull request #2821 from dudakov/master ... Russian Translations - Update	2015-11-18 08:30:46 +01:00
PabstMirror	ebbf2b373a	goggles - prevent CBA PFEH warning ... fix "x\cba\addons\common\fnc_removePerFrameHandler.sqf:30","WARNING: Invalid or not existing PFH ID."	2015-11-17 23:44:50 -06:00
kaban	da16fc1038	\addons\captives\stringtable.xml - resolving conflicts.	2015-11-18 06:50:00 +03:00
kaban	f8481ae5f2	Merge branch 'master' of https://github.com/acemod/ACE3.git into develop ... Conflicts: addons/captives/stringtable.xml	2015-11-18 06:39:58 +03:00
PabstMirror	d6000ae985	local -> private	2015-11-17 14:33:17 -06:00
PabstMirror	3ec9fca73e	local -> private	2015-11-17 14:06:12 -06:00
PabstMirror	75d80be143	Merge branch 'master' into interactionAnimationSetting	2015-11-17 14:05:31 -06:00
PabstMirror	5cbfe4f2a5	local -> private	2015-11-17 14:02:20 -06:00
PabstMirror	896615beb1	Merge pull request #2826 from acemod/settingsParamsArray ... Read settings from paramsArray (params in description.ext)	2015-11-17 14:01:16 -06:00
PabstMirror	5823749f0c	Merge branch 'master' into settingsErrorChecking	2015-11-17 14:00:22 -06:00
PabstMirror	6d04156f69	local -> private	2015-11-17 13:56:55 -06:00
commy2	a57d1bca75	replace local keyword with private	2015-11-17 17:43:07 +01:00
SilentSpike	a718c82780	Implement nice index deletion iteration solution ... Previously when iterating over an array and modifying the same array via deletion of the current index, incorrect means was used to account for the change in index resulting in any further deletions being applied to the wrong elements. This solution does not require duplication of the array or the use of external variables to track the number of deleted elements. We simply lower the `_forEachIndex` by 1 whenever an element is removed.	2015-11-17 16:02:56 +00:00
SilentSpike	23e110d7ce	Remove depreciated spectator hotkey	2015-11-17 15:26:34 +00:00
commy2	b6f9a2b776	Merge pull request #2703 from jonpas/removeAdjustedProneOptics ... Remove enable optics in adjusted prone stances	2015-11-17 16:24:27 +01:00
jokoho48	561f6126dc	fix missing bracket	2015-11-17 13:34:34 +01:00
jokoho48	f3c5c64390	fix Issue with forEach Loops and deleteAt Index	2015-11-17 04:31:17 +01:00
BaerMitUmlaut	e008f87fb8	Cleanup ambience sound module	2015-11-16 19:00:02 +01:00
Jonathan Pereira	6ebd76ff2f	Added PT-BR translations to Cargo	2015-11-14 12:24:01 -02:00
SilentSpike	cf368f240f	Remove ear ringing upon spectator entry ... Volume updating was disabled, however any existing ringing would persist. Setting the volume to 0 should make the hearing PFH stop playing sound.	2015-11-13 13:00:04 +00:00
PabstMirror	a621eaab24	#2750 - Update FCS display after distance adjust	2015-11-13 02:57:06 -06:00
PabstMirror	c3e6990d00	#2528 (6) - Move bandage log before basic exit ... In advanced medical without enableFor AI. Bandaging an AI would exit before adding log.	2015-11-12 01:06:29 -06:00
PabstMirror	9b2c79e7e1	getDistance - use lineIntersectsSurfaces	2015-11-11 14:12:42 -06:00
PabstMirror	391bfc160a	Overpresure - Misc fixes ... - Fix passing magazine/ammo to overpressure event - Use AGL for nearEntities - Fix getDistance returning nil	2015-11-11 13:24:27 -06:00
PabstMirror	9d2d5b9c7c	AdvanBalls - Fix ACE_twistDirection	2015-11-11 01:58:12 -06:00
PabstMirror	e72c1d874a	Merge branch 'master' into fixFlashlightPrivates ... Conflicts: addons/map/functions/fnc_determineMapLight.sqf	2015-11-10 21:21:06 -06:00
PabstMirror	99852f2071	Merge pull request #2718 from acemod/rangeCards-scriptError ... RangeCard / AB fixes	2015-11-10 21:02:16 -06:00
PabstMirror	4ff31771d3	DAGR - missing (	2015-11-10 20:51:00 -06:00
PabstMirror	87b9ff9785	Hearing - Reset earplugs on respawn, addItem setting ... Fix #2835 - readd item on respawn Fix #2837 - setVariable false on respawn	2015-11-10 20:44:55 -06:00
PabstMirror	e2e74e0f5d	DAGR - Fix degrees (° - seems to need UTF-8 BOM)	2015-11-10 16:17:22 -06:00
PabstMirror	830e7d9be4	Merge pull request #2278 from jokoho48/codeCleanUpDagr ... Code cleanup of Dagr module	2015-11-10 16:15:12 -06:00
Thomas Kooi	d91ae9082e	Merge pull request #2628 from acemod/cargoClassnames ... Add support for virtual cargo	2015-11-10 08:38:17 +01:00
Thomas Kooi	ec1187e79b	Merge pull request #2830 from acemod/mixedMedicalDisplay ... Display basicMed wounds for AI in mixed mode	2015-11-10 08:33:21 +01:00
PabstMirror	845909f8af	#2833 - Add earplugs based on loudness (+MGs) ... Use same loudness calc as firedNear (replacing old audibleFire) Give ear plugs to machine gunners (depends on magzine size)	2015-11-08 14:02:00 -06:00
PabstMirror	28738517e8	Merge pull request #2829 from acemod/FlashlightProxyModel ... Fix empty flashlightProxy model + Delete map glow lights from disconnecting players	2015-11-08 11:25:06 -06:00
PabstMirror	5b16638ae5	Always force param settings	2015-11-08 11:22:41 -06:00
P1NGA	6dd3aebe63	Authors....	2015-11-08 15:26:17 +11:00
P1NGA	5ffa646ded	updated spotting scope model and textures.	2015-11-08 15:18:31 +11:00
PabstMirror	dad1388eec	RealisticNames - add ka-60 v2 (black and white)	2015-11-07 18:34:46 -06:00
[OMCB]kaban	2dd90824aa	Map Gestures translations update	2015-11-08 02:52:16 +03:00
PabstMirror	01d679c5dc	#2810 - Delete map glow light from DC players	2015-11-07 14:33:41 -06:00
PabstMirror	ff60cdcfa3	#2828 - Fix empty flashlightProxy model	2015-11-07 11:44:31 -06:00
[OMCB]kaban	34163b5e56	Nametags translations are rolled back	2015-11-07 19:54:48 +03:00
Jonathan Pereira	7ec480c98e	Added ace_captives translation to PT-BR	2015-11-07 11:39:02 -02:00
Glowbal	caa36aa4f6	Merge pull request #2819 from acemod/medicalTranslateHitpoints ... Medical - Better handle odd selection/hitpoint names	2015-11-07 11:06:49 +01:00
PabstMirror	4a6730341a	Fix p3d paths	2015-11-07 00:16:08 -06:00
PabstMirror	826b4fd20b	Cleanup	2015-11-06 20:53:05 -06:00
PabstMirror	e0506f29bc	Read settings from paramsArray (params in description.ext) ... for now just limited to SCALAR/BOOL	2015-11-06 20:46:06 -06:00
PabstMirror	c91789f3c4	Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking	2015-11-06 20:30:12 -06:00
SilentSpike	6e30e9e0df	Fix overpressure priority evaluation ... The code was checking the wrong configs for priority because of some missing variables.	2015-11-06 19:02:54 +00:00
PabstMirror	9161f8e2fb	Merge pull request #2824 from acemod/acreIsSpeaking ... Nametags - Cleanup isSpeaking for ACRE	2015-11-06 09:58:16 -06:00
PabstMirror	c326bc2f87	#2772 - Display basicMed wounds for AI in mixed mode	2015-11-06 01:05:25 -06:00
gienkov	0b6fcacaf0	pl translation	2015-11-06 00:56:15 +01:00
ViperMaul	4b200d6909	bump to v3.3.3	2015-11-05 14:00:01 -08:00
PabstMirror	fabbf6d14d	Nametags - Cleanup isSpeaking for ACRE	2015-11-05 13:13:37 -06:00
[OMCB]kaban	59b9e9a7df	Missing periods added.	2015-11-05 03:45:34 +03:00
kaban	e2763dde27	Russian Translations - Update	2015-11-05 03:28:53 +03:00
PabstMirror	38105136fa	#2820 - Fix target event error	2015-11-04 17:43:51 -06:00
PabstMirror	1cebe613fa	Fix Capitialzation	2015-11-04 14:38:32 -06:00
PabstMirror	c5da32e470	Medical Handle Damage - check hitpoints if selection is weird	2015-11-04 14:36:26 -06:00
PabstMirror	39d4383a04	Merge pull request #2781 from acemod/updateWirecutters ... Wirecutters - Update Fence Configs, Use faster getModelInfo	2015-11-04 13:17:15 -06:00
PabstMirror	c88f77403b	Merge pull request #2805 from jonpas/cleanupMacros ... Cleanup Macro Definitions	2015-11-04 13:16:14 -06:00
PabstMirror	a3443cae43	Merge pull request #2780 from acemod/fixTimeInComments ... Changed ACE_time back to time in comments where appropriate	2015-11-04 13:04:05 -06:00
PabstMirror	cfba7c01e8	Merge branch 'master' into settingsErrorChecking ... Conflicts: addons/map_gestures/stringtable.xml	2015-11-03 12:09:36 -06:00
PabstMirror	50ab2aa904	MicroDagr - move drawEH array define to preInit ... Fix load order problems (init.sqf can be before postInit)	2015-11-02 15:21:34 -06:00
Glowbal	ac22ca3637	Merge pull request #2813 from acemod/medical-hitpoints-fix ... Add method to deal with new hitpoints	2015-11-02 20:20:23 +01:00
Joko	bd97c1ee96	fix Docu in waitUntilAndExecute	2015-11-02 12:05:43 +01:00
ColdEvul	03b82e5859	Adjusted interaction nod, changed carrying height for he barrier.	2015-11-01 22:38:55 +01:00
Broström.A | Evul	100c20fc83	Fixed missing strings ... XEH_ENABLED carryPosition carryDirection dragPosition dragDirection	2015-11-01 20:33:18 +01:00
Glowbal	8f6e9be636	Add method to deal with new hitpoints ... This addition tries to deal with the new hitpoints introduced in Arma3 v1.50 and above. It converts new selection names to by the current medical system usable selection names. This is only a temporarily patch, while we are still working on a larger overhaul to account both the new hitpoints and any potential new features / polishing.	2015-11-01 16:35:25 +01:00
bux578	03d3d1c764	Merge pull request #2789 from ToasterBR/translation02 ... Remaining PT-BR translations	2015-10-31 06:14:37 +01:00
jonpas	998f3e996c	Cleanup macro definitions	2015-10-30 21:59:46 +01:00
BaerMitUmlaut	8f473b4a27	Removed all assignTeam occurrences	2015-10-30 16:50:13 +01:00
jonpas	94ce49fedc	Add selective UI	2015-10-28 23:23:02 +01:00
ColdEvul	b82350baa2	Made ``RoadCone_F` and its inhered `RoadBarrier_F`` dragable, carryable and storeable. ... I remade it and removed comments and unnecessary strings. I also removed the unworking one from the last version.	2015-10-28 21:33:00 +01:00
PabstMirror	10d17a8117	Merge pull request #2783 from acemod/captivesStuff ... Captives Fix duplicate animEH and add handcuffing module	2015-10-28 14:09:13 -05:00
commy2	7d69b7a3f4	fix merkava, patria tracer color	2015-10-28 19:48:49 +01:00
commy2	97999cde04	Merge pull request #2708 from acemod/amvGunSmoke ... - Fix gun smoke on AMV	2015-10-28 19:33:47 +01:00
commy2	d424eadd48	delete superfluous space ocd	2015-10-28 19:25:59 +01:00
commy2	09ba2c8216	Merge pull request #2793 from ColdEvul/CargoFixForTheAutonomus ... Fixed small UAV carrying allot of cargo.	2015-10-28 19:10:56 +01:00
commy2	049d40b96e	change description in function header	2015-10-28 19:02:54 +01:00
commy2	a0bfcdd04c	Revert "rename hasHatch to canTurnOut, change description in function header" ... This reverts commit 932f09ce60.	2015-10-28 19:01:47 +01:00
commy2	932f09ce60	rename hasHatch to canTurnOut, change description in function header	2015-10-28 18:57:47 +01:00
BaerMitUmlaut	7d7aa5b67f	!hasHatch condition part 2	2015-10-28 17:15:46 +01:00
BaerMitUmlaut	a1d72b81bf	Switch to unit namespace, added !hasHatch condition	2015-10-28 17:13:05 +01:00
jonpas	3f59b2fd4e	Merge branch 'master' into uiSettings	2015-10-28 16:18:30 +01:00
ColdEvul	6ac1d8361d	Fixed small UAV carrying allot of cargo.	2015-10-28 16:00:24 +01:00
commy2	643f4d36dc	add FUNC(hasHatch)	2015-10-28 08:01:25 +01:00
Jonathan Pereira	ce5364d7af	Added PT-BR translations ... Added all remaining translations, including dagr, dragging, map, map_gestures, medical, repair, tacticalladder and zeus.	2015-10-26 22:04:03 -02:00
PabstMirror	2c995f9c2c	Minor Cleanup	2015-10-26 10:49:39 -05:00
PabstMirror	fefe24b7eb	Disable debug in parachute	2015-10-24 19:07:23 -05:00
Glowbal	b5539db27f	Merge pull request #2767 from acemod/canTreatLocation ... Fix medical location check when set to disabled for PAK/Surgical	2015-10-24 00:55:51 +02:00
PabstMirror	1c26f6c9f5	Captives - Module to set handcuffing ... also add player check for GVAR(requireSurrender) in canApplyHandcuffes	2015-10-23 14:17:31 -05:00
PabstMirror	ef681e4332	Captives - Fix adding duplicate animEH	2015-10-23 13:11:11 -05:00
PabstMirror	e340f5164c	Wirecutters - Update Fence Configs, Use faster getModelInfo	2015-10-22 20:54:09 -05:00
VKing	069169cc72	Changed ACE_time back to time in comments where appropriate	2015-10-21 22:52:21 +02:00
VKing	a899c74133	ace_fcs_ace_time -> ace_fcs_time	2015-10-21 22:17:28 +02:00
VKing	0936238862	Fix lead calculation for vehicle FCS	2015-10-21 21:52:48 +02:00
PabstMirror	554c303be0	InteractionMenu - Auto Expand First Level	2015-10-20 13:31:09 -05:00
PabstMirror	7db5a34b24	Interaction Menu - Add setting for animation speed	2015-10-20 13:26:42 -05:00
jonpas	349447c5ea	Readd prone down optics removal	2015-10-20 19:37:49 +02:00
BaerMitUmlaut	c227f05f8a	Deprecated isWater	2015-10-19 23:28:50 +02:00
Glowbal	57abe3b885	Merge pull request #2743 from acemod/medicalStuff ... Medical Menu Fixes	2015-10-19 22:47:13 +02:00
PabstMirror	acc3504d7b	Merge branch 'master' into fixFlashlightPrivates ... Conflicts: addons/map/stringtable.xml	2015-10-19 13:59:15 -05:00
PabstMirror	cfde11d2fa	Fix medic treatment location check as well	2015-10-19 01:45:30 -05:00
PabstMirror	aad6cab896	#2765 - Fix location check when set to disabled	2015-10-19 01:20:11 -05:00
bux578	602832cc0c	adjust german translations	2015-10-19 07:29:02 +02:00
bux578	f7b717db64	Merge branch 'patch-11' of git://github.com/licht-im-Norden87/ACE3 into licht-im-Norden87-patch-11	2015-10-19 07:23:51 +02:00
PabstMirror	af80635a3f	ST Map Gesture Force Color Settings	2015-10-18 23:59:40 -05:00
PabstMirror	64de91ed06	Add warning for duplicate setting modules.	2015-10-18 23:34:11 -05:00
PabstMirror	16180686d2	PV GVAR(settings) after modules, add error debug	2015-10-18 18:49:03 -05:00
PabstMirror	26c051d397	Sitting - Fix missing semicolon	2015-10-18 11:48:21 -05:00
IngoKauffmann	1804215dbb	Readded caliber for ACE_Hydra70_DAGR	2015-10-18 13:21:20 +02:00
IngoKauffmann	f02c57b599	Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm ... Conflicts: addons/missileguidance/CfgAmmo.hpp	2015-10-18 13:19:27 +02:00
IngoKauffmann	5a453a7074	Fixed flying ... Moved attached ammo further away	2015-10-18 13:11:28 +02:00
IngoKauffmann	8a4b3a117a	Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm	2015-10-18 12:49:36 +02:00
Glowbal	843eb16837	Merge pull request #2650 from acemod/setDefaultChannel ... Set Default Channel at mission start	2015-10-18 12:28:13 +02:00
Glowbal	f57eb08ce5	Merge pull request #2620 from jonpas/sittingFramework ... Sitting Framework	2015-10-18 12:26:53 +02:00
Glowbal	8e4bc264cc	Merge branch 'master' into map_gestures ... Conflicts: AUTHORS.txt	2015-10-18 12:20:54 +02:00
Glowbal	9a0aa2b14c	Merge pull request #2152 from jokoho48/codeCleanupKestrel4500 ... Code cleanup of Kestrel 4500 module	2015-10-18 12:16:44 +02:00
Glowbal	76efdbcc1c	Merge pull request #2257 from jonpas/parseList ... Parse List Common Function	2015-10-18 12:14:18 +02:00
Glowbal	ebe2bf96cd	Merge pull request #2277 from jokoho48/codeCleanUpConcertina_wire ... Code cleanup of Concertina_wire Module	2015-10-18 12:13:44 +02:00
Glowbal	3682a1710b	Merge pull request #2527 from alef/issues/titan_miss ... Fix: Titan hitting ground instead of vehicle	2015-10-18 12:11:09 +02:00
PabstMirror	da2d140a39	Cleanup unnecessary statement	2015-10-17 14:30:59 -05:00
jokoho48	bfcf057dab	extract Gestures to own Module and Port THS to ACE	2015-10-17 21:17:37 +02:00
SilentSpike	b6dd7b941f	Reduce overhead of spectator map icons ... Fixes #2514 by only rendering individual unit icons when zoomed in and only rendering the units currently within the screen bounds. Behaves as expected, but whether or not it has a significant performance increase under scaled up testing conditions remains to be seen.	2015-10-17 13:23:51 +01:00
PabstMirror	fa7299ba1b	Add array info to header	2015-10-16 08:28:54 -05:00
PabstMirror	94e3cd1f79	Replace old use of showHud	2015-10-15 22:45:35 -05:00
PabstMirror	bec884e581	showHud handler	2015-10-15 22:33:05 -05:00
SzwedzikPL	98f6bb3589	Merge branch 'master' of https://github.com/acemod/ACE3 into interactions_lamps ... Conflicts: addons/cargo/CfgVehicles.hpp addons/interaction/CfgVehicles.hpp addons/interaction/XEH_preInit.sqf addons/interaction/stringtable.xml	2015-10-15 11:49:08 +02:00
PabstMirror	6ffde8150f	Simplify Map Light Interactions	2015-10-14 14:36:40 -05:00
jokoho48	2dcdd224bd	fix privates in Map module	2015-10-14 19:56:54 +02:00
PabstMirror	f7fe0c08e0	#2391 - Use AGL for sitting setPos	2015-10-14 11:15:44 -05:00
PabstMirror	680f52cd27	Handle Distance when mounted	2015-10-13 13:40:16 -05:00
PabstMirror	8ffe1b4e01	#2528 (2) - Integrate Dragging	2015-10-13 02:20:19 -05:00
PabstMirror	ad1191cdd5	#2528 - Medical Menu Work ... (1) Verify target is valid and in reasonable range	2015-10-13 02:01:59 -05:00
PabstMirror	5d76395914	#2734 - Map effects / flashlights for TrippleHead	2015-10-12 11:27:38 -05:00
PabstMirror	7062f60f0a	Fix UBC from #2726	2015-10-12 01:07:20 -05:00
Glowbal	1e26fee3ba	Merge pull request #2683 from acemod/commonCleanupX ... Common cleanup x	2015-10-11 12:15:27 +02:00
Glowbal	8db8e87c53	Merge pull request #2560 from acemod/lockingMissles ... #2349 - Don't disable locking for base RocketPods	2015-10-11 12:06:11 +02:00
Glowbal	94ed78a173	Merge pull request #2578 from alganthe/strings_fix ... PAK and Surgical Kit strings normalized inside modules.	2015-10-11 12:05:11 +02:00
PabstMirror	4ba0d72bfd	#2580 (1) - Fix bandages always created at terrain level.	2015-10-10 23:09:52 -05:00
IngoKauffmann	b5568ca0db	Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel ... Conflicts: optionals/compat_bwa3/config.cpp	2015-10-10 13:13:30 +02:00
PabstMirror	53f833b68c	#2702 - Cargo: Make "Supply Box" pallets heavy	2015-10-10 00:19:09 -05:00
PabstMirror	f2c66240ca	#2717 - Cleanup Coax Weapon Mempoints	2015-10-08 22:32:07 -05:00
PabstMirror	f8ca3693fd	#2709 - Fix AB handleFired _muzzleVelocityShift	2015-10-08 21:22:00 -05:00
PabstMirror	326d549510	#2696 - Rangecard check bounds before select	2015-10-08 20:32:14 -05:00
BaerMitUmlaut	2fe53431c7	Split event handlers	2015-10-08 19:29:30 +02:00
BaerMitUmlaut	e50a28874f	Fix for BI bug, FFV support	2015-10-08 11:31:29 +02:00
PabstMirror	f3c4ff66ca	#2701 - Fix gun smoke on AMV	2015-10-08 02:51:54 -05:00
jonpas	03f26fc12b	Merge branch 'master' into uiSettings ... Conflicts: addons/ui/README.md addons/ui/RscChat.hpp addons/ui/config.cpp	2015-10-08 00:06:41 +02:00
jonpas	e6a5d8c990	Remove enable optics in adjusted prone stances	2015-10-07 23:00:35 +02:00
BaerMitUmlaut	edb76ffae4	Initial commit	2015-10-07 20:11:07 +02:00
PabstMirror	39b838c7ab	Merge pull request #2681 from acemod/vehDetachLocalfix ... Attach getIn/Out run on local unit	2015-10-06 13:49:58 -05:00
commy2	9c22052871	Merge pull request #2685 from acemod/340removeactionsondead ... remove check ammo action on destroyed static weapons	2015-10-06 19:36:19 +02:00
BaerMitUmlaut	1effe61aa9	Removed parent condition	2015-10-06 19:09:51 +02:00
BaerMitUmlaut	090384c014	Fixed canPassMagazine header	2015-10-06 17:56:32 +02:00
BaerMitUmlaut	d6dcd4112e	Resolved merge conflicts	2015-10-06 17:50:55 +02:00
SilentSpike	e5b29727a5	Merge pull request #2617 from jonpas/zeusSpareparts ... Add Zeus Modules for Adding Spare Parts	2015-10-05 19:01:50 +01:00
SilentSpike	780e0aa270	Add vision mode support to spectator external cam ... Since external view is actually another camera, vision modes should also apply to it too.	2015-10-04 19:26:53 +01:00
SilentSpike	4079ca354e	Update spectator function headers	2015-10-04 18:30:07 +01:00
SilentSpike	c1dc8a6493	Fix spectator 3D icons not rendering ... Fixes #2676 as per voiperr's suggestion (working with camera can be really strange, I swear this worked before)	2015-10-04 18:17:07 +01:00
SilentSpike	52d703c2eb	Improve spectator seagull handling ... Previously they were only hidden, but this didn't account for the annoying audio they play so now they're entirely staged like a spectator unit would be.	2015-10-04 18:17:02 +01:00
SilentSpike	f0f822b4bc	Decrease default spectator camera speed	2015-10-04 18:17:01 +01:00
SilentSpike	b1dda86cb2	End spectator interface when the mission ends ... Fixes #2592 (in theory) by forcing spectator closed on mission end	2015-10-04 18:17:01 +01:00
PabstMirror	616bc9f8a0	local-private waitAndXX PFEH	2015-10-04 11:38:31 -05:00
PabstMirror	f3e61e2136	Merge branch 'master' into commonCleanupX	2015-10-04 11:31:05 -05:00
SilentSpike	0beaa40fbc	Add API parameter to allow for unforced spectator ... Adds an optional boolean paremeter to the setSpectator function for forcing the interface. It is forced by default, so if `false` is passed as the value the spectator will be able to close the interface with the escape button.	2015-10-04 13:52:54 +01:00
gienkov	b6d2cdee69	Merge remote-tracking branch 'origin/master' into pl-strings	2015-10-04 12:25:55 +02:00
commy2	d9595b6176	fix fnc_binocularMagazine on remote and dead units	2015-10-04 12:10:08 +02:00
commy2	92ed7eeac2	remove check ammo action on destroyed static weapons, fix #2671	2015-10-04 11:58:26 +02:00
commy2	42ce11cfee	Merge pull request #2679 from acemod/340missingmags ... fix missing magazines after certain scenarios	2015-10-04 11:46:36 +02:00
commy2	5ed290362d	Merge pull request #2663 from acemod/340rallypointminutes ... fix broken time format for rallypoints, fix #2662	2015-10-04 11:46:25 +02:00
commy2	040a63bd8f	Merge pull request #2254 from acemod/waitUntilAndExecute ... Add WaitUntilAndExecute Function	2015-10-04 11:45:54 +02:00
commy2	a2b6166aa0	optimization waitUntilAndExecute, add comments	2015-10-04 11:43:13 +02:00
Glowbal	f8cebd9403	Merge pull request #2007 from jokoho48/codeCleanupWeather ... Code cleanup Weather module	2015-10-04 09:36:32 +02:00
Glowbal	58ea8d5e2c	Merge pull request #2543 from alef/feature/death_short_diagnose ... Remove: pain diagnosis on dead patients	2015-10-04 09:34:10 +02:00
Glowbal	9ce4ce6cdd	Merge pull request #2582 from acemod/fixLitterFloating ... fix Littergeneric fly over ground	2015-10-04 09:32:03 +02:00
Glowbal	e36df978ec	Merge pull request #2646 from DerekSauer/FixArmaInjury ... Fix healHitPointAfterAdvBandage - Issue #2498.	2015-10-04 09:28:47 +02:00
Glowbal	2c292af77e	Merge pull request #2680 from acemod/cargoLockedVeh ... Disable loading into locked vehicles.	2015-10-04 09:26:53 +02:00
Glowbal	4445ecd7c4	Merge pull request #2581 from acemod/invisibleLadder ... Invisible Tactical Ladder	2015-10-04 09:26:34 +02:00
Glowbal	a823eff37f	Merge pull request #2674 from acemod/triageCardGameTime ... Use ACE_gameTime for triage card	2015-10-04 09:22:18 +02:00
PabstMirror	59da3e1c35	Optimize PFEH Funcs	2015-10-03 23:05:46 -05:00
PabstMirror	c75d219b65	Cleanup Undefined Functions	2015-10-03 21:34:46 -05:00
PabstMirror	7315dd650f	Merge branch 'master' into vehDetachLocalfix	2015-10-03 19:44:20 -05:00
PabstMirror	21f35dc7d0	#2664 - Disable loading into locked vehicles.	2015-10-03 19:42:40 -05:00
commy2	f0036fabbb	use BIS fnc for time format	2015-10-04 02:15:38 +02:00
commy2	38422e6586	fix missing magazines after certain scenarios	2015-10-04 01:26:38 +02:00
PabstMirror	10950d5fab	Merge pull request #2623 from acemod/interactMenuSet ... Interact menu settings after init	2015-10-03 12:49:04 -05:00
PabstMirror	12c663978a	Merge pull request #2649 from acemod/captiveEvents ... Global Event for "CaptiveStatusChange"	2015-10-03 12:47:58 -05:00
PabstMirror	b0b755720c	#2672 - Use ACE_gameTime for triage card	2015-10-03 12:28:54 -05:00
jokoho48	25166226a0	change by idea from @jonpas	2015-10-03 17:38:24 +02:00
jokoho48	1de012b7a7	simplify frag config(Macros FTW)	2015-10-03 12:34:04 +02:00
gienkov	3d4a37614c	Merge remote-tracking branch 'origin/master' into pl-strings	2015-10-03 12:19:48 +02:00
commy2	573279bd30	add selection, collision, fall and drowning damage events	2015-10-02 23:19:14 +02:00
commy2	94eaeb38cc	move variable out of params	2015-10-01 21:34:40 +02:00
commy2	7f1f56c121	fix broken time format for rallypoints, fix #2662	2015-10-01 21:28:00 +02:00
commy2	ea01db4030	Merge pull request #2648 from acemod/340goggles ... Code cleanup / refactoring Goggles	2015-10-01 16:54:57 +02:00
licht-im-Norden87	66e8914360	Update stringtable.xml	2015-10-01 04:38:21 +02:00
Derek Sauer	f9352de489	Clarified comment slightly.	2015-09-30 20:34:51 -04:00
Derek Sauer	0a788a282e	Improved efficiency of wound counting. ... Using a switch/case conditional since it offers early termination if a matching condition is found before all conditions are checked. It also unnecessary to use a conditional to confirm whether a limb is wounded or not. Number of Wounds multiplied by Blood loss will return zero for a fully bandaged body part, not incrementing the wound counter; or it will return some other number which will increment the wound counter.	2015-09-30 20:27:40 -04:00
licht-im-Norden87	88ee846d7d	Update Stringtable, german: "captives"	2015-10-01 01:36:27 +02:00
commy2	1fdedb5785	delay scroll wheel init	2015-09-30 19:29:17 +02:00
Derek Sauer	f69f4066e9	Fix capitalization on forEach and getVariable.	2015-09-30 06:17:54 -04:00
commy2	945ec7a388	more goggles code cleanup	2015-09-30 01:31:45 +02:00
commy2	dc882a3c66	more goggles code cleanup	2015-09-30 01:26:08 +02:00
commy2	c0105bf083	Merge branch 'master' of https://github.com/acemod/ACE3 into 340goggles	2015-09-30 00:28:26 +02:00
commy2	75d1ea7df3	Merge branch 'master' of https://github.com/acemod/ACE3	2015-09-30 00:14:41 +02:00
commy2	9f3615ea06	change function header of removeEventhandler and waitAndExecute to public: yes	2015-09-30 00:14:21 +02:00
commy2	8bbd6b69f0	change function header of removeEventhandler and waitAndExecute to public: yes	2015-09-30 00:12:35 +02:00
commy2	28e0e781f5	Merge pull request #2645 from acemod/340fixopticszeus ... fix zeus forced interface broken, fix #2642	2015-09-29 23:04:51 +02:00
Derek Sauer	2824009317	Incorrectly retrieving list of current wounds. ... Used the wrong method to retrieve the target's current wounds and was getting an empty array. This caused bandaging any wound even once to completely heal the target on the Arma side.	2015-09-29 17:00:49 -04:00
commy2	8d5ce1dbe2	more goggles code cleanup	2015-09-29 22:24:25 +02:00
Derek Sauer	8d05214eb0	Resolve merge conflict from upstream pull.	2015-09-29 16:24:17 -04:00
gienkov	ba42e3e295	pl string for dragging, tactical ladder	2015-09-29 22:12:11 +02:00
commy2	62349f685c	more goggles code cleanup	2015-09-29 22:01:40 +02:00
gienkov	d88d2fe578	Merge remote-tracking branch 'origin' into pl-strings	2015-09-29 21:56:29 +02:00
commy2	b7ce315240	more goggles code cleanup	2015-09-29 21:28:57 +02:00
gienkov	251437c415	pl translation	2015-09-29 20:37:30 +02:00
commy2	d1aacf3fef	more goggles code cleanup	2015-09-29 19:51:41 +02:00
commy2	53bfcdb61e	more goggles code cleanup	2015-09-29 18:51:24 +02:00
PabstMirror	d454271fb9	Give the event the D	2015-09-29 11:40:32 -05:00
PabstMirror	c0b78ecf3a	Set Default Channel at mission start	2015-09-29 11:36:30 -05:00
commy2	d051d4c208	more goggles code cleanup	2015-09-29 17:57:09 +02:00
PabstMirror	16b1244b0a	Global Event for "CaptiveStatusChange"	2015-09-29 10:17:17 -05:00
commy2	477e9f06b6	more goggles code cleanup	2015-09-29 17:09:23 +02:00
commy2	2731ac360a	more goggles code cleanup	2015-09-29 16:56:10 +02:00
commy2	d25d79c485	Goggles Code refactoring initial commit	2015-09-29 16:22:57 +02:00
Derek Sauer	954fad615a	Reformatted to follow ACE3 coding guidelines.	2015-09-29 06:36:36 -04:00
Derek Sauer	8619f02538	Take into account wounds that do no cause blood loss.	2015-09-29 06:19:49 -04:00
PabstMirror	6e24d2868c	Fix playerChanged event	2015-09-28 22:41:45 -05:00
Derek Sauer	a864a3411c	Clarified a comment.	2015-09-28 21:32:04 -04:00
commy2	1ec4556bb8	fix zeus forced interface broken, fix #2642	2015-09-29 02:48:22 +02:00
Derek Sauer	488541bba6	Fix for Arma wounds not being healed with healHitPointAfterAdvBandage.	2015-09-28 20:08:07 -04:00
commy2	19131f001d	fix error in handleplayerchanged for tacticl ladder	2015-09-28 21:16:13 +02:00
commy2	bc8cefa5e7	manual merge	2015-09-28 21:06:40 +02:00
commy2	34793ce044	Merge pull request #2635 from acemod/340interactcleanup ... Code Cleanup Interaction	2015-09-28 21:04:28 +02:00
commy2	6c968d8bc7	per frame handler for incremental door opening	2015-09-28 20:07:01 +02:00
commy2	443cbf8be3	fix compile error when trying to open a locked door by shortcut	2015-09-28 19:03:37 +02:00
commy2	6f64fcd0fb	search for door in geometry lod (lineintersectssurface)	2015-09-28 18:45:10 +02:00
commy2	6289a0cadb	Merge pull request #2626 from acemod/340weaponselectcleanup ... Code Cleanup WeaponSelect	2015-09-28 18:10:16 +02:00
commy2	5a3a32f236	more interaction cleanup	2015-09-28 18:06:25 +02:00
commy2	9bf7b68d76	fix errors on game start	2015-09-28 17:28:51 +02:00
commy2	5c5a65443b	more interaction cleanup	2015-09-28 17:20:56 +02:00
commy2	f48636e633	more interaction cleanup, remove dead code	2015-09-28 17:11:53 +02:00
Glowbal	e1bbc06ef8	Merge pull request #2613 from jonpas/improveSlideshowParams ... Improved Slideshow API	2015-09-28 16:38:00 +02:00
jonpas	4521df0a57	Add synchronizedObjects vehicle support to assignObjectsInList with an optional parameter	2015-09-28 16:17:12 +02:00
jonpas	db2572acfd	Merge branch 'master' into parseList ... Conflicts: addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf	2015-09-28 16:06:32 +02:00
jonpas	e4d8f13c89	Change may to must in slideshow error log	2015-09-28 16:02:18 +02:00
Glowbal	7215dd9082	Merge pull request #2368 from jonpas/removeVignetteAndCleanUI ... Removed Vignette and Cleaned up UI component	2015-09-28 15:56:34 +02:00
commy2	9189148b3f	more interaction cleanup	2015-09-28 15:37:18 +02:00
Glowbal	74805caa5d	Merge pull request #2565 from acemod/medVehAssignFix ... assign vehicle module fix for prefilled veh	2015-09-28 15:02:48 +02:00
commy2	4b536425b1	Code Cleanup Interaction	2015-09-28 14:36:51 +02:00
SilentSpike	f5e46bf089	Merge remote-tracking branch 'origin/master' into cargoClassnames	2015-09-27 17:41:38 +01:00
SilentSpike	f65f6e9b72	Add support for virtual cargo ... Allows cargo objects to be added via classname and reduces simulation/synchronization overhead. Objects become physical upon unloading and cannot be re-made virtual, only scripts can add such virtual objects. Also separates the player feedback from the loading/unloading code and adds a progress bar.	2015-09-27 17:34:37 +01:00
commy2	e9770fcb97	remove obsolete functions	2015-09-27 17:15:59 +02:00
commy2	1613ce3ff6	correct comment	2015-09-27 16:55:43 +02:00
commy2	b6532a05cc	new function to select a grenade	2015-09-27 16:47:02 +02:00
alganthe	38fe56472e	ace setting string added for ace_zeus_autoAddObjects	2015-09-27 15:35:32 +02:00
commy2	f8819d3ee4	WeaponSelect cleanup	2015-09-27 14:55:36 +02:00
commy2	e3b926296f	Merge branch 'master' of https://github.com/acemod/ACE3 into 340weaponselectcleanup	2015-09-27 13:53:00 +02:00
commy2	af24428363	Merge pull request #2607 from acemod/340cleanupBackpacks ... Code cleanup Backpacks	2015-09-27 13:50:20 +02:00
commy2	1a5f65ec5a	Merge pull request #2625 from acemod/340safetymodecleanup ... Code Cleanup SafetyMode, also fixes "cannot load sound .wss" RPT error	2015-09-27 13:50:11 +02:00
commy2	92ae1da660	Merge pull request #2622 from jonpas/aliveCommand ... Replaced isAlive function with alive command	2015-09-27 13:49:58 +02:00
commy2	5387700460	Merge pull request #2610 from acemod/340cleanupNoRadio ... Code Cleanup NoRadio	2015-09-27 13:49:08 +02:00
commy2	0500d4385d	Merge pull request #2611 from acemod/340cleanupHitReactions ... Code Cleanup HitReactions	2015-09-27 13:48:57 +02:00
commy2	fbe157614b	Merge pull request #2612 from acemod/340cleanupGrenades ... Code Cleanup Grenades, fix dedicated server AI thrown flasbangs do nothing	2015-09-27 13:48:46 +02:00
commy2	3211e6432e	Merge pull request #2614 from jonpas/loadCargoOptionalHint ... Optionalized Cargo Loaded Hint	2015-09-27 13:48:27 +02:00
commy2	a078d73230	Code Cleanup WeaponSelect	2015-09-27 08:51:42 +02:00
commy2	50046decf3	Code Cleanup SafetyMode	2015-09-27 08:28:55 +02:00
PabstMirror	4a935eb129	Remove debug	2015-09-26 22:02:44 -05:00
PabstMirror	174d8ac306	#2486 - Run color setup on settingsInit	2015-09-26 22:02:05 -05:00
jonpas	2ab58ab9ce	Replaced common,isAlive function with alive command	2015-09-27 02:23:56 +02:00
jonpas	f35b13bf29	Merge branch 'master' into sittingFramework	2015-09-27 02:16:51 +02:00
jonpas	ae07a71b0d	Minimized XEH to ThingX config level	2015-09-27 02:13:32 +02:00
jonpas	cd510c8ff7	Added carrying to chairs	2015-09-27 02:05:38 +02:00
jonpas	85cff04e0c	Stored scroll-wheel action ID into already existing player setVariable instead of having 2	2015-09-27 01:37:19 +02:00
jonpas	dbd0beb514	Stored a global variable in player setVariable	2015-09-27 01:31:23 +02:00
jonpas	a7a716ca8d	Better sitting framework in terms of interactions	2015-09-27 01:20:40 +02:00
jonpas	e3985dce3e	Cleanup sitRotation as it's no longer needed	2015-09-27 00:40:59 +02:00
jonpas	151903ace4	Expanded optional hint to addCargoItem and AddCargoByClass event	2015-09-27 00:31:23 +02:00
jonpas	b345db4ae9	Added Zeus modules for adding Spare Tracks and Wheels	2015-09-27 00:29:19 +02:00
jonpas	30544dc757	Make cargo loaded hint optional, disable it when not loading manually	2015-09-26 23:16:05 +02:00
jonpas	498dddcc26	Used isEqualTo	2015-09-26 23:06:35 +02:00
jonpas	b787286837	Fixed allowed data types	2015-09-26 23:02:18 +02:00
jonpas	4a5d6cade1	Bracket to Brace	2015-09-26 22:54:31 +02:00
jonpas	64d6a172c7	Improved public function parameter handling, Fixed issue with synchronized objects	2015-09-26 22:53:49 +02:00
commy2	cd839a0ddc	remove superfluous brackets	2015-09-26 22:42:47 +02:00
commy2	6cc920dc34	Code Cleanup Grenades, fix dedicated server AI thrown flasbangs do nothing	2015-09-26 22:39:12 +02:00
commy2	028aa404e9	change description in function header	2015-09-26 21:27:00 +02:00
commy2	c12584e15c	Code Cleanup HitReactions	2015-09-26 21:23:18 +02:00
commy2	0509e26690	Code Cleanup NoRadio	2015-09-26 20:45:19 +02:00
commy2	9ae215704c	Code cleanup Backpacks	2015-09-26 20:29:08 +02:00
commy2	f77242fce3	Merge pull request #2604 from acemod/340fixunconaftersettngsinit ... delay setUnconscious until the settings are inited	2015-09-26 19:54:09 +02:00
commy2	07774647e9	delay setUnconscious until the settings are inited, fix #148	2015-09-26 19:30:13 +02:00
Niner1309	1a43341506	Fixed Laser Update Position Bug	2015-09-26 19:15:09 +02:00
commy2	93114802d2	Merge pull request #2603 from acemod/340fixcargodestroyed ... dont access cargo of destroyed vehicles, fix #2523	2015-09-26 18:29:56 +02:00
commy2	8affae9f7a	dont access cargo of destroyed vehicles, fix #2523	2015-09-26 18:16:38 +02:00
commy2	777ac05d16	Merge pull request #2602 from acemod/340respawncleanup ... Code cleanup respawn module, close #2184	2015-09-26 17:58:17 +02:00
commy2	6d9943ff2e	fix wrong macro, missing ;	2015-09-26 16:45:39 +02:00
commy2	b1fb7befe8	remove wrong isServer check	2015-09-26 16:32:29 +02:00
commy2	5425836e47	cleanup respawn module, close #2184	2015-09-26 16:28:18 +02:00
commy2	f0584adeff	Merge pull request #2601 from acemod/340fixfixfloatingSelections ... fix fixFloating resetting reflector hitpoints, close #2279	2015-09-26 14:45:50 +02:00
commy2	dc7d24a3fd	fix fixFloating resetting reflector hitpoints, close #2279	2015-09-26 14:38:50 +02:00
PabstMirror	8bb5f71ba1	Macro for non spawned CBA Debug Logging	2015-09-25 22:30:57 -05:00
commy2	2fe142032e	rework modifier key, cleanup sandbags, tripod, ladder, fix #2590	2015-09-26 03:16:55 +02:00
SilentSpike	5f7c30dd7c	Merge pull request #2597 from Cuel/delay-spectator ... fix spectator view if called instantly	2015-09-25 13:34:37 +01:00
jokoho48	4ad16ed938	fix that waitUntilAndExecute have a return	2015-09-25 13:29:39 +02:00
jokoho48	998fbcc403	Merge remote-tracking branch 'remotes/acemod/master' into waitUntilAndExecute ... Conflicts: addons/common/XEH_postInit.sqf	2015-09-25 13:19:19 +02:00
Cuel	dcbf977d6d	fix spectator view if called instantly ... If you call setSpectator directly from init.sqf you'll be put into some weird limbo mode with borders and spectator not working. This should fix it	2015-09-25 12:51:13 +02:00
commy2	43cdfaecc0	Merge branch 'master' of https://github.com/acemod/ACE3	2015-09-25 11:15:46 +02:00
commy2	412685e0ff	fix some code was commented out in loadPersonLocal and unloadPersonLocal	2015-09-25 11:15:25 +02:00
jokoho48	f7787730e1	fix Littergeneric fly over ground(add Landcontact Points)	2015-09-23 20:17:16 +02:00
jokoho48	d6203d0f2e	Posible Fix for Invisible Tactical Ladder V2	2015-09-23 19:54:12 +02:00
jokoho48	dce49721e4	Posible Fix for Invisible Tactical Ladder	2015-09-23 19:17:57 +02:00
KoffeinFlummi	3471ebef16	Merge https://github.com/dudakov/ACE3 into russian-merge	2015-09-23 19:17:52 +02:00
alganthe	10296d2883	PAK and Surgical Kit strings normalized inside modules. ... Signed-off-by: alganthe <alganthe@live.fr>	2015-09-23 15:50:50 +02:00
bux578	95ec25736e	Merge pull request #2563 from gienkov/missing-strings ... Missing english strings	2015-09-23 09:48:54 +02:00
PabstMirror	ebcc540943	Merge pull request #2572 from acemod/fixClickExplosivePlace ... Delay one frame when selecting explosives	2015-09-22 13:23:33 -05:00
PabstMirror	5add8d6789	#2537 - Delay one frame when selecting explosives	2015-09-22 11:31:58 -05:00
jonpas	a42685af2e	Removed copy/pasted maintainer intruder	2015-09-22 18:04:27 +02:00
Grzegorz	1848ea6325	fixez	2015-09-22 14:58:59 +02:00
[OMCB]kaban	49d1355ad8	Fix due to review	2015-09-22 11:52:06 +03:00
PabstMirror	cf8a7f742e	#2541 - Attach getIn/Out run on local unit	2015-09-21 22:50:48 -05:00
PabstMirror	f93538eb9a	#2423 - assign vehicle module fix for prefilled veh	2015-09-21 21:44:52 -05:00
PabstMirror	079d88ded7	Merge pull request #2509 from acemod/miscFixNilFunctions ... Fix some nil functions	2015-09-21 20:36:09 -05:00
PabstMirror	bf0cdbaf77	Merge pull request #2534 from acemod/unconcHandcuffs ... Take Unconscious captive	2015-09-21 20:35:02 -05:00
Grzegorz	55eae90484	tabz	2015-09-22 02:35:06 +02:00
gienkov	bbccfbaa35	pl medical string	2015-09-22 01:04:46 +02:00
commy2	24f0df55a2	Merge pull request #2559 from acemod/340disableuserinputcleanup ... Use CBA PFH in disableUserInput	2015-09-22 00:52:58 +02:00
commy2	617b1ec78d	Merge pull request #2556 from acemod/340deprecation ... add deprecated warnings	2015-09-22 00:52:43 +02:00
gienkov	229ba1f758	Merge remote-tracking branch 'upstream/master' into missing-strings	2015-09-22 00:36:32 +02:00
gienkov	b05f0c62ff	missing english respawn strings	2015-09-22 00:36:10 +02:00
PabstMirror	45e44251b6	Merge branch 'release' ... Conflicts: addons/repair/stringtable.xml	2015-09-21 17:14:53 -05:00
PabstMirror	6702a1faa4	Fix warnings for WeaponHolderSimulated	2015-09-21 16:34:02 -05:00
jonpas	2e3014daa3	Merge branch 'master' into parseList ... Conflicts: addons/common/functions/fnc_assignObjectsInList.sqf	2015-09-21 22:46:01 +02:00
commy2	23e3db9cc0	use CBA pfh in disableUserInput and fix key input weirdness	2015-09-21 22:42:31 +02:00
Glowbal	62ad9d4284	Version 3.3.2	2015-09-21 22:31:01 +02:00
Glowbal	42b2c18509	Merge pull request #2542 from acemod/FixSparePartsCargo ... Fix cargo setVariable on server with InitPost	2015-09-21 22:28:59 +02:00
Glowbal	6b93760f9b	Merge pull request #2557 from alganthe/torso_diag_fix ... Torso diag fix	2015-09-21 22:27:13 +02:00
Glowbal	bbed98fbef	Merge pull request #2394 from jonpas/cleanupRepairRelease ... Minor Repair Cleanup for release	2015-09-21 22:25:58 +02:00
commy2	f1abd4698f	remove superfluous ;	2015-09-21 22:12:17 +02:00
commy2	08a6da7ed5	Merge branch '340deprecation' of https://github.com/acemod/ACE3 into 340deprecation	2015-09-21 22:10:11 +02:00
commy2	f134a77e98	add and use deprecated macro	2015-09-21 22:09:54 +02:00
PabstMirror	d3c2420381	Merge branch 'master' into miscFixNilFunctions ... Conflicts: addons/common/functions/fnc_doAnimation.sqf	2015-09-21 15:08:43 -05:00
PabstMirror	9996aa22ab	Replace googles - isTurnedOut	2015-09-21 15:03:34 -05:00
commy2	a98e490f5c	Merge pull request #2512 from acemod/340fixaidisposable ... fix ai seemingly reloading disposable launcher at mission start, fix #2508	2015-09-21 22:00:55 +02:00
commy2	f8676afca4	use correct macro for rpt writing	2015-09-21 21:56:18 +02:00
commy2	020915a52a	Revert "fix broken log warning macro" ... This reverts commit b1f79f0383.	2015-09-21 21:51:05 +02:00
commy2	441efcd65f	change version number in deprecated log	2015-09-21 21:48:18 +02:00
commy2	b1f79f0383	fix broken log warning macro	2015-09-21 21:39:45 +02:00
commy2	af309b937b	add depracted warnings	2015-09-21 21:25:18 +02:00
commy2	a1b2d63417	Merge pull request #2551 from acemod/commoncleanup11 ... common code cleanup part 11	2015-09-21 21:12:42 +02:00
commy2	0070ba113c	Merge pull request #2546 from acemod/overheatJamFFV ... Allow fixing jam when in FFV slot	2015-09-21 19:51:14 +02:00
PabstMirror	1d5217d165	Medical - delayedUnconsicous fix waitAndExecute	2015-09-21 12:43:35 -05:00
commy2	5a5242f1c9	more common code cleanup	2015-09-21 19:19:49 +02:00
PabstMirror	4cc9b91d68	Merge pull request #2463 from acemod/cleanupNightvision ... Cleanup Nightvision	2015-09-21 12:06:15 -05:00
PabstMirror	5a67b00540	Merge pull request #2507 from acemod/pythonSearchNilFuncs ... Script to search for undefined functions	2015-09-21 12:05:27 -05:00
commy2	8503d15c9b	more common code cleanup	2015-09-21 18:37:19 +02:00
commy2	1a4ebdac51	more common code cleanup	2015-09-21 17:32:21 +02:00
commy2	13b487e13b	fix missing ;	2015-09-21 17:13:28 +02:00
commy2	b5b5c761c4	fix missing '' in info log macro	2015-09-21 17:09:10 +02:00
commy2	3037181fc2	more common code cleanup	2015-09-21 17:00:53 +02:00
commy2	df3211cc42	more common code cleanup	2015-09-21 14:20:53 +02:00
commy2	b0f9eab1f7	more common code cleanup	2015-09-21 13:53:12 +02:00
commy2	5adca6616d	Merge branch '323cleanuphitpoints' into commoncleanup10	2015-09-21 13:24:12 +02:00
commy2	9fa6eb0651	more common code cleanup	2015-09-21 13:08:10 +02:00
commy2	ef099861a3	Merge pull request #2545 from acemod/commoncleanup9 ... common code cleanup part 9	2015-09-21 09:24:41 +02:00
bux578	9be4072a10	Merge pull request #2547 from gienkov/patch-34 ... Add missing english string	2015-09-21 08:44:31 +02:00
bux578	549a3e0a2a	Merge pull request #2548 from gienkov/patch-35 ... Add missing english string	2015-09-21 08:44:16 +02:00
commy2	d802cdfb23	more common code cleanup	2015-09-21 01:41:17 +02:00
commy2	d449e4bd83	more common code cleanup	2015-09-21 01:07:49 +02:00
PabstMirror	5555eb195a	Also search for missing stringtable entries	2015-09-20 17:46:43 -05:00
Grzegorz	89a1495534	Add missing english string	2015-09-21 00:42:08 +02:00
Grzegorz	29db26eb58	Add missing english string	2015-09-21 00:40:14 +02:00
Grzegorz	fe75aa55cf	Add missing english string	2015-09-21 00:39:13 +02:00
commy2	5f7d8c0095	more common code cleanup	2015-09-21 00:34:04 +02:00
commy2	1679235b51	more common code cleanup	2015-09-21 00:28:25 +02:00
PabstMirror	345b1f0f98	Merge branch 'master' into miscFixNilFunctions ... Conflicts: addons/common/functions/fnc_execPersistentFnc.sqf addons/common/functions/fnc_execRemoteFnc.sqf	2015-09-20 17:02:49 -05:00
PabstMirror	79d4eb62be	Allow fixing jam when in FFV slot	2015-09-20 16:55:33 -05:00
commy2	1d4eb209a4	fix missing ; in dumpPerformanceCounters	2015-09-20 23:50:30 +02:00
commy2	ffc5a16384	more common code cleanup	2015-09-20 23:40:51 +02:00
commy2	a98a45e5d1	more common code cleanup	2015-09-20 23:18:51 +02:00
commy2	62ec00a251	more common code cleanup	2015-09-20 22:36:05 +02:00
commy2	5fd1938f25	more common code cleanup	2015-09-20 22:29:38 +02:00
commy2	493ce1b092	more common code cleanup	2015-09-20 22:16:51 +02:00
commy2	2348c25e1a	more common code cleanup	2015-09-20 20:25:25 +02:00
PabstMirror	86fae2c251	#2528 - addToLog date / missing string fullHeal	2015-09-20 13:19:51 -05:00
PabstMirror	0c8a694b96	Medical_menu settings under medical category	2015-09-20 12:07:44 -05:00
PabstMirror	610fb0bb2c	Fix Merge	2015-09-20 11:28:43 -05:00
PabstMirror	7687374fcf	Merge branch 'master' into miscFixNilFunctions ... Conflicts: addons/common/functions/fnc_resetAllDefaults.sqf	2015-09-20 11:25:33 -05:00
Alessandro Foresi	aabc437314	Remove: pain diagnosis on dead patients	2015-09-20 17:37:33 +02:00
PabstMirror	9c61f256bc	Rem debug	2015-09-20 10:06:24 -05:00
PabstMirror	789f3843d5	#2488 - Fix cargo setVariable on server with InitPost	2015-09-20 10:05:34 -05:00
commy2	0a01bbdc76	more common code cleanup	2015-09-20 16:56:35 +02:00
commy2	e62683a0c4	more common code cleanup	2015-09-20 16:40:49 +02:00
commy2	e8ebe87450	more common code cleanup	2015-09-20 15:52:40 +02:00
alganthe	4265b11d51	wrong target fixed ... Signed-off-by: alganthe <alganthe@live.fr>	2015-09-20 14:13:22 +02:00
Glowbal	461028b4e8	Merge pull request #2521 from acemod/fix-ctd-medical ... Fixed CTD on overpressure with advanced medical enabled	2015-09-20 12:44:58 +02:00
Glowbal	8279f60d09	Merge pull request #2529 from acemod/repairCanInteractCheck ... Add CanInteractWith checks for repair	2015-09-20 11:48:10 +02:00
Glowbal	409c2d5f78	Merge pull request #2505 from acemod/fixBFT ... Run BFT module on server	2015-09-20 11:46:03 +02:00
commy2	4c4785c140	Merge pull request #2535 from acemod/commoncleanup7 ... common code cleanup part 7	2015-09-20 11:06:38 +02:00
commy2	d33a98c612	set variable public didn't work / didn't work on server and headless client	2015-09-20 11:02:15 +02:00
commy2	8c8b23ec18	Merge pull request #2530 from acemod/commoncleanup6 ... common code cleanup part 6	2015-09-20 10:44:31 +02:00
PabstMirror	05f4dad764	maptools - Remove debug	2015-09-19 20:42:46 -05:00
commy2	dfa6d71a64	more common code cleanup	2015-09-20 00:55:58 +02:00
commy2	73a9c1b5f8	more common code cleanup	2015-09-19 23:18:07 +02:00
commy2	6b96c7fd7c	more common code cleanup	2015-09-19 22:27:23 +02:00
commy2	bfd5d13de8	more common code cleanup	2015-09-19 21:33:25 +02:00
bux578	450ee98004	Merge pull request #2515 from acemod/340fixinventoryeh ... fix playerInventoryChanged eventhandler triggers when current weapon is changed fix #2513	2015-09-19 21:04:48 +02:00
PabstMirror	db41537f56	#2524 - Take Unconscious captive	2015-09-19 13:58:34 -05:00
commy2	09f133b7f8	more common code cleanup	2015-09-19 20:55:35 +02:00
SilentSpike	35d94e8d5c	Fix medical litter scopeCurator values ... Solves #2526 where medical litter would appear in zeus with no name.	2015-09-19 19:37:38 +01:00
commy2	3ddaa5ed4a	more common code cleanup	2015-09-19 20:34:07 +02:00
commy2	1636e3976d	more common code cleanup	2015-09-19 20:17:38 +02:00
commy2	cbc7f961b2	more common code cleanup	2015-09-19 19:40:56 +02:00
commy2	20a5c79431	more common code cleanup	2015-09-19 19:26:45 +02:00
commy2	6ee5c6d9f8	Merge pull request #2510 from acemod/commoncleanup5 ... common code cleanup part 5	2015-09-19 18:50:28 +02:00
commy2	fb71e0594e	lsd module, use global variable for color	2015-09-19 18:47:00 +02:00
PabstMirror	8573238cff	Merge branch 'release'	2015-09-19 11:21:33 -05:00
PabstMirror	3c93c2c95c	#2525 - Add CanInteractWith checks for repair	2015-09-19 11:07:03 -05:00
PabstMirror	79d985a648	Fix XEH Warning Debug ... Wait 5 to let supMon run first, and only show visual error if actually missing pbo.	2015-09-19 10:43:29 -05:00
PabstMirror	2e09a7aa4b	"cherrypick" PR #2496 (lockpick)	2015-09-19 10:02:37 -05:00
Alessandro Foresi	22ac16ead5	Changed: Seeker to aimPoint instead of ASL position	2015-09-19 16:22:36 +02:00
Glowbal	1d7cbf40ca	Fixed incorrect handleDamage call	2015-09-19 11:52:35 +02:00
commy2	e08c6c343e	fix LSD module, cutback on global variable usage	2015-09-19 09:24:28 +02:00
commy2	1357d72f16	fix broken LSD module	2015-09-19 02:44:02 +02:00
commy2	25d1e46422	Merge branch 'commoncleanup5' of https://github.com/acemod/ACE3 into commoncleanup5	2015-09-19 01:50:37 +02:00
commy2	c7d636a533	more common code cleanup	2015-09-19 01:50:17 +02:00
jokoho48	e7ff41a03c	Merge branch 'commoncleanup5' of https://github.com/acemod/ACE3 into commoncleanup5	2015-09-19 01:12:20 +02:00
jokoho48	f2070deee8	Change spawn while to CBA PFH	2015-09-19 01:12:03 +02:00
commy2	f8ecf1b8ab	fnc_debug was broken	2015-09-19 00:30:36 +02:00
commy2	30ba4f5586	this append should've been pushBack	2015-09-18 23:34:49 +02:00
commy2	56f4cbb39e	fix playerInventoryChanged eventhandler triggers when current weapon is changed fix #2513	2015-09-18 23:03:35 +02:00
commy2	2e48a92eef	fix ai seemingly reloading disposable launcher at mission start, fix #2508	2015-09-18 22:25:09 +02:00
commy2	85fd9d9d75	more common code cleanup	2015-09-18 21:46:21 +02:00
PabstMirror	5f0d73bab6	Cleanup more stuff	2015-09-18 14:24:20 -05:00
commy2	f3a175e9d6	remove obsolete private	2015-09-18 21:15:06 +02:00
commy2	5d0a7ed062	more common code cleanup	2015-09-18 21:12:40 +02:00
PabstMirror	c62ea5e406	Fix some nil functions	2015-09-18 13:47:19 -05:00
commy2	a53d158a89	Merge pull request #2501 from acemod/commoncleanup4 ... common code cleanup part 4	2015-09-18 19:54:04 +02:00
PabstMirror	65b8585d60	Use _player instead of ACE_player	2015-09-18 12:48:59 -05:00
commy2	8704cd0321	fix additional bracket, formatting	2015-09-18 19:40:48 +02:00
PabstMirror	c21a5d6f08	Merge pull request #2496 from acemod/fixLockPick ... Fix for #2495	2015-09-18 12:28:51 -05:00
PabstMirror	97921aa665	#2503 - run BFT module on server	2015-09-18 12:18:43 -05:00
commy2	a18f63d861	more common code cleanup	2015-09-18 19:12:38 +02:00
commy2	2674310e65	remove another deprecated function	2015-09-18 18:45:41 +02:00
esteldunedain	a621a0c693	Fixes to spanish translations	2015-09-18 13:36:57 -03:00
commy2	1fd2fcafb0	remove old, not working functions	2015-09-18 18:34:29 +02:00
commy2	1b96caedc0	more common code cleanup	2015-09-18 18:28:19 +02:00
esteldunedain	3422f5a7f1	Merge branch 'master' of https://github.com/Legolasindar/ACE3 into spanish-translation ... Conflicts: addons/medical/stringtable.xml addons/repair/stringtable.xml	2015-09-18 13:20:22 -03:00
commy2	a8ba96a01b	more common code cleanup	2015-09-18 16:41:00 +02:00
commy2	39786420fa	more common cleanup	2015-09-18 16:33:53 +02:00
commy2	c0fdd80ba4	formating	2015-09-18 16:00:58 +02:00
commy2	7efcfcc8a0	more common cleanup	2015-09-18 15:40:51 +02:00
commy2	f83dea6e01	formatting, remove an obsolete private	2015-09-18 14:32:58 +02:00
commy2	b0704e486f	more common cleanup	2015-09-18 13:09:40 +02:00
commy2	3a027ff26f	more common cleanup	2015-09-18 09:38:19 +02:00
commy2	e833c3fc42	more common cleanup	2015-09-18 08:47:14 +02:00
commy2	fc82018c49	more common cleanup	2015-09-18 08:23:18 +02:00
commy2	df2c7dce78	replace old pushback macro	2015-09-18 07:53:36 +02:00
commy2	475c193060	common code cleanup part 2	2015-09-18 07:42:10 +02:00
jokoho48	c5eb6e0070	posible fix for #2495	2015-09-18 04:12:18 +02:00
commy2	37c1dbd6f7	Merge pull request #2490 from acemod/commoncleanup ... cleanup common	2015-09-17 23:59:10 +02:00
PabstMirror	a9946e26a5	Merge pull request #2489 from acemod/fixSpareParts ... only run addSpareParts on server	2015-09-17 16:44:31 -05:00
PabstMirror	81f427ad82	Merge branch 'fixSpareParts' into release	2015-09-17 16:43:54 -05:00
commy2	27ca3dc7bd	Merge pull request #2471 from acemod/340noactionmenu ... optional pbo to hide select weapon actions	2015-09-17 22:47:35 +02:00
commy2	3927103a86	Merge pull request #2483 from acemod/340staticmgfcs ... add fcs to static machine guns	2015-09-17 22:47:23 +02:00
commy2	ca43520b7f	Merge pull request #2482 from acemod/340fixdaylaserlight ... fix daylasers being a virtual light source	2015-09-17 22:47:13 +02:00
commy2	cfc7102cb6	Merge pull request #2481 from acemod/340loadcargohint ... display text when loading / unloading cargo	2015-09-17 22:47:05 +02:00
commy2	7336e694c1	Merge pull request #2480 from acemod/340doanim2tweak ... tweak doAnimation switchMove to do no akward camera jumps whenever possible	2015-09-17 22:46:54 +02:00
PabstMirror	7faee2e6ff	Merge pull request #2492 from acemod/fixCPR ... Fix CPR params	2015-09-17 12:37:45 -05:00
PabstMirror	5fc127e94c	#2491 - fix params	2015-09-17 11:34:32 -05:00
commy2	36a279012c	cleanup common	2015-09-17 18:25:02 +02:00
PabstMirror	3b1a9ab415	#2488 - only run addSpareParts on server	2015-09-17 11:19:47 -05:00
commy2	a03bc44ba0	add fcs to static machine guns, close #1188	2015-09-17 14:40:58 +02:00
commy2	864c0b4baf	fix daylasers being a virtual light source, fix #2416	2015-09-17 14:17:48 +02:00
commy2	42a754a981	display text when loading / unloading cargo	2015-09-17 13:43:55 +02:00
KoffeinFlummi	067b08611e	Fix missing newlines	2015-09-17 12:54:26 +02:00
KoffeinFlummi	49cc207e6b	Merge remote-tracking branch 'origin/pr/2397' into polish-merge	2015-09-17 12:53:47 +02:00
commy2	a09ca8fb80	tweak doAnimation switchMove to do no akward camera jumps whenever possible, fix #2474	2015-09-17 12:23:56 +02:00
kaban	4d2707eae2	Russian Translations - Update	2015-09-17 12:21:21 +03:00
kaban	341e122e4c	Russian Translations - Update	2015-09-17 11:43:14 +03:00
commy2	014203413d	handle optional pbos in checkFiles	2015-09-17 02:13:21 +02:00
commy2	ca72770c48	add english translation to switch units module	2015-09-16 23:49:34 +02:00
commy2	6d80740a20	don't default to english on the switch units module description	2015-09-16 23:29:07 +02:00
PabstMirror	b8c687611e	Merge branch 'release'	2015-09-16 14:10:02 -05:00
ViperMaul	c748e56f4a	bump v3.3.1.2	2015-09-16 11:42:01 -07:00
commy2	b7715152e2	correct cargo capacities for quads, karts, boats and jets	2015-09-16 20:12:56 +02:00
alganthe	49e0befbaf	added diagnose to torso ... Signed-off-by: alganthe <alganthe@live.fr>	2015-09-16 19:44:44 +02:00
commy2	f383e8701d	increase trucks cargo space	2015-09-16 19:27:32 +02:00
PabstMirror	06a9f60281	Cleanup Nightvision	2015-09-16 10:55:23 -05:00
PabstMirror	539e158a97	Merge branch 'release'	2015-09-16 10:35:19 -05:00
ViperMaul	e78b59c28a	bump to 3.3.1.1	2015-09-16 05:09:48 -07:00
ViperMaul	f83a76b304	Merge pull request #2458 from acemod/FixAB ... Fix Advaced Basllistic Performance bug	2015-09-16 05:07:26 -07:00
jokoho48	c1baf4f8f7	tweak Vales for B_Truck_01_Base and B_Truck_01_box_F	2015-09-16 12:45:08 +02:00
Ivan Navarro Cabello	463e21dd91	330	2015-09-16 12:40:30 +02:00
jokoho48	a24e5b4665	fix Performance issue in AB	2015-09-16 11:54:49 +02:00
gienkov	e2f9b31fb2	small fix + repair translation	2015-09-16 11:53:05 +02:00
gienkov	a66f4d0e09	Merge remote-tracking branch 'origin/master' into pl-translation-8	2015-09-16 11:44:35 +02:00
gienkov	b94df35c08	Revert "fixed duplicate stringtable entries" ... This reverts commit ab02bed1c1.	2015-09-16 11:42:45 +02:00
alganthe	02faf0a104	fixed zeus addobjects ... The module part in CfgVehicles.hpp was missing. Signed-off-by: alganthe <alganthe@live.fr>	2015-09-16 06:20:05 +02:00
ViperMaul	8330aadb6f	bump version to 3.3.1	2015-09-15 17:56:57 -07:00
PabstMirror	2c2d79cfe0	Merge pull request #2439 from acemod/badXEHcheck ... Bad xeh check	2015-09-15 19:46:10 -05:00
PabstMirror	e254af9964	Fix missing )	2015-09-15 19:26:37 -05:00
PabstMirror	1ea1094a73	Merge branch 'release'	2015-09-15 16:16:10 -05:00
Glowbal	a124b05672	Revert "disable a10 tracers, commanche tracers only nvg"	2015-09-15 21:25:01 +02:00
Glowbal	c6c51af548	Updated build version	2015-09-15 21:13:36 +02:00
Glowbal	7e5ab07e32	Merge pull request #2387 from acemod/FixHCPPE ... Fix that PPEffects Throw a error on HC	2015-09-15 21:04:37 +02:00
Glowbal	b2b221db20	Merge pull request #2441 from SzwedzikPL/air_no_tracers ... disable a10 tracers, commanche tracers only nvg	2015-09-15 21:02:40 +02:00
PabstMirror	88f89b8d76	also check allDeadMen	2015-09-15 13:30:04 -05:00
PabstMirror	a8688609d7	Typo	2015-09-15 13:10:06 -05:00
Glowbal	3cc2ccf025	Merge pull request #2438 from acemod/wheelRepairSettingToolkit ... Add Setting for toolkit requirement for wheel repair	2015-09-15 20:04:38 +02:00
PabstMirror	0e32c28552	#2437 - Warn users when mods break XEH	2015-09-15 12:55:08 -05:00
PabstMirror	db37fa0e04	Update stringtable.xml	2015-09-15 11:45:02 -05:00
PabstMirror	c50c53e5bb	remove debug	2015-09-15 09:57:53 -05:00
PabstMirror	9cd470b849	Add Setting for toolkit requirement for wheel repair	2015-09-15 09:54:55 -05:00
commy2	2c7a2b4140	Merge pull request #2406 from acemod/captiveOnRespawn ... Reset captive status on respawn for reliability	2015-09-15 16:37:01 +02:00
gienkov	6588237e8c	stringtable DAGR	2015-09-15 15:05:30 +02:00
PabstMirror	17fdce7196	Cleanup preInit	2015-09-15 08:03:56 -05:00
Glowbal	478b618e4b	Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros ... Feature/switch to log macros	2015-09-15 14:51:23 +02:00
PabstMirror	d6d64b58b0	Merge pull request #2430 from acemod/microDagr-customDrawEvents ... microDagr - Add ability to access draw event for minimap	2015-09-14 23:36:07 -05:00
PabstMirror	f419762653	Fix time of flight display	2015-09-14 23:33:32 -05:00
PabstMirror	db41512dc0	#2349 - Don't disable locking for base RocketPods	2015-09-14 22:11:12 -05:00
PabstMirror	61cbe543ee	Fix #2432 - Don't check for null attached when mounted	2015-09-14 18:06:46 -05:00
PabstMirror	e029e8318f	microDagr - Add ability to access draw event for minimap	2015-09-14 16:37:39 -05:00
Glowbal	16b7bb389c	Merge pull request #2428 from acemod/FixMainMenuInfo151 ... Fix main menu info151	2015-09-14 23:30:00 +02:00
Glowbal	d52cc917ea	Merge pull request #2419 from acemod/FixBBTexturePath2 ... Fix Bandage Texture Path and UV	2015-09-14 23:26:00 +02:00
Glowbal	4b6082d836	Merge pull request #2424 from acemod/medical-tweaks ... Medical tweaks	2015-09-14 23:20:50 +02:00
Glowbal	7b7ad6eea8	fixed tweak to basic bandage	2015-09-14 23:18:20 +02:00
PabstMirror	f7bd557a30	Fix some stringtable weirdness	2015-09-14 16:11:43 -05:00
Glowbal	10ac127159	Fixed incorrect new damage value in handleDamage advanced. ... The new handleDamage from BI added a new value to the parameters that we didn't account for in handleDamage advanced.	2015-09-14 21:15:57 +02:00
Glowbal	33ac78dbac	Addresses the large amount of bandages required in basic medical ... This should restore the bandaging behavior back to how it is before the adjustments made to basic medical	2015-09-14 21:14:56 +02:00
Glowbal	8c60e76979	Tweaks made to improve determine if fatal algorithm	2015-09-14 21:13:58 +02:00
Glowbal	37639066c2	Include missing frame in the caching execution	2015-09-14 15:19:58 +02:00
Glowbal	6d4744b9ea	Increased duration of knock down for basic medical	2015-09-14 15:19:18 +02:00
Glowbal	032dd6c87c	Tweaked visual effects.	2015-09-14 15:18:56 +02:00
jokoho48	fb75f6ad9e	Fix Bandage Texture Path and UV	2015-09-13 18:57:07 +02:00
Alessandro Foresi	89eb98a248	Added: IT more translation, medic partial ... Fixed: dup entries (from gienkov)	2015-09-12 23:16:57 +02:00
Alessandro Foresi	d4cb290930	Tweaked: shorter sentence, fixed "pressione"	2015-09-12 22:00:43 +02:00
Alessandro Foresi	b0bc81e579	Add: more translation ... Changed: shorter sentence for UI	2015-09-12 22:00:42 +02:00
Alessandro Foresi	6cb902a7ab	Changed: IT riempi instead of ricarica	2015-09-12 22:00:41 +02:00
Alessandro Foresi	8fe629e953	Changed: epi to adrenalina, more wording fixing	2015-09-12 22:00:41 +02:00
Alessandro Foresi	5d74dd1aed	Tweak: Better wording	2015-09-12 22:00:40 +02:00
Alessandro Foresi	15e7f9b767	Add: IV now EV (endovena)	2015-09-12 22:00:39 +02:00
gienkov	530dfa041d	stringtable DAGR	2015-09-12 21:25:02 +02:00
jokoho48	b2b41ce8af	Merge branch 'release' of https://github.com/acemod/ACE3 into release	2015-09-12 18:13:12 +02:00
jokoho48	5feee53c69	Posible fix for #2407	2015-09-12 18:12:57 +02:00
SilentSpike	7c846502b5	Reset captive status on respawn for reliability ... Previously we were resetting on death, but this caused problems when the respawnDelay was 0 as the dead unit wasn't actually the player. To account for "group" and "side" respawn types where you change unit on respawn and could potentially become a captive unit, I am explicity checking the mission respawn type before resetting variables.	2015-09-12 15:42:20 +01:00
SilentSpike	e6c2916a14	Fix spectator template for negligible respawnDelay ... When the value of respawn delay is 0 the timing of the killed and respawn events can be a little strange and result in spectator being entered but never exited. The respawn template should just do nothing when the delay is so small.	2015-09-12 14:02:42 +01:00
bux578	9748abdb48	change order of BloodPressure readout, fix #2400	2015-09-12 10:58:29 +02:00
Alessandro Foresi	eed3fab483	Merge branch 'translation/15bn/alef' of github.com:alef/ACE3 into translation/15bn/alef	2015-09-12 09:50:26 +02:00
Alessandro Foresi	16fd6b490d	Add: IT translation for medical	2015-09-12 09:42:48 +02:00
Alessandro Foresi	bc4f928088	Add: IT translation up to flashlights	2015-09-12 09:41:43 +02:00
Alessandro Foresi	d5ec534f5b	Add: IT cargo and common	2015-09-12 09:39:04 +02:00
Alessandro Foresi	a764f1772e	Added: IT captives, fixed ballistics	2015-09-12 09:35:56 +02:00
Alessandro Foresi	97d9c44fc3	Fixed: IT advanced_ballistics now LF+BOM	2015-09-12 09:29:55 +02:00
Alessandro Foresi	7a762c0940	Add: IT advanced_ballistics	2015-09-12 09:25:17 +02:00
Alessandro Foresi	337cde3fb3	autointerazioni (?)	2015-09-12 09:21:38 +02:00
BaerMitUmlaut	8ee1136758	Rewrite canPassMagazine condition	2015-09-11 23:52:00 +02:00
gienkov	ef36b27fe2	medical pl translation	2015-09-11 23:49:41 +02:00
gienkov	ab02bed1c1	fixed duplicate stringtable entries	2015-09-11 23:42:03 +02:00
jonpas	3de783d3a7	Cleanup for branch release, picked from #2366	2015-09-11 19:57:21 +02:00
BaerMitUmlaut	ccf1bf1de7	Cleaned up canPassMagazine condition	2015-09-11 18:24:46 +02:00
jonpas	6fb22ebd11	Added isNull check to PFH for explicity	2015-09-11 17:55:28 +02:00
jonpas	efa8252b45	Remove debug	2015-09-11 17:43:29 +02:00
jonpas	2d3a02085e	Improved comment	2015-09-11 17:27:08 +02:00
jonpas	d49798144c	Replaced hasChairMoved with isEqualTo, fixed missing variable	2015-09-11 17:25:46 +02:00
jokoho48	b7e02da1cc	remove if (!hasInterface) from PFH ... move ! in ()	2015-09-11 16:58:26 +02:00
jonpas	c5f9f85d27	Updated comment	2015-09-11 16:53:09 +02:00
jonpas	0b9c6254e4	Removed redundant rotation control - changed to config	2015-09-11 16:46:51 +02:00
SilentSpike	aa7b6cf39f	Improve angular behaviour of spectator camera ... Changes the position calculation of the external spectator camera to correctly retain the pan and tilt of the free camera. Makes transitioning between the two less disorienting for the user.	2015-09-11 14:46:21 +01:00
SilentSpike	77c2b99ee5	Change spectator external camera behaviour ... Using the "external" view is limited by the server difficulty setting. Instead the spectator external camera has been replaced with an oribtal camera as was originally planned to be added alongside the default views.	2015-09-11 14:46:21 +01:00
BaerMitUmlaut	a29902ddb3	More use of params, event system, removed compile	2015-09-11 15:36:23 +02:00
SilentSpike	17f9eab03a	Improve display name of medical heal hitpoints setting ... ace_medical_healHitPointAfterAdvBandage had a slightly misleading display name that didn't quite convey what it is actually doing	2015-09-11 12:33:18 +01:00
BaerMitUmlaut	45bfa3eaf5	Fixed vanishing mags and localized hint	2015-09-10 22:23:37 +02:00
Glowbal	f60954a49b	increased build number (3.3.0.1)	2015-09-10 22:18:13 +02:00
KoffeinFlummi	70dfbe2ec0	Fix some merging errors	2015-09-10 22:11:09 +02:00
KoffeinFlummi	63c2712360	Merge branch 'release' into portuguese	2015-09-10 21:59:30 +02:00
KoffeinFlummi	c2ffe7cad0	Merge branch 'release' into russian	2015-09-10 21:05:32 +02:00
KoffeinFlummi	a5621604fd	Merge branch 'release' into czech	2015-09-10 20:51:33 +02:00
KoffeinFlummi	83aa2cc68c	Merge branch 'release' into french	2015-09-10 19:36:56 +02:00
FreeZbe	fa7943c8be	Update French translations	2015-09-10 19:14:51 +02:00
jokoho48	cc9cdae972	Merge branch 'release' of https://github.com/acemod/ACE3 into FixHCPPE	2015-09-09 20:25:48 +02:00
Glowbal	82d9e70c88	Merge pull request #2385 from jokoho48/BackBlastEnhanced ... Back blast enhanced	2015-09-09 19:39:32 +02:00
jonpas	e07b71faf0	Merge branch 'master' into parseList ... Conflicts: addons/medical/functions/fnc_moduleAssignMedicRoles.sqf addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf	2015-09-09 19:13:04 +02:00
jokoho48	defbdf1b1a	fix that HC throw a issue if PPEffect was used/applyed	2015-09-09 17:05:48 +02:00
Michael Braun	a5fb09a7e1	Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros ... Conflicts: addons/repair/functions/fnc_moduleRepairSettings.sqf	2015-09-09 02:55:12 +02:00
jokoho48	1ed52e08bf	fix missing default	2015-09-08 19:45:46 +02:00
Glowbal	6a31140f7d	Version 3.3.0	2015-09-08 19:38:52 +02:00
Glowbal	d6b51b2138	Merge pull request #2374 from acemod/microDagr ... Move MicroDAGR 3D model from BFT branch to microdagr module reopen #2373	2015-09-08 19:31:02 +02:00
Glowbal	0c371ddf37	disabled debug for medical	2015-09-08 19:06:01 +02:00
BaerMitUmlaut	c26107bc5c	Added ability to pass a magazine	2015-09-08 14:07:16 +02:00
ProfessorCZ	a28e9d96c7	Czech Translations - Update	2015-09-07 17:40:14 +02:00
gienkov	ad50c1ab4b	medical and repair translation	2015-09-07 16:15:18 +02:00
jokoho48	7f6e7de68c	Add LoD ... Lower Poly in Shadow LoD	2015-09-07 16:10:55 +02:00
gienkov	c4475ff5be	Merge branch 'pl-translation-7' of https://github.com/gienkov/ACE3 into pl-translation-7	2015-09-07 16:06:17 +02:00
gienkov	1edcc320d1	Merge remote-tracking branch 'origin' into pl-translation-7	2015-09-07 16:05:45 +02:00
Glowbal	7b349ab388	Merge pull request #2361 from acemod/medical-adjustments2 ... Medical adjustments2	2015-09-07 15:51:27 +02:00
nsgundy	eee5664ec5	Move MicroDAGR 3D model from BFT branch to microdagr module	2015-09-07 11:05:18 +02:00
ViperMaul	2fc35338d5	Build number for Release Candidate	2015-09-06 21:37:20 -07:00
jokoho48	45eb8c4822	Add Code for CBA update 2.1	2015-09-06 19:34:46 +02:00
Alessandro Foresi	c31f13e4b3	Add: IT translation up to flashlights	2015-09-06 19:13:42 +02:00
commy2	adb1a11211	increase leg and arm armor value, more TRACE debug	2015-09-06 11:49:08 +02:00
[OMCB]kaban	78084f271a	Changed "Effect Zeus RC" to "Affects Zeus RC"	2015-09-06 07:11:27 +03:00
jonpas	f45c0334fc	Added spaces	2015-09-06 03:49:52 +02:00
ViperMaul	98202f4f38	Additional debug statements for caching and wounds.	2015-09-05 15:31:14 -07:00
jonpas	f2bfc385eb	Merge branch 'master' into removeVignetteAndCleanUI ... Conflicts: addons/ui/README.md addons/ui/config.cpp	2015-09-05 22:00:51 +02:00
jonpas	ce1c735d89	Removed Vignette, Cleaned up UI	2015-09-05 21:57:22 +02:00
Glowbal	a745b07cb6	Merge pull request #2365 from jonpas/addSparePartsSettingInitDelay ... Used new setting init delay function in addSpareParts	2015-09-05 21:18:25 +02:00
jonpas	06baa5e4d3	Fixed nilCheck, changed moduleAddSpareParts to use new parseList	2015-09-05 20:51:48 +02:00
jonpas	8fc061bfd6	Merge branch 'master' into parseList	2015-09-05 20:16:59 +02:00
jonpas	a2dd77ca70	Use splitString instead of BIS_fnc_splitString	2015-09-05 20:15:31 +02:00
Jonathan Pereira	7147891710	Added latest ACE3 PT-BR translations	2015-09-05 15:12:31 -03:00
jonpas	f22072a94d	Use pushBack instead of array compiling	2015-09-05 19:57:35 +02:00
jonpas	a8412361bd	Use setting init delay function for addSpareParts	2015-09-05 19:33:25 +02:00
TheMagnetar	27a0e8f639	Repair: Fix possible out of bounds setting ... Setting "engineerSetting_fullRepair" had an out of bounds default value.	2015-09-05 16:30:00 +02:00
Glowbal	315f46c6c6	Merge branch 'master' into medical-adjustments2	2015-09-05 14:41:25 +02:00
Glowbal	0a6b77b902	Removed more deprecated wound sync code	2015-09-05 14:10:28 +02:00
Glowbal	e4c246984f	Removed another debug trace that should not be there	2015-09-05 14:10:04 +02:00
Glowbal	d9af19df28	properly fixes unconscious weird behavior. Because it never registered any unconscious conditions.	2015-09-05 14:08:46 +02:00
Glowbal	41db78b52b	Merge pull request #2341 from acemod/323tracers ... better scaling for tracer sizes, fix #1008	2015-09-05 13:47:37 +02:00
commy2	46d741281b	Merge pull request #2358 from acemod/322flashbangexplosive ... sort flashbang under explosive grenades, not misc grenades	2015-09-05 13:40:24 +02:00
Glowbal	a4b4c5d2a3	Merge pull request #2187 from jonpas/trackToTrackedVehicles ... Added Spare Parts module handling	2015-09-05 13:36:42 +02:00
Glowbal	dad96822be	Only add 1/4 of the new damage to pain instead of everything.	2015-09-05 13:27:02 +02:00
Glowbal	6405ef7d91	Merge branch 'master' into medical-adjustments2	2015-09-05 13:22:44 +02:00
Glowbal	f15a1c033d	Added allowSelfTreatment attribute to treatment actions	2015-09-05 13:20:19 +02:00
Glowbal	f0a074072f	Merge pull request #2329 from acemod/323medicalstrcturaldamage ... setStructuralDamage function	2015-09-05 13:16:13 +02:00
Alessandro Foresi	03b5ae1408	Add: IT cargo and common	2015-09-05 13:13:09 +02:00
Glowbal	446f367f8b	Merge pull request #2359 from acemod/fixRestoreGear ... fix restore gear	2015-09-05 13:09:21 +02:00
Glowbal	9c7f7429d1	Merge pull request #2350 from jonpas/cargoHideActionOnLocked ... Prevent Cargo opening if vehicle is locked	2015-09-05 13:09:14 +02:00
Glowbal	a4e406658f	Reduced initial knockdown time for basic medical	2015-09-05 13:02:19 +02:00
Glowbal	17ad7ecb8c	replaced diag_logs by trace	2015-09-05 12:59:09 +02:00
Glowbal	9c0288cd3f	Removed debug message	2015-09-05 12:55:49 +02:00
Glowbal	c8a7b94777	Merge pull request #2363 from acemod/MedicalMenuBlackoutBlur ... Add Screen Blur and Blackout for Medical Menu by Interact_menu setting	2015-09-05 12:53:04 +02:00
Glowbal	d617fba6c6	Merge branch 'master' into medical-adjustments2	2015-09-05 12:51:18 +02:00
Glowbal	c828544d02	Added init stacking	2015-09-05 12:50:32 +02:00
jokoho48	c70c9cdee6	Add Screen Blur and Blackout for Medical Menu by Interact_menu setting	2015-09-05 12:49:23 +02:00
Glowbal	23d45c53cf	Merge branch 'master' into medical-adjustments2	2015-09-05 12:47:32 +02:00
Glowbal	c673ea2cbb	Restored uniqueIds	2015-09-05 12:38:12 +02:00
Glowbal	17648739dd	Removed more deprecated wound sync code	2015-09-05 12:37:01 +02:00
Glowbal	25a75b9f69	fixed incorrect macro usage	2015-09-05 12:35:48 +02:00
Glowbal	6b73eafcce	Allow users to disable medical 3d interaction.	2015-09-05 12:31:52 +02:00
Glowbal	268220bbae	Possible fix for weird unconscious behavior in basic medical	2015-09-05 12:20:40 +02:00
Alessandro Foresi	d68728c908	Added: IT captives, fixed ballistics	2015-09-05 12:17:07 +02:00
Glowbal	4122b32dba	Removed deprecated wound sync code	2015-09-05 12:02:09 +02:00
Glowbal	e0db571e13	Minor adjustment to fatality change on torso damage	2015-09-05 12:00:45 +02:00
Alessandro Foresi	49911d9b4a	Fixed: IT advanced_ballistics now LF+BOM	2015-09-05 11:58:47 +02:00
Glowbal	883b9ab545	Removed blur screen for medical menu #2069	2015-09-05 11:58:34 +02:00
Glowbal	85dc59d66c	Fixed: should only display "no injuries" when there are no injuries. Not the other way around	2015-09-05 11:57:41 +02:00
Glowbal	130569c485	Made basic medical bleeding information work with new damage system	2015-09-05 11:57:17 +02:00
Glowbal	39ff82e764	fixes for CPR condition in basic medical and improvements to lethalDamage	2015-09-05 11:52:12 +02:00
Glowbal	4514812523	Basic bandaging now works with new damage system	2015-09-05 11:51:46 +02:00
Alessandro Foresi	76a235384e	Add: IT advanced_ballistics	2015-09-05 11:28:07 +02:00
Glowbal	cd9e5df782	Clean up of handleDamage. Fixes some debug code	2015-09-05 11:25:56 +02:00
Glowbal	df3dbc9772	Removed deprecated fire handling	2015-09-05 11:25:31 +02:00
Glowbal	a25f640614	fixes #2114 No CPR available in basic medical when revive is enabled	2015-09-05 11:07:10 +02:00
Glowbal	3d342ece20	Fixes #2156 Animation is still played even if you cancel any treatment	2015-09-05 11:04:11 +02:00
Glowbal	a02f95ae06	Merge pull request #2355 from acemod/settingInitDelayFunctions ... Setting init delay functions	2015-09-05 11:01:44 +02:00
Alessandro Foresi	c8f26ed0f4	autointerazioni (?)	2015-09-05 10:29:51 +02:00
[OMCB]kaban	cc9a566c15	Fix due to review	2015-09-05 05:23:27 +03:00
[OMCB]kaban	298b475433	Fix due to review	2015-09-05 05:15:29 +03:00
[OMCB]kaban	ce49f752f1	Fix due to review	2015-09-05 05:14:34 +03:00
[OMCB]kaban	1bad390dba	Fix due to review	2015-09-05 05:09:47 +03:00
[OMCB]kaban	8ef007b727	Fix due to review	2015-09-05 05:08:16 +03:00
[OMCB]kaban	6c48a4a0de	Fix due to review	2015-09-05 05:07:18 +03:00
[OMCB]kaban	85b0127f56	Fix due to review	2015-09-05 05:00:18 +03:00
[OMCB]kaban	6f7437bb80	Fix due to review	2015-09-05 04:57:07 +03:00
[OMCB]kaban	f69b94af98	Fix due to review	2015-09-05 04:53:30 +03:00
[OMCB]kaban	421f7bc6f8	Fix due to review	2015-09-05 04:38:39 +03:00
[OMCB]kaban	9f416b796c	Fix due ti review	2015-09-05 02:07:26 +03:00
ViperMaul	4c0c7bc290	debug change	2015-09-04 10:21:10 -07:00
ViperMaul	7f58d5a94d	Revert "Adding same ADV special case to BASIC handle damage." -Not Needed ... This reverts commit bf267246bf.	2015-09-04 10:20:34 -07:00
jonpas	644460ed96	Merge branch 'master' into parseList ... Conflicts: addons/slideshow/functions/fnc_makeList.sqf	2015-09-04 18:40:35 +02:00
ViperMaul	bf267246bf	Adding same ADV special case to BASIC handle damage.	2015-09-04 07:48:16 -07:00
ViperMaul	2bc20501bc	Adding more debug	2015-09-04 07:46:35 -07:00
ViperMaul	813e54a668	Fixing Debug for object variable hasPain	2015-09-04 07:37:20 -07:00
ViperMaul	89b0c05929	Fixed a debug statement.	2015-09-03 13:17:59 -07:00
commy2	b737f42777	fix error when opening triage card	2015-09-03 18:30:29 +02:00
bux578	9e1ae58f4f	fix restore gear	2015-09-03 18:17:53 +02:00
PabstMirror	f63e652636	Merge pull request #2334 from acemod/mapToolsAspectRatio ... MapTools - Handle Bad Aspect Ratio	2015-09-03 10:44:34 -05:00
commy2	795b7a893f	Merge branch 'medical-adjustments2' of https://github.com/acemod/ACE3 into medical-adjustments2	2015-09-03 17:18:32 +02:00
ViperMaul	6d28214287	Add some debug values.	2015-09-03 08:18:37 -07:00
commy2	0bd92af072	fix variables not inited, csat armor scaleing	2015-09-03 17:17:54 +02:00
commy2	e753131f2d	arms and legs to vulnerable, better scaling for pilots and csat	2015-09-03 16:17:48 +02:00
commy2	a84be46ed4	fix errors from cleanup	2015-09-03 15:49:49 +02:00
commy2	0436209dae	Merge branch 'master' of https://github.com/acemod/ACE3 into medical-adjustments	2015-09-03 15:33:53 +02:00
commy2	736be74c2b	Merge pull request #2344 from acemod/322hideclock ... hide clock on map if no watch in inventory, #414	2015-09-03 13:44:20 +02:00
commy2	36b42f2780	Merge pull request #2343 from acemod/322flares ... scripted approach to hand flares, fix #1079	2015-09-03 13:44:04 +02:00
commy2	529c85df58	Merge pull request #2338 from acemod/322sit ... Sitting improvements	2015-09-03 13:43:53 +02:00
commy2	6b7f84b297	add missing ;	2015-09-03 13:39:17 +02:00
commy2	76bb2bd2b8	replace function with FUNC macro	2015-09-03 13:37:36 +02:00
commy2	a187be7255	sort flashbang under explosive grenades	2015-09-03 13:23:15 +02:00
PabstMirror	024dc3effe	Cleanup	2015-09-03 00:16:48 -05:00
PabstMirror	789de9d111	runAfterSettingsInit helper func	2015-09-03 00:11:49 -05:00
PabstMirror	cbccd898ea	Run functions after setting init	2015-09-02 23:58:24 -05:00
kaban	15fe2c32b8	Russian Translations - Update	2015-09-03 04:58:08 +03:00
kaban	08b7110e58	Russian Translations - Update	2015-09-03 04:54:52 +03:00
kaban	50b05fcdf0	Russian Translations - Update	2015-09-03 04:38:38 +03:00
commy2	fbf00b9aa5	correct comment	2015-09-03 02:55:40 +02:00
kaban	91cae690c0	Russian Translations - Update	2015-09-03 03:36:15 +03:00
ProfessorCZ	44fa520bdd	Czech Translations - Update	2015-09-03 01:20:24 +02:00
jonpas	def2d29501	Cleaned up slideshow privates	2015-09-02 22:51:31 +02:00
jonpas	0bbf4d4128	Prevent Cargo opening if vehicle is locked	2015-09-02 22:24:46 +02:00
Glowbal	f38d245771	fixed bloodloss for basic medical	2015-09-02 21:56:00 +02:00
commy2	f939f9215e	stop flickering of wounds, fix #346	2015-09-02 20:49:17 +02:00
BaerMitUmlaut	2898fd66d2	Added GEOM backup LOD	2015-09-02 20:19:17 +02:00
commy2	7d2f1f52a4	remove protection, hitpoint config (fix ubc), some debug stuff	2015-09-02 20:13:51 +02:00
commy2	dc5e6b7c3c	Merge branch '323medicalstrcturaldamage' into medical-adjustments	2015-09-02 20:02:19 +02:00
BaerMitUmlaut	01c37f5bb5	Merge fix	2015-09-02 20:00:17 +02:00
BaerMitUmlaut	93ea0c5654	Update to lineIntersectsSurfaces and params	2015-09-02 19:43:13 +02:00
commy2	9665f73fa3	Merge branch 'master' of https://github.com/acemod/ACE3 into medical-adjustments	2015-09-02 17:03:36 +02:00
SilentSpike	6aa191b788	Merge pull request #2327 from acemod/fixGunnerGoggles ... Fix gunner goggles	2015-09-02 13:31:50 +01:00
commy2	07ab7d1c35	correct comment	2015-09-02 02:00:53 +02:00
commy2	29efc13556	hide clock, use eventhandler	2015-09-02 01:59:07 +02:00
commy2	43c54d51e8	hide clock on map if no watch in inventory, #414	2015-09-02 01:40:38 +02:00
commy2	83424cdcab	header for fnc_flare	2015-09-02 00:03:16 +02:00
commy2	7ce606740c	make flares work in mp	2015-09-01 23:56:25 +02:00
commy2	be56fd7d46	scripted approach to hand flares, fix #1079	2015-09-01 23:19:49 +02:00
commy2	471d54f674	better saling for tracer sizes, fix #1008	2015-09-01 21:48:40 +02:00
commy2	237d5b6536	stand up action (uses get out shortcut) and less awkward standing animaton	2015-09-01 21:03:28 +02:00
commy2	ec0229d9a9	don't force free looking while jumping	2015-09-01 20:33:02 +02:00
commy2	acfc48efc2	animate head when surrendered and handcuffed	2015-09-01 20:00:28 +02:00
commy2	405d85eaaa	fix leaning back through chair while sitting, fix #1795	2015-09-01 19:06:20 +02:00
PabstMirror	264091957a	#1917 - Pointing Update Circle Icon	2015-09-01 10:09:14 -05:00
commy2	fb9ad6075f	Merge pull request #2337 from acemod/322bouncym84 ... bouncing flashbangs, fix #1907	2015-09-01 17:05:36 +02:00
commy2	dd788342fe	remove commented debug messages	2015-09-01 16:37:46 +02:00
commy2	b1fbbcc49f	bouncing flashbangs, fix #1907	2015-09-01 12:46:15 +02:00
commy2	5e68486233	high command module breaks ace, fix #2134	2015-09-01 10:06:01 +02:00
commy2	73911f701d	add debug messages for #2134	2015-09-01 08:53:11 +02:00
Michael Braun	035b3432c5	Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros ... Conflicts: addons/common/XEH_postInit.sqf	2015-09-01 08:45:59 +02:00
PabstMirror	c97e0eb500	MapTools - Handle Bad Aspect Ratio	2015-08-31 22:50:01 -05:00
jokoho48	3f4d0af940	prevent Issues with other mods	2015-09-01 01:03:34 +02:00
jokoho48	afee398b11	woops	2015-09-01 00:51:32 +02:00
jokoho48	5d612abd02	posible Fix for #2310	2015-09-01 00:42:13 +02:00
commy2	3362bbf0bf	fix protection 1.50 ubc issues	2015-09-01 00:01:42 +02:00
commy2	5a164c5cdc	fix UBC issues, simplify uniform hitpoint config	2015-08-31 23:36:59 +02:00
commy2	87cf7ded83	Merge pull request #2311 from acemod/322backpack ... objectParent command replacing fnc_getBackpackAssignedUnit	2015-08-31 21:32:42 +02:00
commy2	e7d9e8c0dc	Merge pull request #2312 from acemod/322opendoor3rdperson ... increase reach in 3rd person for opening doors, fix #2301	2015-08-31 21:32:34 +02:00
commy2	aa1ad1bc2a	Merge pull request #2313 from acemod/322ffvweaponselect ... fix weapon select in ffv slots not working	2015-08-31 21:32:26 +02:00
commy2	9b6bc73c1a	Merge pull request #2314 from acemod/322spottingscope ... better animation for spotting scope, fix #1638	2015-08-31 21:32:17 +02:00
commy2	591327aaf3	Merge pull request #2315 from acemod/3220xgrenadebug ... fix autoriflemen spawning with 0x frag grenade bug	2015-08-31 21:32:09 +02:00
commy2	80a0c93bdc	Merge pull request #2316 from acemod/322customcamera ... fix custom cameras (for intros) being broken with ACE, fix #2248	2015-08-31 21:32:02 +02:00
commy2	d85f96eac0	Merge pull request #2320 from acemod/322notonladder ... disable all actions while being on a ladder by default, close #2289	2015-08-31 21:31:54 +02:00
commy2	e241c70a78	Merge pull request #2318 from acemod/322tripotmagsize ... tripod hmgs should have 100rnd mags instead of 500rnd mags, fix #1190	2015-08-31 21:31:44 +02:00
commy2	2a82b97b5a	Merge pull request #2328 from acemod/322laserpointer ... laserpointer with new command lineintersectssurface	2015-08-31 21:31:35 +02:00
commy2	37aec2b3c3	enable repairing while on ladder	2015-08-31 21:22:22 +02:00
PabstMirror	ba3ecf2a0a	Merge pull request #2321 from acemod/HearingStuff ... Hearing stuff	2015-08-31 13:24:29 -05:00
PabstMirror	38122ffeaf	Merge pull request #2197 from acemod/mapOpenCloseEvents ... Map open close events / MapTools Cleanup	2015-08-31 13:23:10 -05:00
commy2	f15805d1f3	setStructuralDamage function	2015-08-31 20:05:38 +02:00
commy2	e1d683d8dc	laserpointer with new command lineintersectssurface	2015-08-31 17:31:37 +02:00
SilentSpike	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
SilentSpike	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
SilentSpike	5e57cad669	Merge pull request #2216 from acemod/isolateZeusMenuKeybind ... Prevent CBA keybindings in zeus interface	2015-08-31 14:41:48 +01:00
SilentSpike	04269831e8	Consider modifier keys for zeus interaction hack ... The hacky keybind detection method should consider modifier keys also to prevent keybinds on the same key with different modifiers from firing	2015-08-31 14:40:31 +01:00
Glowbal	8c6f896164	fixed script error when canceling treatment actions	2015-08-31 13:00:17 +02:00
jokoho48	228eeab1a8	fix comments	2015-08-31 00:05:55 +02:00
jokoho48	4e6f289493	fix Function Names ... fix Input	2015-08-30 23:40:53 +02:00
jokoho48	317706cf46	add Trace	2015-08-30 23:10:03 +02:00
jokoho48	bda274efff	fix wrong config access point	2015-08-30 22:59:27 +02:00
PabstMirror	4be7411a05	Use "visibleMapChanged" event	2015-08-30 15:26:43 -05:00
commy2	7a4c37c085	disable all actions on ladders by default, close #2289	2015-08-30 22:03:45 +02:00
commy2	c3beee8261	make use of getHitpointsDamage command to drastically speed up some functions about hitpoints	2015-08-30 21:13:29 +02:00
commy2	fae38a2232	tripod hmgs should have 100rnd mags instead of 500rnd mags, fix #1190	2015-08-30 20:20:00 +02:00
commy2	c18af0d34b	completely prevent ace_optics from interfering with any mission camera scripts	2015-08-30 19:30:44 +02:00
commy2	74dfd73167	fix issues with pip optics camera in virtual arsenal	2015-08-30 19:05:35 +02:00
commy2	8d589ea8f0	solution for custom cameras (for intros) being broken with ACE	2015-08-30 15:50:51 +02:00
commy2	fc6f97e09e	fix autoriflemen spawning with 0x frag grenade bug	2015-08-30 13:30:21 +02:00
commy2	610bb7a1df	better animation for spotting scope, fix #1638	2015-08-30 13:10:25 +02:00
commy2	58ec4a68cb	fix weapon select in ffv slots not working	2015-08-30 12:01:13 +02:00
commy2	4682235d8a	increase reach in 3rd person for opening doors, fix #2301	2015-08-30 11:13:26 +02:00
commy2	32300a0a80	objectParent command replacing fnc_getBackpackAssignedUnit	2015-08-30 10:45:14 +02:00
PabstMirror	910bb151e2	#1988 - Boost explosive hearing damage	2015-08-30 01:47:40 -05:00
PabstMirror	8307ccea96	firedNear - use new isKindOf	2015-08-30 01:37:14 -05:00
PabstMirror	2f54cfadbc	Merge pull request #2146 from jokoho48/codeCleanupHearing ... Code cleanup of Hearing module	2015-08-30 01:18:47 -05:00
jokoho48	05e07f37ac	Merge branch 'master' of https://github.com/acemod/ACE3 into BackBlastEnhanced	2015-08-30 07:49:55 +02:00
jokoho48	d97cb8e78f	add Missing Include	2015-08-30 07:49:12 +02:00
jokoho48	6d2e25d40b	change some DFUNC to FUNC	2015-08-30 07:38:17 +02:00
jokoho48	35b6e04345	rewrite Caching in overpressure ... update code to params command update Comments	2015-08-30 07:35:58 +02:00
Grzegorz	5662e9eb62	proper name for stabilizer	2015-08-30 01:54:43 +02:00
gienkov	9187b31b92	pitot tube	2015-08-30 01:47:20 +02:00
gienkov	17f647f341	PL translation	2015-08-30 01:42:42 +02:00
KoffeinFlummi	6a17e3fa83	Merge remote-tracking branch 'origin/master'	2015-08-30 00:42:46 +02:00
KoffeinFlummi	5f63290508	Merge branch 'ptbr'	2015-08-30 00:42:31 +02:00
Glowbal	b968a32ea2	Merge pull request #2260 from acemod/updateMainConfig ... Update Main Config File	2015-08-30 00:37:46 +02:00
KoffeinFlummi	a7f2a7fefc	Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3	2015-08-30 00:35:11 +02:00
Glowbal	4bde554854	Merge branch 'master' into medical-adjustments ... Conflicts: addons/medical/functions/fnc_actionCheckBloodPressure.sqf addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf addons/medical/functions/fnc_actionCheckPulse.sqf addons/medical/functions/fnc_actionCheckPulseLocal.sqf	2015-08-29 23:49:58 +02:00
PabstMirror	f67809b18c	Merge branch 'master' into mapOpenCloseEvents	2015-08-29 16:43:24 -05:00
PabstMirror	22f8b2e8c2	Merge pull request #2305 from acemod/attachEventHandlers ... Attach event handlers	2015-08-29 16:35:51 -05:00
Glowbal	2fd30ba20c	fixes #2274	2015-08-29 22:57:52 +02:00
Glowbal	602ef690fc	Allow diagnose on torso #1879	2015-08-29 22:54:51 +02:00
Glowbal	ce42f5864f	fix #2155	2015-08-29 22:53:08 +02:00
Glowbal	b291141d11	Should Be a better fix for #2298	2015-08-29 22:51:42 +02:00
Glowbal	183e872f1f	Possible fix for #2298	2015-08-29 22:44:52 +02:00
PabstMirror	fa3a0213b7	Merge pull request #2249 from acemod/captiveFFV ... Captive ffv animation fix + cleanup	2015-08-29 15:39:23 -05:00
Michael Braun	657157d767	Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros ... Conflicts: addons/hearing/functions/fnc_moduleHearing.sqf	2015-08-29 22:38:26 +02:00
Glowbal	998bc2d45a	Merge pull request #2297 from acemod/addMoreHearingProtection ... Add Hearing Protection to Helmets with Peltor Headsets	2015-08-29 22:34:59 +02:00
Joko	91a8463198	Merge pull request #2299 from acemod/FixTactialLadderAnimation ... Fix Tactical Ladder Animation Clipping Fixes #2287	2015-08-29 22:33:08 +02:00
Michael Braun	fa4ae6c9a8	Merge branch 'master' of https://github.com/acemod/ACE3 into map_gestures ... Conflicts: AUTHORS.txt	2015-08-29 22:22:16 +02:00
SilentSpike	620136a1a7	Merge branch 'master' into spectator ... Conflicts: AUTHORS.txt	2015-08-29 21:20:04 +01:00
PabstMirror	0b3b3871ff	Merge pull request #2065 from acemod/hearingDisableZeus ... Setting to disable hearing for zeus RC	2015-08-29 15:15:14 -05:00
PabstMirror	d06680e2a0	#1571 - Handle Null Attached Objects	2015-08-29 11:47:56 -05:00
SilentSpike	200f44d963	Adjust spectator camera speed based on height ... Slows the camera movement close to the ground as it feels more natural when spectating units up close and such	2015-08-29 16:05:04 +01:00
PabstMirror	6eba898301	Merge pull request #2160 from acemod/updatingBaseClass150 ... realisticnames 1.50 Updating Base Class Changes	2015-08-29 09:55:25 -05:00
PabstMirror	321ca815a2	semi-colon	2015-08-29 09:52:28 -05:00
PabstMirror	f6c752045c	Cleanup	2015-08-29 09:38:57 -05:00
jokoho48	8916b70fe1	Improve some Code	2015-08-29 15:29:02 +02:00
jokoho48	588f5adce8	fix math issue	2015-08-29 14:54:42 +02:00
Glowbal	6796b3126d	Staged work on fixing updating base classes for hitpoints	2015-08-29 12:59:28 +02:00
Glowbal	1e08244f21	Removed debug output	2015-08-29 12:59:11 +02:00
Glowbal	1a4736e663	Clean up	2015-08-29 12:01:00 +02:00
Glowbal	1c9e88f213	fixes #1964	2015-08-29 11:58:28 +02:00
Glowbal	d56f3cea81	Added pain and unconsciousness handling for new basic medical code	2015-08-29 11:58:03 +02:00
Glowbal	354e4410d1	Merge pull request #2268 from gienkov/pulse-enhancement ... HR and BP enhancement	2015-08-29 11:47:00 +02:00
Glowbal	70c0edf436	Merge pull request #2283 from acemod/cargoCanInteract ... Add canInteractWith checks for cargo	2015-08-29 11:45:50 +02:00
PabstMirror	007859d42e	Attach - getin/out/killed event handlers (#2200 #2300)	2015-08-28 16:57:16 -05:00
jokoho48	1f602ea9a3	disable Debug	2015-08-28 13:17:29 +02:00
jokoho48	a83a5a17a3	Fix Issues	2015-08-28 13:15:21 +02:00
jokoho48	5598c3abe1	Merge branch 'master' of https://github.com/acemod/ACE3 into codeCleanupKestrel4500	2015-08-28 13:03:28 +02:00
jokoho48	438f9da87b	Improve Comments	2015-08-28 12:58:53 +02:00
jokoho48	3269114861	Fix Tactical Ladder Animation Clipping	2015-08-28 11:55:32 +02:00
bux578	19a6226ced	add Hearing Protection to Helmets with Peltors	2015-08-28 09:10:58 +02:00
PabstMirror	80d18c468e	Merge pull request #2244 from acemod/wireCuttersConfigAndCleanup ... wirecutters config for fences + cleanup	2015-08-27 16:01:31 -05:00
ViperMaul	a86ff93c16	Merge pull request #2052 from MikeMatrix/logMacros ... ACE specific logging macros	2015-08-26 21:52:20 -07:00
Michael Braun	93106697ab	Added debug log macros	2015-08-27 06:21:02 +02:00
ViperMaul	d38cb31240	Merge pull request #2109 from acemod/pushSubmaine ... Push SDV sub, cleanup push	2015-08-26 21:03:46 -07:00
PabstMirror	bc016eac4c	1.50 - use new didJip command (Ref #2241)	2015-08-26 22:39:27 -05:00
ViperMaul	5ea98143e2	Merge pull request #2211 from jonpas/integrateAsdg ... Integrated ASDG JR Optional	2015-08-26 17:53:32 -07:00
jonpas	6d27299883	Cleaned up spare parts collection after SettingsInitialized, Check if vehicle already in collection	2015-08-26 23:43:06 +02:00
jonpas	48e0f5757d	Merge branch 'master' into trackToTrackedVehicles ... Conflicts: addons/repair/stringtable.xml	2015-08-26 23:38:51 +02:00
jonpas	ef1b4cbd26	Merge branch 'master' into trackToTrackedVehicles ... Conflicts: addons/repair/XEH_preInit.sqf	2015-08-26 23:33:05 +02:00
jonpas	6a6c5008c0	Merge branch 'master' into repairHitpointStrings ... Conflicts: addons/repair/functions/fnc_doRepair.sqf	2015-08-26 23:29:36 +02:00
Glowbal	f7679b45ad	Merge pull request #2246 from jonpas/repairHitpointGroups ... Repair Hitpoint Groups Framework	2015-08-26 23:27:08 +02:00
PabstMirror	9c8e9732ed	Add canInteractWith checks for cargo	2015-08-26 16:26:08 -05:00
jonpas	ce8da8d720	Fixed Full Repair available even when vehicle is already fully repaired	2015-08-26 23:09:46 +02:00
jonpas	b6d5db9157	Reverted IGNORED_HITPOINTS, Added Taru glasses to it	2015-08-26 23:09:04 +02:00
jonpas	cc70580a93	Improved comments	2015-08-26 22:51:41 +02:00
jonpas	e4123c9730	Added 2 strings, changed 1	2015-08-26 22:44:30 +02:00
jonpas	8529e5c9b7	Merge branch 'master' into trackToTrackedVehicles	2015-08-26 21:25:08 +02:00
PabstMirror	ca991712e8	Merge pull request #2270 from acemod/codeCleanUpMicroDagr ... Code Cleanup MicroDagr Module	2015-08-26 11:03:22 -05:00
PabstMirror	4cf81b493a	Fix stringtable and more cleanup	2015-08-26 11:00:59 -05:00
Michael Braun	36aeb61d81	Fixed error caused by closing square bracket	2015-08-26 17:51:56 +02:00
Michael Braun	3dc3331d87	Replaced rogue format with FORMAT_#	2015-08-26 17:45:17 +02:00
Michael Braun	5047d4de1c	Switched to ACE_LOG<LEVEL>_# variation	2015-08-26 17:39:44 +02:00
Michael Braun	9ca19def70	Added autoformatting variations for log macros	2015-08-26 17:09:31 +02:00
jonpas	dc2e146e8b	Merge branch 'master' into repairHitpointStrings ... Conflicts: addons/repair/functions/fnc_addRepairActions.sqf	2015-08-26 17:04:05 +02:00
jonpas	c0379c7809	Updated with correct cargo events and settings category	2015-08-26 17:02:29 +02:00
Michael Braun	097506076f	Fixed format usage in macros requiring ARR_# for it to work	2015-08-26 16:48:55 +02:00
Michael Braun	fd204d972d	Fixed issue with ERROR conflicting with log level input	2015-08-26 16:45:28 +02:00
Michael Braun	5f6584ba3f	Added Log format macros for use with not printing it to the log.	2015-08-26 15:53:03 +02:00
ulteq	f1d41731fb	Merge pull request #2149 from jokoho48/codeCleanupHuntIR ... Code cleanup of HuntIR module	2015-08-26 15:48:29 +02:00
Michael Braun	9e10aa86d7	Standardize logging format through ACE_LOG macros	2015-08-26 15:32:54 +02:00
Michael Braun	a17d94c213	Removed semicolon of log macro	2015-08-26 14:12:17 +02:00
Michael Braun	5a0e95dcf0	Simplified log macros	2015-08-26 14:04:17 +02:00
Grzegorz	5ad0e192c3	Fix being able to TQ torso	2015-08-26 11:18:54 +02:00
Glowbal	604a33f71b	Merge branch 'master' into medical-adjustments	2015-08-26 10:13:44 +02:00
Glowbal	19bfa478d1	Revert use of param in action string	2015-08-26 10:13:30 +02:00
Glowbal	9488b6cc2c	Merge branch 'master' into medical-adjustments	2015-08-26 10:08:39 +02:00
Glowbal	0d7e7fa0cc	should be type of	2015-08-26 10:08:32 +02:00
Glowbal	307afc0922	Merge branch 'master' into medical-adjustments	2015-08-26 10:05:46 +02:00
Glowbal	81068e6086	fixed dragging getWeight	2015-08-26 10:05:30 +02:00
Glowbal	0cfb492916	Fixes and removal of duplicate code	2015-08-26 10:04:51 +02:00
Glowbal	7a48f595be	Merge branch 'basic-medical-test' into medical-adjustments	2015-08-26 09:13:12 +02:00
Glowbal	26ffcf473f	Merge branch 'master' into medical-adjustments	2015-08-26 09:11:56 +02:00
Glowbal	1a0abf31fd	fix global variable in local name space	2015-08-26 09:11:43 +02:00
Glowbal	3acfc4d2a3	Merge branch 'master' into medical-adjustments	2015-08-26 09:10:45 +02:00
Glowbal	65e16da998	fix missing semi column and bracket	2015-08-26 09:10:29 +02:00
Glowbal	db96d42f25	Merge branch 'CodeCleanUpMedical' into medical-adjustments	2015-08-26 09:06:27 +02:00
Glowbal	13740c06e4	Merge pull request #1816 from voiperr/ace_map_dev ... Flashlight simulation on map	2015-08-26 09:01:30 +02:00
gienkov	6a123020d2	fail to find BP on limbs with TQ on	2015-08-26 08:55:50 +02:00
Glowbal	fb5563e7ba	Merge pull request #2048 from MikeMatrix/codeCleanupSwitchunits ... Code cleanup of Switchunits module	2015-08-26 08:51:22 +02:00
Glowbal	5bec26c721	Merge pull request #2086 from jokoho48/codeCleanUpDragging ... Code cleanup of Dragging module	2015-08-26 08:45:30 +02:00
Glowbal	222e0183ed	Merge pull request #2202 from jonpas/cargoEvents ... Cargo Events	2015-08-26 08:36:31 +02:00
Glowbal	ad7716a25e	Merge pull request #2233 from gienkov/patch-27 ... Increase "load in bodybag" action time to 15s	2015-08-26 08:36:06 +02:00
Glowbal	d97dfce2d3	Merge pull request #2245 from jonpas/repairHitpointSelections ... Custom Hitpoint Repair Positions Framework	2015-08-26 08:33:01 +02:00
Glowbal	a139a3cccc	Merge pull request #2263 from gienkov/patch-30 ... Bandage and tourniquet on adv. medical change proposal	2015-08-26 08:30:59 +02:00
jokoho48	ca71dd43e1	Code Cleanup MicroDagr Module	2015-08-26 05:31:33 +02:00
Grzegorz	b8a29bfd44	@jokoho482 suggestion	2015-08-26 03:00:43 +02:00
gienkov	cae5f828fb	run check only on arms	2015-08-26 02:51:05 +02:00
gienkov	c3af5e81e7	fix my error	2015-08-26 02:41:12 +02:00
gienkov	5a9817322b	remove tabs	2015-08-26 02:39:34 +02:00
gienkov	8498589920	pulse zero on limb with TQ on	2015-08-26 02:37:51 +02:00
PabstMirror	bcb6c474a0	Merge pull request #2250 from acemod/fixExportColors ... - Fix Exporting Color Arrays	2015-08-25 16:42:26 -05:00
Felix Wiegand	3098794951	Merge pull request #2194 from NemesisRE/patch-1 ... Changed german strings for aid kit	2015-08-25 23:18:21 +02:00
PabstMirror	2c64cca44d	Merge pull request #2236 from acemod/hugeChangeToInteractMenu ... Compile Self Menu, set "Default Params" to array instead of code	2015-08-25 13:34:30 -05:00
PabstMirror	275f04d876	preInit defines and fix func name	2015-08-25 13:18:59 -05:00
Grzegorz	5280ded680	Bandage and tourniquet on adv. medical change proposal ... Make bandaging longer as it is not very fast process. Make putting on tourniquet faster cause it's should be easy to put one on limb, so it's actually useful now and with above change (putting it on before was longer than bandagin).	2015-08-25 20:05:05 +02:00
jokoho48	8d29170551	fixing Spelling Issues ... Change from DEBUG_SETTINGS_CORE to DEBUG_SETTINGS_MAIN	2015-08-25 19:33:10 +02:00
ulteq	f0cc1ca333	Merge pull request #2015 from jokoho48/codeCleanupAB ... Code cleanup of the Advanced Ballistics module.	2015-08-25 18:56:45 +02:00
jokoho48	2af486ab6b	Update Main Config File	2015-08-25 18:34:10 +02:00
SilentSpike	ffcf0ecf7d	Merge pull request #2253 from gienkov/spectator-pl-translation ... Translate spectator strings to polish	2015-08-25 16:25:14 +01:00
voiper	e237bea88c	Dimmed the glow values.	2015-08-24 15:43:43 -07:00
voiper	f8f8d7fd19	Simplified the colour check again.	2015-08-24 15:43:21 -07:00
voiper	54f1a87222	Simplified the colour check.	2015-08-24 15:42:12 -07:00
Michael Braun	431bd309a8	Fixed variable privatization	2015-08-24 23:26:03 +02:00
voiper	9de7953345	More cba capitalisation.	2015-08-24 14:12:04 -07:00
voiper	720f6c075a	Removed old references to NVG.	2015-08-24 14:08:02 -07:00
voiper	1f8b16f7fb	Fixed BFT module weirdness.	2015-08-24 14:06:19 -07:00
voiper	72b12e3af4	Fixed indentation.	2015-08-24 14:03:23 -07:00
voiper	79e6ce3803	Fixed CBA capitalisation.	2015-08-24 14:02:55 -07:00
voiper	b230762abd	Add some string checking for flashlight glow type.	2015-08-24 13:59:35 -07:00
Michael Braun	93acdbcb4d	Replaced custom mapping implementation with ACE Hash	2015-08-24 22:45:59 +02:00
Michael Braun	2b0ef7bc6d	Removed explicitly stated isClientSettable in Map Gestures ace settings	2015-08-24 22:10:02 +02:00
Michael Braun	3cbe6a3ebc	Fixed multiple group settings not applying properly. ... Added client configuration options for default colors.	2015-08-24 22:03:47 +02:00
jonpas	3f41882a06	Removed debug	2015-08-24 21:56:21 +02:00
jonpas	5b6429f23e	Made more modules use assignObjectsInList common function	2015-08-24 21:55:48 +02:00
jonpas	ef2924623f	Added common parseList function for module list parsing	2015-08-24 21:45:02 +02:00
Michael Braun	0ff5e86b52	Another missing semi-colon	2015-08-24 21:00:24 +02:00
jonpas	9718883599	Consolidated into 1 function	2015-08-24 20:58:54 +02:00
bux578	21aa4da4ad	Merge pull request #2255 from J3aLeiNe/master ... rangecard stringtable : french translation	2015-08-24 20:51:44 +02:00
jonpas	3f0909ddd5	Fixed typo	2015-08-24 20:12:45 +02:00
jonpas	78e7565121	Added support for multiple groups, Fixed check group damage returning true even if hitpoint not in a group	2015-08-24 20:03:11 +02:00
jonpas	2c521527f4	Readded newline	2015-08-24 18:19:25 +02:00
jonpas	cb6efc7c9a	Removed copy/paste minuses	2015-08-24 18:18:54 +02:00
jonpas	04da19190f	Changed custom hitpoint positions config entry to 2d array	2015-08-24 18:17:56 +02:00
jonpas	449af180c7	Moved check for zero position in it's own line	2015-08-24 17:58:19 +02:00
jonpas	32d5ac99d9	Readded ignored hitpoints	2015-08-24 17:56:34 +02:00
Grzegorz	288457d366	fix	2015-08-24 17:43:02 +02:00
Michael Braun	ee2cc22801	Added missing semicolon	2015-08-24 17:28:08 +02:00
jokoho48	203c4d8a6c	add WaitUntilAndExecute	2015-08-24 17:10:54 +02:00
Michael Braun	7217d5ec10	Various code cleanups and switch to player UIDs instead of sanitized names	2015-08-24 17:03:47 +02:00
SzwedzikPL	384c4bc55e	config macro, script tweaks	2015-08-24 16:48:53 +02:00
gienkov	0fa10045d2	pl translation of spectator	2015-08-24 14:35:15 +02:00
jokoho48	644c13c971	fix Typo ... Remove macro GETVAR	2015-08-24 13:43:11 +02:00
Glowbal	b14dc7cb02	Merge pull request #2242 from jonpas/fixSlideshowModule ... Allow spaces in slideshow module	2015-08-24 09:38:10 +02:00
PabstMirror	5d104106c5	#2188 - Fix Exporting Color Arrays	2015-08-24 00:58:45 -05:00
PabstMirror	a2022bb6fb	Merge pull request #2176 from acemod/remove-asdg-message ... remove asdg message	2015-08-24 00:17:18 -05:00
PabstMirror	d3db5ad2ed	Cleanup	2015-08-24 00:07:40 -05:00
PabstMirror	40634318f0	Move RemoveHandcuffs to Main (always blocked by hands)	2015-08-23 23:41:35 -05:00
PabstMirror	bb616887dc	Don't run when mounted	2015-08-23 22:55:43 -05:00
jonpas	7f175bad5f	Added support for display messages	2015-08-24 05:24:25 +02:00
jonpas	144af2ed17	Added support for when one of the grouped hitpoints is damaged but not main	2015-08-24 05:14:04 +02:00
jonpas	f2bda7c434	Added hitpoint groups framework	2015-08-24 04:17:24 +02:00
jonpas	94c4c411e2	Added custom hitpoint selection framework with a starting example, removed blacklist	2015-08-24 03:23:37 +02:00
jonpas	1253d1267c	Inlined selection check	2015-08-24 01:54:12 +02:00
jonpas	5c33f7736c	Added support in repair for hitpoints with non-center selections	2015-08-24 01:51:34 +02:00
SilentSpike	152faf6388	Improve spectator interface entry and exit ... - Use a display rather than a dialog (contextually makes more sense). - Move the entry/exit functionality to the setSpectator function. Preserves the handleInterface function for purely display related events and makes more sense. - Fix missing semi-colon	2015-08-24 00:43:20 +01:00
PabstMirror	2e1d734420	#2238 - use config for fences + cleanup	2015-08-23 18:39:08 -05:00
jonpas	6a1b8cc359	Changed to LSTRING	2015-08-24 01:25:00 +02:00
jonpas	d33834261f	Removed debug	2015-08-24 01:14:59 +02:00
jonpas	e368ae28f5	Fixed localization on same type hitpoints	2015-08-24 01:13:42 +02:00
jonpas	396e01cd6e	Added string checking for less needed string multiplicates	2015-08-24 01:04:57 +02:00
PabstMirror	27d974687e	Merge pull request #2235 from acemod/mdagrFixes ... Mdagr fixes	2015-08-23 17:00:37 -05:00
PabstMirror	05925ad7c2	Merge pull request #1902 from acemod/virtualExplosivesPlace ... Virtual explosives place	2015-08-23 16:57:24 -05:00
Michael Braun	fc45d1216a	Simplyfied bounding value detection	2015-08-23 22:26:31 +02:00
PabstMirror	58f4ef5b62	Merge pull request #2226 from acemod/codeCleanupMarker ... Code Cleanup Marker Module	2015-08-23 14:27:07 -05:00
PabstMirror	a82e5b5436	Fix Colors + Debug Trace	2015-08-23 14:25:41 -05:00
jonpas	0fc9a33d38	Shortened sub-action text localization	2015-08-23 21:11:45 +02:00
jonpas	e08bf59ac2	Removed 'Repair' word from sub-actions	2015-08-23 21:09:36 +02:00
jonpas	2808ae6fc9	Removed debug	2015-08-23 19:55:52 +02:00
jonpas	ca1b47beb5	Use correct module group	2015-08-23 19:54:55 +02:00
jonpas	6d15e63f85	Fixed #2222 - Allow spaces in slideshow module by just trimming the splitted input string rather than removing all whitespace	2015-08-23 19:48:57 +02:00
PabstMirror	8ca06a9a76	More FFV animation stuff	2015-08-23 12:32:46 -05:00
Steven Koeberich	d5a1a99f90	Update stringtable.xml ... corrected spelling	2015-08-23 18:58:13 +02:00
Michael Braun	9352a8dbcb	Hotfix for missreplaced variable in projectile direction adjustment	2015-08-23 18:38:19 +02:00
Michael Braun	021c835b02	Removed debug messages	2015-08-23 17:54:10 +02:00
Michael Braun	20b45e10a4	Fixed issue with selecting the wrong value, when perfect barrel length match occured.	2015-08-23 17:53:33 +02:00
PabstMirror	b5fb0daa9b	Merge branch 'master' into captiveFFV	2015-08-23 10:46:49 -05:00
Michael Braun	1c14897194	Fixed velocity limit detection and small comment fix	2015-08-23 17:39:48 +02:00
J3aLeiNe	490602facd	rangecard stringtable : french translation ... rangecard stringtable : french translation	2015-08-23 17:01:41 +02:00
jokoho48	260b048da4	some more Improvements	2015-08-23 14:13:55 +02:00
Grzegorz	836b5001be	Make reserve steerable	2015-08-23 13:40:13 +02:00
PabstMirror	69df301e67	Replace one more macro	2015-08-23 02:29:51 -05:00
PabstMirror	9aed148e8a	Default Action parameters is [] for self (ref #2228) ... Makes it match fnc_compileMenu.sqf	2015-08-23 00:16:01 -05:00
PabstMirror	248b4449bf	#2204 - Tweak road draw for performance	2015-08-22 22:07:29 -05:00
PabstMirror	3df5b82402	#2225 - Fix mdagr list box colors	2015-08-22 20:53:29 -05:00
Grzegorz	33889fa46b	Increase "load in bodybag" action time ... Around 15 seconds seems optimal (for dead bodies that are left in **one** piece).	2015-08-23 00:13:09 +02:00
Joko	3eae83439b	Merge pull request #2231 from gienkov/patch-26 ... Fix stitching action progress bar	2015-08-22 22:59:46 +02:00
jokoho48	29cc4c2697	stringtable Cleanup	2015-08-22 22:50:36 +02:00
jokoho48	9d0f3c7f5b	stringtable Cleanup	2015-08-22 22:45:14 +02:00
jokoho48	4d81e4a99e	Code Cleanup Medical Menu Module.	2015-08-22 22:33:15 +02:00
jonpas	f43282024a	Updated FoV Based PFH function header	2015-08-22 22:26:04 +02:00
Grzegorz	07019ed928	Fix stitching action progress bar	2015-08-22 22:20:20 +02:00
jokoho48	fab4c6a67f	fix Spelling Issues	2015-08-22 21:32:36 +02:00
SzwedzikPL	2285717acd	typo	2015-08-22 20:19:35 +02:00
SzwedzikPL	074ae2c2da	fix conflict	2015-08-22 20:02:27 +02:00
SzwedzikPL	3e19b33493	interaction with portable lamps	2015-08-22 20:00:26 +02:00
jokoho48	19dd55147a	Code Cleanup Medical Module (Part 4).	2015-08-22 19:47:23 +02:00
jokoho48	2d4ef16429	fix CTD	2015-08-22 18:54:51 +02:00
jokoho48	ff6c8a31be	Code Cleanup Medical Module (Part 3).	2015-08-22 18:33:06 +02:00
jokoho48	10127ed957	Fix Typo	2015-08-22 17:10:19 +02:00
jonpas	18f5a2ca94	Renamed cargo events	2015-08-22 16:45:50 +02:00
jokoho48	21e0a9fff3	Merge branch 'master' of https://github.com/acemod/ACE3 into codeCleanupMedical	2015-08-22 16:32:15 +02:00
jokoho48	c2d94239a2	Code Cleanup Medical Module (Part 2).	2015-08-22 16:26:53 +02:00
jokoho48	d09ca9ec8b	Code Cleanup Medical Module (Part 1).	2015-08-22 16:25:10 +02:00
Glowbal	7d2ca74402	Merge pull request #2220 from acemod/fixHitEffectRepair ... Fix Hit Effect on Track and Wheel	2015-08-22 14:32:03 +02:00
jokoho48	f35b82ddb9	Code Cleanup Marker Module.	2015-08-22 14:08:35 +02:00
IngoKauffmann	8b53b4f0d0	Fixes ... Moved macros to function Fixed MP bugs Changed class history of nozzle	2015-08-22 13:34:24 +02:00
bux578	bfc3a4048e	Merge pull request #2221 from gienkov/pl-translation-6 ... PL translation and fixes	2015-08-22 12:38:52 +02:00
gienkov	cf585790db	fixes done	2015-08-22 11:41:15 +02:00
SilentSpike	21b0ee087a	Add spectator UI interrupt system ... A public API system to allow external systems to interrupt and resume the spectator interface. Also made use of it for the escape menu and zeus support.	2015-08-22 00:26:43 +01:00
jonpas	a24da99722	Merge branch 'master' into dynamicViewDistance ... Conflicts: addons/viewdistance/README.md addons/viewdistance/XEH_clientInit.sqf	2015-08-22 00:49:57 +02:00
SilentSpike	b8b71e1c76	Merge pull request #2195 from jonpas/fixVDlimit ... Fixed View Distance limit not applied on Video Settings	2015-08-21 23:47:02 +01:00
jonpas	295acddc7a	Added view distance set on module load, so it is guaranteed to be set	2015-08-22 00:33:16 +02:00
gienkov	96c3b62cb9	zeus translation	2015-08-22 00:19:51 +02:00
gienkov	75c31c10fd	optionsmenu and repair first version of translation	2015-08-22 00:17:01 +02:00
jokoho48	11f753f873	Fix Hit Effect on Track and Wheel	2015-08-22 00:13:29 +02:00
gienkov	cc430fc8c2	medical translation	2015-08-21 23:54:01 +02:00
gienkov	1bbf721ef6	main translation	2015-08-21 23:51:48 +02:00
gienkov	f22531cc59	cargo translation	2015-08-21 23:50:54 +02:00
gienkov	8f483ba8df	fix medical_menu stringtable error	2015-08-21 23:46:05 +02:00
IngoKauffmann	01c20d4544	Minor formating and docu	2015-08-21 22:57:14 +02:00
IngoKauffmann	22576f938e	Added dropping and progress bars	2015-08-21 22:43:45 +02:00
jonpas	ccd0a7bd88	Merge branch 'master' into trackToTrackedVehicles ... Conflicts: addons/repair/stringtable.xml	2015-08-21 21:04:50 +02:00
PabstMirror	cc9eee5609	Typo	2015-08-21 09:42:23 -05:00
PabstMirror	e0f20350a2	Merge branch 'master' into virtualExplosivesPlace	2015-08-21 09:16:15 -05:00
SilentSpike	5112bd9bdf	Merge pull request #2163 from acemod/add-objects-to-curator ... Add objects to all curators	2015-08-21 13:53:45 +01:00
Glowbal	bf8318530e	Merge pull request #2081 from acemod/close-med-menus-distance ... Fixed #1893 - Menu closes when patient is more as 10 meters away	2015-08-21 14:20:41 +02:00
Glowbal	b3ee889cac	Merge pull request #2113 from MikeMatrix/codeCleanupSafemode ... Code cleanup Safemode module	2015-08-21 14:20:08 +02:00
Glowbal	f0792233ae	Merge pull request #2173 from jokoho48/codeCleanupMagazineRepack ... Code Cleanup Magazine Repack Module	2015-08-21 14:09:55 +02:00
Glowbal	2f0ed4fba1	Merge pull request #2207 from jonpas/readmes ... Added and Updated README.md files	2015-08-21 14:07:30 +02:00
Glowbal	26c172ff11	Merge pull request #2066 from acemod/fixDisableUserInput ... Fix and enhancement of two common functions	2015-08-21 14:05:47 +02:00
Glowbal	20918f2c70	Merge pull request #2183 from acemod/treatmentWhileDeployed ... Fix treatment when weapon deployed	2015-08-21 14:04:51 +02:00
PabstMirror	51a8cb7974	Only force Animation for FFV Cargo Seats	2015-08-20 23:58:06 -05:00
IngoKauffmann	f44060c6a0	Cleanup and improvements	2015-08-20 22:10:26 +02:00
SzwedzikPL	a8c11a249d	cargo sup for bodybag and concertina	2015-08-20 21:41:28 +02:00
IngoKauffmann	9162789579	Manny things ... Added dummy objects Added carrying Added dropping Added storing Added more progress bars ...	2015-08-20 19:51:22 +02:00
SilentSpike	5b8708a179	Prevent CBA keybindings in zeus interface ... Checks if the key pressed matches the zeus menu keybind and only fires the code to handle CBA keybinds if true. Should fix the majority of weirdness with keybinds in zeus. However, not perfect as shared keybinds with different modifiers will still fire and it's really an un-ideal workaround.	2015-08-20 18:17:37 +01:00
Glowbal	60ef673896	Merge pull request #2198 from jonpas/logistics ... Added Logistics Categories	2015-08-20 18:43:55 +02:00
PabstMirror	645e8a63ef	Captive FFV Lock Animation	2015-08-20 04:20:46 -05:00
IngoKauffmann	dd1917464d	Preliminary carrying and dropping of carried ammo ... Could not use ace_dragging since it block interact menu	2015-08-20 01:20:31 +02:00
SilentSpike	33ef60266b	Fix medical CPR code and log message ... Performing CPR would never succeed when the patient was in revive state because the code was accidentally using `exitWith` instead of `then`. The log message string was also incorrect.	2015-08-19 23:30:13 +01:00
PabstMirror	4c14dc7684	#2208 - Use ACE Message Display instead of sideChat	2015-08-19 17:25:45 -05:00
IngoKauffmann	a37608b9b1	Added generic dummy	2015-08-20 00:03:16 +02:00
nsgundy	3aab62fa7c	Return true / false if event was handled so that CBA keybinding doesn't have a reason to complain. ... Converted tabs to spaces	2015-08-19 15:32:46 -03:00
IngoKauffmann	bdc5e54f55	Fixed turret locality and driver empty magazine issues	2015-08-19 17:33:32 +02:00
jonpas	d71c43b91c	Fixed unknown char	2015-08-19 17:12:39 +02:00
jonpas	9fd155f3ec	Integrated ASDG JR Optional	2015-08-19 17:11:15 +02:00
jonpas	b627e32a00	Added shared logistics categories	2015-08-19 16:54:44 +02:00
Glowbal	4acdfcbd24	Merge pull request #2193 from jokoho48/ModelFix ... Model Fixes	2015-08-19 12:02:28 +02:00
jonpas	683e727cb4	Readded items	2015-08-19 04:22:39 +02:00
jonpas	5a0a3a53e0	Uppercased 2 readme files	2015-08-19 04:19:00 +02:00
jonpas	de033f0ff2	README.md files added to all modules	2015-08-19 04:18:33 +02:00
jonpas	b16d313e35	Moved spare parts cargo init to cargo	2015-08-19 03:36:31 +02:00
jonpas	583682396f	Changed cargo initVehicle to event driven, Added listenable event cargo_itemAdded	2015-08-18 23:59:01 +02:00
PabstMirror	4e3bbfac16	Clean old updateMapToolMarkers calls	2015-08-18 16:57:56 -05:00
jonpas	4c86db9505	Added AddCargoItem event and function to add an item by classname	2015-08-18 23:51:30 +02:00
IngoKauffmann	f852eb5f4b	Moved compatibility stuff	2015-08-18 23:48:25 +02:00
jonpas	ffb765bf7a	Changed to AddCargoItem event	2015-08-18 23:43:34 +02:00
jonpas	3bcebf9033	Moved spare parts adding to init, Added module option to add spare parts or not, Added module to add specific spare part and amount of it to specific vehicle(s)	2015-08-18 23:41:25 +02:00
IngoKauffmann	cdd0c4c013	Next few things ... Clean up Removed MP issues Added macros for reused code Added death handling Added unconscious handling Added fueling restart	2015-08-18 23:18:32 +02:00
IngoKauffmann	8b9be1923c	Added support for third subturret of main turret	2015-08-18 19:06:41 +02:00
jonpas	e110874800	Added cargo listenable and callable events	2015-08-18 18:48:21 +02:00
jonpas	16add9d376	Changed cargo_hideUnit for already existing hideObjectGlobal event	2015-08-18 18:19:18 +02:00
IngoKauffmann	cf9c49f13c	Attempt to fix turret locality issues	2015-08-18 18:09:37 +02:00
IngoKauffmann	3072bd9d22	Fixed rearm sucess hint and collision with dummy	2015-08-18 17:38:50 +02:00
IngoKauffmann	463309db2d	Small cleanup	2015-08-18 16:20:11 +02:00
IngoKauffmann	2816e8863a	Minor fixes	2015-08-18 16:09:59 +02:00
PabstMirror	4a245bd935	Remove Spawn for CBA_fnc_addPerFrameHandler	2015-08-17 22:21:18 -05:00
PabstMirror	1f9a98f77d	Cleanup / Params	2015-08-17 21:51:40 -05:00
PabstMirror	980fc7a235	Merge branch 'master' into mapOpenCloseEvents	2015-08-17 21:08:07 -05:00
jonpas	6c8352c9e5	Added README.md to rearm, self to authors	2015-08-18 03:38:28 +02:00
jonpas	7244a583d6	Removed unnecessary ACE_Action calls parameters and changed others to _this	2015-08-18 03:37:02 +02:00
jonpas	387aad4204	Removed 3rd party config, Moved ACE Hydra to rearm config to missileguidance	2015-08-18 03:18:38 +02:00
jonpas	33e92f8ca0	Fixed SmokeLauncherMag rearming on level 0 when empty	2015-08-18 02:57:39 +02:00
jonpas	c8c6488125	Cleaned, improved, fixed, changed - entire rearm	2015-08-18 02:32:10 +02:00
IngoKauffmann	f54beb5c86	Many things ... Added correct hooks for fuel trucks Added code for finding closest hook Cleanup	2015-08-18 00:42:35 +02:00
jonpas	64c1a93517	Renamed macro, removed debug	2015-08-17 18:50:02 +02:00
jonpas	f14830624b	Added separate handling for Air vehicles (longer view distances), Fixed normal zoom level to actual A3 value	2015-08-17 18:46:14 +02:00
jonpas	3147cb038b	Removed unnecessary param assignment, fixed comment example	2015-08-17 18:22:03 +02:00
jonpas	fe9e4fee07	Fixed viewdistance limit not applied when Video Settings option is selected, Removed unnecessary EHs	2015-08-17 18:12:00 +02:00
Steven Koeberich	b333fe0cd1	Changed german strings for aid kit ... Missed some.	2015-08-17 17:42:03 +02:00
Steven Koeberich	f543cf2897	Changed german strings for aid kit ... The translation for Fielddressing and Aid kit are the same in the german translation which is missleading. Changed to "Erste-Hilfe-Set" (first aid kit) which is less missleading.	2015-08-17 17:31:40 +02:00
jokoho48	e14c640c6f	Fix Some LandContactPoints ... Fix Positions of some Model	2015-08-17 16:11:23 +02:00
Glowbal	4d10f2a72d	Merge pull request #2182 from jonpas/repairClean ... Repair Cleanup	2015-08-17 11:31:57 +02:00
Glowbal	f59927a9a7	Merge pull request #2186 from jonpas/cargoClean ... Cargo Cleanup	2015-08-17 09:50:49 +02:00
jonpas	539fc69275	Increased interaction distance to 7 (same as attach) to cover bigger vehicles	2015-08-17 01:58:52 +02:00
jonpas	9ad8718762	Added canCheckFuel for check fuel condition, removed extra spaces	2015-08-17 01:57:05 +02:00
jokoho48	d5f9998ad0	Merge branch 'master' of https://github.com/acemod/ACE3 into codeCleanupABOnEchtFrameTest	2015-08-17 01:50:48 +02:00
jonpas	4dc8747430	Bypassed interaction menu subactions distance bug	2015-08-17 01:44:47 +02:00
jonpas	68370f63d7	Fixed returnNozzle function, Moved Return action up	2015-08-17 01:24:45 +02:00
jonpas	68489c456e	Alphabetized PREPs	2015-08-17 01:12:47 +02:00
jonpas	40eb5a5ba9	Made return nozzle bypass connect-attach	2015-08-17 01:12:14 +02:00
jonpas	b717ff8dde	Fixed interaction menu overwrapping, Moved all actions under one main Refuel action, Changed fuel nozzle pickup action to config	2015-08-17 00:55:26 +02:00
IngoKauffmann	0fcf692d36	Moved dummies to CfgVehicles	2015-08-16 23:52:37 +02:00
jonpas	dcf074ed5a	Changed Optional parameter comment to default value	2015-08-16 23:05:26 +02:00
jonpas	7b89784aae	Removed semi-colons from return statements, command capitalization	2015-08-16 22:48:52 +02:00
jonpas	bbc715b2ee	Cleaned function headers	2015-08-16 22:41:35 +02:00
PabstMirror	359ee1d23b	#2180 - Fix QGVAR(fullRepairLocation) switch statement	2015-08-16 15:31:20 -05:00
jonpas	98dd60c6ca	Alphabetized PREPs, removed newlines and repair references	2015-08-16 22:21:39 +02:00
jonpas	fb73d3a436	Fixed dependencies	2015-08-16 22:17:04 +02:00
bux578	905628bc1c	Merge pull request #2165 from acemod/enhanceRespawn ... after respawn select last weapon, muzzle and mode	2015-08-16 22:05:41 +02:00
jonpas	b2824c82bb	Removed redundant function	2015-08-16 21:54:04 +02:00
jonpas	fda0850ad7	Condensed duplicated function, alphabetized PREPs	2015-08-16 21:39:42 +02:00
PabstMirror	dd58eef415	Fix double weapon switch for standing treatment	2015-08-16 14:12:26 -05:00
PabstMirror	21f46f4401	#2178 - Fix treatment when weapon deployed	2015-08-16 13:58:58 -05:00
jonpas	161a75adc7	Added missing arguments in header, replaced QOUTE(DFUNC()) with QFUNC()	2015-08-16 20:34:02 +02:00
jonpas	701c98e0da	Cleaned up repair function headers and some code	2015-08-16 20:14:54 +02:00
jokoho48	8a5e572baf	Fix Model Warning Unsupported UVSet	2015-08-16 19:52:28 +02:00
jokoho48	e41ce78dbb	Code Test PFH	2015-08-16 19:49:47 +02:00
IngoKauffmann	1a22c4d85a	Many things ... Added dummy objects Added carrying Added display names for a few magazines, that didn't have any	2015-08-16 18:16:38 +02:00
jonpas	85cc662fa4	ACE_Repair capitalization 2/2	2015-08-16 16:46:32 +02:00
jonpas	68359974f1	ACE_Repair capitalization 1/2	2015-08-16 16:46:17 +02:00
jonpas	b7282e476c	Used macros, getVariable capitalization, removed start of file newlines, separated CfgActions	2015-08-16 16:45:46 +02:00
Glowbal	9f3af45a8f	Fixed repair items not registered as loadable	2015-08-16 16:16:04 +02:00
SilentSpike	1d51bd7c40	Merge pull request #2162 from acemod/assign-medic-curator-modules ... Add medical curator modules	2015-08-16 14:13:31 +01:00
jonpas	5b0168efdb	Fixed Atropine autoinjector display name	2015-08-16 14:14:49 +02:00
bux578	5ffdf4628f	remove asdg message ... new cba will include asdg jr	2015-08-16 13:15:01 +02:00
Glowbal	0c1b828946	Merge pull request #2171 from acemod/fix-error-invalid-hitpoints ... Fixed error pop-up invalid configured hitpoints	2015-08-16 10:24:24 +02:00
PabstMirror	61bc40a650	Opps	2015-08-16 02:05:34 -05:00
bux578	ec29890780	Merge pull request #2128 from acemod/gienkov-pl-translation-5 ... Gienkov pl translation 5	2015-08-16 08:54:47 +02:00
PabstMirror	b9638f749b	SetPosition Event - Fix digging down (#1991)	2015-08-16 01:51:44 -05:00
IngoKauffmann	3eaaca84fb	Added different rearm levels	2015-08-16 02:18:53 +02:00
jokoho48	4478be096e	Code Cleanup Magazine Repack Module.	2015-08-16 00:30:24 +02:00
Glowbal	0420f0b216	Fixed error pop-up kicking you out of game in case a third party vehicle has incorrect configured hitpoints/selections	2015-08-16 00:15:16 +02:00
jokoho48	965b024bfa	Code Cleanup Logistic UAV Battery.	2015-08-16 00:07:17 +02:00
jokoho48	bcec28e4b5	Code Cleanup laser Self Designate Module.	2015-08-15 23:53:04 +02:00
IngoKauffmann	214c639839	Added module icon	2015-08-15 23:38:08 +02:00
IngoKauffmann	957756893c	Updated module icon	2015-08-15 23:35:05 +02:00
SilentSpike	05bf239d8e	Specify zeus setMedic module conditions further	2015-08-15 21:44:40 +01:00
SilentSpike	c01052e5bf	Update ace_zeus function headers	2015-08-15 21:11:49 +01:00
PabstMirror	fc6cd34d33	params, cleanup	2015-08-15 14:35:33 -05:00
Glowbal	7fa30009d3	Merge branch 'add-objects-to-curator' of github.com:acemod/ACE3 into add-objects-to-curator	2015-08-15 20:39:54 +02:00
Glowbal	1417429782	Switched to serverInit instead of init as per suggestion from @SilentSpike	2015-08-15 20:39:22 +02:00
Glowbal	c7f47c0b34	Replaced check for captive module by check for ACE_medical	2015-08-15 20:31:41 +02:00
IngoKauffmann	a576ed82ee	Fixed some macro stuff	2015-08-15 19:26:26 +02:00
IngoKauffmann	a8c263b6cc	More fixes ... Thanks guys	2015-08-15 19:23:02 +02:00
PabstMirror	30828b83d2	Stringtable fixes	2015-08-15 12:21:49 -05:00
PabstMirror	d023139e8d	Stringtable fix	2015-08-15 12:04:57 -05:00
IngoKauffmann	26c54b352a	Fixed some logistics remnants	2015-08-15 19:00:28 +02:00
bux578	3d9b0d527c	fix indentation ... atom needed the editorconfig package	2015-08-15 18:58:31 +02:00
bux578	675cfc2da7	after respawn select last weapon, muzzle and mode ... #2138	2015-08-15 18:54:39 +02:00
IngoKauffmann	0c4924259d	Initial code	2015-08-15 18:43:13 +02:00
PabstMirror	4d8a9ae890	Merge branch 'master' into virtualExplosivesPlace	2015-08-15 11:40:06 -05:00
Glowbal	ed66255b19	Add objects to all curators	2015-08-15 18:39:43 +02:00
Glowbal	0e57d3d97c	Added assign medic, medicalfacility and medical vehicle curator modules	2015-08-15 18:25:48 +02:00
Glowbal	29b21b8f41	Merge pull request #275 from acemod/cargo ... load things into vehicles	2015-08-15 17:36:44 +02:00
Glowbal	bac1a8fce4	Merge pull request #186 from acemod/repair ... add repair PBO, fix #185	2015-08-15 17:36:31 +02:00
IngoKauffmann	94a5b38cf6	Renamed an interaction	2015-08-15 17:24:11 +02:00
IngoKauffmann	67091a7aeb	Added real fuel amounts ... Some are best guesses though	2015-08-15 16:49:57 +02:00
Glowbal	fe9751f725	Added category to settings ... Fixed client setting attribute spelling mistake	2015-08-15 16:00:37 +02:00
Glowbal	d3aa6a7f6b	Added missing assign modules	2015-08-15 15:49:41 +02:00
Michael Braun	3646654ff3	Added module icons	2015-08-15 12:21:40 +02:00
Michael Braun	c3c39150a3	Improved handling of accessing dynamic variable names	2015-08-15 12:12:41 +02:00
PabstMirror	c54081d677	Don't broadcast localization for settings ... smaller `publicVariable`	2015-08-15 03:48:25 -05:00
Glowbal	317c73a80e	Added Land_PaperBox_closed_F ... fixed initOBject	2015-08-15 10:22:44 +02:00
PabstMirror	660d048670	Options Menu - Fix Colors when category selected	2015-08-15 03:21:03 -05:00
PabstMirror	a2897e6d32	Merge branch 'master' into cargo	2015-08-15 03:11:19 -05:00
PabstMirror	ea2dc46d59	1.50 realisticnames - ubc	2015-08-15 02:56:34 -05:00
Glowbal	03413ef6b6	Merge branch 'cargo' of github.com:acemod/ACE3 into cargo ... Conflicts: addons/cargo/functions/fnc_initVehicle.sqf	2015-08-15 09:51:15 +02:00
Glowbal	d8084e20d7	Added cargo settings and settings module.	2015-08-15 09:50:00 +02:00
PabstMirror	c35fc35eb3	Captive FFV stuff	2015-08-14 21:29:01 -05:00
PabstMirror	7c276d9d25	Grenade Cleanup	2015-08-14 20:25:27 -05:00
PabstMirror	e160a62599	Merge pull request #2145 from jokoho48/codeCleanupGrenades ... Code cleanup of Grenades module	2015-08-14 20:18:30 -05:00
PabstMirror	b9db03de20	Fix count problems	2015-08-14 20:13:41 -05:00
PabstMirror	e3a31687a8	Merge pull request #2084 from jokoho48/codeCleanupDisarming ... Code cleanup of Disarming module	2015-08-14 20:01:23 -05:00
PabstMirror	253fb6e66a	Merge pull request #1986 from acemod/addMainAction ... Always make sure ACE_MainActions exists	2015-08-14 19:48:04 -05:00
PabstMirror	f9b3cbc02a	Merge pull request #1956 from SzwedzikPL/laser_default_keybinds ... default laser code down keybind fix	2015-08-14 19:36:02 -05:00
PabstMirror	6932014b9d	Merge pull request #1993 from acemod/fixMapCompassChange ... Fix ace_map changes to compass display object	2015-08-14 19:34:09 -05:00
PabstMirror	fc51ad9a5e	Merge pull request #2137 from acemod/checkPBO-spawnloop ... CheckPBO Fix endless waitUntil if checkAll is false	2015-08-14 19:31:36 -05:00
PabstMirror	13abee2612	Merge pull request #2106 from acemod/optionMenuFiltering ... Option Menu Fixes for categories	2015-08-14 19:31:17 -05:00
PabstMirror	21400b0174	UBC, privates, LSTRING	2015-08-14 15:46:51 -05:00
PabstMirror	2be74dfdca	Privates	2015-08-14 15:14:36 -05:00
Glowbal	2062f5dcb6	fixed incorrect variable name	2015-08-14 22:07:49 +02:00
Glowbal	96ec435d0d	Added load in cargo containers	2015-08-14 22:01:14 +02:00
Glowbal	55ad706761	fixed car check - invalid variable name	2015-08-14 22:00:55 +02:00
PabstMirror	066a78d9aa	Fix var	2015-08-14 14:36:54 -05:00
Glowbal	83f46be990	Fixes and improvements for the repair module ... 1. Added full repair, 2. Added missing settings to modules and settings framework, 3. added assign engineer module. 4. Fixed animation bug	2015-08-14 20:49:51 +02:00
PabstMirror	ef5a3d69f5	Merge pull request #2148 from acemod/nameTagFixes ... nametag cleanup and fix cursortarget distance	2015-08-14 12:58:02 -05:00
PabstMirror	09296e42a0	Merge pull request #2143 from acemod/removeBreifingPFEH-hack ... Remove PFEH hack	2015-08-14 12:50:35 -05:00
ViperMaul	c3f6ee7141	Merge pull request #2140 from acemod/addActionParamChecking ... AddAction basic param checking	2015-08-14 10:48:07 -07:00
Joko	ec5a1f038a	fix Typo issue	2015-08-14 18:42:22 +02:00
jokoho48	c4ed18f39f	Fix findNearestVehicle dont return BOOL ... Fix that findNearestVehicle dont return any time the nearest car Small Performance Improvement in getSizeItem/handleDestroyed/startUnload Enhance Some legibility	2015-08-14 18:07:31 +02:00
jokoho48	8e7e9b9ee3	Fix Typo	2015-08-14 14:57:29 +02:00
Michael Braun	eaae6dfb7d	Replaced padding chain with params defaults	2015-08-14 11:43:36 +02:00
Michael Braun	2bbf631e71	Fixed missing semi-colon in safemode.	2015-08-14 11:39:22 +02:00
IngoKauffmann	6dc5050dc3	Missed one return type	2015-08-14 03:21:16 +02:00
IngoKauffmann	de500fb80b	First batch of fixes	2015-08-14 03:18:54 +02:00
jokoho48	84685f4a84	add dayOfWeek and updateMemory to Own File ... Update some Comments Fixing Spelling Issue	2015-08-14 02:22:15 +02:00
jokoho48	183aac1911	Code cleanup of Kestrel 4500 module.	2015-08-14 01:55:54 +02:00
jokoho48	bd56d1bb83	ok that is my fault	2015-08-14 00:36:36 +02:00
jokoho48	cb8d009ef0	Woops	2015-08-14 00:31:42 +02:00
PabstMirror	28ac2fbec6	Merge pull request #2147 from jokoho48/codeCleanUpHitReaction ... Code cleanup of HitReaction module	2015-08-13 17:11:19 -05:00
jokoho48	d62f00146e	Comment CleanUp	2015-08-14 00:02:19 +02:00
jokoho48	0656418cd1	Code cleanup of HuntIR module.	2015-08-14 00:00:34 +02:00
PabstMirror	68517756c4	#2139 and nametag cleanup	2015-08-13 17:00:24 -05:00
jokoho48	e890b310c1	Code cleanup of HitReaction module	2015-08-13 23:50:51 +02:00
jokoho48	27babd351d	Merge branch 'master' of https://github.com/acemod/ACE3 into codeCleanupHearing	2015-08-13 23:43:01 +02:00
jokoho48	c6fbdb420c	Code cleanup of Hearing module	2015-08-13 23:42:20 +02:00
PabstMirror	2d8261ddb5	Merge pull request #2135 from acemod/nameTagsWhenPaused ... Don't draw nametags when escape menu is open	2015-08-13 16:09:32 -05:00
PabstMirror	43e9c420c4	Merge pull request #2136 from acemod/captiveHeliFix ... Don't use old Helicopter_F	2015-08-13 16:01:59 -05:00
jokoho48	7bf7066cfd	Code cleanup of grenades module.	2015-08-13 22:36:58 +02:00
PabstMirror	7c60375105	Merge pull request #2102 from acemod/disposableFixes ... Disposable fixes	2015-08-13 15:13:03 -05:00
PabstMirror	05def2f62b	Merge pull request #2016 from jokoho48/codeCleanupBackpack ... Code cleanup of the Backpack module.	2015-08-13 15:10:39 -05:00
PabstMirror	8f142e26f8	Merge pull request #2094 from jokoho48/codeCleanupFingering ... Code cleanup of Finger module.	2015-08-13 15:09:18 -05:00
jokoho48	acb4e44c19	Code cleanup of Finger module is Incomming(Part 2).	2015-08-13 22:04:35 +02:00
jokoho48	fcd60650b2	PATHTOF dont work with say3d	2015-08-13 21:57:58 +02:00
jokoho48	5597b7e40c	Code cleanup of Backpacks module	2015-08-13 21:56:02 +02:00
PabstMirror	a7ad6dafc9	Remove PFEH hack	2015-08-13 14:09:25 -05:00
PabstMirror	4f0dab23b8	Nametag category	2015-08-13 13:27:24 -05:00
PabstMirror	763f793d0e	Localize Catagoires in loadSettingsLocalizedText ... Minor, but allows us to use CSTRINGS in configs for consistancy	2015-08-13 13:20:37 -05:00
IngoKauffmann	7d75f9cd2c	Initial draft	2015-08-13 19:33:55 +02:00
PabstMirror	6ca3761710	AddAction basic param checking	2015-08-13 11:54:26 -05:00
PabstMirror	cfaf046e29	CheckPBO Fix endless waitUntil if checkAll is false	2015-08-13 00:31:29 -05:00
PabstMirror	3425913d27	#2132 - Don't use depreciated Helicopter_F	2015-08-12 23:32:57 -05:00
PabstMirror	b94cb3b85d	#2129 - Don't draw nametags when escape menu is open	2015-08-12 16:14:12 -05:00
jonpas	936e6868bc	Added README.md to viewdistance and Arkhir to AUTHORS.txt	2015-08-12 22:34:16 +02:00
jonpas	e46bd16df0	More cleaning to ACE_Settings in viewdistance	2015-08-12 22:20:07 +02:00
jonpas	b1408af43a	Mk 1 eyeballs integration	2015-08-12 22:09:59 +02:00
jonpas	47fbe9bca5	Changed postInit to clientInit	2015-08-12 20:18:23 +02:00
jonpas	e20811c0f2	Cleaned up headers, newlines in viewdistance	2015-08-12 20:16:01 +02:00
bux578	3b3d99fd60	fix gienkov's stuff	2015-08-12 18:46:56 +02:00
bux	3dc53ec492	replace <Original> with <English>	2015-08-12 10:25:37 +02:00
Michael Braun	58b697e292	Fixed missing space invalidating some xml parsers.	2015-08-12 10:06:45 +02:00
Glowbal	0080335617	Added config attributes for cargo on wheel and tracks	2015-08-11 23:21:44 +02:00
Glowbal	aadddaa2c5	Added wheel as initial cargo when cargo module is enabled	2015-08-11 23:20:25 +02:00
Glowbal	abc732ac35	Added support for cargo configuration on vehicle spawn	2015-08-11 23:18:01 +02:00
Glowbal	c7b7418ae0	Removed "can only remove damaged wheels"	2015-08-11 21:42:20 +02:00
Glowbal	b45aa51d47	hacked approach for repair tracks. ... Could probably better go with config entries, but this seems to be a very good value for 90% of the vanilla tracked vehicles. It's also still easily accessible and on an acceptable place for the remaining vehicles.	2015-08-11 21:35:13 +02:00
Glowbal	660f8debf6	Merge branch 'master' into repair	2015-08-11 21:09:44 +02:00
Glowbal	17115b8846	test switch to adv medical handleDamage	2015-08-11 20:58:00 +02:00
voiper	f676f605f3	Fix 00000101.	2015-08-11 11:18:54 -07:00
voiper	f5b6eb5ca9	Git fix Nummer 5.	2015-08-11 11:14:32 -07:00
voiper	4aa28368ad	Git fix numero 5.	2015-08-11 11:10:42 -07:00
voiper	8230dbd272	Git fix #4.	2015-08-11 11:08:01 -07:00
voiper	2d101d064e	Git fix #3.	2015-08-11 10:59:50 -07:00
voiper	e0ed81dc67	Git fix #2.	2015-08-11 10:59:21 -07:00
voiper	2144a56be1	Fix attempt.	2015-08-11 10:49:39 -07:00
Michael Braun	4babfa0bf8	Fixed missing return value description in safemode module	2015-08-11 17:56:46 +02:00
Michael Braun	42e7340b79	Code cleanup of Safemode module	2015-08-11 16:50:05 +02:00
SilentSpike	95aa9f604b	Fix manual pre-setting of spectator camera unit ... If the spectator camera unit was set before the camera had ever opened then the unit list wouldn't be populated and as such the camera would automatically abort to free mode since the unit wasn't available to spectate. So now I'm running the updateUnits function before opening the camera to pre-populate the list.	2015-08-11 13:53:55 +01:00
PabstMirror	a908863317	Use proper lnbXXX commands	2015-08-11 04:15:55 -05:00
PabstMirror	bdca10eac4	Close Client Settings When open Server Settings	2015-08-11 01:38:31 -05:00
PabstMirror	4cce799ace	#2045 - Push SDV sub, cleanup push	2015-08-10 22:08:13 -05:00
PabstMirror	2565a80a22	#2098 - Option Menu Fixes for categories ... Use lbValue to store the index of the filtered selection	2015-08-10 17:19:30 -05:00
Glowbal	f1eed825f6	Moved models to APL folder	2015-08-10 23:54:45 +02:00
Glowbal	800b254004	Merge branch 'master' into trenches ... Conflicts: AUTHORS.txt	2015-08-10 23:48:07 +02:00
Glowbal	ffa476bee2	Improved action display text	2015-08-10 23:16:58 +02:00
Glowbal	c016d01414	Initial load in cargo module	2015-08-10 23:07:47 +02:00
PabstMirror	4377bbeb75	Delete unused file	2015-08-10 15:26:44 -05:00
PabstMirror	512011a756	Remove Debug Code	2015-08-10 15:16:16 -05:00
PabstMirror	47b18b2b39	Cleanup disposables also fix #2090 (alt add for AI)	2015-08-10 15:12:42 -05:00
Michael Braun	a315596c5a	Fixed isValidColorArray returning true when array had the right size, but wrong datatypes/value ranges	2015-08-10 20:32:26 +02:00
Michael Braun	3e82391a36	Added validation and various fixes	2015-08-10 19:04:49 +02:00
Glowbal	27a57d89f8	Merge branch 'master' into cargo	2015-08-10 17:59:19 +02:00
Michael Braun	5287455c0b	Fixed aborting data transmission on no owner id encounter	2015-08-10 17:07:01 +02:00
Michael Braun	5e4316d0e2	Fixed missing semi-colon	2015-08-10 16:43:33 +02:00
Michael Braun	5788705821	Fixed code style issues and added missing variable initialization in map_gestures	2015-08-10 15:24:57 +02:00
Michael Braun	b1d3654a97	Fixed owner id not getting assigned in map gestures	2015-08-10 14:54:28 +02:00
Glowbal	e5eaefafdb	fixed #2097 - script error because of global variable in params	2015-08-10 09:51:14 +02:00
Michael Braun	90e4d005ee	Give credit where credit is due	2015-08-10 08:45:43 +02:00
Michael Braun	a38cdda8e3	First iteration on implementing Dslyecxi's ST Map Gestures	2015-08-10 04:40:30 +02:00
jokoho48	f3fbf0c5ff	Code cleanup of Finger module is Incomming.	2015-08-10 00:19:27 +02:00
Glowbal	0c2c71e70e	Merge pull request #2056 from MikeMatrix/codeCleanupSandbag ... Code cleanup of Sandbag module	2015-08-09 23:56:25 +02:00
jokoho48	5db5e34edf	Fix Git Shit	2015-08-09 23:50:02 +02:00
gienkov	1c537c6739	fix captives again	2015-08-09 23:04:16 +02:00
gienkov	0914193e14	fix captives module	2015-08-09 22:45:01 +02:00
jokoho48	a3fd072328	Make New Model	2015-08-09 22:44:39 +02:00
gienkov	be787883f2	captives translation	2015-08-09 22:38:34 +02:00
gienkov	49668a25f8	Merge remote-tracking branch 'origin/master' into pl-translation-5	2015-08-09 22:36:41 +02:00
SilentSpike	c30cb45bd6	Optimize spectator UI held key prevention system	2015-08-09 20:59:57 +01:00
PabstMirror	dc06927418	missing ;	2015-08-09 13:57:39 -05:00
PabstMirror	b57ca91f69	Merge branch 'master' into virtualExplosivesPlace	2015-08-09 13:45:51 -05:00
PabstMirror	6755b8766a	Merge pull request #2085 from jokoho48/codeCleanupDisposable ... Code cleanup of Disposable module	2015-08-09 13:24:18 -05:00
Glowbal	9c8a03b0b3	fixes #2070 - medication is not translated on activity log	2015-08-09 20:12:31 +02:00
Glowbal	aa4840d860	fixes #2075 - menu doesn't show which bodypart is selected on Basic medical	2015-08-09 20:08:45 +02:00
Glowbal	298f64a7bf	fixes #2078 ... 1. Fixed incorrect activity string for tourniquet 2. Fixed incorrect macro usage, should have grabbed variables from medical module.	2015-08-09 20:07:06 +02:00
PabstMirror	207c002f3a	params	2015-08-09 13:02:08 -05:00
PabstMirror	5723c5eaac	Merge branch 'master' into addMainAction	2015-08-09 13:00:56 -05:00
jokoho48	fb56517099	Merge branch 'master' of https://github.com/acemod/ACE3 into repair	2015-08-09 18:58:02 +02:00
Glowbal	e4abf7c8cc	added spare wheel to config	2015-08-09 18:26:49 +02:00
Glowbal	ed6a53a402	Attempt at repairing tracks. Improved repair wheel actions	2015-08-09 18:08:53 +02:00
Glowbal	872d026cd0	All repair actions are now functional	2015-08-09 17:23:32 +02:00
Glowbal	9adbb07367	Moved replace and repair wheel actions into the repair action framework	2015-08-09 15:53:52 +02:00
jokoho48	fab0eee5dd	corrected some small point	2015-08-09 15:28:11 +02:00
jokoho48	79cf8dd98e	Fixing Some Spelling ... Remove Some forgotten Commands	2015-08-09 15:20:50 +02:00
jokoho48	323832474f	Code cleanup of Dragging module	2015-08-09 14:53:13 +02:00
Glowbal	3cac137851	Fixed #1893 - Menu closes when patient is more as 10 meters away	2015-08-09 09:14:42 +02:00
Glowbal	58fc69c2a6	Updated litter configuration. Closes #2002	2015-08-09 08:59:04 +02:00
PabstMirror	ec97cd2edd	Fix wheel texture	2015-08-09 01:58:49 -05:00
PabstMirror	4b603ff46f	Localization, params	2015-08-09 01:54:44 -05:00
PabstMirror	0e17bebd23	Merge branch 'master' into repair	2015-08-09 00:33:08 -05:00
jokoho48	b23f9c0de2	Code cleanup of Disposable module	2015-08-09 05:25:19 +02:00
jokoho48	156609aab2	Code cleanup of Disarming module	2015-08-09 05:18:26 +02:00
PabstMirror	7624a459eb	Merge pull request #2010 from jokoho48/codeCleanupInteractMenu ... Code cleanup Interact_menu module	2015-08-08 21:35:54 -05:00
PabstMirror	95d88b920e	#2079 - RemoveTourniquet doesn't require any items	2015-08-08 21:25:36 -05:00
PabstMirror	5628ce1bcd	#2074 - Medical Menu Module not unique	2015-08-08 20:27:56 -05:00
PabstMirror	879826de8b	Merge pull request #2077 from jonpas/fixNametagsString ... Fixed incorrect string path in nametags	2015-08-08 19:58:52 -05:00
PabstMirror	c949daae1f	OptionMenu C->LStrings	2015-08-08 19:57:57 -05:00
jokoho48	bd1a6d14a8	Code cleanup of Dagr module	2015-08-09 02:33:00 +02:00
jokoho48	7bdfe03c92	Code cleanup of Concertina_wire module	2015-08-09 02:19:34 +02:00
gienkov	ce99404200	move english strings from original to english, remove original	2015-08-09 01:52:22 +02:00
gienkov	1c0a6fb457	PL translation of common, medical_menu, optionsmenu	2015-08-09 01:47:55 +02:00
jonpas	7d36d80072	Fixed incorrect string path in nametags	2015-08-09 01:23:20 +02:00
Glowbal	2b3c936e99	count should be a foreach	2015-08-09 00:41:43 +02:00
Glowbal	c7ac190f58	Finalized settings	2015-08-09 00:21:59 +02:00
gienkov	6bd4fcc4fd	Fix stringtable error	2015-08-08 23:39:29 +02:00
Glowbal	54ad9d1444	Merge branch 'master' into require-surrender-captive	2015-08-08 23:21:00 +02:00
Glowbal	493254619c	Merge pull request #2039 from acemod/medical-menu ... Medical menu	2015-08-08 23:11:11 +02:00
Glowbal	f02a00ae69	Merge pull request #2058 from acemod/add-category-optionsmenu ... Add category optionsmenu #852	2015-08-08 22:59:19 +02:00
SilentSpike	416d559354	Expand common isFeatureCameraActive function ... The function is currently only used by ace_goggles and it makes sense to expand it to detect if any common feature camera is active rather than just BI cameras	2015-08-08 20:51:24 +01:00
PabstMirror	a6acff9178	Setting to disable hearing for zeus RC	2015-08-08 14:40:19 -05:00
PabstMirror	d5a3c66b89	Minor Spelllings Fixes	2015-08-08 14:17:03 -05:00
Glowbal	c0562aaf6c	clean up debug messages	2015-08-08 20:31:19 +02:00
Glowbal	696546de5c	Finalized ACE medical menu settings	2015-08-08 20:22:19 +02:00
SilentSpike	d294989cb0	Allow chat use on input disabled listen server ... Listen server technically doesn't have serverCommandAvailable.	2015-08-08 19:11:41 +01:00
SilentSpike	182eef39de	Adjust spectator camera pan and tilt with zoom	2015-08-08 18:41:38 +01:00
PabstMirror	c6be0bbb8c	Merge branch 'master' into add-category-optionsmenu ... Conflicts: addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf	2015-08-08 12:39:14 -05:00
PabstMirror	feceff2746	Polish the stringtable	2015-08-08 12:36:42 -05:00
SilentSpike	213deeffb4	Add keys to adjust spectator camera speed and zoom ... Allows for finer control of the speed and zoom, as well as a quick way to reset either.	2015-08-08 18:31:37 +01:00
PabstMirror	0719a3c1c6	Merge pull request #2055 from MikeMatrix/codeCleanupScopes ... Code cleanup Scopes module	2015-08-08 11:42:40 -05:00
Glowbal	4c7bcbb6fe	Added triage card display	2015-08-08 18:29:30 +02:00
SilentSpike	d7730103c9	Update ace_spectator readme	2015-08-08 17:22:04 +01:00
PabstMirror	7fe6c2fe1b	Merge pull request #2063 from jonpas/fixMissingString ... Fixed missing string	2015-08-08 11:19:27 -05:00
PabstMirror	8e905af444	Merge pull request #1977 from acemod/attachClickCooldown ... Mouse cooldown for click to interact option	2015-08-08 11:18:20 -05:00
Glowbal	31a5f8899b	Changed default keybinding value to be H	2015-08-08 18:16:25 +02:00
PabstMirror	451c88c601	Merge pull request #2027 from acemod/joinGroupTeamManagement ... EnableTeamManagement setting for joinGroup	2015-08-08 11:16:20 -05:00
Glowbal	bb79feeaf1	Clean up duplicate files	2015-08-08 18:16:11 +02:00
jonpas	8e3a961ee3	Fixed missing string	2015-08-08 18:11:28 +02:00
PabstMirror	7c7fb35cee	Merge pull request #2036 from acemod/mapToolsOnOtherMaps ... MapTools work on children of itemMap	2015-08-08 11:10:32 -05:00
Glowbal	054ac3443d	Merge pull request #2062 from jonpas/removeDuplicatedStrings ... Removed duplicated strings	2015-08-08 18:04:44 +02:00
jonpas	1aecd54fc3	Removed duplicated Enabled/Disabled/Yes/No/DoNotForce strings as they were moved to common	2015-08-08 18:02:20 +02:00
Glowbal	364e0455ee	Merge branch 'master' into medical-menu	2015-08-08 17:55:43 +02:00
Glowbal	bd0593f8f4	fixed missing semi-column	2015-08-08 17:49:43 +02:00
Glowbal	12f0808784	Merge branch 'master' into hearingRingingModule ... Conflicts: addons/common/stringtable.xml	2015-08-08 17:42:18 +02:00
Glowbal	c69aa09d55	Merge pull request #2054 from MikeMatrix/codeCleanupSitting ... Code cleanup of Sitting module	2015-08-08 17:00:07 +02:00
SilentSpike	be7b156c49	Add "focus on unit" to spectator free camera ... Pressing F will move the free camera to a position viewing the unit currently selected in the list. Fixes map teleporting functionality also.	2015-08-08 15:49:07 +01:00
Glowbal	9fc94eefd9	Merge pull request #2006 from jokoho48/codeCleanupWinddeflection ... Code cleanup Winddeflection module	2015-08-08 15:03:26 +02:00
Glowbal	a65495fb14	Merge pull request #2011 from jokoho48/codeCleanupBallistic ... Code cleanup Ballistics module.	2015-08-08 15:00:08 +02:00
Glowbal	ff421db3df	Merge pull request #1980 from MikeMatrix/headDirBasedWindIndication ... Headdirection based wind indication	2015-08-08 14:51:37 +02:00
Glowbal	66f2dfa31e	Merge pull request #2059 from MikeMatrix/documentationFixWeaponselect ... Updated function documentation of Weaponselect	2015-08-08 14:45:28 +02:00
Michael Braun	e4a4a942d0	Updated function documentation of Weaponselect	2015-08-08 14:40:23 +02:00
Glowbal	65c06551a5	Merge pull request #1652 from gienkov/patch-22 ... Fix checking vitals anim	2015-08-08 14:32:36 +02:00
SilentSpike	5b881224c5	Allow admins to use chat in the spectator UI	2015-08-08 13:31:10 +01:00
Glowbal	d8d706eb04	Merge pull request #1974 from jokoho48/parachutePrivateScope ... Fix that Reserve Parachute can get in Arsenal or in Crate	2015-08-08 14:25:40 +02:00
Glowbal	be00f7ffe4	Merge pull request #2000 from acemod/treatmentResetWeaponMode ... Treatment reset weapon mode	2015-08-08 14:20:10 +02:00
Glowbal	94be0d9fbd	Merge pull request #2008 from jokoho48/codeCleanupViewdistance ... Code cleanup Viewdistance module	2015-08-08 14:18:45 +02:00
Glowbal	e8961e3d0e	Use display instead of just idc	2015-08-08 13:41:25 +02:00
Michael Braun	9c29ff0c57	Inlined PFHs in Switchunits	2015-08-08 13:34:35 +02:00
SilentSpike	e59f0ce822	Fix spectator respawn template for types 0 and 1 ... Type 0 worked, but the mission didn't end when all players were killed. Type 1 didn't work because isPlayer isn't true for seagulls. So spectator virtual state is now entirely unassociated from objects in the game.	2015-08-08 12:33:34 +01:00
Glowbal	13f7d0f632	Merge pull request #2003 from jokoho48/codeCleanupWeaponselect ... Code cleanup Weaponselect module	2015-08-08 13:32:45 +02:00
Glowbal	872c257901	Used the wrong string macro.	2015-08-08 13:21:13 +02:00
Glowbal	25597704ed	Added fail save for incorrect string value input	2015-08-08 13:07:40 +02:00
Glowbal	e7a607ca35	Finalized server export category select	2015-08-08 13:07:22 +02:00
jonpas	12399db0ac	Merge branch 'master' into slideshowFixes ... Conflicts: addons/slideshow/functions/fnc_createSlideshow.sqf	2015-08-08 13:00:11 +02:00
Glowbal	c6af8aaeb6	Localized category name for interaction menu related settings	2015-08-08 11:52:53 +02:00
Glowbal	e9151d921c	Localized category names for medical settings	2015-08-08 11:52:37 +02:00
Glowbal	0601aa80bb	Localized All categories string ... Enabled categories for config export menu	2015-08-08 11:52:23 +02:00
Glowbal	38b9fdab4d	fixes #1948	2015-08-08 11:51:31 +02:00
Michael Braun	2b56b919db	Fixed missing private in Switchunits	2015-08-08 11:28:08 +02:00
Michael Braun	680bbebc02	Fixed missing private in scopes	2015-08-08 11:25:45 +02:00
Glowbal	b798058ef8	Merge pull request #2032 from acemod/unloadVehicleBug ... isTouchingGround is unreliable for ground vehicles	2015-08-08 11:04:09 +02:00
Glowbal	831af1bbf8	Merge pull request #2043 from MikeMatrix/keybindCategoryLocalization ... Added localizations for keybinding categories	2015-08-08 10:59:34 +02:00
Glowbal	7c24d9dbad	Merge pull request #2057 from jonpas/sittingFixes ... Sitting Fixes	2015-08-08 10:58:47 +02:00
Glowbal	2951c9a965	Merge pull request #2046 from MikeMatrix/codeCleanupTripod ... Code cleanup in Tripod module	2015-08-08 10:58:01 +02:00
Glowbal	02bffce4c4	Merge pull request #2047 from MikeMatrix/codeCleanupTacticalladder ... Code cleanup in Tacticalladder module	2015-08-08 10:57:13 +02:00
Glowbal	df0e13b21c	Merge pull request #2050 from MikeMatrix/codeCleanupSpottingscope ... Cleanup code of Spottingscope module	2015-08-08 10:52:50 +02:00
Glowbal	6b256a604c	Merge pull request #2051 from MikeMatrix/codeCleanupSlideshow ... Code cleanup of Slideshow module	2015-08-08 10:52:08 +02:00
Michael Braun	940cd8e921	Small documentation correction in sandbag module	2015-08-08 02:28:27 +02:00
jonpas	52ac13273c	Fixed #1937 - Made use of CfgMoves to make free-look head movement visible, Fixed grenade throwing while sitting	2015-08-08 02:13:14 +02:00
Michael Braun	d1a2bec7fd	Code cleanup of sandbag module	2015-08-08 02:00:00 +02:00
Michael Braun	8355558db1	Small readability improvement in slideshow	2015-08-08 01:18:48 +02:00
PabstMirror	a3a481f96d	Some fixes	2015-08-07 15:08:52 -05:00
jonpas	9e64e8c2aa	Increased sitting interaction distance - fixes #1950	2015-08-07 21:41:07 +02:00
Glowbal	d125b9ad9c	Add category to options menu. Initial work.	2015-08-07 21:14:45 +02:00
PabstMirror	a9ed1052dd	vehLock - debug trace / type checking	2015-08-07 13:24:47 -05:00
Glowbal	cd5b5f1d24	clean up of the config	2015-08-07 20:15:09 +02:00
PabstMirror	50adc7c096	Merge pull request #2004 from jokoho48/codeCleanupVehiclelock ... Code cleanup Vehiclelock module	2015-08-07 13:01:56 -05:00
SilentSpike	57bda372f0	Adjust spectator free camera speed with zoom	2015-08-07 19:00:31 +01:00
SilentSpike	c5d9ec5d50	Add speed boost button to spectator free camera ... Sometimes you just want a burst of speed rather than to adjust it and then adjust it back. Also swapped the speed/zoom scrolling modifier around.	2015-08-07 18:59:48 +01:00
jonpas	256536467b	Fixed no interaction menu support condition	2015-08-07 19:36:10 +02:00
Glowbal	f21023b4ee	Added logs for quick view and activity view separate from the activity log for medical menu	2015-08-07 19:11:57 +02:00
Glowbal	d7db2e159c	Split up into activity and quick view logs	2015-08-07 19:11:27 +02:00
Glowbal	471e8d27df	Fixed clean up	2015-08-07 19:11:10 +02:00
Michael Braun	fb32bbf8de	Code cleanup of scopes module	2015-08-07 16:43:06 +02:00
SilentSpike	1c79c8fa45	Update spectator UI styling ... Adds a title to the unit tree to match the help list and enters the title text.	2015-08-07 15:15:04 +01:00
Glowbal	f21da3ead6	Merge pull request #2026 from acemod/cleanBandages ... Clean bandages if no damage on hitpoint	2015-08-07 15:46:44 +02:00
Michael Braun	1cec4400b3	Missing count replacement in slideshow module	2015-08-07 15:44:41 +02:00
Michael Braun	d192f7eea4	Added parentheses back	2015-08-07 15:35:52 +02:00
Michael Braun	b2e7cf04c0	Fixed function argument documentation in slideshow	2015-08-07 15:19:59 +02:00
Michael Braun	60e4c2e601	Code cleanup of sitting module	2015-08-07 15:12:24 +02:00
Glowbal	27ec3adeac	Added stringtable entries requireSurrender setting	2015-08-07 14:51:56 +02:00
Glowbal	997ac53c11	Added isSurrendering check	2015-08-07 14:49:01 +02:00
Glowbal	4c935bb504	Added setting for require surrender	2015-08-07 14:46:28 +02:00
SilentSpike	702e50b731	Improve spectator UI respawn counter blending ... When the BI respawn counter is blended with the spectator UI its colours are also updated to match	2015-08-07 12:30:50 +01:00
SilentSpike	f143db7fc0	Draw player names on spectator map	2015-08-07 12:20:39 +01:00
Michael Braun	7839224aa2	Added Polish Keybind Category translations thanks to @gienkov	2015-08-07 13:01:36 +02:00
Michael Braun	da97472600	Added ace specific logging methods	2015-08-07 12:56:10 +02:00
Michael Braun	fa56196fe3	Code cleanup of slideshow module	2015-08-07 12:11:34 +02:00
Michael Braun	2f5f282431	Cleanup code of Spottingscope module	2015-08-07 11:47:23 +02:00
Michael Braun	a330e7b0c5	Code cleanup of Switchunits module	2015-08-07 09:18:42 +02:00
Michael Braun	0fafe27da9	Code cleanup in Tacticalladder module	2015-08-07 08:19:15 +02:00
Michael Braun	ef01660ab3	Code cleanup in Tripod module	2015-08-07 08:07:10 +02:00
Michael Braun	c6cb18749d	Fixed translation typo	2015-08-07 05:51:26 +02:00
Michael Braun	d9eb7a3d2c	Added localizations for keybinding categories	2015-08-07 05:48:51 +02:00
Michael Braun	5f313c75d5	Cleanup of medical_menu	2015-08-07 05:37:41 +02:00
SilentSpike	485f9438bb	Change spectator UI toggle to include help window ... With new layout of help window the toggle UX also changes. User expects help window to toggle as part of overall UI.	2015-08-07 01:51:46 +01:00
SilentSpike	043c5c47c5	Improve spectator help window layout ... Having the help window in the centre of the screen blocked too much of the users view and also clashed with the MPTable element (the table that appears on death, aka "respawnDialog"). It was moved to the right of the screen and now mirrors the unit list. To save screen space, the action keys are given as tooltips for the listbox entries so users must mouse over for more info.	2015-08-07 01:44:32 +01:00
SilentSpike	f59536b5a3	Remove legacy spectator settings module argument	2015-08-07 00:28:54 +01:00
SilentSpike	4c9b6e94cf	Overhaul and improve spectator unit tree UX ... The old method of refreshing the tree on each update would reset all expanded/collapsed nodes. Now the code will cull any units/groups/sides no longer spectatable from the list and cache the ones that are still valid. The cached data is then used to populate the list with new units. Add coloured unit icons beside units in the list for quick user reference of side and type. Store group netIDs in respective nodes for possible use in code.	2015-08-07 00:06:22 +01:00
jonpas	8b802006a4	Moved no interaction menu support inside the function, made code run selectively on server/clients, fixes #2037, closes #1945	2015-08-07 00:32:12 +02:00
Glowbal	abaf43be11	Selection restrictions	2015-08-07 00:09:40 +02:00
Glowbal	9b380315e5	First working version of the medical menu	2015-08-06 23:51:17 +02:00
Glowbal	5ac2972573	Added local event upon successful treatment.	2015-08-06 23:50:44 +02:00
Glowbal	4b5632a8f6	Added categories and missing displayName entries	2015-08-06 23:50:23 +02:00
jonpas	2e386038b7	Added support without ace_intract_menu	2015-08-06 23:43:18 +02:00
PabstMirror	016f45f0e8	fix speling	2015-08-06 15:41:24 -05:00
PabstMirror	598c1766d8	Merge pull request #2017 from jokoho48/codeCleanupCaptives ... Code cleanup of the Captives module.	2015-08-06 14:02:50 -05:00
PabstMirror	7ef13cd546	Merge pull request #2009 from jokoho48/codeCleanupVehicle ... Code cleanup Vehicle module	2015-08-06 13:24:35 -05:00
PabstMirror	f1d44972c9	Attach fix and param trace	2015-08-06 13:17:59 -05:00
PabstMirror	b5a6e1e883	Merge pull request #2013 from jokoho48/codeCleanupAttach ... Code cleanup of the Attach module.	2015-08-06 12:50:43 -05:00
PabstMirror	6086553fce	Move DoNotForce to common	2015-08-06 12:24:56 -05:00
PabstMirror	d8c36663da	#2033 - MapTools work on children of itemMap	2015-08-06 12:14:45 -05:00
SilentSpike	bcb21b782e	Overhaul spectator icon handling and rendering ... - Optimize and improve 3D icon drawing - Combine 2D and 3D PFHs into 1 - Render group icons outside of 200m, unit icons within - Store list of groups on units update to cut down on what needs to be done each frame - Change map control type to 100 to remove all default unit icons - Improve colour caching, group colours don't change, unit colours do - Remove icon setting, toggling should be at users discretion	2015-08-06 16:03:32 +01:00
jokoho48	87b9b5019c	AB Performance Optimization (Part 8)	2015-08-06 13:35:55 +02:00
SilentSpike	92ef0bfe99	Whitelist spectator free camera boom keys ... Now that booming the free camera is influenced by the camera speed, the keys should be whitelisted from the held-key prevention system to allow the speed to be adjusted on the move. Also includes a failed attempt to fix the free camera map teleporting functionality.	2015-08-06 11:39:32 +01:00
jokoho48	15a1a0d535	AB Performance Optimization (Part 7)	2015-08-06 10:58:07 +02:00
PabstMirror	e45bd43e5e	CreateLitter / syncEvents performance fixes	2015-08-06 00:28:43 -05:00
SilentSpike	d6cc14a39d	Add zeus support to spectator UI ... Can only use zeus while alive, so it won't work using the respawn template. However it's useful for communities usign custom frameworks	2015-08-06 00:53:49 +01:00
SilentSpike	d1975a593d	Improve spectator pause menu emulation ... Makes the fake pause menu closer to the real thing for UX purposes	2015-08-06 00:53:48 +01:00
PabstMirror	0bd1e1afce	#2024 - EnableTeamManagement setting for joinGroup	2015-08-05 18:02:57 -05:00
Michael Braun	d16a33bee4	Fixed issue with params being incorrectly being parsed in Weaponselect	2015-08-06 00:36:28 +02:00
PabstMirror	6ab72e905c	#1807 - Clean bandages if no damage on hitpoint	2015-08-05 17:32:00 -05:00
SilentSpike	c808021c7c	Tweak spectator interface layout ... - Swap the FOV and vision mode tools into a more logical order. - Shorten the unit list to prevent overlay with main UI - Fix name tool on dead units	2015-08-05 21:11:39 +01:00
SilentSpike	42b5abae11	Add support for respawn counter to spectator UI ... Rather than hiding the BI respawn counter, it should be "integrated" into the UI via code if present.	2015-08-05 20:35:48 +01:00
ViperMaul	d3d3ea756d	isTouchingGround is unreliable for ground vehicles ... #2020	2015-08-05 11:48:04 -07:00
PabstMirror	7203bb2a3d	Cleanup Debug, Limit Satchel Mass	2015-08-05 12:22:43 -05:00
PabstMirror	a6292db1e8	#2018 - Dead Mans Switch / unconscious	2015-08-05 11:54:45 -05:00