7739 Commits

Author	SHA1	Message	Date
KoffeinFlummi	13691fb5fa	More changes for Linux / armake	2016-05-02 21:18:44 +02:00
KoffeinFlummi	86a94baa8f	Rename files for Linux	2016-05-02 21:18:25 +02:00
KoffeinFlummi	c02e7ead32	Fix medical paths	2016-05-02 16:49:33 +02:00
commy2	7c2977ed47	Merge pull request #3150 from acemod/fixinteractmenusavegame ... reset interaction menu time variables on save game load	2016-03-10 23:46:37 +01:00
esteldunedain	3122542814	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2016-03-08 15:25:04 -03:00
esteldunedain	69bd858167	Merge branch 'fr-fix-quotes' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-fix-quotes ... Conflicts: addons/fastroping/CfgMoves.hpp addons/fastroping/CfgVehicles.hpp	2016-03-08 15:24:23 -03:00
Thomas Kooi	bfe738ba80	Merge pull request #3513 from acemod/cbaVersioning ... Add CBA 2.3.1 to versioning check	2016-03-08 19:21:36 +01:00
Thomas Kooi	ddd8187b19	Merge pull request #3534 from GitHawk/refuel_isEngineOn ... Disallow refueling with running engine	2016-03-08 19:20:28 +01:00
esteldunedain	2b33dd7686	Merge branch 'fr-ai-deploy' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-ai-deploy ... Conflicts: addons/fastroping/XEH_preInit.sqf	2016-03-08 15:13:50 -03:00
esteldunedain	88f4c49c08	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2016-03-08 15:08:53 -03:00
esteldunedain	afe835816f	Merge branch 'fr-fixes' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-fixes ... Conflicts: addons/fastroping/CfgVehicles.hpp	2016-03-08 15:07:45 -03:00
commy2	4ceb1b34b8	Merge pull request #3566 from acemod/removeDragCarryFromCannons ... Disable drag and carry for StaticCannon	2016-03-08 19:05:04 +01:00
PabstMirror	1a77b0fcd4	Disable drag and carry for StaticCannon ... #3528	2016-03-08 11:43:35 -06:00
Thomas Kooi	60af0d3162	Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR ... Standardize GVAR array brackets in configs.	2016-03-08 18:19:50 +01:00
PabstMirror	3232654e13	Close #3565 -Fix spelling of local var _woundEffectiveness	2016-03-08 11:02:54 -06:00
commy2	e605ede04a	execute addActionEvents in unscheduled env	2016-03-08 01:19:32 +01:00
BaerMitUmlaut	35857f4523	Cleanup canPrepareFRIES	2016-03-07 20:42:13 +01:00
Thomas Kooi	d86f58f418	Merge pull request #3525 from acemod/sandbag3den ... Set sandbag side to civ to show in 3den	2016-03-07 19:30:24 +01:00
Thomas Kooi	8946779c1a	Merge pull request #3527 from acemod/fixHrCallbackVar ... Fix empty callback for hr adjustment	2016-03-07 12:51:23 +01:00
BaerMitUmlaut	c65656a016	Improved rope glitchyness	2016-03-06 20:33:23 +01:00
BaerMitUmlaut	84af4b7676	Force open ramps on helicopters	2016-03-06 19:53:37 +01:00
commy2	a85c5b14cf	Merge pull request #3547 from acemod/fixsavegamecrashmaybe ... Store Interact Menus on CBA Namespaces	2016-03-06 19:28:26 +01:00
commy2	a9578ab473	Merge pull request #3524 from acemod/fixCancelAction ... Fix Cancel (RMB) Action	2016-03-06 19:16:40 +01:00
commy2	81c29d8120	Merge pull request #3551 from acemod/disableOnlyActionMenuOnMouseHint ... Disable only action menu on mouse hint and modifier where unnecessary	2016-03-06 19:13:10 +01:00
commy2	391aaeba89	Merge pull request #3548 from acemod/namespaceforcargofilters ... use namespace for cargo filters, fixes problem with save games	2016-03-06 19:10:53 +01:00
commy2	c90775091e	Merge pull request #3549 from acemod/fixmagincompat ... remove obsolete fix, fix #3545	2016-03-06 19:10:45 +01:00
jonpas	858c68f8d7	Don't use modifier for rotation where not needed	2016-03-06 16:54:27 +01:00
jonpas	c378cd9f12	Disable action menu on mouse hint with inGameUISetEventHandler rather than showHud, as showHud disables UI script commands	2016-03-06 16:47:46 +01:00
jonpas	f956675d35	Merge pull request #3542 from acemod/refuelGlobalEvents ... Replace execRemoteFnc with events and increase fuel update delay in refuel	2016-03-06 16:23:02 +01:00
jonpas	b47b887a21	Fix event name already being used	2016-03-06 16:20:16 +01:00
jonpas	52007fab6a	Add sanity checks, fix explosives checks	2016-03-06 12:06:17 +01:00
commy2	79db282aca	remove obsolete fix, fix #3545	2016-03-06 09:12:49 +01:00
commy2	8892aeed9d	missed one	2016-03-06 07:55:34 +01:00
commy2	8603f2062a	simplify	2016-03-06 07:14:43 +01:00
commy2	f43b287093	use namespace for cargo filters, fixes problem with save games	2016-03-06 06:53:59 +01:00
commy2	6a58af5b33	fix save game crash?, ref #3397	2016-03-06 06:22:38 +01:00
jonpas	ae3a41e6d8	Move common event handlers closer to their counterparts	2016-03-06 02:38:05 +01:00
Nicolás Badano	de6af27912	Merge pull request #3492 from acemod/Fix3491_MortarBoxes ... Replace transportMax... with maximumLoad for mortar boxes.	2016-03-05 22:09:07 -03:00
Nicolás Badano	9f205b4a54	Merge pull request #3509 from acemod/fix3379 ... Increase interaction distance with explosives from 1m to 1.5m.	2016-03-05 22:08:31 -03:00
Nicolás Badano	1d3950bfff	Merge pull request #3497 from acemod/liteDrag ... Fix portable light floating / dir when carrying	2016-03-05 22:07:43 -03:00
Nicolás Badano	e2c2495d52	Merge pull request #3496 from looterz/bftbug ... Fix for player markers not showing up correctly with BFT_ShowPlayerNames	2016-03-05 22:05:33 -03:00
BaerMitUmlaut	8e895e8cff	Added gantry hiding animation	2016-03-05 23:21:10 +01:00
BaerMitUmlaut	b20e433f43	Fixed bug with fastroping simultaneously	2016-03-05 23:20:44 +01:00
BaerMitUmlaut	8039332743	Switched to preStart + XEH_PREP	2016-03-05 23:19:53 +01:00
BaerMitUmlaut	21d546ac1c	Added note concerning BIS_fnc_guiMessage	2016-03-05 21:22:45 +01:00
PabstMirror	721aa94a29	Merge pull request #3536 from acemod/dediCaps ... Fix captivity system on dedicated	2016-03-05 14:08:53 -06:00
BaerMitUmlaut	b8a4349c10	Added deployment API and waypoint	2016-03-05 20:25:35 +01:00
jonpas	9463b05218	targetEvent -> objectEvent	2016-03-05 18:16:09 +01:00
jonpas	881eaf951a	Move setVectorDirAndUp and setHitPointDamage events to common, Make refuel set nozzle position execute only on target where local	2016-03-05 18:07:07 +01:00
jonpas	589ca27b60	Fix missing comma	2016-03-05 18:02:21 +01:00