commy2
05d30c5573
convert log macros to cba versions ( #4282 )
...
* convert log macros to cba versions
* Add changes to AB
* remove obsolete macro
2016-10-02 12:55:31 +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
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
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
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
jonpas
26fbc36cab
Merge branch 'master' into cbaEventSystem
2016-05-31 22:36:08 +02:00
commy2
7512c4e52e
manual merge
2016-05-30 21:14:34 +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
BaerMitUmlaut
7fcbe93b71
Cleaned up excessive whitespace
2016-05-03 02:32:44 +02:00
commy2
467075ad67
replace timePFH with CBA_missionTime
2016-03-02 11:01:39 +01:00
PabstMirror
575fabb69d
#2872-Map time support for subclasses of ItemWatch
2015-11-24 16:17:06 -06:00
PabstMirror
7981faad64
private -> local
2015-11-23 17:47:58 -06:00
PabstMirror
e72c1d874a
Merge branch 'master' into fixFlashlightPrivates
...
Conflicts:
addons/map/functions/fnc_determineMapLight.sqf
2015-11-10 21:21:06 -06:00
PabstMirror
01d679c5dc
#2810 - Delete map glow light from DC players
2015-11-07 14:33:41 -06:00
PabstMirror
acc3504d7b
Merge branch 'master' into fixFlashlightPrivates
...
Conflicts:
addons/map/stringtable.xml
2015-10-19 13:59:15 -05:00
jokoho48
2dcdd224bd
fix privates in Map module
2015-10-14 19:56:54 +02:00
PabstMirror
c0b78ecf3a
Set Default Channel at mission start
2015-09-29 11:36:30 -05:00
commy2
6b7f84b297
add missing ;
2015-09-03 13:39:17 +02:00
commy2
76bb2bd2b8
replace function with FUNC macro
2015-09-03 13:37:36 +02:00
commy2
29efc13556
hide clock, use eventhandler
2015-09-02 01:59:07 +02:00
voiper
720f6c075a
Removed old references to NVG.
2015-08-24 14:08:02 -07:00
voiper
2144a56be1
Fix attempt.
2015-08-11 10:49:39 -07:00
PabstMirror
2d051188a7
#1957 - Fix BFT Module / Settings (for 3.2.1)
2015-08-01 00:01:33 -05:00
PabstMirror
c58ff8d31d
#1736 - Allow moving map while shake effect active
2015-07-01 00:13:55 -05:00
jonpas
2e50261bd3
Exit entire map Client XEH on Headless
2015-06-21 21:10:50 +02:00
jonpas
a7d9489555
Fixed map module init, Prevented BFT execution on Headless, Changed BFT Enabled string
2015-06-21 21:08:37 +02:00
jonpas
4f35e10afa
Changed BFT_Enabled to module option for proper ACE_Settings handling
2015-06-21 04:46:55 +02:00
jonpas
10602f10c6
Fixed BFT ACE_Settings, Fixed Map Module Initialized diag_log
2015-06-21 04:19:12 +02:00
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
Nicolás Badano
618c021f7e
Tab to space plus comments for the spawns
2015-03-14 17:15:28 -03:00
Nicolás Badano
518010be36
Reordered the map, mapfx and pbos:
...
- mapfx moved inside map
- everything related to map tools and drawing moved to it's own pbo called ace_maptools
Also fixed a couple of bugs in BFT
- Only a single marker was being drawn
- The BFT_HideAi parameter had the opposite effect
2015-03-14 16:58:05 -03:00
PabstMirror
4cc57be48c
Cleanup debug
2015-01-16 22:07:53 -06:00
PabstMirror
687c7e98aa
almost done
2015-01-16 02:13:29 -06:00
PabstMirror
b12844f175
Converted to CBA style
2015-01-15 15:50:48 -06:00
PabstMirror
f4c84182d4
Progress on Map
2015-01-15 03:51:18 -06:00