476 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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	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
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
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
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
Nicolás Badano	112c9f319f	scopes: partial fix	2015-01-18 18:34:45 -03:00
Nicolás Badano	63af6892eb	fix for safemode	2015-01-18 17:56:12 -03:00
Nicolás Badano	e38eb5c09d	fix for fcs	2015-01-18 17:56:05 -03:00
Nicolás Badano	7895173407	overheating: cba keybinds	2015-01-18 17:08:56 -03:00
Nicolás Badano	5a77e2c220	reload: cba keybinds	2015-01-18 17:05:32 -03:00
Nicolás Badano	9ed9dc916b	resting: cba keybinds	2015-01-18 17:05:17 -03:00
Nicolás Badano	dc8c5758f1	scopes: cba keybinds	2015-01-18 17:01:18 -03:00
Nicolás Badano	60649d780c	scopes: cba keybinds	2015-01-18 17:01:07 -03:00
Nicolás Badano	d8d665cc03	vehicles: cba keybinds	2015-01-18 17:00:43 -03:00
Garth L-H de Wet	0f04d0dfb1	Moved goggles to addons folder and renamed all occurances of AGM to ACE.	2015-01-18 21:43:51 +02:00
Thomas Kooi	a800c2935f	Removed ported CSE functionality from TO_MERGE folder	2015-01-18 20:17:22 +01:00
Glowbal	b80cec4c18	Merge pull request #45 from KoffeinFlummi/csePort_fixed ... Port from CSE Common.	2015-01-18 20:12:18 +01:00
Thomas Kooi	8dfdd11f3c	Changed tabs to 4 spaces	2015-01-18 20:09:19 +01:00
KoffeinFlummi	a78730d387	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-01-18 20:03:59 +01:00
KoffeinFlummi	8872424abe	Merge branch 'fcs-extension'	2015-01-18 20:03:40 +01:00
KoffeinFlummi	4978bb5294	Move FCS calculation to extension	2015-01-18 20:02:37 +01:00
Thomas Kooi	86663e8a8e	Changed disableUserInput_f to setDisableUserInputStatus.	2015-01-18 19:54:43 +01:00
Nou	6a04408a74	Initial nou menu commit.	2015-01-18 10:38:27 -08:00
Nicolás Badano	d532caf1a0	fix execNextFrame (#56)	2015-01-18 15:26:26 -03:00
Nicolás Badano	d299331f80	Merge branch 'weaponSelecCbaKeyBinds'	2015-01-18 15:24:15 -03:00
Nicolás Badano	1b1e5fd70d	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into fcsCbaKeyBinds	2015-01-18 15:23:32 -03:00