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,342 Commits 73 Branches 88 Tags 752 MiB
a48aded5e5
Commit Graph

4356 Commits

Author SHA1 Message Date
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
PabstMirror
9997b94fb1 Merge pull request #1510 from acemod/settingInDebug 
Dump settings to debug
 2015-06-04 15:54:29 -05: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
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
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
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
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
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
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
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
IngoKauffmann
e60cfddc77 Limited strength of pain effect while unconscious 
Limited _strength to 0.1 so a player does not have to watch a flashing
screen while he can't do anything about it. Otherwise we need to include
a serious epilepsy warning!
 2015-06-03 17:17:35 +02:00
ulteq
24f70e1012 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into Yardage450 
Conflicts:
	addons/apl/data/default.rvmat
 2015-06-03 16:28:22 +02:00
ulteq
682af84425 Ported the ACE2 Yardage 450 laser rangefinder 2015-06-03 16:26:30 +02:00
bux578
9096f38777 Ear Plugs -> Earplugs 
http://en.wikipedia.org/wiki/Earplug
 2015-06-03 15:29:38 +02:00
ulteq
dc66e6e1d8 Merge pull request #1476 from acemod/mx2a 
Ported the ACE2 MX-2A thermal imaging device
 2015-06-03 14:54:03 +02:00
PabstMirror
701aa7e343 Add New Icons 2015-06-03 00:55:20 -05:00
SzwedzikPL
18940d0787 Interaction menu background options 2015-06-03 06:04:47 +02:00
PabstMirror
5dc94487c5 Module Settings for Captivity 
Setting for handcuffing own team, and allowing surrender.
 2015-06-02 20:50:27 -05:00
ulteq
1777719f20 Merge pull request #1485 from acemod/abFixes 
Ab fixes
 2015-06-02 23:13:05 +02:00
ulteq
f0849e70ff Slightly increased the alpha value of the bullet trace effect. 2015-06-02 23:11:44 +02:00
Nicolás Badano
8f15856084 Merge pull request #1415 from GitHawk/master 
runOnHover can now be CODE & SurgicalKits
 2015-06-02 18:07:36 -03:00
ulteq
16f6650486 Decreased the velocity threshold for the bullet trace effect 2015-06-02 22:38:44 +02:00
ulteq
c3e7129d13 Removed newline brackets 2015-06-02 22:38:12 +02:00
ulteq
52d304e9f9 Increased the protractor size 2015-06-02 22:37:27 +02:00
jonpas
3206e3b537 Fixed a syntax error, Fixed nametags module order as per last pull request 2015-06-02 22:36:06 +02:00
jonpas
5496333c26 Merge branch 'master' into macroSTR 
Conflicts:
	addons/nametags/ACE_Settings.hpp
	addons/nametags/CfgVehicles.hpp
	addons/nametags/stringtable.xml
 2015-06-02 22:22:51 +02:00
jonpas
541f1010a7 Merge branch 'master' into macroSTR 
Conflicts:
	addons/attach/functions/fnc_attach.sqf
	addons/captives/functions/fnc_moduleSurrender.sqf
	addons/common/CfgVehicles.hpp
	addons/explosives/CfgModule.hpp
	addons/hearing/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/map/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
	addons/mk6mortar/CfgVehicles.hpp
	addons/nametags/CfgVehicles.hpp
	addons/nightvision/functions/fnc_changeNVGBrightness.sqf
	addons/respawn/CfgVehicles.hpp
	addons/switchunits/CfgVehicles.hpp
	addons/vehiclelock/CfgVehicles.hpp
	addons/winddeflection/stringtable.xml
 2015-06-02 22:14:32 +02:00
Nicolás Badano
0022548748 Merge pull request #1204 from usecforce/nametagsToggle 
Disablable NameTags Module option
 2015-06-02 17:03:47 -03:00
ulteq
5b2ad32c3f Added model.cfg 2015-06-02 20:22:37 +02:00
ulteq
81a0f5147e Stringtable cleanup 2015-06-02 20:18:30 +02:00
ulteq
f767f7eb2b Removed duplicate code 2015-06-02 20:15:31 +02:00
ulteq
663ae1db4a Fixed spelling 2015-06-02 20:07:35 +02:00
ulteq
c2be6ffef6 Added additional abort condition. 2015-06-02 20:06:56 +02:00
ulteq
4580168080 Fixed incorrect execution order 2015-06-02 20:01:48 +02:00
ulteq
2b6157bdb8 Fixed a typo 2015-06-02 20:01:00 +02:00
Glowbal
324aee1e57 Merge pull request #1471 from acemod/bodybagCleanup 
Body bag cleanup:
 2015-06-02 20:00:12 +02:00
ulteq
3f10eed73c All TMR code was removed. 2015-06-02 19:56:42 +02:00
ulteq
d733527f71 Ported the ACE2 sandbags 2015-06-02 19:30:50 +02:00
bux578
6ebf9067ef Merge pull request #1478 from acemod/switchunitscleanup 
cleanup switchunits
 2015-06-02 19:20:34 +02:00
