1909 Commits

Author	SHA1	Message	Date
jaynus	c428bf051f	placeholder model for hellfire, optics refreshing on titan	2015-04-10 10:42:02 -07:00
jaynus	2fe55b3117	Attack profile buildout.	2015-04-10 10:14:30 -07:00
jaynus	c1089dfffa	Working save, distance shots are off.	2015-04-09 16:43:05 -07:00
jaynus	2e9f6a7058	Better projected up/down.	2015-04-09 16:31:14 -07:00
jaynus	1eadcade72	Linear work javelin.	2015-04-09 15:34:42 -07:00
jaynus	8fe11c36ee	Linear altitude comparison.	2015-04-09 14:11:15 -07:00
jaynus	198d4f3540	Fixed private variable overrides and timing failure.	2015-04-09 13:03:28 -07:00
jaynus	01535c7f5c	Merge remote-tracking branch 'origin/master' into allTheMissiles ... Conflicts: addons/wep_javelin/config.cpp	2015-04-09 12:41:09 -07:00
jaynus	fe147c4986	Config expansion.	2015-04-09 09:39:23 -07:00
commy2	2d265ec6c2	prevent ai fro being stuck, #290	2015-04-09 16:54:50 +02:00
commy2	b41c6280ba	prvent falling ai from being stcuk, fix #290	2015-04-09 16:52:59 +02:00
commy2	147fcdfa0c	Merge pull request #392 from KoffeinFlummi/requiredaddons ... sorting out required addons for modularity	2015-04-09 16:37:47 +02:00
esteldunedain	f0cc0941e5	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-09 10:05:38 -03:00
esteldunedain	8519bb04b7	Merge remote-tracking branch 'origin/removeRecoil' ... Conflicts: addons/recoil/config.cpp	2015-04-09 10:05:14 -03:00
Nicolás Badano	c57044fd4a	Merge pull request #390 from KoffeinFlummi/betterMapColors ... Improve map colors by taking them from A2	2015-04-09 09:52:06 -03:00
esteldunedain	6447b39d1a	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 ... Conflicts: addons/scopes/XEH_postInit.sqf	2015-04-09 09:32:58 -03:00
esteldunedain	34639c153c	Allow holding scope adjustment keys	2015-04-09 09:31:18 -03:00
KoffeinFlummi	3a871eed58	Merge branch 'master' into tools-cleanup	2015-04-09 13:37:19 +02:00
commy2	5ea35a01bb	sorting out required addons for modularity	2015-04-09 13:23:29 +02:00
esteldunedain	99aa439561	Improve map colors taking them from A2	2015-04-09 01:28:36 -03:00
jaynus	bbfd28586b	Apply ace_missileguidance to Titan. (Direct only) This is testing the extensible framework for mod makers.	2015-04-08 19:51:21 -07:00
PabstMirror	2033676e81	another undef to Make PBO-Project Happy	2015-04-08 18:20:00 -05:00
jaynus	5a9a8d239c	Remove test parameters, timing correct. Attack profile selection working.	2015-04-08 15:52:58 -07:00
jaynus	0a1aae8553	Work save, timing correction.	2015-04-08 15:41:26 -07:00
jaynus	97230c2252	compensate for FPS lag.	2015-04-08 15:34:59 -07:00
jaynus	c89df1b04f	Dir arc created.	2015-04-08 14:51:19 -07:00
jaynus	97febd6207	Disable debug, wtf math	2015-04-08 14:31:44 -07:00
jaynus	04b0efb22b	Safer calling, build out attack profiles.	2015-04-08 13:57:08 -07:00
jaynus	cf876116a9	Working configuration based guidance framework.	2015-04-08 13:45:43 -07:00
commy2	3e3390750d	manual merge	2015-04-08 22:01:41 +02:00
commy2	c5b38c8942	manual merge	2015-04-08 21:51:42 +02:00
commy2	1ae69d56ff	Merge pull request #377 from KoffeinFlummi/142light ... 142 directional light for map effects	2015-04-08 21:46:48 +02:00
commy2	7346c194f4	Merge pull request #306 from KoffeinFlummi/optics ... Taosenai's Animated Optics req 1.42	2015-04-08 21:41:12 +02:00
PabstMirror	c3564ee883	undef to Make PBO-Project Happy	2015-04-08 14:38:29 -05:00
jaynus	6f9203262a	tweak default deflection values for testing	2015-04-08 12:32:33 -07:00
Glowbal	3702679ee4	fixed wrong value for radio disabled on waking up	2015-04-08 21:31:59 +02:00
jaynus	d2e3ea347a	Merge remote-tracking branch 'origin/master' into allTheMissiles	2015-04-08 12:17:46 -07:00
PabstMirror	a4af1fcb30	Fix Marker Placement on UAV Map	2015-04-08 13:55:29 -05:00
jaynus	3946ee32d2	Fixes left/right issue.	2015-04-08 11:27:30 -07:00
commy2	3de3432664	Merge pull request #271 from KoffeinFlummi/142resting ... 1.42 - Remove scripted weapon resting	2015-04-08 20:26:13 +02:00
PabstMirror	2bc0976979	Merge pull request #277 from KoffeinFlummi/revert-276-revert-272-142menudeploy ... Revert "Revert "1.42 - cursor mode when bipod deployed""	2015-04-08 13:26:05 -05:00
PabstMirror	023a2d2202	Merge pull request #267 from KoffeinFlummi/142Markers ... 1.42 Marker Placement	2015-04-08 13:24:55 -05:00
PabstMirror	176a39e86c	Merge pull request #265 from KoffeinFlummi/142InventoryConfig ... 1.42 Inventory Config	2015-04-08 13:22:12 -05:00
PabstMirror	007e4fc234	Merge pull request #274 from KoffeinFlummi/142requiredaddons ... 1.42 ensure ace is loaded after marksmen configs	2015-04-08 13:21:33 -05:00
jaynus	bc7943d729	added todo	2015-04-08 09:18:11 -07:00
jaynus	87dac2c2ad	Merge remote-tracking branch 'origin/master' into allTheMissiles	2015-04-08 08:55:14 -07:00
jaynus	177be598d7	Fixes: Laser designator now uses strongest ray result.	2015-04-08 08:48:08 -07:00
jaynus	64724737cd	Code passing cleanup.	2015-04-08 08:35:24 -07:00
PabstMirror	af3d6a5113	#386 - Ace Options Menu on main menu ... Same limitations as CBA controls, needs a intro or mission loaded Doesn't work with -skipintro command line.	2015-04-08 10:33:12 -05:00
jaynus	61f5324d29	ACE_Settings entry for guidance.	2015-04-08 08:19:19 -07:00