Commit Graph

10019 Commits

Author SHA1 Message Date
e7fa02d0d9 Merge pull request #3812 from acemod/cbaDelayedExecFnc
Use new CBA delayed execution functions and deprecate ACE functions
2016-05-30 21:02:29 +02:00
94b5cea3cf Merge pull request #3814 from acemod/cbaBinocularMagazineFnc
Use new binocular magazine CBA functions and deprecate ACE functions
2016-05-30 21:00:43 +02:00
272775445f Merge pull request #3670 from acemod/useQuotedFuncMacros
Use new quoted function macros
2016-05-30 21:00:23 +02:00
882aa26ab2 Merge pull request #3813 from acemod/cbaGetItemObjectConfig
Use new CBA get config functions and deprecate ACE functions
2016-05-30 21:00:05 +02:00
4df30327ac Flashsuppressors - use next CBA's JM configs (#3709)
#3700
2016-05-30 13:49:08 -05:00
816da2aef1 Normalize to LF line endings 2016-05-30 18:37:03 +02:00
5672a96f5f Set .paa as binary 2016-05-30 18:27:40 +02:00
c34a686ba5 Set LF line endings as default 2016-05-30 18:18:38 +02:00
3163b53710 gforces - Fix missing ace_settings.hpp include (#3837) 2016-05-29 11:54:44 -05:00
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
bc6f756df4 fix rallypoint being objNull, when created via 'createvehicle' 2016-05-29 13:22:49 +02:00
1b5d0ccc7a Merge pull request #3835 from acemod/fix_comma
replace a comma with semi colon
2016-05-29 12:02:54 +02:00
1bd44e562a replace a comma with semi colon 2016-05-29 11:44:00 +02:00
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
9f588d283c Fixed indentation again 2016-05-27 19:10:44 +01:00
d92b5fb459 Fixed indentation 2016-05-27 19:08:34 +01:00
b0363d4ba9 Removed Valon from any vest configured for holsters 2016-05-27 18:52:30 +01:00
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
4f515ec4e1 QGVAR captives, interaction 2016-05-25 20:23:53 +02:00
5d36f84eb1 qGVAR overheating and reloadlaunchers 2016-05-25 20:13:36 +02:00
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
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
87ee34ba35 vehicleLock - Use QGVAR 2016-05-24 19:37:24 -05:00
fef50ae48f Fix duplicate event 2016-05-24 19:25:38 -05:00
c4999c13e4 QGVAR and Fix sandbag, tagging, tripod, viewdistance, weather, zeus 2016-05-25 02:19:50 +02:00
7ede53bbdd QGVAR and Fix laser, map, map_gestures, maptools, modules, nightvision, optics 2016-05-25 02:09:11 +02:00
b54d1985f1 QGVAR and fix gforces, goggles, grenades, hearing, interact_menu 2016-05-25 01:57:41 +02:00
99675417c6 QGVAR and fix events in concertina_wire, disarming and explosives 2016-05-25 01:51:58 +02:00
dd2e9140ae Q(E)GVAR rangefinderData event 2016-05-25 01:44:56 +02:00
da4c08fb6c QGVAR all reload events 2016-05-24 20:51:10 +02:00
30b15ee3d3 Fix quotes in cargo 2016-05-24 19:22:48 +02:00
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
207d6612da Remove duplicate ACE_newEvents entries 2016-05-24 15:06:17 +01:00
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
78cdd0d55a Add event renaming script 2016-05-24 14:08:18 +01:00
5e64ee0c6c Merge pull request #3820 from acemod/ffvSafeMode
Fix Can't toggle safemode in FFV seats
2016-05-24 11:25:06 +02:00
ccbd52e811 Fix Can't toggle safemode in FFV seats #3819
Also block safemode when no weapon
2016-05-23 15:51:09 -05:00
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
86b9022322 Fix VehLock Macros 2016-05-22 23:13:15 -05:00
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
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
36205e3864 Merge pull request #3809 from acemod/improve_getTurretX
fullCrew new parameter to improve FUNC(getTurretX)
2016-05-22 17:02:45 +02:00
bb52c55984 Merge branch 'master' of https://github.com/acemod/ACE3 into improve_getTurretX 2016-05-22 17:01:10 +02:00
bd0e05d7d6 Use CBA config functions, return correct value 2016-05-22 16:18:24 +02:00
38b48390b5 Call CBA binocular functions - leave as wrapper 2016-05-22 16:03:41 +02:00
bbd96f9e71 Call CBA delayed execution functions, remove ACE's PFH for handling them 2016-05-22 16:01:12 +02:00
4b121480bb Use new binocular magazine CBA functions, deprecate ACE functions 2016-05-22 15:48:03 +02:00
d35e89892c Use new get item and object config CBA functions, deprecate ACE functions 2016-05-22 15:36:31 +02:00
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
472e4631d6 Deprecate delayed execution functions 2016-05-22 15:25:59 +02:00