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
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
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
bux578
9184ef479a
add disarm icon, add action psd, move icon files
2015-04-12 14:47:08 +02:00
PabstMirror
656fa8868a
Module Icons
2015-04-07 19:37:46 -05: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
Glowbal
5390c3668e
Added icon microDAGR
2015-03-13 18:43:21 +01:00
bux578
e86270d03b
fix eps
2015-03-12 14:50:25 +01:00
bux578
192934e3b1
add logo variants
...
red: #ba2619
2015-03-12 10:22:23 +01:00
bux578
b6423cc011
add icons psd
2015-03-11 10:38:22 +01:00