Commit Graph

9709 Commits

Author SHA1 Message Date
jonpas
c34a686ba5 Set LF line endings as default 2016-05-30 18:18:38 +02:00
PabstMirror
3163b53710 gforces - Fix missing ace_settings.hpp include (#3837) 2016-05-29 11:54:44 -05:00
bux578
b4cb49ffec Merge pull request #3836 from acemod/fix_null_rallypoint
fix rallypoint being objNull, when created via 'createvehicle'
2016-05-29 13:57:44 +02:00
commy2
bc6f756df4 fix rallypoint being objNull, when created via 'createvehicle' 2016-05-29 13:22:49 +02:00
bux578
1b5d0ccc7a Merge pull request #3835 from acemod/fix_comma
replace a comma with semi colon
2016-05-29 12:02:54 +02:00
commy2
1bd44e562a replace a comma with semi colon 2016-05-29 11:44:00 +02:00
nic547
37068a5247 compat for adr-97 (#3728)
* Added compat_adr_97 and realisticnames

p90 cyka blyat

* typo

* Added Balistics stuff for p90 compat

* 2 spaces to 4 spaces

* styled my shit

* Name for Hex variants, firemodes for the civilian variant

* Also changed the magzine names

* fixed ubc warning

* fixed my style once again

* my stuff looks even better now ...

* ...
2016-05-28 18:48:39 +02:00
voiperr
52ea640c4b ace_map: More realistic flashlight glow + minor fix (#3824)
* -Converted flashlight glow object to chemlight type (emits light without sprite)
-Fixed issue where glow object was being deleted without being first detached

* Cleanup of temp classes.

* Spaces before and after =

* Moved effects into Effects.hpp.
2016-05-27 19:16:15 +02:00
Nicolás Badano
9cccacd74d Merge pull request #3823 from gpgpgpgp/patch-1
add a line to support JSRS Eden (getting rid of JSRS explosion sound …
2016-05-25 10:39:30 -03:00
gpgpgpgp
cfb3d7f0a9 add a line to support JSRS Eden (getting rid of JSRS explosion sound effect)
JSRS Eden defines a SoundSetExplosion[] on ShellBase to define explosion sounds, which gives huntir unexpected exploding sound when used together. Adding SoundSetExplosion[] = {}; shall fix the problem.
2016-05-25 09:17:19 +08:00
Glowbal
5e64ee0c6c Merge pull request #3820 from acemod/ffvSafeMode
Fix Can't toggle safemode in FFV seats
2016-05-24 11:25:06 +02:00
PabstMirror
ccbd52e811 Fix Can't toggle safemode in FFV seats #3819
Also block safemode when no weapon
2016-05-23 15:51:09 -05:00
commy2
36205e3864 Merge pull request #3809 from acemod/improve_getTurretX
fullCrew new parameter to improve FUNC(getTurretX)
2016-05-22 17:02:45 +02:00
commy2
bb52c55984 Merge branch 'master' of https://github.com/acemod/ACE3 into improve_getTurretX 2016-05-22 17:01:10 +02:00
Glowbal
391191241b Add apply to script validation 2016-05-21 13:46:26 +02:00
commy2
c9ea5676ea travis test 2016-05-21 13:29:42 +02:00
commy2
e40c814b04 Merge branch 'master' of https://github.com/acemod/ACE3 into improve_getTurretX 2016-05-21 13:27:51 +02:00
Glowbal
7f8bfa091a Merge branch 'master' of github.com:acemod/ACE3 2016-05-21 13:26:46 +02:00
Glowbal
54caadfb88 Add support for new script command select in travis 2016-05-21 13:26:04 +02:00
commy2
d395fcd792 travis pls 2016-05-21 13:22:13 +02:00
commy2
aee4d23bdb fullCrew new parameter to improve FUNC(getTurretX) 2016-05-21 13:07:17 +02:00
PabstMirror
f69142dd45 Hearing - New XEH, Fix dead effects, Medical var (#3802)
* Hearing - New XEH, Fix dead effects, Medical var

* Use setHearingCapability

* Cleanup dead player vol update

* Don't change global hearing in medical

* Fix exitWith
2016-05-20 11:23:14 -05:00
commy2
f67b3561e8 Merge pull request #3804 from acemod/fcsScopesFFV
Fcs scopes ffv
2016-05-20 15:23:49 +02:00
PabstMirror
d464a23d21 Use the lovely CBA_fnc_canUseWeapon function 2016-05-20 01:10:12 -05:00
PabstMirror
0d5385ffaf Update FCS hud when manually setting range. 2016-05-19 21:50:51 -05:00
PabstMirror
508b71e7ba Scopes - Allow Scope Adjust from FFV 2016-05-19 21:39:15 -05:00
PabstMirror
709916c0f3 Fix UBC errors for RHS 4.1 (#3800) 2016-05-19 19:53:23 -05:00
commy2
e1403d567c Merge pull request #3793 from acemod/improvePlayerInventoryChanged
skip 'playerInventoryChanged' after firing
2016-05-18 12:23:28 +02:00
commy2
25876d82ca manual merge 2016-05-18 12:21:53 +02:00
commy2
230f0ab85e manual merge 2016-05-18 12:20:33 +02:00
commy2
0e2cafcbba Merge pull request #3797 from acemod/add-backwards-compat-inventoryChanged
Add backwards compatability for InventoryChanged
2016-05-16 16:39:12 +02:00
commy2
473149b8ca revert changes from other PR to make it compatible 2016-05-16 15:22:37 +02:00
commy2
cac7b9c0c3 optional param to skip deprecated warning 2016-05-16 15:15:51 +02:00
Glowbal
32055401d3 Add backwards compatability for InventoryChanged
The output of `getUnitLoadout` is different as `getAllGear`. Using a different format in the event would mean that any eventhandler depending on the inventory output would now be broken.
2016-05-16 00:09:53 +02:00
commy2
07caf1b0bd fix for null player 2016-05-14 20:33:33 +02:00
PabstMirror
7628f9a4ab Fix nils in array 2016-05-14 13:08:58 -05:00
commy2
e4c86a8af5 don't do 'playerInventoryChanged' just because ammo decreased after firing 2016-05-14 19:50:08 +02:00
commy2
cc9e128e74 Merge pull request #3792 from acemod/useGetUnitLoadout
use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it
2016-05-14 13:04:35 +02:00
commy2
c5275813a4 use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it 2016-05-14 10:49:09 +02:00
Glowbal
04b61ff32e Fix missing semicolon 2016-05-14 10:37:29 +02:00
Glowbal
180a0f9d84 Merge pull request #3462 from acemod/medicalLoops
Cleanup medical PFHs
2016-05-14 09:39:14 +02:00
Glowbal
36e48554c2 Merge pull request #3787 from acemod/motorcycleInteraction
Add interaction support to Motorcycle class
2016-05-14 09:33:41 +02:00
Glowbal
4e109ae93b Merge pull request #3781 from acemod/specTree
Fix spectator unit tree refreshing
2016-05-14 09:26:42 +02:00
Glowbal
e867db3a24 Merge pull request #3780 from acemod/lighter-bodybags
Adjusted weight of bodybag
2016-05-14 09:24:25 +02:00
Glowbal
eb8390741b Change round down mass of body bag
Mass is an integer.
2016-05-14 09:23:29 +02:00
Glowbal
57e83f8b35 Merge pull request #3791 from acemod/dropTestMission
Remove old test-mission
2016-05-14 09:18:06 +02:00
PabstMirror
d48bd3ca83 Remove old testmission addon 2016-05-13 19:54:14 -05:00
PabstMirror
895bf2580a Merge pull request #3773 from J3aLeiNe/master
fnc_getMGRSdata.sqf update3
2016-05-13 15:59:24 -05:00
Nicolás Badano
dd2767a4ec Merge pull request #3789 from acemod/pushConfig
Add canPush config entry
2016-05-13 11:38:35 -03:00
jonpas
a950b2c2fe Add canPush config entry to enable pushing on boats with mass higher than 2600 2016-05-13 16:33:15 +02:00