Commit Graph

10564 Commits

Author SHA1 Message Date
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
Grey-Soldierman
9f588d283c Fixed indentation again 2016-05-27 19:10:44 +01:00
Grey-Soldierman
d92b5fb459 Fixed indentation 2016-05-27 19:08:34 +01:00
Grey-Soldierman
b0363d4ba9 Removed Valon from any vest configured for holsters 2016-05-27 18:52:30 +01: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
jonpas
4f515ec4e1 QGVAR captives, interaction 2016-05-25 20:23:53 +02:00
jonpas
5d36f84eb1 qGVAR overheating and reloadlaunchers 2016-05-25 20:13:36 +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
PabstMirror
87ee34ba35 vehicleLock - Use QGVAR 2016-05-24 19:37:24 -05:00
PabstMirror
fef50ae48f Fix duplicate event 2016-05-24 19:25:38 -05:00
jonpas
c4999c13e4 QGVAR and Fix sandbag, tagging, tripod, viewdistance, weather, zeus 2016-05-25 02:19:50 +02:00
jonpas
7ede53bbdd QGVAR and Fix laser, map, map_gestures, maptools, modules, nightvision, optics 2016-05-25 02:09:11 +02:00
jonpas
b54d1985f1 QGVAR and fix gforces, goggles, grenades, hearing, interact_menu 2016-05-25 01:57:41 +02:00
jonpas
99675417c6 QGVAR and fix events in concertina_wire, disarming and explosives 2016-05-25 01:51:58 +02:00
jonpas
dd2e9140ae Q(E)GVAR rangefinderData event 2016-05-25 01:44:56 +02:00
jonpas
da4c08fb6c QGVAR all reload events 2016-05-24 20:51:10 +02:00
jonpas
30b15ee3d3 Fix quotes in cargo 2016-05-24 19:22:48 +02:00
jonpas
331c3c70cb Verify and fix cargo, nametags, rearm, reload, repair, ui, Convert infoDisplayChanged in common and mk6mortar Rsc's 2016-05-24 18:58:27 +02:00
SilentSpike
207d6612da Remove duplicate ACE_newEvents entries 2016-05-24 15:06:17 +01:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
SilentSpike
78cdd0d55a Add event renaming script 2016-05-24 14:08:18 +01: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
PabstMirror
84eca899a9 Add event renaming system
Allows us to switch event names such that anyone currently using our old event framework and names won't have their code broken until it is deprecated in version 3.8.0
2016-05-23 14:03:55 +01:00
PabstMirror
86b9022322 Fix VehLock Macros 2016-05-22 23:13:15 -05:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01:00
SilentSpike
f0b8da33c4 Deprecate ACE events framework
CBA 2.4.0 entirely replaces the ACE events framework.

Adds wrappers with deprecated warnings to all of the public event framework functions and removes all of the underlying GVARs and code.
2016-05-22 16:09:49 +01: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
jonpas
bd0e05d7d6 Use CBA config functions, return correct value 2016-05-22 16:18:24 +02:00
jonpas
38b48390b5 Call CBA binocular functions - leave as wrapper 2016-05-22 16:03:41 +02:00
jonpas
bbd96f9e71 Call CBA delayed execution functions, remove ACE's PFH for handling them 2016-05-22 16:01:12 +02:00
jonpas
4b121480bb Use new binocular magazine CBA functions, deprecate ACE functions 2016-05-22 15:48:03 +02:00
jonpas
d35e89892c Use new get item and object config CBA functions, deprecate ACE functions 2016-05-22 15:36:31 +02:00
jonpas
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
jonpas
472e4631d6 Deprecate delayed execution functions 2016-05-22 15:25:59 +02:00
jonpas
d902d1182a Replace ace_common_fnc_execRemoteFunc with events 2016-05-21 23:55:48 +02:00
SilentSpike
a7c1d0e5bf Remove erroneous tabs 2016-05-21 17:45:50 +01:00
SilentSpike
3e16142ff6 Merge branch 'master' into zeusModuleUiExample 2016-05-21 17:37:49 +01:00
SilentSpike
b3192adbb7 Add support for a zeus module position attribute
Allows zeus to select a position for the module task to be carried out at - as a bonus it works alongside the radius attribute and will draw a circle preview if a radius is present.

Unfortunately control types 100 & 101 don't play nicely with controls groups and so I've commented out the position attribute from the displays that would currently use it. Otherwise it is all seemingly working fine, just that the position of the control is all wrong and it doesn't stay within the bounds of the controls group.

I opened an issue tracker ticket for the problem here: https://feedback.bistudio.com/T116708
2016-05-21 17:29:53 +01: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
Glowbal
dd60ac8170 Remove isEnabled check in sitting
IsEnabled check is not necessary here. It should not have been included, as it was a left over from testing for migrating sitting to ACEX.
2016-05-21 00:41:49 +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