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,539 Commits 73 Branches 88 Tags 752 MiB
47ef53201a
Commit Graph

5539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
ulteq
993ee2d498 Ported the ACE2 spotting scope 2015-06-05 09:34:27 +02:00
PabstMirror
e01ba64683 Fix Missing Strings 2015-06-04 22:51:40 -05:00
ulteq
04e6acfc6a Merge pull request #1479 from acemod/sandbag 
Ported the ACE2 sandbags
 2015-06-04 23:02:55 +02:00
ulteq
52b40a50d9 Merge pull request #1491 from acemod/Yardage450 
Ported the ACE2 Yardage 450 laser rangefinder
 2015-06-04 23:02:06 +02:00
ulteq
618e7e6ea1 Added polish translation. 2015-06-04 23:01:07 +02:00
Glowbal
512c8a0da9 Merge pull request #1512 from SzwedzikPL/interact_menu_background 
Update authors.txt
 2015-06-04 22:57:04 +02:00
SzwedzikPL
3bb16508df Update authors.txt 2015-06-04 22:55:21 +02:00
PabstMirror
9997b94fb1 Merge pull request #1510 from acemod/settingInDebug 
Dump settings to debug
 2015-06-04 15:54:29 -05:00
Glowbal
1a898a70a9 Merge pull request #1511 from jonpas/stringMacroGuard 
Added Macro Guard to string macros
 2015-06-04 22:48:37 +02:00
jonpas
e7cfda5c77 Added Macro Guard to string macros 2015-06-04 22:46:06 +02:00
PabstMirror
1cb1468183 Remove unused control 2015-06-04 15:40:56 -05:00
Glowbal
e13992d896 Merge pull request #1508 from SilentSpike/strings 
Macroified ACE_Zeus Strings
 2015-06-04 22:36:34 +02:00
PabstMirror
1221498357 Dump settings to debug 2015-06-04 15:31:10 -05:00
Glowbal
7f2ada38a2 Merge branch 'checkpboSettings' of github.com:usecforce/ACE3 
Conflicts:
	addons/common/CfgVehicles.hpp
	addons/common/config.cpp
 2015-06-04 21:51:54 +02:00
Glowbal
e103007ae7 Merge pull request #1492 from GitHawk/master 
Disabled pain effect while unconscious
 2015-06-04 21:45:48 +02:00
ulteq
f88d23d3ca Update $PBOPREFIX$ 
Fixed a typo
 2015-06-04 21:39:39 +02:00
ulteq
91c288123a Fixed dragging position 2015-06-04 21:20:15 +02:00
ulteq
e7add69556 Ported the ACE2 Tripod 2015-06-04 21:13:44 +02:00
SilentSpike
2b79838555 Use existing disabled string 2015-06-04 19:40:11 +01:00
Nicolás Badano
ddc6688d03 Merge pull request #1505 from alganthe/strobe-intensity 
strobe light more bearable
 2015-06-04 15:34:20 -03:00