1874 Commits

Author	SHA1	Message	Date
commy2	a6a19e956b	flashsupressors for new weapons, #264	2015-04-09 19:59:08 +02: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
PabstMirror	2033676e81	another undef to Make PBO-Project Happy	2015-04-08 18:20:00 -05: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
Glowbal	3702679ee4	fixed wrong value for radio disabled on waking up	2015-04-08 21:31:59 +02:00
PabstMirror	a4af1fcb30	Fix Marker Placement on UAV Map	2015-04-08 13:55:29 -05: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
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
commy2	01a9374a26	Merge pull request #382 from KoffeinFlummi/disablebs ... disable cursor showing map position	2015-04-08 10:48:31 +02:00
commy2	deece11689	remove debug	2015-04-08 10:47:56 +02:00
commy2	a47cdb9738	disable map cursor coordinates in mp	2015-04-08 10:45:57 +02:00
esteldunedain	b18bcf8835	Add option to turn on/off cursor coordinates	2015-04-08 01:49:56 -03:00
commy2	691ab012b4	fix map loaded on preInit	2015-04-08 00:44:14 +02:00
commy2	4834facccf	moving it to map	2015-04-08 00:30:36 +02:00
KoffeinFlummi	ce45237989	Report full version number in RPT for debugging	2015-04-08 00:27:00 +02:00
commy2	50dbbda8eb	disable cursor showing map position	2015-04-08 00:20:43 +02:00
esteldunedain	ed3ac637d2	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-07 19:19:46 -03:00
PabstMirror	2f4335d3c2	#344 - Ignore missing ace_serverconfig on client	2015-04-07 17:14:27 -05:00
commy2	949c5d4333	manual merge	2015-04-07 23:26:16 +02:00
commy2	518c704db6	manual merge	2015-04-07 23:18:31 +02:00
commy2	2e66e57535	manual merge	2015-04-07 23:08:17 +02:00
commy2	d1b8595c0e	light intensity from object: handle campfires	2015-04-07 23:02:54 +02:00
PabstMirror	d060b13bbe	#86 - Stretch gps info box to support 8 digits	2015-04-07 15:47:12 -05:00
commy2	b6c278e7d3	fix using efunc vs func	2015-04-07 22:33:35 +02:00
commy2	96268b6407	directional light for map effects	2015-04-07 22:19:03 +02:00
PabstMirror	6b0fb84f65	Cleanup / Headers	2015-04-07 15:01:44 -05:00
commy2	88a5519465	cache the frames	2015-04-07 21:42:08 +02:00
PabstMirror	2ad9193475	Use DrawIcon for map tools	2015-04-07 14:38:35 -05:00
commy2	14718eb5b4	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-07 21:22:21 +02:00
commy2	d825505aa0	cache light config properties	2015-04-07 21:22:00 +02:00
Glowbal	14906c68c0	Merge pull request #374 from KoffeinFlummi/medicalImprovements ... Medical improvements	2015-04-07 21:07:28 +02:00
Glowbal	ffbe9f0c71	Setting for getting rid of hitpoint damage after adv medical damage	2015-04-07 21:06:48 +02:00