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
4,048 Commits 73 Branches 88 Tags 752 MiB
2aa788bba2
Commit Graph

4048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ulteq
79ff3146b5 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-27 12:40:28 +02:00
ulteq
04d3a31b5b Fixed a typo 2015-04-27 12:34:21 +02:00
ulteq
3c91f6abe3 Added ace/module settings for ace_weather: 
*enableServerController // weather propagation on the server
*useACEWeather // disable ace weather
*syncRain
*syncWind
*syncMisc
 2015-04-27 12:28:56 +02:00
ulteq
135157419e Merge pull request #876 from Brisse89/patch-2 
Realistic weapon names: Update stringtable.xml
 2015-04-27 12:20:43 +02:00
Brisse89
ecaa23ada2 Update stringtable.xml 
Removed the space in HK121
 2015-04-27 12:17:36 +02:00
Brisse89
faa17d0e56 Update stringtable.xml 
Noreen Bad News -> Noreen "Bad News" ULR
 2015-04-27 12:13:09 +02:00
Brisse89
3339759321 Update stringtable.xml 
Is this better? 
SIG 762 -> SIG 556
HK 122 -> HK 121
 2015-04-27 11:58:39 +02:00
ulteq
579936c781 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into fragCleanup 2015-04-27 11:22:49 +02:00
ulteq
b0876ca394 Enables: d64783fca1 2015-04-27 11:06:16 +02:00
ulteq
d6f757e096 Enabled scope adjustments for the Khalia (old) optic 2015-04-27 11:04:12 +02:00
Brisse89
db553644aa Update stringtable.xml 
Is this okay? 
MAR-10 -> Noreen Bad news
EMR-1 -> SIG 762
Navid -> HK 122
 2015-04-27 10:24:42 +02:00
commy2
276d3e4683 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-27 02:40:26 +02:00
commy2
d64783fca1 remove the calibers from the weapon names 2015-04-27 02:40:04 +02:00
Felix Wiegand
f34fc66385 Merge pull request #875 from Brisse89/patch-1 
Update AUTHORS.txt
 2015-04-26 23:55:59 +02:00
Brisse89
882bfd711b Update AUTHORS.txt 
Added myself, including e-mail (only made two minor contributions so far though)
 2015-04-26 23:50:03 +02:00
simon84
e2a15a3487 Merge branch 'master' of https://github.com/simon84/ACE3 2015-04-26 23:39:12 +02:00
ulteq
1fc044dfa9 Cleanup++: 
*Moved GVAR(enabled) into ACE_Settings.hpp
*Replaced BIS_fnc_magnitude with vectorMagnitude
*Renamed Nou_GBU12
*Added G_40mm_HE config data
 2015-04-26 23:14:54 +02:00
ulteq
6170ef0d50 Code cleanup 2015-04-26 23:05:58 +02:00
Grzegorz
3b9019e363 Update stringtable.xml 2015-04-26 23:01:42 +02:00
Grzegorz
3d5f7b1bf0 Update stringtable.xml 2015-04-26 23:01:31 +02:00
Grzegorz
78329110a1 Update stringtable.xml 2015-04-26 23:01:18 +02:00
Grzegorz
5add444026 Update stringtable.xml 2015-04-26 23:01:10 +02:00
Grzegorz
cfd9c6b3e9 Update stringtable.xml 2015-04-26 23:01:02 +02:00
Grzegorz Sikora
a272258500 PL translation 2015-04-26 22:59:20 +02:00
ulteq
3e5462f3d4 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-26 22:50:54 +02:00
ulteq
9c322d5a22 Added module descriptions for advanced ballistics and wind deflection 2015-04-26 22:50:47 +02:00
ulteq
af2dc62705 Improved a module setting description 2015-04-26 22:44:18 +02:00
Grzegorz Sikora
1c52259f22 Merge branch 'master' of https://github.com/gienkov/ACE3 2015-04-26 22:34:00 +02:00
Grzegorz Sikora
0f47d8bfb2 PL translation 2015-04-26 22:33:25 +02:00
ulteq
9bd32f5797 Fixed an incorrect module setting description 2015-04-26 22:33:11 +02:00
KoffeinFlummi
365f1e025b Merge remote-tracking branch 'origin/GermanMedicalTranslation' into german-merge 
Conflicts:
	addons/medical/stringtable.xml
 2015-04-26 22:04:39 +02:00
ulteq
58395b166b Fixed a typo 2015-04-26 21:29:43 +02:00
ulteq
3aa759f914 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-26 21:28:27 +02:00
ulteq
227f4827f2 Added advanced_ballistics and weather shortcuts 2015-04-26 21:28:16 +02:00
commy2
d2d54f6760 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-26 21:27:29 +02:00
commy2
4e0e9c9e85 Merge branch 'nikolauska-master' 2015-04-26 21:27:11 +02:00
commy2
aabe532829 manual merge 2015-04-26 21:26:57 +02:00
ulteq
a148ded254 Added an e-mail address 2015-04-26 21:15:04 +02:00
KoffeinFlummi
b472292b20 Remove tabler comments. 
sed is awesome.
 2015-04-26 21:05:41 +02:00
KoffeinFlummi
1bb8628109 Merge https://github.com/simon84/ACE3 into german-merge 2015-04-26 21:00:22 +02:00
commy2
ac51d45f11 Merge pull request #848 from acemod/recoiltweaks 
tweaking recoil
 2015-04-26 20:59:27 +02:00
commy2
9fed22cdcc Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-26 20:58:14 +02:00
commy2
f5d7331847 no team management on the dead or unconscious units, fix #803 2015-04-26 20:57:55 +02:00
Felix Wiegand
384ff3c9b0 Add biprivatekeys to gitignore 
... just in case.
 2015-04-26 20:12:11 +02:00
commy2
9b8e130b1f Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-26 19:33:23 +02:00
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