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
ACE3/addons
History
esteldunedain 6f4bb48489 Merge branch 'master' into linearMenuExperiment 
Conflicts:
	addons/attach/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/overheating/stringtable.xml
	extensions/CMakeLists.txt
2015-04-14 19:09:57 -03:00
..
advanced_ballistics
AB and Kestrel: Move macros from defines.h to script_component
2015-04-14 10:22:26 -03:00
ai
increase engagement ranges / burst mode on new mmg / full auto dmr
2015-04-12 18:21:28 +02:00
aircraft
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
atragmx
Merge pull request #574 from gienkov/master
2015-04-14 10:10:59 -03:00
attach
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
backpacks
Switch everything to use modelToWorldVisual instead of modelToWorld.
2015-04-03 15:26:27 -07:00
ballistics
Updated stringtable
2015-04-13 21:36:47 +02:00
captives
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
common
Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge
2015-04-14 15:04:42 +02:00
difficulties
Create README.md
2015-01-26 13:37:41 +01:00
disarming
Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge
2015-04-14 15:04:42 +02:00
disposable
Merge https://github.com/Anthariel/ACE3 into french-merge
2015-04-13 13:31:48 +02:00
dragging
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
explosives
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
fcs
Merge https://github.com/gienkov/ACE3 into polish-merge
2015-04-13 13:00:59 +02:00
flashsuppressors
Fixes
2015-04-13 18:02:48 +02:00
frag
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
gforces
Cleaning up of all tabs in source code files.
2015-04-06 09:22:43 -07:00
goggles
Merge https://github.com/Kllrt/ACE3 into czech-merge
2015-04-12 14:27:59 +02:00
grenades
Fixes
2015-04-13 18:02:48 +02:00
hearing
Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge
2015-04-14 15:04:42 +02:00
hitreactions
prevent ai fro being stuck, #290
2015-04-09 16:54:50 +02:00
interact_menu
Merge branch 'master' into linearMenuExperiment
2015-04-14 19:09:57 -03:00
interaction
Merge branch 'master' into linearMenuExperiment
2015-04-14 19:09:57 -03:00
inventory
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
javelin
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
kestrel4500
AB and Kestrel: Move macros from defines.h to script_component
2015-04-14 10:22:26 -03:00
laser
Remove thermal, prep for coding.
2015-04-12 16:44:39 -07:00
laser_selfdesignate
Merge branch 'master' into linearMenuExperiment
2015-04-14 19:09:57 -03:00
laserpointer
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
logistics_uavbattery
Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge
2015-04-14 15:04:42 +02:00
logistics_wirecutter
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
magazinerepack
Merge branch 'master' into linearMenuExperiment
2015-04-14 19:09:57 -03:00
main
Revert "Translation"
2015-04-10 19:46:18 +03:00
map
Merge pull request #392 from KoffeinFlummi/requiredaddons
2015-04-09 16:37:47 +02:00
maptools
Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge
2015-04-14 15:04:42 +02:00
markers
Revert "Revert "Russian Translation""
2015-04-11 21:33:34 +03:00
medical
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
microdagr
Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge
2015-04-14 15:04:42 +02:00
missileguidance
Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge
2015-04-14 15:04:42 +02:00
missionmodules
Cleaning up of all tabs in source code files.
2015-04-06 09:22:43 -07:00
modules
Indentation
2015-03-22 12:45:46 +01:00
movement
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
nametags
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
nightvision
Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge
2015-04-14 15:04:42 +02:00
noidle
indentation
2015-03-26 18:03:13 +01:00
noradio
mute implementation in noradio, handle post init on remote units
2015-04-12 11:17:58 +02:00
norearm
hide rearm action for players
2015-03-26 14:14:56 +01:00
optics
fix misc issues with optics, fix #537
2015-04-13 12:04:43 +02:00
optionsmenu
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
overheating
Merge branch 'master' into linearMenuExperiment
2015-04-14 19:09:57 -03:00
overpressure
Cleaning up of all tabs in source code files.
2015-04-06 09:22:43 -07:00
parachute
rewrite assigned item fix
2015-04-10 18:31:43 +02:00
protection
manual merge
2015-04-08 22:01:41 +02:00
ragdolls
Add remaining READMEs, add helper script
2015-01-26 14:34:48 +01:00
realisticnames
Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge
2015-04-14 15:04:42 +02:00
reload
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
reloadlaunchers
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
respawn
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
safemode
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
scopes
AdvBal PL translation
2015-04-14 11:42:52 +02:00
smallarms
Cleaning up of all tabs in source code files.
2015-04-06 09:22:43 -07:00
switchunits
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
testmissions
Cleaning up of all tabs in source code files.
2015-04-06 09:22:43 -07:00
thermals
Add remaining READMEs, add helper script
2015-01-26 14:34:48 +01:00
vector
how do I merge
2015-04-13 19:23:42 +02:00
vehiclelock
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
vehicles
Switching nicknames
2015-03-24 01:18:00 -03:00
weaponselect
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
weather
AdvBal PL translation
2015-04-14 11:42:52 +02:00
winddeflection
Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge
2015-04-14 15:04:42 +02:00