2199 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
jaynus	fb8c4fa1eb	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-08 12:09:24 -07:00
jaynus	3f84a08494	Update FCS iteration limit for accuracy over range.	2015-04-08 12:09:11 -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
jaynus	104dd2258e	Guidance framework working.	2015-04-08 08:01:39 -07: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
ViperMaul	92b672f713	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-07 20:40:09 -07:00
ViperMaul	ca1bafcc79	Improved usage of the registry for path to CfgConvert.exe and MikeRo Tools	2015-04-07 20:36:19 -07:00
PabstMirror	29d9da9f4d	Include needed CBA file prerec ... Dragging needs this to compile	2015-04-07 22:05:15 -05: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
KoffeinFlummi	490df5930e	Add build number to release build	2015-04-08 00:13:58 +02:00
KoffeinFlummi	4d001642dc	Merge remote-tracking branch 'origin/master' into tools-cleanup	2015-04-07 23:42:47 +02: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
KoffeinFlummi	7398c7a8ed	Make build.bat a python script	2015-04-07 22:16:22 +02:00
PabstMirror	6b0fb84f65	Cleanup / Headers	2015-04-07 15:01:44 -05:00
jaynus	bf70a9ba77	Tracers and colors	2015-04-07 12:59:35 -07:00
jaynus	fa9cf0280c	script error	2015-04-07 12:44:15 -07:00
commy2	88a5519465	cache the frames	2015-04-07 21:42:08 +02:00
KoffeinFlummi	37935c014d	Add release folder and cache files to gitignore	2015-04-07 21:40:26 +02:00
KoffeinFlummi	b2de6a0013	Move syntax highlighting to extras/	2015-04-07 21:39:49 +02:00