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
5,660 Commits 73 Branches 88 Tags 752 MiB
f08bd7acc2
Commit Graph

5660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ulteq
5b3fd31b1b Merge pull request #1525 from acemod/HuntIR 
ACE2 HuntIR port
 2015-06-07 17:47:27 +02:00
ulteq
b1b8fe3645 Removed debug output 2015-06-07 14:48:46 +02:00
ulteq
cb2b120023 Reduced the max. transmission range 2015-06-07 14:47:56 +02:00
ulteq
618d557227 Layer IDs are now stored in #defines 2015-06-07 13:55:35 +02:00
ulteq
9ce655dcd2 Fixes stuck camera on remote controlled units. 2015-06-07 13:50:38 +02:00
ulteq
9561957fd6 Merge pull request #1245 from acemod/ChatColours 
Chat visibility enhancement
 2015-06-07 13:35:02 +02:00
AKALegman
d3eae58237 Fixed Zeus Unconscious 2015-06-07 12:17:52 +01:00
ulteq
fb1ddb4dd6 Removed HuntIR explosion sound 2015-06-07 12:48:01 +02:00
ulteq
665fa55adf Further reduced the container shell timeToLive value. 2015-06-07 12:12:06 +02:00
ulteq
5e30c88d11 Made use of the += operator 2015-06-07 11:58:56 +02:00
ulteq
9818f65545 Improved HuntIR descriptions 2015-06-07 11:58:34 +02:00
ulteq
0f186154c0 Tabs -> Spaces 2015-06-07 11:44:28 +02:00
ulteq
4339344aee Merge branch 'HuntIR' of https://github.com/KoffeinFlummi/ACE3 into HuntIR 2015-06-07 11:43:42 +02:00
ulteq
48f8730415 Removed dead code 2015-06-07 11:43:32 +02:00
ulteq
66193a8c67 Removed duplicate code 2015-06-07 11:36:58 +02:00
ulteq
c40a2a9a2f Merge pull request #1527 from acemod/r3fCompat 
Added R3F compat pbo
 2015-06-07 10:18:02 +02:00
ulteq
6a792a7a82 Merge pull request #1528 from acemod/rangecardGuiFix 
Barrel length is now displayed in half inch accuracy.
 2015-06-07 10:17:02 +02:00
ulteq
a9b6af38e1 Barrel length is now displayed in half inch accuracy. 2015-06-07 10:16:30 +02:00
ulteq
afb2bb45fe Added R3F compat pbo 2015-06-07 10:11:50 +02:00
PabstMirror
abf2887826 Manual MainActions position for some statics weapons 2015-06-07 00:25:52 -05:00
PabstMirror
0f03bef5f1 Merge pull request #1524 from acemod/handleFiredCleanup 
Removed some dead code
 2015-06-06 23:31:07 -05:00
PabstMirror
24cdf77de0 Move to right side, directly under BIS news 2015-06-06 23:28:52 -05:00
Glowbal
c75ae71adf Merge pull request #1497 from acemod/Fix-PlayFiremodeChangedSound 
Fixed find file extension in playChangefiremode
 2015-06-06 21:39:34 +02:00
KoffeinFlummi
c47e0ce796 Merge https://github.com/ODK-Bn/ACE3 into russian-merge 2015-06-06 21:13:03 +00:00
AKALegman
0e375075ea improved explosives v2.1 2015-06-06 19:04:58 +01:00
AKALegman
46ed9416ed improved explosives v2 2015-06-06 18:58:42 +01:00
ulteq
833335ddb9 Call setRain each frame 2015-06-06 14:16:05 +02:00
ulteq
a870d5d760 ACE2 HuntIR port 2015-06-06 14:13:34 +02:00
AKALegman
f9a7ab5ae0 improved explosives 2015-06-06 10:11:00 +01:00
ulteq
cfc23fe3e7 Removed some dead code 2015-06-06 10:01:30 +02:00
PabstMirror
732dbd315a Tripod - use addToInventory 2015-06-05 21:13:33 -05:00
AgentRev
4a416a12a2 Added "medical_onSetDead" local event in fnc_setDead.sqf 2015-06-05 22:03:27 -04:00
PabstMirror
32ce0aa6fd Macroize all stringtables 2015-06-05 21:02:24 -05:00
PabstMirror
560609fbed Cleanup 2015-06-05 19:46:19 -05:00
PabstMirror
470492759c Merge branch 'master' into multipleDevices 
Conflicts:
	addons/atragmx/initKeybinds.sqf
	addons/common/XEH_postInit.sqf
	addons/kestrel4500/CfgVehicles.hpp
	addons/kestrel4500/initKeybinds.sqf
	addons/microdagr/CfgVehicles.hpp
	addons/microdagr/XEH_clientInit.sqf
 2015-06-05 17:50:04 -05:00
PabstMirror
a0f4ea4e93 Resize, User Option, Localization 2015-06-05 17:23:51 -05:00
PabstMirror
3c3affa69f Merge branch 'master' into mainMenuVersionHTML 2015-06-05 16:48:59 -05:00
PabstMirror
237b5b4e35 Merge pull request #1239 from acemod/laserPointerAsdgConflict 
ASDG- Fail gracefully if attachments not compatible
 2015-06-05 16:40:49 -05:00
PabstMirror
827c51c088 Merge pull request #1488 from acemod/captiveModuleSettings 
Captive module settings
 2015-06-05 16:40:36 -05:00
PabstMirror
b6951b7a13 #1022 - reset hearing deafness on respawn 2015-06-05 16:37:27 -05:00
PabstMirror
84428e5e6c Medical - unconsciousness: fix exitWith scope 2015-06-05 15:43:09 -05:00
PabstMirror
4e8fc49b5e Always remove fakeWeapon after adding 
Should fix #1500
 2015-06-05 15:38:45 -05:00
PabstMirror
50b2dd0651 Merge pull request #1410 from Tourorist/patch-2 
README: Shields back up
 2015-06-05 12:00:40 -05:00
ulteq
595e4e7529 Merge pull request #1371 from gienkov/pl-translation-1 
Polish translations
 2015-06-05 17:58:14 +02:00
ulteq
c22a66bad4 Merge pull request #1515 from acemod/spotting_scope 
Ported the ACE2 Spotting Scope
 2015-06-05 17:03:14 +02:00
ulteq
04ae03695b Reverted dragging init. 2015-06-05 17:03:09 +02:00
ulteq
7fed1085a6 Merge pull request #1509 from acemod/SSWT_Kit 
Ported the ACE2 Tripod
 2015-06-05 16:53:47 +02:00
PabstMirror
3f3ffe117e Inherit ACE_Actions - addToInventory 2015-06-05 03:32:55 -05:00
gienkov
de13985492 interact_menu translation 2015-06-05 09:55:13 +02:00
gienkov
c1a7374404 Merge remote-tracking branch 'upstream/master' into pl-translation-1 
Conflicts:
	addons/interact_menu/stringtable.xml
 2015-06-05 09:40:50 +02:00