Commit Graph

3046 Commits

Author SHA1 Message Date
jaynus
9db256ad8d ignore preceeding numbers 2015-04-16 09:54:52 -07:00
ulteq
aeffc55859 Added missing privates 2015-04-16 18:52:48 +02:00
jaynus
3c4a3c67db Merge branch 'master' of github.com:acemod/ACE3 2015-04-16 09:48:27 -07:00
jaynus
9d87f08aa6 Regex's kill kids. 2015-04-16 09:48:21 -07:00
KoffeinFlummi
bf0aa6f344 Merge branch 'spanish-merge' 2015-04-16 18:32:37 +02:00
KoffeinFlummi
11f9478035 Merge https://github.com/Legolasindar/ACE3 into spanish-merge
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/atragmx/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/javelin/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/scopes/stringtable.xml
	addons/weather/stringtable.xml
2015-04-16 18:31:31 +02:00
ulteq
d82d9984d8 Added missing parentheses 2015-04-16 18:29:23 +02:00
jaynus
cdb460d36d Merge branch 'master' of github.com:acemod/ACE3 2015-04-16 09:22:16 -07:00
jaynus
4c749a30cf ignore leading numbers search_privates 2015-04-16 09:22:11 -07:00
ulteq
4e4dee18df Added missing privates / Removed unused privates 2015-04-16 18:21:19 +02:00
ulteq
fa39e8f001 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-16 18:14:42 +02:00
ulteq
e35d3dab49 Overworked the ATragMX target slot logic:
*Added missing privates
*Solutions are now automatically calculated on target/gun selection
2015-04-16 18:14:32 +02:00
jaynus
43016e6766 Merge branch 'master' of github.com:acemod/ACE3 2015-04-16 09:00:29 -07:00
jaynus
b50c615e2c Updated for module-specific command line argument. 2015-04-16 09:00:22 -07:00
Nicolás Badano
b1328a9c00 Merge pull request #669 from Tachii/patch-6
Update AUTHORS.txt
2015-04-16 12:59:24 -03:00
ulteq
5117595ecc Minor performance improvement 2015-04-16 17:52:21 +02:00
jaynus
517242be99 Merge branch 'master' of github.com:acemod/ACE3 2015-04-16 08:46:16 -07:00
jaynus
fe7596d28d handles CBA PARAMS_ and EXPLODE_ 2015-04-16 08:46:11 -07:00
ulteq
defe46b769 Added new PFH abort condition (velocity < 100 m/s) 2015-04-16 17:30:50 +02:00
Tachii
e6f29cfdb1 Update AUTHORS.txt 2015-04-16 18:23:00 +03:00
bux578
2e0ab35af9 Merge pull request #668 from Tachii/patch-5
Update stringtable.xml
2015-04-16 17:21:03 +02:00
Tachii
f5078020fb Update AUTHORS.txt
https://github.com/acemod/ACE3/blob/master/addons/movement/config.cpp

I want to be famous!
2015-04-16 18:20:40 +03:00
Tachii
2466d83cac Update stringtable.xml 2015-04-16 18:19:11 +03:00
jaynus
54b7022bc1 Merge branch 'master' of github.com:acemod/ACE3 2015-04-16 08:18:41 -07:00
jaynus
184d7c8506 Tool addition. Search for missing private declarations by file. 2015-04-16 08:18:30 -07:00
bux578
62a422e36a Merge pull request #667 from Tachii/patch-4
Update stringtable.xml
2015-04-16 17:17:35 +02:00
Tachii
def2f9c28e Update stringtable.xml 2015-04-16 18:13:53 +03:00
bux578
8f325860e0 Merge pull request #666 from Tachii/patch-3
Update stringtable.xml
2015-04-16 17:10:53 +02:00
Tachii
dca11e523b Update stringtable.xml 2015-04-16 18:08:58 +03:00
Nicolás Badano
8cb167d1be Merge pull request #663 from ruPaladin/patch-1
addons/realisticnames translation to Russian
2015-04-16 10:06:12 -03:00
bux578
66f5ad5142 Merge pull request #664 from Coren4/master
Translation
2015-04-16 15:04:26 +02:00
Coren4
4ff68eabd4 Update stringtable.xml 2015-04-16 14:59:19 +02:00
Coren4
4686203d2c Merge pull request #1 from acemod/master
Update
2015-04-16 14:57:31 +02:00
ulteq
55d9f7a3da The previous GUI state is now restored when you open the ATragMX 2015-04-16 13:46:32 +02:00
ulteq
d6cadb593a Enabled the ATragMX to use the advanced ballistics extension 2015-04-16 13:44:54 +02:00
ulteq
ca3293aa1a Added ACE_Box_Ammo (WIP):
*TODO: Define a model
2015-04-16 13:43:41 +02:00
ulteq
15240ac87c Minor code change in the extension detection logic 2015-04-16 13:42:28 +02:00
ruPaladin
e00dd1c2f2 addons/realisticnames translation to Russian 2015-04-16 14:10:48 +03:00
ulteq
aa724129d1 Tuned down the default timeToLive value. 2015-04-16 10:51:33 +02:00
PabstMirror
9c9136ae91 Stringtable cleanup 2015-04-16 02:54:50 -05:00
PabstMirror
b2625c43e7 #644 - Extra Space in macro 2015-04-15 20:30:09 -05:00
commy2
8d8ae3dadb Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-16 02:00:55 +02:00
commy2
4169351b1a fix addActionEH didn't work after respawn 2015-04-16 02:00:37 +02:00
Glowbal
59ae4623ff Derp 2015-04-16 00:17:17 +02:00
Glowbal
f3ca1a85b9 Merge branch 'master' of github.com:acemod/ACE3 2015-04-16 00:15:57 +02:00
Glowbal
0f4b7d0977 fixes #347
Please??
2015-04-16 00:14:05 +02:00
PabstMirror
0076be6a86 Fix stringtables 2015-04-15 17:08:35 -05:00
PabstMirror
c0c5af2957 ballistics - fix ubc 2015-04-15 17:07:06 -05:00
PabstMirror
361efe4147 Missing NoVoice words
Protocol bin\config.bin/ACE_RadioProtocolNoRadio/: Missing word RallyUp
/ UnderFireE
2015-04-15 17:04:03 -05:00
bux578
c2815bb180 Merge pull request #641 from Tachii/patch-2
Update fnc_createAction.sqf
2015-04-16 00:01:39 +02:00