Commit Graph

14632 Commits

Author SHA1 Message Date
c3fbd8a195 Removed the old Kestrel module 2015-04-07 22:22:41 +02:00
96268b6407 directional light for map effects 2015-04-07 22:19:03 +02:00
7398c7a8ed Make build.bat a python script 2015-04-07 22:16:22 +02:00
b60a8f2547 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 2015-04-07 22:13:20 +02:00
183034183e Resolved a minor issue between protractor and wind info 2015-04-07 22:02:38 +02:00
6b0fb84f65 Cleanup / Headers 2015-04-07 15:01:44 -05:00
bf70a9ba77 Tracers and colors 2015-04-07 12:59:35 -07:00
2a619b5aeb Merge branch 'abIntegration' into AdvancedBallistics
Conflicts:
	addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
	addons/advanced_ballistics/functions/fnc_displayWindInfo.sqf
2015-04-07 21:59:28 +02:00
ef3205e078 Replaced all <floats> with <NUMBER> 2015-04-07 21:54:29 +02:00
c9ad2b279d Commented all advanced ballistics functions 2015-04-07 21:46:43 +02:00
fa9cf0280c script error 2015-04-07 12:44:15 -07:00
88a5519465 cache the frames 2015-04-07 21:42:08 +02:00
37935c014d Add release folder and cache files to gitignore 2015-04-07 21:40:26 +02:00
b2de6a0013 Move syntax highlighting to extras/ 2015-04-07 21:39:49 +02:00
d0009cd38a Remove unneeded scripts 2015-04-07 21:39:22 +02:00
2ad9193475 Use DrawIcon for map tools 2015-04-07 14:38:35 -05:00
93b31af2d3 Properly indent stringtable scripts 2015-04-07 21:38:27 +02:00
6b73713585 Make Pabst's make.py the default 2015-04-07 21:38:03 +02:00
d3d5554c49 Laser designation information localized to vehicle. 2015-04-07 12:35:34 -07:00
a8cbcb14d3 Replaced tabs with spaces 2015-04-07 21:27:04 +02:00
650c9592c8 Updated the readme 2015-04-07 21:24:09 +02:00
26c8f9588a AdvancedBallistics is now always using the dll extension 2015-04-07 21:22:58 +02:00
14718eb5b4 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-07 21:22:21 +02:00
d825505aa0 cache light config properties 2015-04-07 21:22:00 +02:00
0c3b51c28b Merge remote-tracking branch 'origin/master' into allTheMissiles 2015-04-07 12:12:05 -07:00
2ea7ecdbf7 Working save. 2015-04-07 12:11:28 -07:00
14906c68c0 Merge pull request #374 from KoffeinFlummi/medicalImprovements
Medical improvements
2015-04-07 21:07:28 +02:00
ffbe9f0c71 Setting for getting rid of hitpoint damage after adv medical damage 2015-04-07 21:06:48 +02:00
2a458f2e3d Removed Altitude and Latitude negation 2015-04-07 21:03:17 +02:00
9fb640195a Removed weather hack 2015-04-07 21:02:57 +02:00
b5b962bd4a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into abIntegration 2015-04-07 20:59:37 +02:00
5443d46f7b Default Altitude and Latitude are now read from the config 2015-04-07 20:59:05 +02:00
ba618a69ec Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-07 20:54:45 +02:00
722c2af4dc lightIntensity, handle soldier flashlights 2015-04-07 20:54:25 +02:00
c72dd39691 Build script: use cmd line cfgConvert 2015-04-07 13:53:40 -05:00
c823826f17 Merge branch 'master' into medicalImprovements 2015-04-07 20:53:24 +02:00
ab5518c35d Fixed a typo 2015-04-07 20:53:14 +02:00
2b341c2a8b left over CSE function calls removed 2015-04-07 20:50:44 +02:00
545014b073 missing return value 2015-04-07 20:47:36 +02:00
96ba28afa3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 2015-04-07 20:34:21 +02:00
2dfc9d7919 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX 2015-04-07 20:33:44 +02:00
71886b7266 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 2015-04-07 20:31:34 +02:00
0a7552d46f Removed unnecessary canInteractWith check 2015-04-07 20:21:16 +02:00
c94c1c1bcb Replaced tabs with spaces 2015-04-07 20:19:35 +02:00
ac3bda3135 improvements to displayPatientInformation. Bandaged wounds should be more clear now 2015-04-07 20:19:32 +02:00
f6a9a007cc Fixed the readme 2015-04-07 20:11:50 +02:00
a4e22986e0 Integrated the ATragMX into the ace interaction menu 2015-04-07 20:09:25 +02:00
04d94bb7be Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-07 15:01:53 -03:00
765ae4ee64 Merge branch 'master' into tabCleanup
Conflicts:
	addons/explosives/functions/fnc_addClacker.sqf
	addons/explosives/functions/fnc_detonateExplosive.sqf
	addons/explosives/functions/fnc_getPlacedExplosives.sqf
	addons/explosives/functions/fnc_openDetonateUI.sqf
	addons/explosives/functions/fnc_openPlaceUI.sqf
	addons/explosives/functions/fnc_openTransmitterUI.sqf
	addons/explosives/functions/fnc_openTriggerSelectionUI.sqf
	addons/explosives/functions/fnc_placeExplosive.sqf
	addons/explosives/functions/fnc_place_Approve.sqf
	addons/explosives/functions/fnc_setPosition.sqf
2015-04-07 15:00:56 -03:00
a4c70fe616 Integrated the Kestrel 4500 into the ace interaction menu 2015-04-07 19:57:42 +02:00