6673 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas Kooi	23f8b8a9ad	Added AGM config changes	2015-01-22 21:59:34 +01:00
Thomas Kooi	183b36d55e	Menu now opens for ACE_player instead of player	2015-01-22 13:33:12 +01:00
Thomas Kooi	0c221c2912	Changed effects only display while in curator view	2015-01-22 13:28:45 +01:00
Thomas Kooi	ae5996bcd2	Fixed animations for carry/drag	2015-01-22 13:12:46 +01:00
PabstMirror	47c3ad1e5e	Remove debug config	2015-01-22 00:17:31 -06:00
Nicolás Badano	14d2a6ee69	Merge pull request #83 from KoffeinFlummi/cseOptionsMenu ... Port: CSE options menu	2015-01-22 02:57:34 -03:00
Nicolás Badano	0d24ddf994	optionsMenu: tweak columns	2015-01-22 02:56:11 -03:00
Nicolás Badano	0c3c0b0e33	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 ... Conflicts: addons/weather/XEH_postInit.sqf	2015-01-22 02:48:48 -03:00
Nicolás Badano	58db703db7	weather: small fix	2015-01-22 02:47:02 -03:00
Nicolás Badano	86e841bc64	optionsMenu: matched the size and font style of the main menu buttons	2015-01-22 02:45:27 -03:00
Nicolás Badano	96289b6395	optionsMenu: added localization to menu name	2015-01-22 02:44:45 -03:00
jaynus	0df7f86d66	Merge pull request #74 from KoffeinFlummi/lasers ... laser_selfdesginate commit for commanche	2015-01-21 21:39:17 -08:00
Nicolás Badano	f73a456fb0	optionmenu: increase size	2015-01-22 02:33:51 -03:00
jaynus	81ae9e6e8f	Javelin fixed and firing TDA terminal kill. Direct selection needs to be completed.	2015-01-21 21:31:58 -08:00
Nicolás Badano	b6f35cc015	define all sizes and offsets through macros	2015-01-22 01:48:39 -03:00
Nicolás Badano	91f066b84d	remove quotes	2015-01-22 01:40:17 -03:00
jaynus	eaa157b4c5	Fixed script error on launch missing ;	2015-01-21 20:35:27 -08:00
Nicolás Badano	ccc96eb71c	Merge branch 'cseOptionsMenu' of github.com:KoffeinFlummi/ACE3	2015-01-22 00:58:53 -03:00
PabstMirror	cb561a2d93	Convert Old Ace_Options	2015-01-21 18:19:10 -06:00
PabstMirror	d5916ced9e	Colors from config	2015-01-21 17:43:57 -06:00
PabstMirror	2b62c170fd	Read from config	2015-01-21 17:29:42 -06:00
commy2	b0e7cefb06	Merge pull request #82 from KoffeinFlummi/weather ... weather module	2015-01-22 00:23:40 +01:00
commy2	ce81f6d9f5	kestrel 360, weather	2015-01-22 00:22:09 +01:00
commy2	770a151bf5	CBA keybinding for vector	2015-01-21 23:49:16 +01:00
PabstMirror	fe4a0b9be8	Formating	2015-01-21 16:27:53 -06:00
commy2	1737e3e7fa	vector config, DONE	2015-01-21 23:05:19 +01:00
PabstMirror	a595b48d32	More Locaization	2015-01-21 16:00:54 -06:00
commy2	f344c499f5	Merge branch 'master' into vectorconfig	2015-01-21 22:53:03 +01:00
commy2	efb761a14c	vector settings	2015-01-21 22:52:39 +01:00
Thomas Kooi	7020a8ef30	Replaced some PFH by waitandExecute	2015-01-21 21:37:03 +01:00
PabstMirror	c29acb4c68	Localization start	2015-01-21 14:23:33 -06:00
commy2	2c4c1d7db2	add config, settings to vector	2015-01-21 21:15:51 +01:00
PabstMirror	92bbfd92d1	Color Sliders	2015-01-21 13:53:05 -06:00
jaynus	598e4d1427	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-01-21 10:56:16 -08:00
jaynus	2ae2f5fc2f	Remove pbo's for build.bat	2015-01-21 10:56:06 -08:00
Thomas Kooi	77bd8f753d	Added AGM blood volume greyness effect	2015-01-21 16:04:34 +01:00
Thomas Kooi	dcd42f55e8	Minor improvements to handleTreatment	2015-01-21 15:53:18 +01:00
Thomas Kooi	7e5806b834	Improved drag and carry actions.	2015-01-21 15:52:59 +01:00
Thomas Kooi	bbf9ce61f0	Changed QGVAR(isDead) to ACE_isDead ... Minor improvements to debug function	2015-01-21 15:52:11 +01:00
PabstMirror	0ae940fdfb	Rough Conversion ... Gut keybind stuff, redo data arrays, reset button, progress on color changer.	2015-01-21 05:43:58 -06:00
Nicolás Badano	2c34c16621	weather: weird syntax!	2015-01-21 02:28:23 -03:00
PabstMirror	09bb14d11b	Options Menu from CSE	2015-01-20 23:27:08 -06:00
Nicolás Badano	306b3250e5	Merge branch 'master' into weather	2015-01-21 02:21:07 -03:00
Nicolás Badano	b6bdb71547	Merge remote-tracking branch 'origin/master' into HEAD	2015-01-21 02:15:21 -03:00
Nicolás Badano	3a57b477de	weather: replace agm's seasonal by cse's monthly temperatures	2015-01-21 02:12:57 -03:00
Nicolás Badano	590528c879	Merge branch 'cse_advanced_ballistics' of git@github.com:KoffeinFlummi/ACE3.git into weather	2015-01-21 01:23:30 -03:00
Nicolás Badano	71b1bc9632	Merge branch 'weather' of git@github.com:KoffeinFlummi/ACE3.git into weather	2015-01-21 01:22:03 -03:00
Nicolás Badano	59144e7b53	weather: only force set misc parameters on clients	2015-01-21 01:07:33 -03:00
Nicolás Badano	851db25e56	weather: add config data for A3 islands	2015-01-21 01:05:27 -03:00
Nicolás Badano	66d6d4b2be	weather: add config data for A3 islands	2015-01-21 00:18:39 -03:00