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,783 Commits 73 Branches 88 Tags 752 MiB
6cb1813527
Commit Graph

5783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
SilentSpike
25f613b712 Initial implementation of static zeus menu 2015-06-04 23:24:57 +01: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
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