Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,987 Commits 73 Branches 88 Tags 752 MiB
f107b700a7
Commit Graph

1987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ulteq
f107b700a7 Fixed Kestrel4500 self interaction menu conditions 2015-04-08 11:26:12 +02:00
ulteq
f974e7a9a1 Removed duplicate Kestrel4500_ prefix 2015-04-08 11:25:15 +02:00
ulteq
9f2a862489 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 2015-04-08 11:10:02 +02: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
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
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
ulteq
c3fbd8a195 Removed the old Kestrel module 2015-04-07 22:22:41 +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
commy2
ba618a69ec Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-07 20:54:45 +02:00
commy2
722c2af4dc lightIntensity, handle soldier flashlights 2015-04-07 20:54:25 +02:00
PabstMirror
c72dd39691 Build script: use cmd line cfgConvert 2015-04-07 13:53:40 -05:00
Glowbal
c823826f17 Merge branch 'master' into medicalImprovements 2015-04-07 20:53:24 +02:00
Glowbal
2b341c2a8b left over CSE function calls removed 2015-04-07 20:50:44 +02:00
Glowbal
545014b073 missing return value 2015-04-07 20:47:36 +02:00
ulteq
71886b7266 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 2015-04-07 20:31:34 +02:00
ulteq
0a7552d46f Removed unnecessary canInteractWith check 2015-04-07 20:21:16 +02:00
ulteq
c94c1c1bcb Replaced tabs with spaces 2015-04-07 20:19:35 +02:00
Glowbal
ac3bda3135 improvements to displayPatientInformation. Bandaged wounds should be more clear now 2015-04-07 20:19:32 +02:00
ulteq
f6a9a007cc Fixed the readme 2015-04-07 20:11:50 +02:00
esteldunedain
04d94bb7be Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-07 15:01:53 -03:00
esteldunedain
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
ulteq
a4c70fe616 Integrated the Kestrel 4500 into the ace interaction menu 2015-04-07 19:57:42 +02:00
Glowbal
526e24f133 formatting 2015-04-07 19:56:54 +02:00
Glowbal
3d82cb8eac Removed deprecated onTreatmentCompleted event 2015-04-07 19:54:24 +02:00
PabstMirror
18b51aa2b5 Build script: possibly fixed cfgConvert problems 2015-04-07 12:49:15 -05:00
commy2
d34cfdb003 fix: day laser when being captured 2015-04-07 19:38:19 +02:00
ulteq
9fb26c2d18 Enabled the weather module 2015-04-07 19:21:07 +02:00
ulteq
f73bdfa148 Fixed several syntax errors in fnc_buttonPressed.sqf 2015-04-07 19:20:38 +02:00
Glowbal
7fb3ac6740 Added _x_ca suffixes to all item pictures 2015-04-07 19:16:56 +02:00
commy2
98f7125171 function to return light intensity recieved from another object 2015-04-07 18:54:53 +02:00
ulteq
b62827c050 Added comments to all functions 2015-04-07 17:58:54 +02:00
ulteq
7d42eeed28 Fixed incorrect icon path 2015-04-07 17:45:52 +02:00
ulteq
0315219cf2 Added new Kestrel4500 branch: 
*TODO: Fix the dialog button actions (action="...") in RscTitles.hpp
 2015-04-07 17:43:54 +02:00