Commit Graph

4633 Commits

Author SHA1 Message Date
jonpas
1ccc7e1e0a CBA Macro for addEventHandler 2015-05-15 17:44:58 +02:00
jonpas
2edbacd15b Added SettingChanged EH and proper handling 2015-05-15 17:16:55 +02:00
jonpas
a7cd36bc3e Added Force setting 2015-05-15 16:52:27 +02:00
jonpas
62d7ea0b03 Fixed module entry not taking effect 2015-05-15 16:31:06 +02:00
jonpas
58ad012433 Merge branch 'master' into nametagsToggle
Conflicts:
	addons/nametags/ACE_Settings.hpp
2015-05-15 15:37:18 +02:00
ulteq
4d88744df6 Merge branch 'Winter259-module-cleanup' 2015-05-15 15:00:03 +02:00
ulteq
b609b0fec1 Merge branch 'module-cleanup' of https://github.com/Winter259/ACE3 into Winter259-module-cleanup 2015-05-15 14:59:54 +02:00
SAM
736c4f94e1 Revered macro on fnc_throwGrenade 2015-05-15 14:47:37 +02:00
ulteq
f835ba95e8 Merge pull request #1222 from acemod/cleanupWeather
Weather module macro cleanup
2015-05-15 14:20:40 +02:00
ulteq
7a95e2a7bd Weather module macro cleanup 2015-05-15 14:20:18 +02:00
ulteq
c5e78956c9 Merge pull request #1221 from BullHorn7/master
Documentation: Update WindDeflection
2015-05-15 14:08:48 +02:00
BullHorn
7e3f8f109b Documentation: Update windeflection.md
Remove Usage (it is mentioned in the \missionmaker\modules.md wiki)
Improve grammar
2015-05-15 15:04:29 +03:00
BullHorn
77374212c0 Authors.txt - add BullHorn 2015-05-15 14:18:11 +03:00
BullHorn
56f4a32221 Documentation: Update WindDeflection
Noted compatibility with Advanced Ballistics
2015-05-15 14:16:54 +03:00
BullHorn
730e0c5963 Documentation: Create WindDeflection doc 2015-05-15 14:02:56 +03:00
BullHorn
ef04eb3738 Update windeflection.md 2015-05-15 13:56:55 +03:00
Glowbal
bf64e441f0 Specified that config exports requires SP 2015-05-15 10:41:39 +02:00
SAM
8199a4ad34 Removed extra private 2015-05-15 10:30:15 +02:00
SAM
ca17e71200 Safemode macro cleanup 2015-05-15 10:06:11 +02:00
SAM
7c099c1009 Weaponselect module macro cleanup 2015-05-15 09:59:57 +02:00
bux578
82e4bd0c13 Merge remote-tracking branch 'origin/master' 2015-05-15 09:45:48 +02:00
bux578
4e37f7ea77 add description fields to frontmatter header 2015-05-15 09:45:15 +02:00
ulteq
c00f2c2e09 Fixed the headings in the ab documentation 2015-05-15 09:25:36 +02:00
ulteq
08b6e556c2 Merge pull request #1211 from acemod/AB_Documentation
Overworked the advanced ballistics documentation
2015-05-15 07:14:39 +02:00
Nicolás Badano
71bb655e87 Merge pull request #1213 from BullHorn7/master
Documentation: Fix typos, grammar, redundancy
2015-05-14 21:55:58 -03:00
PabstMirror
297cbaef08 #1212 - Add PREP for explosive's module function 2015-05-14 18:49:11 -05:00
PabstMirror
a07f6091f1 Merge pull request #1207 from acemod/commongPrivates2
Common Privates 2
2015-05-14 18:34:22 -05:00
David
a8da880870 Update captives.md 2015-05-15 02:31:41 +03:00
David
7fe431113c Fix typos/grammar/redundancy 2015-05-15 02:24:53 +03:00
David
94138df4f2 Fix typos/grammar/redundancy 2015-05-15 02:15:54 +03:00
PabstMirror
666db5e245 Fix Typo 2015-05-14 18:13:20 -05:00
David
3313177d64 Fix typos 2015-05-15 02:11:55 +03:00
David
049a708464 Fix typos 2015-05-15 02:05:39 +03:00
ulteq
6ca2be5247 Overworked the advanced ballistics documentation 2015-05-15 01:04:57 +02:00
esteldunedain
032a2f3778 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into viewdistancetweaks
Conflicts:
	addons/viewdistance/XEH_postInit.sqf
2015-05-14 19:54:58 -03:00
ulteq
53ab091ffc Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-05-15 00:27:59 +02:00
ulteq
20756ff29a Merge branch 'dharmab-doc-ballistics' 2015-05-15 00:27:05 +02:00
ulteq
2574e517b9 Merge branch 'doc-ballistics' of https://github.com/dharmab/ACE3 into dharmab-doc-ballistics 2015-05-15 00:26:41 +02:00
PabstMirror
8cab041806 Missing Nametag Settings File from #1196 2015-05-14 17:24:37 -05:00
PabstMirror
d5db268fc0 Clean unused privates 2015-05-14 17:17:41 -05:00
PabstMirror
c27d84e382 Common Privates Redo 2015-05-14 17:12:40 -05:00
jonpas
22c5c03f6f Removed redundant defaultValue and checks 2015-05-15 00:04:20 +02:00
jonpas
6ba4289511 Merge branch 'master' into nametagsToggle
Conflicts:
	addons/nametags/config.cpp
2015-05-14 23:38:11 +02:00
jonpas
d7b617f49e Stringtables fixed, variable macro fixed 2015-05-14 23:33:35 +02:00
Nicolás Badano
d9b6636221 Merge pull request #1196 from Winter259/common-cleanup
Cleanup of nearly all common functions
2015-05-14 18:31:19 -03:00
Dharma Bellamkonda
fdabce85ac Improve ballistics documenation
Thanks @ulteq and vking for feedback and help
2015-05-14 15:30:50 -06:00
jonpas
446ad378ca Fixed variable incosistency, string added for new module option 2015-05-14 23:27:41 +02:00
jonpas
8a2a53ddac Show player names module option added 2015-05-14 23:26:37 +02:00
jonpas
77e13ca5be Seperated ACE_Settings 2015-05-14 23:18:38 +02:00
Dharma Bellamkonda
bdc3b20624 Merge branch 'master' into doc-ballistics
Merge upstream in to make upstream merge easier
2015-05-14 14:31:48 -06:00