Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2025-07-25 12:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
03413ef6b6249724f2dc0852c0edef7db1ef0dc4
ACE3/addons
History
Glowbal 03413ef6b6 Merge branch 'cargo' of github.com:acemod/ACE3 into cargo 
Conflicts:
	addons/cargo/functions/fnc_initVehicle.sqf
2015-08-15 09:51:15 +02:00
..
advanced_ballistics
Merge branch 'release'
2015-08-04 22:29:05 +02:00
ai
Fixed Capitalized folders on include paths
2015-05-20 23:28:10 +02:00
aircraft
Merge branch 'master' into ace_spectator
2015-07-26 14:15:24 +01:00
apl
Merge pull request #1493 from acemod/tacticalladder
2015-06-13 09:37:41 +02:00
atragmx
Capitalization for macro CBA_fnc_addPerFrameHandler
2015-08-04 02:34:38 -05:00
attach
Merge pull request #1977 from acemod/attachClickCooldown
2015-08-08 11:18:20 -05:00
backpacks
Merge branch 'master' into ace_spectator
2015-07-26 14:15:24 +01:00
ballistics
Updated parameterization in Ballistics module.
2015-08-05 01:14:03 +02:00
captives
Finalized settings
2015-08-09 00:21:59 +02:00
cargo
Merge branch 'cargo' of github.com:acemod/ACE3 into cargo
2015-08-15 09:51:15 +02:00
common
Merge pull request #2039 from acemod/medical-menu
2015-08-08 23:11:11 +02:00
concertina_wire
Merge pull request #1977 from acemod/attachClickCooldown
2015-08-08 11:18:20 -05:00
dagr
Merge branch 'master' into ace_spectator
2015-07-26 14:15:24 +01:00
difficulties
…
disarming
Merge branch 'master' into macroSTR
2015-06-02 22:14:32 +02:00
disposable
fixed #2097 - script error because of global variable in params
2015-08-10 09:51:14 +02:00
dragging
CZ - Translation
2015-06-12 15:05:04 +02:00
explosives
Manual Fix #1931
2015-07-28 15:25:52 -05:00
fcs
Macroize all stringtables
2015-06-05 21:02:24 -05:00
finger
Merge branch 'release'
2015-08-04 22:29:05 +02:00
flashsuppressors
Correcting some spacing
2015-06-24 17:09:43 +01:00
fonts
Fixed: Font config breaking checkPBO
2015-05-20 10:42:24 -07:00
frag
Capitalization for macro CBA_fnc_addPerFrameHandler
2015-08-04 02:34:38 -05:00
gforces
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
goggles
Capitalization for macro CBA_fnc_addPerFrameHandler
2015-08-04 02:34:38 -05:00
grenades
Merge branch 'master' into ace_spectator
2015-07-26 14:15:24 +01:00
hearing
Move DoNotForce to common
2015-08-06 12:24:56 -05:00
hitreactions
HitReactions - Don't do when mounted, add setting
2015-05-31 16:16:14 -05:00
huntir
Merge branch 'master' into ace_spectator
2015-07-26 14:15:24 +01:00
interact_menu
Merge pull request #2010 from jokoho48/codeCleanupInteractMenu
2015-08-08 21:35:54 -05:00
interaction
Merge pull request #2027 from acemod/joinGroupTeamManagement
2015-08-08 11:16:20 -05:00
inventory
Merge branch 'master' into macroSTR
2015-06-02 22:14:32 +02:00
javelin
Merge branch 'master' into ace_spectator
2015-07-26 14:15:24 +01:00
kestrel4500
Switch to some already translated CSTRINGs
2015-08-03 15:52:35 -05:00
laser
Merge branch 'release'
2015-08-04 22:29:05 +02:00
laser_selfdesignate
Capitalization for macro CBA_fnc_addPerFrameHandler
2015-08-04 02:34:38 -05:00
laserpointer
Merge pull request #1541 from jonpas/sitting
2015-06-26 21:34:34 +02:00
logistics_uavbattery
Merge branch 'master' into ace_spectator
2015-07-26 14:15:24 +01:00
logistics_wirecutter
Merge branch 'master' into ace_spectator
2015-07-26 14:15:24 +01:00
magazinerepack
Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting
2015-06-13 22:08:13 +02:00
main
Updated version to 3.2.2
2015-08-04 21:36:03 -07:00
map
#1957 - Fix BFT Module / Settings (for 3.2.1)
2015-08-01 00:01:33 -05:00
maptools
#2033 - MapTools work on children of itemMap
2015-08-06 12:14:45 -05:00
markers
Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting
2015-06-13 22:08:13 +02:00
medical
fixes #2070 - medication is not translated on activity log
2015-08-09 20:12:31 +02:00
medical_menu
fixes #2075 - menu doesn't show which bodypart is selected on Basic medical
2015-08-09 20:08:45 +02:00
microdagr
Merge branch 'master' into ace_spectator
2015-07-26 14:15:24 +01:00
missileguidance
Capitalization for macro CBA_fnc_addPerFrameHandler
2015-08-04 02:34:38 -05:00
missionmodules
Capitalization for macro CBA_fnc_addPerFrameHandler
2015-08-04 02:34:38 -05:00
mk6mortar
Mk6 - Misc cleanup
2015-07-26 16:45:34 -05:00
modules
Ace_modules - Pass synced objects to functions
2015-07-01 01:53:15 -05:00
movement
Merge branch 'master' into ace_spectator
2015-07-26 14:15:24 +01:00
mx2a
Merge branch 'master' into ace_spectator
2015-07-26 14:15:24 +01:00
nametags
Fixed incorrect string path in nametags
2015-08-09 01:23:20 +02:00
nightvision
Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting
2015-06-13 22:08:13 +02:00
noidle
…
noradio
Correcting some spacing
2015-06-24 17:09:43 +01:00
norearm
…
optics
Merge branch 'master' into macroSTR
2015-05-30 19:54:32 +02:00
optionsmenu
OptionMenu C->LStrings
2015-08-08 19:57:57 -05:00
overheating
Capitalization for macro CBA_fnc_addPerFrameHandler
2015-08-04 02:34:38 -05:00
overpressure
Fixed Capitalized folders on include paths
2015-05-20 23:28:10 +02:00
parachute
Merge pull request #1974 from jokoho48/parachutePrivateScope
2015-08-08 14:25:40 +02:00
protection
Fix 1.44 Updating Base Class
2015-05-05 10:46:56 -05:00
ragdolls
Fixed Capitalized folders on include paths
2015-05-20 23:28:10 +02:00
rangecard
Merge branch 'master' into ace_spectator
2015-07-26 14:15:24 +01:00
realisticnames
CZ - Translation
2015-06-12 14:50:50 +02:00
recoil
Removed debug output
2015-04-28 19:33:00 +02:00
reload
Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting
2015-06-13 22:08:13 +02:00
reloadlaunchers
Merge branch 'master' into ace_spectator
2015-07-26 14:15:24 +01:00
respawn
#1699 - Rally point object names
2015-07-01 01:27:06 -05:00
safemode
Merge branch 'master' into ace_spectator
2015-07-26 14:15:24 +01:00
sandbag
Merge pull request #2056 from MikeMatrix/codeCleanupSandbag
2015-08-09 23:56:25 +02:00
scopes
count should be a foreach
2015-08-09 00:41:43 +02:00
sitting
Merge pull request #2054 from MikeMatrix/codeCleanupSitting
2015-08-08 17:00:07 +02:00
slideshow
Merge branch 'master' into slideshowFixes
2015-08-08 13:00:11 +02:00
smallarms
…
spottingscope
Cleanup code of Spottingscope module
2015-08-07 11:47:23 +02:00
switchunits
Capitalization for macro CBA_fnc_addPerFrameHandler
2015-08-04 02:34:38 -05:00
tacticalladder
Merge pull request #1977 from acemod/attachClickCooldown
2015-08-08 11:18:20 -05:00
testmissions
Fixed Capitalized folders on include paths
2015-05-20 23:28:10 +02:00
thermals
Fixed Capitalized folders on include paths
2015-05-20 23:28:10 +02:00
tripod
Merge pull request #1977 from acemod/attachClickCooldown
2015-08-08 11:18:20 -05:00
ui
Added ace_ui - enchanced chat visibility on the map screen
2015-05-16 15:28:59 +02:00
vector
Merge branch 'master' into ace_spectator
2015-07-26 14:15:24 +01:00
vehiclelock
vehLock - debug trace / type checking
2015-08-07 13:24:47 -05:00
vehicles
Fixed documentation typo in Vehicles module
2015-08-05 06:02:21 +02:00
viewdistance
fixed missing semi-column
2015-08-08 17:49:43 +02:00
weaponselect
Updated function documentation of Weaponselect
2015-08-08 14:40:23 +02:00
weather
Merge pull request #1980 from MikeMatrix/headDirBasedWindIndication
2015-08-08 14:51:37 +02:00
winddeflection
Updated parameterization in Winddeflection module.
2015-08-04 23:52:16 +02:00
yardage450
Merge branch 'master' into ace_spectator
2015-07-26 14:15:24 +01:00
zeus
Fixed typo that slipped into the code
2015-08-05 08:36:01 +02:00