Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,205 Commits 73 Branches 88 Tags 752 MiB
a428abea84
Commit Graph

3205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
commy2
73fd9ac62e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into parafix 2015-04-17 12:55:07 +02:00
commy2
558a4fb363 Merge pull request #461 from Tenga/altimeter-fix 
Altimeter fix, division by zero when no time has passed (game paused, etc.)
 2015-04-17 12:49:06 +02:00
commy2
45d639b395 disposable cleanup, fix #696 2015-04-17 12:28:06 +02:00
bux578
5c2a44e5c4 Merge pull request #694 from ruPaladin/patch-3 
One more russian translation fix
 2015-04-17 11:12:30 +02:00
ulteq
e04a0c438a Fixed deprecated delete_gun function 2015-04-17 11:05:24 +02:00
commy2
20565e8b02 hide height / velocity while parachuting, freefallig in expert mode, fix 692 2015-04-17 11:02:01 +02:00
ruPaladin
e38a6fc62b one more russian fix 2015-04-17 12:01:01 +03:00
esteldunedain
54daa02aa4 Weather: headers + privates 2015-04-17 01:44:38 -03:00
PabstMirror
7d5a70246b Remove unnecessary cfgSounds 2015-04-16 22:10:33 -05:00
esteldunedain
bdd3422150 Allow to dynamically modify actions at runtime. An optional code entry called modifierFunction can be added. That code is called before evaluating the action, allowing to dynamically change the actions name, icon, etc 2015-04-16 23:53:54 -03:00
PabstMirror
1729c781bd Cleanup / private vars 2015-04-16 19:46:42 -05:00
PabstMirror
53af014eab Fix Localization in value[] array 2015-04-16 19:29:39 -05:00
PabstMirror
4e5c2ef187 option menu ui scaling 2015-04-16 19:11:42 -05:00
PabstMirror
e12831bee4 #678 - Missing Text Height in settingMenu 2015-04-16 15:17:56 -05:00
jaynus
ce4a9c3676 Apply javelin guidance to static titans. 2015-04-16 11:32:47 -07:00
ulteq
4ef80ab3a3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-16 20:14:33 +02:00
PabstMirror
fa6cb3e75c #672 - Don't show speaking icon for unconc players 2015-04-16 12:58:54 -05:00
ulteq
a7507fefef Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-16 19:55:48 +02:00
ulteq
1794606304 Got rid of the __DSP macro 2015-04-16 19:52:20 +02:00
KoffeinFlummi
3d14b171a6 Make make.py itself support 32-&64-bit systems ... 
... because having two different files is dumb.
 2015-04-16 19:38:07 +02:00
jaynus
4a1dd6a957 Merge pull request #661 from rlex/master 
Add link for issue report details
 2015-04-16 10:37:39 -07:00
PabstMirror
638433614c Some missing private defines. 2015-04-16 12:36:16 -05:00
Nicolás Badano
95cab9d0e7 Merge pull request #671 from Legolasindar/master 
added spanish translation
 2015-04-16 14:18:41 -03:00
PabstMirror
3dfcbe42b8 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-16 12:10:44 -05:00
PabstMirror
e06fd7350e DEFAULT_PARAM KEY_PARAM private check 2015-04-16 12:10:40 -05:00
jaynus
3d7ae5e3a1 Merge branch 'master' of github.com:acemod/ACE3 2015-04-16 10:10:31 -07:00
jaynus
6a942ac820 Fixed: ACE_Fake**** Was showing in arsenal. Fixes #670 2015-04-16 10:10:24 -07:00
jaynus
8837355d29 Merge remote-tracking branch 'origin/master' into guidanceHandoff 2015-04-16 10:04:57 -07:00
Ivan Navarro Cabello
61d1e6854e added spanish translation 
added spanish translation to ballistics and respawn
 2015-04-16 19:03:15 +02:00
ulteq
c79afeb2fe Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-16 19:03:06 +02:00
ulteq
668888de81 Fixed constant name not following the coding-guideline 2015-04-16 19:00:37 +02:00
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
Legolasindar
3426237b6c Merge pull request #4 from acemod/master 
update my master fork
 2015-04-16 18:52:06 +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
jaynus
bce4f14cc8 Merge remote-tracking branch 'origin/laserCodes' into guidanceHandoff 2015-04-16 09:40:47 -07:00
jaynus
6d93fe45a6 Guidance handoff to guiding unit/laser shooter. This needs LOBL vs. LOAL capability. 2015-04-16 09:35: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