PabstMirror
d727cb400a Modules - fix addEventHandler 2015-06-02 12:15:58 -05:00
bux578
0bd358c415 cleanup switchunits 2015-06-02 19:13:58 +02:00
ulteq
d0b8a97e79 Fixed requiredAddons[] 2015-06-02 13:40:10 +02:00
ulteq
f1dbe0fffc Ported the ACE2 MX-2A thermal imaging device 2015-06-02 12:58:47 +02:00
ulteq
048e5b6f6d Body bag cleanup: 
* Increased the treatment time to match the animation duration
* Fixed the body bag alignment with the dead unit
 2015-06-01 22:33:25 +02:00
Glowbal
cf0b2c2a52 Merge pull request #1469 from acemod/placeInBodyBagFix 
Fixes random body bag teleports
 2015-06-01 22:06:35 +02:00
SilentSpike
e3c09a7099 Added icon to unconscious module 2015-06-01 20:56:58 +01:00
SilentSpike
bfd1f8a102 Localise module names 2015-06-01 20:56:57 +01:00
SilentSpike
a30f6be713 Better module naming convention 2015-06-01 20:56:56 +01:00
SilentSpike
8fe1a65207 Cleaned up event handler 2015-06-01 20:56:54 +01:00
SilentSpike
bfce854be3 Localise module messages 2015-06-01 20:50:19 +01:00
SilentSpike
4c1641b64a Generalized contextual modules system 2015-06-01 20:44:54 +01:00
SilentSpike
7d71d85ffc Death to tabs 2015-06-01 20:44:53 +01:00
SilentSpike
e27ac53713 Implemented contextual modules 2015-06-01 20:44:51 +01:00
SilentSpike
eefe995a0c Transfer curator functionality from ace_captives 2015-06-01 20:44:50 +01:00
SilentSpike
b72512e3f1 Zeus modules require larger icons 2015-06-01 20:44:50 +01:00
SilentSpike
97a1ff9bd6 Include no longer needed 2015-06-01 20:44:48 +01:00
SilentSpike
cd6474c748 Adding module icons 2015-06-01 20:44:47 +01:00
SilentSpike
9619b7d167 Improved naming and removed pointless category 2015-06-01 20:43:21 +01:00
SilentSpike
44ca13fe3a Implemented capture module 2015-06-01 20:36:06 +01:00
SilentSpike
6251248a09 Fixed conditions 2015-06-01 20:36:05 +01:00
SilentSpike
49ef30ca5b Corrected macro 2015-06-01 20:36:05 +01:00
SilentSpike
aad56866ea Forgot my privates 2015-06-01 20:36:04 +01:00
SilentSpike
90033aa591 Updated function headers 2015-06-01 20:36:03 +01:00
SilentSpike
5f1725cf1f Missing setUnconscious parameter 2015-06-01 20:36:02 +01:00
SilentSpike
0dcfd9f941 Use zeus category 2015-06-01 20:36:02 +01:00
SilentSpike
a4512e4740 Implemented surrender module 
Improved knockout module
 2015-06-01 20:36:01 +01:00
SilentSpike
3702d0b671 Implemented knockout module 2015-06-01 20:36:00 +01:00
ulteq
14607f7aba Fixes random body bag teleports 2015-06-01 21:23:00 +02:00
ulteq
47acb0f470 Merge pull request #1458 from acemod/drag_carry_fix 
Fixes random teleport when dragging/carrying inside of buildings.
 2015-06-01 20:22:29 +02:00
PabstMirror
25a597e5fe Merge pull request #1460 from acemod/hitReactionsMounted 
HitReactions - Don't do when mounted, add setting
 2015-06-01 13:17:06 -05:00
PabstMirror
f57427ec96 switch waitAndExecute with 0 delay to execNextFrame 
Should Fix #1463
 2015-06-01 13:14:05 -05:00
ulteq
9d4c572261 Fixes build error: "config.cpp has externs but no RequiredAddons" 2015-06-01 20:12:07 +02:00
Nicolás Badano
9ed851a966 Merge pull request #1265 from gienkov/module-translations-2 
Stringtable Zeus and View Distance
 2015-06-01 14:44:04 -03:00
Glowbal
1c0c73be54 Merge pull request #1433 from acemod/fixSettingsFromModules 
Delay initialization of modules until settings are properly setup
 2015-06-01 19:18:11 +02:00
ulteq
8de5129313 Merge pull request #1464 from acemod/densityAltitude 
Implemented Density Altitude calculation
 2015-06-01 16:22:41 +02:00
ulteq
e626794866 Fixes array init 2015-06-01 16:21:30 +02:00
ulteq
0364975c12 Implemented Density Altitude calculation 2015-06-01 16:09:35 +02:00
KoffeinFlummi
fa73aec15b Merge https://github.com/Macusercom/ACE3 into german-merge 2015-06-01 14:27:49 +02:00
PabstMirror
473ab7d7c0 Fix mmg UBC 2015-05-31 23:48:20 -05:00