Commit Graph

5609 Commits

Author SHA1 Message Date
commy2
5320f4c6b7 fix broken parse text cache in some cases 2015-04-26 19:33:08 +02:00
commy2
6aea424f6d Merge pull request #872 from acemod/muteuncon
mute unconsious units
2015-04-26 17:40:51 +02:00
commy2
7319a3dbc6 remove obsolete config entries 2015-04-26 17:38:48 +02:00
commy2
31ae05dd6e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-26 17:26:16 +02:00
commy2
90f1d1f3fa those damn mine detectors, also fix advanced medical box not showing up in zeus 2015-04-26 17:25:56 +02:00
Glowbal
4612298917 Merge pull request #864 from acemod/Add-translations-for-adv.-medical
Add translations for adv. medical
2015-04-26 17:06:36 +02:00
commy2
d6f2ac95dd fix ace ammo box doesn't show up in zeus 2015-04-26 17:04:49 +02:00
commy2
8976b6983d mute unconsious units 2015-04-26 16:47:36 +02:00
bux578
28a8fbc4fe fix vector name
it's the vector 21 not the vector IV
2015-04-26 15:36:47 +02:00
Grzegorz Sikora
b73e4cfb05 Merge branch 'master' of https://github.com/gienkov/ACE3 2015-04-26 15:13:12 +02:00
Grzegorz
7ebf5e5a10 Merge pull request #7 from acemod/master
Update master
2015-04-26 15:11:12 +02:00
Simon Reuter
769953d8c1 Update AUTHORS.txt
Added email address.
2015-04-26 14:46:04 +02:00
bux578
6cc4f48eb2 Uppercase Injuries 2015-04-26 14:19:28 +02:00
bux578
67dc600cae Merge branch 'master' of https://github.com/acemod/ACE3 into Add-translations-for-adv.-medical 2015-04-26 14:02:47 +02:00
bux578
b3c461b9da last few translations 2015-04-26 14:02:14 +02:00
commy2
71f29466d7 Merge pull request #866 from acemod/interfix
imenu: remove shadow, fix caching
2015-04-26 12:42:17 +02:00
commy2
f96deadd20 imenu: remove shadow, fix caching 2015-04-26 12:41:15 +02:00
bux578
b2dd065429 remove comment 2015-04-26 12:27:06 +02:00
Glowbal
b266734f6e Merge branch 'master' into medicalImprovements 2015-04-26 11:20:04 +02:00
Glowbal
fc08ebb0a5 added "isNotInside" exception to unload 2015-04-26 11:19:25 +02:00
bux578
dec47dade8 ups, remove test code 2015-04-26 09:38:56 +02:00
bux578
0aa2b31dd4 gj git 2015-04-26 09:37:02 +02:00
bux578
171cea998e add most of the translations 2015-04-26 09:36:51 +02:00
ulteq
ad6176832d Completed the CfgWeapon and CfgAmmo config entries 2015-04-26 09:26:01 +02:00
ulteq
5ed7cee6fd Fixed a copy&paste typo 2015-04-26 09:22:04 +02:00
VyMajoris
ba89bc8faa Added - Myself to AUTHORS.txt 2015-04-26 03:15:25 -03:00
VyMajoris
523cb49ff1 Added - Portuguese translation to lots of things.
Also fixed a typo the english key for STR_ACE_microdagr_configure.
2015-04-26 03:09:16 -03:00
bux578
1c5c432392 fix vector list 2015-04-26 08:00:16 +02:00
bux578
4e6c6a46d7 add vector21 to getting started 2015-04-26 07:51:13 +02:00
KoffeinFlummi
f7315a6879 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-26 01:04:02 +02:00
KoffeinFlummi
9a8dd5ee41 Merge branch 'patch-4' of https://github.com/ruPaladin/ACE3 into russian-merge
Conflicts:
	addons/medical/stringtable.xml
2015-04-26 01:03:29 +02:00
Felix Wiegand
6ac0341090 Merge pull request #685 from Tourorist/master
README cleanup + Wiki revision
2015-04-26 01:00:48 +02:00
KoffeinFlummi
9ac662ea7c Lowercase curator ammo frag entries 2015-04-26 00:01:48 +02:00
KoffeinFlummi
59bdc23a95 Merge branch 'master' into curatorFragmentation 2015-04-25 23:55:29 +02:00
commy2
986d2ee168 fix c&p error 2015-04-25 23:41:20 +02:00
KoffeinFlummi
772ac6056b Move german README to documentation/ 2015-04-25 23:21:52 +02:00
KoffeinFlummi
d8395b0f07 Merge branch 'readme_de' of https://github.com/licht-im-Norden87/ACE3 into german-readme 2015-04-25 23:21:19 +02:00
PabstMirror
ca980379c8 Minor captive cleanup 2015-04-25 16:03:21 -05:00
PabstMirror
898d6c74a8 #854 - No canInteractWith check for Ace_MainAction
Was preventing subactions from showing.
2015-04-25 16:02:59 -05:00
Glowbal
11d86248a7 Reorganised module and settings #809 2015-04-25 22:20:28 +02:00
Glowbal
3aab1f782c Merge pull request #826 from acemod/medicalDocumentation
Medical system documentation
2015-04-25 21:48:50 +02:00
ulteq
ca6a559557 Fixed a typo 2015-04-25 21:18:09 +02:00
Felix Wiegand
393d7b330e Merge pull request #845 from acemod/removeObsoletePBOs
Remove obsolete PBOs
2015-04-25 20:47:40 +02:00
Felix Wiegand
057c060212 Merge pull request #822 from acemod/frag-lowercase
Convert frag config entry names to lowercase
2015-04-25 20:46:59 +02:00
Felix Wiegand
dc7c7fcaf5 Merge pull request #811 from gienkov/master
PL translation
2015-04-25 20:46:47 +02:00
PabstMirror
2d3606302f Merge pull request #464 from acemod/fixFiredNear
Hearing: Fix firedNear not working in vehicles
2015-04-25 13:34:18 -05:00
ulteq
f63be1ce69 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-25 20:30:13 +02:00
ulteq
bccf07cafb Fixes: https://github.com/acemod/ACE3/issues/855 2015-04-25 20:30:03 +02:00
ulteq
8c8d023345 Fixed compat_rh_m4 module component name 2015-04-25 20:29:45 +02:00
ulteq
e873aa1943 Removed unused config entries 2015-04-25 20:29:27 +02:00