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,620 Commits 73 Branches 88 Tags 752 MiB
883006c420
Commit Graph

205 Commits

Author SHA1 Message Date
commy2
c1ead851cb Add 3den attribute to disable bft (#4452) 
* add 3den object attribte to disable BFT on the object

* delay setVariable public on group

* fix tooltip
 2016-09-24 21:46:03 +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
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
Ozan Eğitmen
8f80cd59c8 Use GVAR where applicable 2016-07-20 07:15:18 +03:00
commy2
08886f413c change remaining ace events to CBA 'addPlayerEventHandler' 2016-06-22 11:16:55 +02:00
commy2
89ecc81111 convert common events to CBA playerEvents 2016-06-22 01:39:20 +02:00
commy2
3fdc0dd521 Merge pull request #3955 from acemod/add_name 
add 'name' to components
 2016-06-20 19:25:58 +02:00
BaerMitUmlaut
88b58216ee Added beautified component names 2016-06-20 11:44:36 +02:00
commy2
c481ddedaf add 'name' to components 2016-06-19 09:38:39 +02:00
Josuan Albin
d26f133733 Add missing french entries in stringtables and update older ones 
Take changes from #3480 and completed empty entries
 2016-06-19 01:18:12 +02:00
Josuan Albin
7c9dcf6bdb Merge branch 'pr/3480' 
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/cargo/stringtable.xml
	addons/flashlights/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/main/stringtable.xml
	addons/map/stringtable.xml
 2016-06-18 16:26:46 +02:00
jonpas
03e923aa68 Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
voiper
d5b3b03c1c Make flashlight on/off + glow a PVAR. 
Clean up all privates.
Change glow proxies to not inherit from chemlight_base, to avoid ammo detection issues.
Make handleDisconnect glow deletion dedi server compatible (was only listen server compatible).
Clean up determineMapLight: faster when no chemlights nearby, a tad slower when chemlights nearby, however sources the colour settings directly from the chemlight's config.
 2016-06-17 17:18:06 -07:00
voiper
a20629066a Further cleanup. Checked some privates. 2016-06-15 16:27:46 -07:00
voiper
2158d39e8a Used QPATHTOF. Reverted config names. 
Optimised fnc_getUnitFlashlights.
 2016-06-15 14:58:07 -07:00
voiper
01c335d13a More cleanup + a bug fix. 2016-06-13 19:23:14 -07:00
voiper
69c3dd5cfb Remove extra bracket. 2016-06-13 18:42:45 -07:00
voiper
1ffd9d58ab Revert postInit. 2016-06-12 15:39:16 -07:00
voiper
f3fc99f3b8 Housekeeping of ace_flashlights and ace_map. 
ace_map now handles flashlights independently of ace_flashlights.
ace_map searches for flashlight beam textures directly from weapon configs.
ace_map has acc_flashlight config (so vanilla ace_map will have at least one flashlight to use).
 2016-06-12 15:31:11 -07:00
SilentSpike
9e4fd77745 Update common event names to meet new standard 2016-06-03 22:39:43 +01:00
PabstMirror
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
jonpas
95573ee711 Stringtable URL (#3855) 
* Move url into stringtable to display it properly, Add some missing author and url entries

* Fix main

* Remove duplicate author
 2016-06-01 23:45:51 +02:00
jonpas
1354826d56 Put semi-colon to the correct place 2016-06-01 14:11:32 +02:00
jonpas
1331265e65 Move url into a macro 2016-06-01 13:49:10 +02:00
jonpas
6730d016c2 Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility 2016-06-01 13:27:02 +02:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
commy2
fd26e2e44e Merge pull request #3516 from acemod/cbamissiontime 
replace timePFH with CBA_missionTime
 2016-05-30 21:23:57 +02:00
commy2
7512c4e52e manual merge 2016-05-30 21:14:34 +02:00
jonpas
7a307393a4 Merge branch 'master' into useQuotedPathMacros 2016-05-30 21:14:17 +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
jonpas
7ede53bbdd QGVAR and Fix laser, map, map_gestures, maptools, modules, nightvision, optics 2016-05-25 02:09:11 +02:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01: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
commy2
da70854568 manual merge 2016-05-18 11:48:27 +02:00
Ozan Eğitmen
b8abec0c61 Fix Capitalization of ACE Settings classes. (#3627) 2016-05-07 22:14:56 +02:00
BaerMitUmlaut
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
looterz
b86e5d8ad6 Fixes player markers not showing up correctly when BFT_ShowPlayerNames is enabled in multiplayer 2016-03-01 18:23:33 -06:00
NorXAengell
772c4cc100 Another batch of translations and corrections (Fr) 2016-03-01 02:27:19 +01:00
BlackWindowS
c61e7b5104 Tweaked & added translations 
Translation of almost every STR to French
 2016-02-28 14:48:04 +01:00
Thomas Kooi
ae136af2d6 Merge pull request #3415 from looterz/bftplayernames 
Added Show Player Names option to Blue Force Tracking Module
 2016-02-27 12:43:15 +01:00
looterz
8b534bb4bf Fixed ACE_Settings.hpp GVAR's missing category 2016-02-26 19:00:55 -06:00
looterz
859a4321c6 Actually, nevermind that last commit 2016-02-25 09:03:30 -06:00
looterz
e6314eb114 Wrapped _groupsToDrawMarkers filtering with a condition check 2016-02-25 09:00:47 -06:00
looterz
b354fed39a Moved _playersToDrawMarkers into BFT_ShowPlayerNames code region 2016-02-25 08:35:33 -06:00
looterz
00f06f81d1 Added Show Player Names option to Blue Force Tracking Module 2016-02-25 07:57:32 -06:00
esteldunedain
71707bc81a Some spanish translations for 3.5.0 2016-02-25 10:54:19 -03:00
jonpas
7f022eda00 Replace Purista with Roboto - everywhere, close #3401 2016-02-24 15:06:27 +01:00