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
12,198 Commits 73 Branches 88 Tags 752 MiB
5e6ae3ca36
Commit Graph

12198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolás Badano
06743bef52 interaction: fix canInteract and exceptions in agm menu 2015-01-20 02:58:06 -03:00
Nicolás Badano
b6dbd8d3c4 interact_menu: add canInteract (including exceptions) and canInteractWith to condition. 2015-01-20 02:41:04 -03:00
Nicolás Badano
9e11aeb0b9 interaction: fix canInteract and exceptions in agm menu 2015-01-20 02:39:22 -03:00
PabstMirror
cb52ac18c9 Send marker configNames instead of index 
Upstream fix from AGM
If CfgMarkers don't match, will throw warning:
22:46:53
[3896,74.535,0,"z\ace\addons\markers\functions\fnc_setMarkerNetwork.sqf:11","WARNING:
CfgMarker not found changed to milDot"]
 2015-01-19 22:49:39 -06:00
jaynus
7e621616d0 function name error. 2015-01-19 20:19:33 -08:00
jaynus
c5d03ce2c0 GBU and DAGR guidance initializations. 2015-01-19 20:16:33 -08:00
jaynus
16a296e92b laser_selfdesginate commit for commanche 2015-01-19 20:13:12 -08:00
Nicolás Badano
a5ac89dcb1 make some key events non blocking to allow some actions to share keybinds 2015-01-20 01:12:30 -03:00
Nicolás Badano
3bdd706e5d Merge remote-tracking branch 'origin/master' into moreCbaKeyBinds 2015-01-20 00:38:18 -03:00
Nicolás Badano
f3746d8391 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into nouInteractionMenu 2015-01-19 23:56:36 -03:00
Nicolás Badano
1cb8da4c21 Merge branch 'interact_menu' of github.com:KoffeinFlummi/ACE3 into nouInteractionMenu 2015-01-19 23:56:16 -03:00
commy2
42f2270a3a stuff 2015-01-20 02:19:31 +01:00
commy2
8e41bcce59 Merge pull request #73 from KoffeinFlummi/agmPortKestrel 
Port: AGM kestrel
 2015-01-20 01:35:23 +01:00
commy2
599dc134d8 simplify stuff 2015-01-20 01:34:26 +01:00
commy2
70b642afc0 get kestrl to work 2015-01-20 01:05:57 +01:00
Nou
ef94011cdc Menu rendering should be done with the mission event handler for Draw3D because it executes before rendering the current frame, rather than after the current frame. 2015-01-19 15:13:41 -08:00
Nicolás Badano
b0e99ada12 Merge branch 'master' into HEAD 2015-01-19 19:03:02 -03:00
commy2
8c8e14b0ca port kestrel 2015-01-19 21:13:56 +01:00
commy2
97ee63a349 getting PFH to work on briefing screen, review 2015-01-19 17:47:52 +01:00
commy2
fc3c73a174 Merge pull request #56 from KoffeinFlummi/agmPortMarkers 
port markers
 2015-01-19 17:35:18 +01:00
commy2
87adbe9b9e DFUNC 2015-01-19 17:30:04 +01:00
commy2
e55a85cc26 get markers to work 2015-01-19 16:59:00 +01:00
commy2
1c37c76cc6 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into agmPortMarkers 2015-01-19 14:42:25 +01:00
Garth "L-H" de Wet
3f83085aed Merge pull request #68 from KoffeinFlummi/agmGogglesPort 
Agm goggles port
 2015-01-19 13:57:08 +02:00
KoffeinFlummi
d2c75087e8 Make all py scripts in /tools executable 2015-01-19 12:44:58 +01:00
KoffeinFlummi
340f75fc03 Add ADDON variable to blank module 2015-01-19 12:40:03 +01:00
KoffeinFlummi
4356c0d02b Add addon variable to FCS 2015-01-19 12:38:07 +01:00
Garth L-H de Wet
2fe155f990 Converted a couple PFHs to use the waitAndExecute function as that is what they were doing. 
Fixed a couple bugs.
 2015-01-19 10:34:49 +02:00
Nou
1a2231c14a Privatize 2015-01-18 20:13:45 -08:00
Nou
84f404ae84 Remove debug, added scripted add/remove actions. 2015-01-18 20:08:34 -08:00
Thomas Kooi
29c4676b20 Added missing variables to private array. 2015-01-19 00:59:19 +01:00
Thomas Kooi
e4b1265a84 Fixed incorrect parameter passing in treatment actions 2015-01-19 00:58:36 +01:00
Thomas Kooi
76e877067c Fixed examine actions 2015-01-19 00:58:17 +01:00
Garth L-H de Wet
ef19ffad0c Glasses conditions are local to each unit. No longer global scope on each client. 2015-01-19 01:38:54 +02:00
Garth L-H de Wet
b499cc9a1d Rain effect is working as expected. 2015-01-19 01:12:45 +02:00
Garth L-H de Wet
10cdbeb4dd Made the glasses effects slowly fade (not completely away) over 30 seconds. 2015-01-19 01:04:32 +02:00
Thomas Kooi
a890400c55 Fixed tourniquet treatment actions. 2015-01-18 23:58:10 +01:00
Garth L-H de Wet
49e19610c2 Removed a bunch of spawns and used PFH's in their place. 2015-01-19 00:57:39 +02:00
Thomas Kooi
5745408647 Added hold and release functionality for CMS menu. 2015-01-18 23:44:32 +01:00
Nicolás Badano
fc8c391596 nametags: cba keybinds 2015-01-18 19:39:15 -03:00
Nicolás Badano
058aa8d920 interaction: cba keybinds 2015-01-18 19:38:58 -03:00
commy2
9e2eaa96e1 pull master into branch 2015-01-18 23:26:41 +01:00
Garth L-H de Wet
fc18cb443f Converted Goggles to use ACE/CBA macros. 2015-01-18 23:50:45 +02:00
Nicolás Badano
6731a8e1d6 Merge pull request #66 from KoffeinFlummi/cbaKeyBinds 
Cba key binds for various modules
 2015-01-18 18:46:43 -03:00
Thomas Kooi
920453e150 Fixed incorrect personal aid kit model. 2015-01-18 22:37:26 +01:00
Nicolás Badano
112c9f319f scopes: partial fix 2015-01-18 18:34:45 -03:00
Thomas Kooi
e468832324 Added initial port of CSE medical (CMS) 2015-01-18 22:16:35 +01:00
KoffeinFlummi
915e0c291f Revert "Remove stray dll, add .dlls and .sos to gitignore" 
This reverts commit c4e57dcf9f.
 2015-01-18 22:14:33 +01:00
KoffeinFlummi
f0356dc070 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-01-18 22:09:04 +01:00
Nicolás Badano
63af6892eb fix for safemode 2015-01-18 17:56:12 -03:00