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
10,612 Commits 73 Branches 88 Tags 752 MiB
8f86482a86
Commit Graph

8747 Commits

Author SHA1 Message Date
jonpas
13df3efce2 Prepare 3.7.0 RC4 2016-09-06 22:56:22 +02:00
commy2
6e99e8a951 don't let tripod fall over as easily (#4352) 2016-09-06 21:55:23 +02:00
PabstMirror
1a4ed7b7b4 Grenades - disable throw mode / keybind if advThrow (#4350) 2016-09-06 21:54:42 +02:00
commy2
5cd9b56866 don't let tripod fall over as easily (#4352) 2016-09-06 21:53:38 +02:00
PabstMirror
a320a56813 Fix blood bags not showing in medical menu (#4351) 
fix #4306
 2016-09-06 21:52:22 +02:00
PabstMirror
4781903be6 Add setting for medical ai 2016-09-06 21:48:46 +02:00
PabstMirror
ec4c2276a5 Add setting for medical ai 2016-09-05 22:35:01 -05:00
Glowbal
f3dc1afdbf Prepare 3.7.0 RC3 2016-09-05 22:27:30 +02:00
PabstMirror
4fd5d6be6c Fix handleDamage params for addDamageToUnit (#4344) 2016-09-05 22:27:00 +02:00
BaerMitUmlaut
a096439f36 Moved particles component to optionals (#4341) 2016-09-05 20:50:30 +02:00
PabstMirror
a585a36ced Add ace mags to 7.62 SPAR_03 (#4340) 2016-09-05 20:33:12 +02:00
jonpas
2034234940 Refuel nozzle taking, disconnecting, connecting and returning interaction fixes (#4337) 
* Prevent taking or disconnecting a nozzle if already carrying one

* Fix multiple nozzle connect actions, Fix returning nozzle into a vehicle being refueled
 2016-09-05 20:23:28 +02:00
jonpas
2474da36b3 Fix pick up delay and IR chemlights, prevent picking up GL and mortar smoke shells (#4336) 
* Fix pick up interaction not rendering right after throw, Prevent GL rounds from being picked up

* Prevent picking up GL and mortar smoke shells

* Fix pick up delay properly, Add separate define for quick throwing (for use when debugging)

* Fix forgotten rename in IR chemlight handling
 2016-09-05 20:23:03 +02:00
Glowbal
be8b4468af Increment build number 2016-09-05 08:27:58 +02:00
PabstMirror
7055b242e4 Fix AF author String (#4330) 2016-09-04 22:34:48 +02:00
PabstMirror
f21d45392f SPAR use ACE Magazines - Fix #4207 (#4329) 2016-09-04 21:56:05 +02:00
Glowbal
849a2cd475 Prepare 3.7.0 2016-09-04 21:51:36 +02:00
Glowbal
5034dffec8 Fix build error with make 2016-09-04 21:51:13 +02:00
BaerMitUmlaut
cc414de8d1 Add Advanced Fatigue component (#4321) 
* Initial commit advanced fatigue

* Added animation changes

* Fixes, rewrites

* Broadcast 3den attribute and fix UBC

* Further animation tweaks

* Added Eden attribute and CBA settings

* Switch to CBA events

* Add beautified component name

* Rewrites, fixes, tweaks

* Move setVars to GVARs

* Add setting to disable

* Switch to status effect handler for sprint and jog blocking

* Add component name

* Failsafe for early unit player EH

* Removed raised weapon penalty for pistols

* Added respawn compatibility

* Tweaked side jog animation speed

* Added support for virtual load

* Added stamina bar

* Remove debug flags

* Added custom duty factor functions and values

* Added structural comments

* Disabled CBA settings, added ACE settings

* Fixed config

* Added readme

* Remove leftover debug diag_logs

* Improved stringtable
 2016-09-04 21:33:07 +02:00
PabstMirror
7314f863f6 Add spare barrel to VA in 1.64 (#4328) 
Close #4325
 2016-09-04 21:26:15 +02:00
PabstMirror
0848b6d1de Fix script errors (#4327) 2016-09-04 21:03:52 +02:00
BaerMitUmlaut
8a47d7a9b6 Add fade nametags towards screen border (#4316) 
* Fade nametags towards screen border

* Use distance2D instead of vector commands

* Don't calculate fade when off screen

* Made fade on border optional
 2016-09-04 20:50:12 +02:00
Glowbal
b0fa1a32d9 Fix params 2016-09-04 20:37:25 +02:00
Glowbal
b489750d5b Minor optimizations using private, params, and isEqualType (#4323) 
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
 2016-09-04 16:44:22 +02:00
BaerMitUmlaut
278e7fa800 Add Medical AI implementation for basic medical (#4311) 
* Initial commit medical AI

* Finished non-healing functions

* Initial work on self healin

* AI healing

* Finished medical AI for basic medical

* Finito

* Fix for dead units, medic not being close enough

* Make ace_medical required

* Fixed double systemChat

* Made AI units able to heal players

* Fixed wound treatment

* Fixed medic movement

* Made units heal themselves earlier
 2016-09-04 11:25:03 +02:00
BaerMitUmlaut
c3222bdf0c Add realistic weights (#3868) 
* Adjusted weapon weights - Vanilla

* Adjusted weapon weights - Marksmen DLC

* Adjusted weight of SIG 556 to SIG 550
 2016-09-04 11:07:36 +02:00
PabstMirror
1c5761f845 Bundle fire damage into larger chunks (#4223) 2016-09-03 22:00:45 +02:00
J3aLeiNe
7220d0ee5d compat RHS US : Change for default ACE_12.7x99 (#4184) 
* Change for default ACE_12.7x99

 - rhsusf_ammo_127x99_M33_Ball = B_127x99_Ball from addons/ballistics/CfgAmmo.hpp

 - rhsusf_ammo_127x99_mk211 = ACE_127x99_API from addons/ballistics/CfgAmmo.hpp

* Default ACE3 12.7x99 and recheck bullets values

 - 7.62 M993 : fix Ballistic Coefficient and Mass according with ballistics/CfgAmmo.hpp
 - 7.62 M993 : add a muzzle velocity according with the Mk11 Mod0 barrel length (609.6mm) and the M14 EBR-R1 barrel length (558.8mm) (empiric, not perfect but better than nothing)
 - recheck all bullets values

* Accurate M249s' barrel length

* Little add and fix for Atragmx "GunList" (#1)

- add 12.7x99 API
 - fix .408 "Mass" according with the ballistics/CfgAmmo.hpp
 - fix .300WM MK248 Mod0 "Mass" according with the ballistics/CfgAmmo.hpp
 - Typo Mod0, Mod1 for a better reading on the Atrag's panel
 - fix .308 M80 "Mass" according with the ballistics/CfgAmmo.hpp
 - add .308 Mk316
 2016-09-03 22:00:15 +02:00
PabstMirror
2b29dcadc3 Merge pull request #4310 from acemod/voiperr-flashlight_housekeeping 
Map + Flashlights Cleanup (merge conflicts + fixes)
 2016-09-02 18:57:48 -05:00
jonpas
0e1f2828a9 Rename Advanced Throwing component to be in-line with other advanced_ components (#4318) 
* Rename Advanced Throwing component to be in-line with other advanced_ components

* Rename wiki page as well

* Add redirect from old wiki page
 2016-09-03 01:39:34 +02:00
PabstMirror
12de3265b8 Fix INFO Macro not in CBA 3.0 (#4320) 2016-09-02 12:50:23 -05:00
jonpas
d3ee125d5e Fix Advanced Throwing IR Chemlight and in-hand pick up (#4313) 
* Fix IR Chemlights pick up

* Fix attached throwable pick up interaction condition

* Fix in hand pick up locality
 2016-09-02 14:57:20 +02:00
PabstMirror
c4d2383005 Increase blood bag flow rate for basic medical (#4306) 
* Change blood bags

- Increase flow rate for basic medical
- Don't queue bags

* change to ivBags, reset var on init / fullHeal
 2016-09-01 12:46:08 +02:00
jonpas
eb007973c1 Merge pull request #4315 from acemod/fixChemlightShieldDescriptions 
Fix Chemlight Shield Green and Red descriptions
 2016-09-01 01:20:04 +02:00
jonpas
cbdabfb78d Fix Chemlight Shield Green and Red descriptions 2016-08-31 23:14:12 +02:00
PabstMirror
62bb1db705 Fix chemlight supplyCreate UBC (#4314) 2016-08-31 16:10:40 -05:00
PabstMirror
41d758567e Chemlights cleanup (#4304) 2016-08-31 22:12:40 +02:00
Glowbal
df66b0876f Minor private variable fixes (#4300) 2016-08-27 17:35:45 +02:00
PabstMirror
d448ea8916 Improve interaction position for air units. (#4285) 
Fix #4233
 2016-08-27 10:37:58 +02:00
[OMCB]kaban
64cf8aa95a Russain Translations Update (#4286) 2016-08-27 10:36:00 +02:00
PabstMirror
df7aa38a7a Allow inheritance for addActionToClass (#4272) 
* Allow inheritance for addActionToClass

* Update Headers

* Use inline code for inheritance example
 2016-08-27 10:35:21 +02:00
Glowbal
1366a6f15f Merge pull request #4289 from acemod/earlyAddPlayerEventHandler 
Fix null ace_player from early call to addPlayerEH
 2016-08-27 10:32:12 +02:00
Grey-Soldierman
dae3d8d682 Definable classname for Spare Barrel (#4121) 
* Added definable barrel classname through weapon config

* Improved condition for player carrying spare barrel
 2016-08-27 10:21:15 +02:00
voiperr
fedad7f8f7 Ace_Chemlights (Chemlight Enhancements) (#3921) 
* Add ace_chemlights.
Make chemlight intensity and dropoff more realistic.
Add orange, white, IR chemlights.
Add chemlight shields.
Make chemlight impact sounds more realistic.

* Moved impact sound changes to a different branch.

* Used QPATHTOF. Fixed scopes. Used initServer. Reduced lifetime duration.
Checked privates.

* Stringtable: 5 minute.

* Blue lifetime. Removed ref to deprecated function

* Use proper magazine macro. Add new chemlights to Misc box.
 2016-08-27 10:19:39 +02:00
commy2
9ef24d25ba paradrop crates from helicopter or plane cargo (#2468) 2016-08-27 10:14:54 +02:00
PabstMirror
c9f9b89ea2 Fix merge (was moved to XEH_postInitServer) 
Use short circuit for loadout change and add note
 2016-08-25 18:56:57 -05:00
PabstMirror
fd6bd7f794 Merge branch 'flashlight_housekeeping' of https://github.com/voiperr/ACE3 into voiperr-flashlight_housekeeping 2016-08-25 15:50:11 -05:00
Joko
927d8ead8f add Hiddenselection camo to bodybag for Retexturing (#4276) 
* add Hiddenselection camo to bodybag

* Add default texture

* Use macro
 2016-08-24 12:42:32 -05:00
PabstMirror
3f343086dc ad fix for noradio 2016-08-23 22:43:37 -05:00
PabstMirror
18153b0451 Fix null ace_player from early call to addPlayerEH 2016-08-23 22:24:59 -05:00
PabstMirror
5a83659136 Don't cookoff when commander turret is hit (#4280) 2016-08-23 09:57:54 +02:00
jonpas
f8dfa4f933 Add Advanced Throwing (#3477) 
* Add Advanced Throwing

* Add feature documentation
 2016-08-22 15:09:08 +02:00
commy2
cda100c9e7 Remove superfluous requiredAddons in hearing 2016-08-20 21:10:37 +02:00
Glowbal
d911dab5a7 Merge pull request #4191 from acemod/fix-4181 
add explosive devices to missing units, close #4181
 2016-08-20 12:25:56 +02:00
Glowbal
83e78f1021 Merge pull request #4258 from acemod/reviveTimer 
Clear reviveState when calling setUnconscious
 2016-08-20 11:57:51 +02:00
Glowbal
47d17c49dc Merge pull request #4245 from acemod/eject-ai-crew-cookoff 
eject ai during cookoff
 2016-08-20 11:56:40 +02:00
Glowbal
167dc7735d Merge pull request #4197 from acemod/litterSimpleObject 
Use createSimpleObject for medical litter
 2016-08-20 11:53:43 +02:00
Glowbal
1f8f463f32 Merge pull request #4267 from acemod/fix-object-event 
fix FUNC(objectEvent)
 2016-08-20 11:49:53 +02:00
PabstMirror
7f9a697dca Update CBA_DEBUG_SYNCHRONOUS macro for new CBA (#4271) 2016-08-19 16:33:27 -05:00
commy2
1c6825bcab skip DLL check on non-windows machines, close #4253 2016-08-19 16:01:59 +02:00
commy2
91e4f50ba0 fix FUNC(objectEvent) 2016-08-19 15:23:47 +02:00
jonpas
ff0dcd3152 Use pushBackUnique in Tags cache (#4249) 
* Use pushBackUnique in tagging

* Use configProperties, Add maintainers

* Fix header

* Revert to configClasses
 2016-08-18 20:52:28 +02:00
jonpas
986ac43a68 Cache config UI (#4234) 
* Cache config UI

* Use configClasses to prevent reading entries in base class

* Fix header not containing return value

* One more count

* More lazy eval
 2016-08-18 19:07:05 +02:00
PabstMirror
b02e91e02e Clear reviveState when calling setUnconscious 
#4250
 2016-08-18 01:59:40 -05:00
freghar
9fa247398f add BlueForceTracking filtering via an object variable (#4196) 
There's no good workaround for this:

 * creating a dummy unit on [0,0,0] and making it leader prevents
   grp members from entering vehicles
 * joining group of a different side prevents grp members from seeing
   blueforce tracking markers of their original side

Usage (_obj can be group or unit, depending on BFT_ShowPlayerNames):

  _obj setVariable ["ACE_map_hideBlueForceMarker", true];

The inverse, hiding of markers of other groups/units for a particular
player, can be already done by 'ace_map_BFT_Enabled = false' locally,
as the Update function checks for it every time.

Signed-off-by: freghar <freghcz@gmail.com>
 2016-08-16 19:28:21 -05:00
PabstMirror
24d13e525f Add ACE_isBelt for DLC/Expansion magazines 
Fix #4094
 2016-08-14 13:35:00 -05:00
commy2
7d2f2023ee eject ai during cookoff 2016-08-14 13:51:33 +02:00
commy2
2231464087 fix bug which would cause unecessary echo network traffic (#4242) 2016-08-13 16:45:50 +02:00
Lukas
84a370d0f2 Czech translation (#4241) 2016-08-13 15:44:48 +02:00
Glowbal
fdfe672491 Merge pull request #4166 from acemod/glasses-hearing 
Make hearing component compatible with glasses
 2016-08-13 14:17:47 +02:00
Glowbal
ba8c8bb5b0 Merge pull request #4109 from acemod/port-incendiary-grenades 
Port ACE2 incendiary grenades
 2016-08-13 14:16:39 +02:00
commy2
58539a0949 Merge branch 'master' of https://github.com/acemod/ACE3 into glasses-hearing 2016-08-13 13:03:23 +02:00
commy2
5b3d424509 always destroy engine, effect only requires cookoff 2016-08-13 12:44:38 +02:00
commy2
d0d407a2c5 only do engine burning effect if cookoff is enabled 2016-08-13 12:39:52 +02:00
commy2
1bde8d617b rename cookoff setting to 'GVAR(enable)' 2016-08-13 12:38:04 +02:00
commy2
0dc13276df change default value to true 2016-08-13 12:13:49 +02:00
commy2
f0a74781c9 add setting to disable cook off effects 2016-08-13 12:12:34 +02:00
commy2
c42004449d Port AGM cook off 2016-08-13 11:59:15 +02:00
commy2
9a93dffc3b port A2 incendiary grenades 2016-08-13 11:49:36 +02:00
Broström.A | Evul
0dfee34a56 Added additional cargo and dragging for crates (#4129) 
* Added Cargo and Dragging for `Land_WoodenBox_F` and `Land_WoodenCrate_01_F`.
 2016-08-13 11:33:41 +02:00
PabstMirror
f354bab3c2 Add Tripflare (#4152) 2016-08-13 11:29:01 +02:00
[OMCB]kaban
8fc2cbd0ef Russian Translations - Update (#4217) 2016-08-13 11:25:43 +02:00
jonpas
5985f3bd26 Fix missing zeroing UI on vehicles without FCS 2016-08-11 22:34:38 +02:00
PabstMirror
a2da54bfec Fix javelin fire block not being removed (#4228) 2016-08-11 13:30:28 -05:00
commy2
5e40c24985 Merge pull request #4185 from acemod/cleanup-deprecated 
remove deprecated functions
 2016-08-09 18:34:43 +02:00
commy2
c2da1b4980 Merge pull request #4225 from acemod/fix-missing-magazine-mass 
Fix wrong config path in FUNC(calculateMass)
 2016-08-09 18:30:04 +02:00
commy2
9228bb9349 manual merge 2016-08-09 18:28:42 +02:00
jonpas
e909901100 Merge pull request #4226 from acemod/fixTagString 
Fix tagging cstring
 2016-08-09 18:27:00 +02:00
commy2
36e78e0722 Merge pull request #4171 from acemod/cleanup-hash 
deprecate ACE hash functions in favor of CBA versions
 2016-08-09 18:25:01 +02:00
commy2
83f32ebc29 Merge pull request #4170 from acemod/cleanup-missionSQM 
remove some broken functions
 2016-08-09 18:24:52 +02:00
commy2
439a85924c Merge pull request #4188 from acemod/cba-hash-synchedEvent 
Convert common to CBA hashes
 2016-08-09 18:24:27 +02:00
commy2
7000414df4 Fix wrong config path in FUNC(calculateMass) 2016-08-09 18:20:25 +02:00
PabstMirror
8e10bf5eef Fix tagging cstring 2016-08-09 11:18:52 -05:00
jonpas
51450b86fb Add dogtags $, Improve function headers 2016-08-09 01:15:59 +02:00
jonpas
91128729ba Improve stringRemoveWhitespace function header 2016-08-08 23:08:39 +02:00
jonpas
c6f3627c70 Merge pull request #4146 from acemod/taggingFramework 
Tagging Framework and Improvements
 2016-08-08 23:04:28 +02:00
freghar
769ca7e835 lower wirecutter item mass (#4209) 
The current mass makes it take a LOT of inventory space (~half of
an assault pack) which makes it impractical to carry around as a tool.

Signed-off-by: freghar <freghcz@gmail.com>
 2016-08-08 15:18:51 -05:00
PabstMirror
c46b2d09cf Heal hitpoint after bandage sets bodyPartStatus 2016-08-07 13:58:09 -05:00
Mark Ruffner
ff297e307b Fix the captive module from creating attributes when not needed (#4213) 
* Fix default values

Fix default values, so we don't get two custom attributes per unit, even when the unit is not handcuffed/surrendered

* Add parentheses to avoid conversion
 2016-08-07 12:50:58 -05:00
PabstMirror
919c8469de Add interaction action on demand (#4079) 
* Only use addActionEventHandler when needed

-Only install addActionEventHandler when the interaction menu is
actually open
-Less SQF running each frame,
-it should help with issue #4066

* Cleanup debug
 2016-08-05 12:05:15 -05:00
PabstMirror
dc7ac4c42c Fix static weapons not being loadable in cargo (#4205) 
- Fix #4165
 2016-08-05 12:03:45 -05:00
PabstMirror
6f22df40b6 dragging - Don't run animChanged event on all units 
Also Fix CBA_fnc_addPlayerEventHandler
 2016-08-03 15:35:10 -05:00
PabstMirror
afe3e5ccd3 Fix repair cargo not added to zeus created objects (#4201) 
- Fix #4200 (add delay for units created via zeus)
- Use ace_settingsInitialized to add events
 2016-08-03 13:44:04 -05:00
PabstMirror
82cf18575c Minor tweaks to medical 
- decrease needed blood loss on selection to turn icon red. (Largest
wound bleedingRate is only 0.1)
- Don't print warning for basic medical bandage not having sub configs
 2016-08-03 13:14:12 -05:00
PabstMirror
be3afe6eb3 Increase defuse range for underwater mines (#4195) 
Fix #4144
- Adds a 2nd defuse helper with increased range
 2016-08-02 18:29:31 -05:00
PabstMirror
787a57c12b Fix track repair selection placement 2016-08-01 21:19:48 -05:00
PabstMirror
02c308e141 Use createSimpleObject for medical litter 2016-08-01 16:20:13 -05:00
PabstMirror
a2f391cd59 Convert finger to CBA hashes (#4183) 2016-07-30 12:28:07 -05:00
commy2
46adfe1150 convert map-gestures to cba hashes (#4187) 2016-07-30 17:17:52 +02:00
commy2
1f6b10c4cb convert laser to cba hashes (#4186) 2016-07-30 17:16:29 +02:00
commy2
9a468c4068 add explosive devices to missing units, close #4181 2016-07-30 13:15:45 +02:00
commy2
b059217f4d fix-inverted-logic 2016-07-30 12:35:10 +02:00
commy2
5a1b33a5da convert common to cba hashes 2016-07-30 12:28:06 +02:00
commy2
1ffe3131e3 remove deprecated functions 2016-07-30 11:16:19 +02:00
commy2
c9a8e0a892 deprecate ACE hash functions in favor of CBA versions 2016-07-30 10:54:01 +02:00
Glowbal
a2a8f53157 Merge pull request #4155 from acemod/firedEHCleanup 
Minor cleanup of fired EH listeners
 2016-07-28 23:49:01 +02:00
Glowbal
35c7de2fb0 Merge pull request #4172 from acemod/log-file-and-linenumbers 
log file and line numbers for warnings/errors/debug msgs
 2016-07-28 23:47:21 +02:00
Glowbal
d9112fb07e Merge pull request #4175 from acemod/remove-obsolete-pickup-fix 
reenable pickup action, because related bug has been fixed
 2016-07-28 23:47:07 +02:00
Glowbal
66a741a9c3 Merge pull request #4169 from acemod/cleanup-sort 
deprecate sort function
 2016-07-26 23:24:52 +02:00
commy2
4f77adaa0c Merge pull request #4137 from 654wak654/master 
Use GVAR Macro Where Applicable
 2016-07-26 19:15:00 +02:00
commy2
5711a863c6 reenable pickup action, because related bug has been fixed 2016-07-26 19:07:31 +02:00
commy2
755f6bcc6b Make hearing component compatible with glasses 2016-07-26 16:14:16 +02:00
PabstMirror
fa7d0df2df Improve creation time of house actions dummy (#4159) 2016-07-26 00:03:29 -05:00
commy2
0c073448dc log file and line numbers for warnings/errors/debug msgs 2016-07-25 20:39:30 +02:00
commy2
37d4a4a0c3 deprecate sort function 2016-07-25 20:00:41 +02:00
commy2
63b41843fc remove some broken functions 2016-07-25 19:43:42 +02:00
jonpas
541349efef Fix refuel not respecting time acceleration and pause (#4140) 
* Fix refuel not respecting time acceleration and pause

* Make lastTickMissionTime local
 2016-07-24 20:11:35 +02:00
jonpas
e3a70c6d3b Add Tagging module icon 2016-07-24 20:08:53 +02:00
jonpas
4b8f203f9b Add quick tag keybind and setting 2016-07-24 20:00:33 +02:00
PabstMirror
455f65947a Minor cleanup of fired EH listeners 2016-07-23 23:08:40 -05:00
PabstMirror
9cc0e64b46 Fix spectator map click not changing cam pos 
Fix #3842
PFEH FUNC(handleCamera) will set camera position using GVAR(camPos)
 2016-07-23 14:07:03 -05:00
jonpas
9b4f565cc5 Split cache and EH to functions 2016-07-23 15:52:20 +02:00
jonpas
c5edc00ee9 Add Tagging framework and improvements 2016-07-23 15:09:13 +02:00
PabstMirror
fa176bdea7 Change macro for pboProject (#4120) 2016-07-21 20:08:29 -05:00
PabstMirror
399404024c Don't frag for some shells that end in water (#4136) 
shotbullet, shotShell don't seem to explode when touching water, so
don't create frags
Fix #4134
 2016-07-21 20:08:11 -05:00
PabstMirror
7239f3e88c Fix terrain LOS check for vehicles with low getPos (#4130) 
Fix #4126
 2016-07-21 20:07:54 -05:00
Ozan Eğitmen
8f80cd59c8 Use GVAR where applicable 2016-07-20 07:15:18 +03:00
SilentSpike
fed71b00e8 Merge pull request #4089 from acemod/dogtagSSN 
Improve SSN hash
 2016-07-15 22:59:41 +01:00
Glowbal
c8a54fd090 Merge branch 'release' 2016-07-15 02:03:42 +02:00
PabstMirror
1213c08e4b Fix cached call events 2016-07-14 13:06:45 -05:00
bux578
630ab70982 Merge branch 'release' into cut-ropes-keybind 2016-07-14 15:30:38 +02:00
bux578
51bdf32f9f Merge branch 'release' into microdagr-zero-fixes 2016-07-14 15:25:25 +02:00
ColdEvul
492f075ac8 Added fixed name for Weapon_SMG_05_F (MP5K) for EDEN item. 2016-07-14 15:18:29 +02:00
ColdEvul
43c1c89cc1 Made new APEX crates draggable 2016-07-14 15:12:54 +02:00
Glowbal
2f2c4b91a1 3.6.2 2016-07-14 14:51:46 +02:00
BaerMitUmlaut
21f1329762 Added keybind to cut ropes 2016-07-14 08:13:52 +02:00
BaerMitUmlaut
40d460b1b6 Fixed MicroDAGR trailing zero 2016-07-14 03:32:30 +02:00
Glowbal
10b7e5d270 Merge pull request #4107 from acemod/fixMainMenuAceOptionsPlacement 
Fix MainMenu Ace_Options Placement to top left
 2016-07-14 01:39:18 +02:00
Glowbal
11a72431c2 Merge pull request #4099 from acemod/FixMinigunMags 
Add missing vanilla magazines to LMG_Minigun
 2016-07-14 01:38:58 +02:00
Glowbal
078647c403 Merge pull request #4097 from acemod/fixApex3denLayout-cherry-pick 
Fix 3den attribute layout for 1.62, target release
 2016-07-14 01:38:41 +02:00