Commit Graph

66 Commits

Author SHA1 Message Date
PabstMirror
1a98726716 Add makeLoadable sync module 2016-01-21 22:12:54 -06:00
Thomas Kooi
e669f3e2cb Merge pull request #2699 from BaerMitUmlaut/disable-nvgs-in-sight
Disable nvgs in sight
2015-11-28 20:37:30 +01:00
Thomas Kooi
581f71f8a1 Merge pull request #2141 from GitHawk/refuel
Adding vehicle refueling
2015-11-26 16:16:13 +01:00
IngoKauffmann
fd2fd3241e Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm 2015-11-23 19:37:10 +01:00
IngoKauffmann
cbe8d98f86 Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel 2015-11-23 19:29:05 +01:00
PabstMirror
1c26f6c9f5 Captives - Module to set handcuffing
also add player check for GVAR(requireSurrender) in canApplyHandcuffes
2015-10-23 14:17:31 -05:00
IngoKauffmann
8a4b3a117a Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm 2015-10-18 12:49:36 +02:00
IngoKauffmann
b5568ca0db Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel
Conflicts:
	optionals/compat_bwa3/config.cpp
2015-10-10 13:13:30 +02:00
BaerMitUmlaut
edb76ffae4 Initial commit 2015-10-07 20:11:07 +02:00
IngoKauffmann
214c639839 Added module icon 2015-08-15 23:38:08 +02:00
IngoKauffmann
957756893c Updated module icon 2015-08-15 23:35:05 +02:00
PabstMirror
a2897e6d32 Merge branch 'master' into cargo 2015-08-15 03:11:19 -05:00
Glowbal
d8084e20d7 Added cargo settings and settings module. 2015-08-15 09:50:00 +02:00
jonpas
d3fda398cb Moved slideshow module icon to proper location 2015-08-11 21:36:26 +02:00
SilentSpike
159937dc45 Merge branch 'master' into ace_spectator
Conflicts:
	addons/explosives/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/stringtable.xml
	addons/medical/stringtable.xml
	addons/sitting/stringtable.xml
	addons/spectator/stringtable.xml
	extras/assets/icons/Icons_Modules.psd
2015-07-26 14:15:24 +01:00
SilentSpike
13201866bd Module icon 2015-07-17 23:31:31 +01:00
jonpas
71609c70e6 Properly moved PNGs and shortened folder tree of extras/assets/icons, Added Thumbs.db to .gitignore 2015-06-29 22:21:07 +02:00
jonpas
f1f9ee1365 Added module icon, removed comment 2015-06-09 18:27:58 +02:00
ulteq
fc4095c11d Added the yardage manual 2015-06-03 16:32:19 +02:00
SilentSpike
e3c09a7099 Added icon to unconscious module 2015-06-01 20:56:58 +01:00
SilentSpike
b72512e3f1 Zeus modules require larger icons 2015-06-01 20:44:50 +01:00
SilentSpike
cd6474c748 Adding module icons 2015-06-01 20:44:47 +01:00
ulteq
5c8e79c50a Updated all airFriction values according to: extras/airFrictionAnalysis.txt 2015-05-31 16:45:59 +02:00
KoffeinFlummi
5e33176b52 Convert ACE_barrelLength(s) to millimeters 2015-05-08 12:47:45 +02:00
KoffeinFlummi
aa9561f287 Convert ACE_barrelTwist to millimeters 2015-05-08 12:46:44 +02:00
KoffeinFlummi
adc758cd14 Convert ACE_bulletLength to millimeters 2015-05-08 12:45:17 +02:00
KoffeinFlummi
ce8e192a01 Convert ACE_caliber to millimeters 2015-05-08 12:44:06 +02:00
KoffeinFlummi
4b3a111681 Convert ACE_barrelLength to meters 2015-05-07 18:44:01 +02:00
KoffeinFlummi
3313582aec Convert ACE_barrelTwist to meters 2015-05-07 18:41:54 +02:00
KoffeinFlummi
68c9127753 Convert ACE_barrelLengths to meters 2015-05-07 18:39:57 +02:00
KoffeinFlummi
27c8255987 Convert ACE_bulletMass to grams 2015-05-07 18:33:34 +02:00
KoffeinFlummi
b20c42398b Convert ACE_bulletLength to meters 2015-05-07 18:29:02 +02:00
KoffeinFlummi
4eaab93fd1 Convert ACE_caliber to meters 2015-05-07 18:21:15 +02:00
Felix Wiegand
6b5fa25ba9 Merge pull request #334 from acemod/mk6tweaks
Vanilla Mortars - Rangetables/Tweaks
2015-04-25 20:27:20 +02:00
ulteq
9f2196ffcf Spaces 2015-04-24 19:56:51 +02:00
PabstMirror
aa7de84783 Merge branch 'master' into mk6tweaks 2015-04-23 13:34:25 -05:00
bux578
8a55c282e1 add repair module icon 2015-04-21 13:27:45 +02:00
ulteq
387572c560 Added some weapon class reference data 2015-04-20 22:29:15 +02:00
ulteq
404eb87631 Added some ammo class reference data 2015-04-20 22:24:37 +02:00
ulteq
2332f19274 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics
Conflicts:
	addons/ballistics/stringtable.xml
	addons/magazines/CfgAmmo.hpp
	addons/magazines/CfgMagazines.hpp
	addons/magazines/CfgVehicles.hpp
	addons/magazines/CfgWeapons.hpp
	addons/magazines/newclasses.txt
2015-04-13 21:35:53 +02:00
bux578
9184ef479a add disarm icon, add action psd, move icon files 2015-04-12 14:47:08 +02:00
ulteq
ad8e6450eb Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 2015-04-10 15:44:33 +02:00
PabstMirror
656fa8868a Module Icons 2015-04-07 19:37:46 -05:00
KoffeinFlummi
b2de6a0013 Move syntax highlighting to extras/ 2015-04-07 21:39:49 +02:00
ulteq
c1aad2a0f5 Added manuals for the Horus ATrag and Kestrel 4500. 2015-04-06 11:39:21 +02:00
bux578
c44b944044 add missing icons 2015-03-25 06:32:08 +01:00
bux578
60c50e0daf Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons 2015-03-24 19:12:23 +01:00
Nicolás Badano
eb557bf777 Make interac_menu work in real 2D:
- Children positions are calculated directly on screen space
- Saves a lot of worldToScreen, ATLtoASL, etc calls
- Selector is now a control instead of a 3D icon
2015-03-23 18:08:31 -03:00
bux578
ba42ec831b second batch of icons 2015-03-23 20:02:35 +01:00
bux578
1114e12186 add first batch of module icons, naming conventions 2015-03-23 13:56:59 +01:00