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,868 Commits 73 Branches 88 Tags 752 MiB
21ce877115
Commit Graph

5868 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
SilentSpike
94a6eefa32 using new string macros 2015-06-04 19:33:19 +01:00
PabstMirror
cecc133a59 Missing </Key> in stringtable 2015-06-04 13:22:55 -05:00
PabstMirror
b466566104 Switch to new CSTRING 2015-06-04 13:19:05 -05:00
PabstMirror
e5edc0345b Merge branch 'master' into captiveModuleSettings 
Conflicts:
	addons/captives/CfgVehicles.hpp
 2015-06-04 13:15:53 -05:00
PabstMirror
21db1bcf46 Fix Ammo check / formating 2015-06-04 13:08:01 -05:00
ulteq
fb2f3f8c3f Added function headers / Fixed requiredAddons 2015-06-04 17:51:04 +02:00
Josuan Albin
70e83707c4 strobe light more bearable 
changed the intensity of the strobe light, it's still VERY visible on a
very long distance, (around 1.6k maybe more)
 2015-06-04 17:40:49 +02:00
ulteq
e728003725 Removed newline bracket 2015-06-04 17:23:01 +02:00
ViperMaul
97a4fefe60 Merge pull request #1406 from jonpas/macroSTR 
Stringtable macros
 2015-06-04 08:16:07 -07:00
jonpas
9fbf256acd Merge branch 'master' into macroSTR 
Conflicts:
	addons/hearing/functions/fnc_putInEarplugs.sqf
	addons/interact_menu/ACE_Settings.hpp
 2015-06-04 17:13:09 +02:00
ulteq
39a6c29e3e ACE2 concertina wire port. 2015-06-04 17:11:09 +02:00
Nicolás Badano
b5544ad390 Merge pull request #1502 from Winter259/CUP-backblast-disposable 
CUP Launchers Backblast + Disposable
 2015-06-04 11:26:30 -03:00
Nicolás Badano
aae8f4cf19 Merge pull request #1487 from SzwedzikPL/interact_menu_background 
Interact menu - background options
 2015-06-04 11:23:11 -03:00
SAM
885fe3ea1b Added NLAW disposable 2015-06-04 14:57:43 +02:00
bux578
ee85aab791 fix #1439 2015-06-04 14:30:38 +02:00
bux578
2bf2b5737a Merge pull request #1489 from acemod/DocumentationFixes 
fix documenation typos
 2015-06-04 13:48:08 +02:00
bux578
c88152fca6 add VON to nametags soundwaves 2015-06-04 13:47:18 +02:00
SAM
c6f0dd465d Added RPG18 disposable config 2015-06-04 13:47:10 +02:00
SAM
3f4182d066 Finished M136 disposable config 2015-06-04 13:38:50 +02:00
SAM
c154e5a620 Added required CfgMagazines.hpp 2015-06-04 13:21:23 +02:00
SAM
ef1dc5453c Added M136 disposable config 2015-06-04 13:14:57 +02:00
ulteq
da28aa3c64 More sandbag features: 
* You can now carry sandbags
* Different sandbag model during deployment (no geometry)
* Deploying sandbags now requires an appropriate surface
* Proper PhysX activation chain when you deploy/pickup sandbags
* Sandbags are now destructible
* Some stringtable fixes
 2015-06-04 11:13:12 +02:00
Glowbal
9bbeb7183e Fixed find file extension in playChangefiremode 2015-06-04 10:39:43 +02:00
SAM
a54ccbcf16 Updating all values to proper required variables 2015-06-04 10:15:26 +02:00
SAM
9581dbbbec SMAW inheritance fix 2015-06-04 10:08:11 +02:00
bux578
c9529a1e1c Merge pull request #1484 from alganthe/documentation_pass_6 
Documentation pass 6
 2015-06-04 09:52:22 +02:00
SAM
23b7cd93b8 Added RPG18 backblast 2015-06-04 09:47:49 +02:00
SAM
01b969cfe4 Added NLAW backblast 2015-06-04 09:47:16 +02:00
SAM
592ca28117 Added M136 backblast 2015-06-04 09:46:29 +02:00
SAM
206249ebd5 Added Strela 2015-06-04 09:33:13 +02:00
SAM
a6106f2cc2 Added stinger 2015-06-04 09:32:44 +02:00
SAM
8508d62d57 Added SMAW 2015-06-04 09:31:54 +02:00
SAM
15052b93d5 Added RPG7V 2015-06-04 09:31:15 +02:00
SAM
de18016430 Added Metis 2015-06-04 09:30:43 +02:00
SAM
c2c3b2014e Added MAAWS 2015-06-04 09:29:38 +02:00
SAM
5285207403 Added M47 2015-06-04 09:28:19 +02:00
gienkov
46dbd3113c Fix 2015-06-04 01:38:57 +02:00
gienkov
fb10961a9b PL translation for new things 2015-06-04 01:34:58 +02:00
gienkov
b5eb39291c Merge remote-tracking branch 'origin' into pl-translation-1 
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/frag/stringtable.xml
 2015-06-04 00:52:35 +02:00
SAM
0b160b9a0a Added CUP_launch_Igla backblast 2015-06-03 22:09:14 +02:00
ulteq
68b652cee9 Initial draft of the ACE2 tactical ladder port. 2015-06-03 20:27:52 +02:00
ViperMaul
237f5c1130 Merge pull request #1304 from acemod/debugButton 
Export debug report from options menu
 2015-06-03 09:28:37 -07:00
IngoKauffmann
ede8d74c54 Disabled pain effect while unconscious 
If the player is unconscious the pain effect is disabled.
 2015-06-03 17:53:09 +02:00