7149 Commits

Author	SHA1	Message	Date
Glowbal	0154dfc51e	Merge pull request #1799 from jokoho48/3DModelUpdate ... Add and Update Some 3D Object and Textures	2015-07-17 08:17:42 +02:00
PabstMirror	df90c4b88e	More Attach Stuff	2015-07-16 23:59:31 -05:00
SilentSpike	6540971298	Tweaking a controls group	2015-07-17 02:58:31 +01:00
SilentSpike	27d85180f1	Improve handling of unit tree	2015-07-17 02:38:42 +01:00
SilentSpike	6cb1813527	Fix button y value	2015-07-17 02:16:35 +01:00
SilentSpike	81f87ee13c	params for public functions	2015-07-17 02:05:24 +01:00
SilentSpike	78a8149cc2	Viewpoint order UX	2015-07-17 01:52:08 +01:00
SilentSpike	e012fbc7f9	Unit tools control group	2015-07-17 01:47:21 +01:00
SilentSpike	840d766d83	Fixing typos, updating interface	2015-07-17 01:22:38 +01:00
PabstMirror	b6e124d340	#1856 - Close huntIR monitor if item removed	2015-07-16 19:12:11 -05:00
PabstMirror	f845d54290	#1634 - Integrate with DAGR	2015-07-16 18:35:38 -05:00
PabstMirror	f438c6d0c5	Revert "Use new worldSize command instead of whileLoop" ... This reverts commit 7d26519b2e.	2015-07-16 18:10:10 -05:00
PabstMirror	7d26519b2e	Use new worldSize command instead of whileLoop	2015-07-16 17:47:39 -05:00
PabstMirror	b47a17230b	Merge branch 'master' into 10digitGrids2	2015-07-16 17:26:19 -05:00
Nicolás Badano	04e137090b	Merge pull request #1753 from jonpas/slideshow ... Slideshow	2015-07-16 18:25:05 -03:00
Nicolás Badano	67d83d0d49	Merge pull request #1862 from acemod/disappearingActionsFix ... Cache the objects actions for nearby objects and set the GVAR(objectA…	2015-07-16 18:24:55 -03:00
jonpas	77631eb61c	Only add ACE_MainActions if one doesn't exist yet, Cleaned comments	2015-07-16 23:16:09 +02:00
SilentSpike	e823ec681d	Toggle help key	2015-07-16 21:45:52 +01:00
jonpas	23e7e19100	Fixed macro, Added privates	2015-07-16 22:39:02 +02:00
SilentSpike	78e17c4bdc	Fix function calls with switch to params	2015-07-16 21:37:20 +01:00
SilentSpike	a7a87c40f0	Using control groups	2015-07-16 21:33:50 +01:00
esteldunedain	8da43d25c6	Cache the objects actions for nearby objects and set the GVAR(objectActionList) correctly.	2015-07-16 17:28:27 -03:00
jonpas	a136545b85	Merge branch 'master' into slideshow	2015-07-16 22:20:56 +02:00
SilentSpike	723a0f96f6	Improve view switching UX	2015-07-16 19:43:16 +01:00
SilentSpike	20f05d9906	Improve unit switching UX	2015-07-16 18:31:49 +01:00
SilentSpike	458fe363ff	Fixing typo	2015-07-16 17:56:50 +01:00
SilentSpike	3895a51f02	Correcting view transition	2015-07-16 17:48:32 +01:00
SilentSpike	e3c9e52fdd	Tree events to update camUnit	2015-07-16 17:29:10 +01:00
SilentSpike	549d53d919	Use RscPicture for compass	2015-07-16 15:51:32 +01:00
SilentSpike	d043a471b3	Improving unit list handling	2015-07-16 15:49:02 +01:00
Joko	d92e6af1c2	Add IRStrobe to CfgMagazines	2015-07-16 15:17:09 +02:00
Joko	0ba8a39dc5	Add LoD to Wirecutter	2015-07-16 14:46:08 +02:00
Joko	c9a47ec053	Add LoDs for IVBag 250/500/1000 ... Add LoDs for Kestrell	2015-07-16 14:41:42 +02:00
PabstMirror	1f4488253d	Only attach some triggers	2015-07-15 23:52:47 -05:00
Joko	b2b7015b8e	Remove Unessesary Comments in RVMAT	2015-07-15 21:35:30 +02:00
Joko	9aa0285064	Revert LoD Changes	2015-07-15 21:13:05 +02:00
Joko	fd4d4abb73	Move UAV Battery form models to data ... change LoD Distance Fix IVBag names(my issue)	2015-07-15 20:51:06 +02:00
Joko	a72312738e	Add to all Objects a LoD with nothing in for "hiding" Objects in Distance ... Remove Old Earplugs Use 3 Object instead of 9 for IVBag with Using of Model Config	2015-07-15 20:34:35 +02:00
SilentSpike	7f04164653	Handling the spectatable unit list	2015-07-15 14:58:38 +01:00
SilentSpike	147571c76f	Better method of updating camera view	2015-07-15 14:58:08 +01:00
SilentSpike	784865d634	Clear workspace	2015-07-15 13:50:10 +01:00
SilentSpike	5dc4dbeb88	Handle camera attributes	2015-07-15 12:34:44 +01:00
SilentSpike	d2345a398a	Handle free cam movement	2015-07-15 12:23:25 +01:00
SilentSpike	90b6fd3d8b	Initalize interface	2015-07-15 12:09:28 +01:00
SilentSpike	d7cc309591	setSpectator correct group handling, disable user input	2015-07-15 11:48:49 +01:00
SilentSpike	a02470c341	Unify interface as display	2015-07-15 11:43:09 +01:00
PabstMirror	7cc2628c53	Stuff	2015-07-15 03:18:19 -05:00
PabstMirror	104d1a1cc7	Attaching (Rotate to verticle)	2015-07-15 02:54:38 -05:00
jonpas	e1fb4db63a	Fixed chairs inheritance in sitting	2015-07-15 00:42:41 +02:00
jonpas	174ef91b82	Fixed comment typo	2015-07-15 00:36:05 +02:00
jonpas	338aa19aaa	Increased ability to look up #1846, Cleaned up new and empty lines in movement	2015-07-15 00:35:12 +02:00
PabstMirror	6130b5b373	Working Demo	2015-07-14 00:24:55 -05:00
PabstMirror	14eae93f4b	#1814 - Save and restore last mortar charge setting	2015-07-13 19:09:55 -05:00
PabstMirror	78d0767051	#1838 - Remove base airFriction test (broke smokes)	2015-07-13 18:42:59 -05:00
SilentSpike	7b88280988	Merge pull request #1852 from jonpas/fixELSTRINGmacroWord ... Fixed ELSTRING macro typo	2015-07-14 00:02:34 +01:00
jonpas	01ba50bbb2	Fixed ELSTRING macro typo	2015-07-13 22:12:54 +02:00
jonpas	b266effe5b	Made object actions dynamic	2015-07-13 22:07:21 +02:00
SzwedzikPL	60641d57d2	Disable hearing in zeus camera	2015-07-13 21:01:41 +02:00
Nicolás Badano	01d8d7957c	Merge pull request #1824 from Legolasindar/master ... Update spanish translation	2015-07-13 15:36:36 -03:00
jonpas	4fa1c7dc0a	Moved verification to public function, removed unnecessary str	2015-07-13 19:56:25 +02:00
PabstMirror	061ddbd8de	Remove debug testing code	2015-07-12 14:09:27 -05:00
PabstMirror	46cee06f07	#1812 - Show Options on Intro/Outro	2015-07-12 10:26:08 -05:00
PabstMirror	d4f70134e6	medical/setUnconscious header	2015-07-12 10:25:00 -05:00
jonpas	89c5218bbd	Fixed module init exit condition	2015-07-12 16:45:09 +02:00
jonpas	b83b161e3d	Fixed default duration value in module init, Added error if required fields left empty, Combined 2 lines	2015-07-12 16:32:48 +02:00
PabstMirror	05d98370e4	Handle enableCombatDeafness and/or ringing enabled	2015-07-11 21:00:40 -05:00
PabstMirror	7a204cbdb1	#1843 - HuntIR - Handle Dead Projectile	2015-07-11 19:48:52 -05:00
PabstMirror	6de3df6474	Update README.md	2015-07-11 12:42:19 -05:00
PabstMirror	040f4a92a0	#1696 - Flashbangs make big boom	2015-07-10 21:39:35 -05:00
PabstMirror	c27afca485	DisableEarRinging / Cleanup	2015-07-10 21:30:47 -05:00
PabstMirror	d11fa939e1	Hearing - Merge PFEH (ringing/volume)	2015-07-10 21:01:32 -05:00
Joko	83e74d848d	fix that cachedOverPressureValue is called Multible per Weapon	2015-07-11 00:50:12 +02:00
Joko	9bb9df59ec	Add caching for Backblast	2015-07-11 00:09:20 +02:00
jonpas	c90c83831d	Removed Tripod PBOPREFIX newline	2015-07-10 23:36:30 +02:00
jonpas	ef18006423	Tripod indentation to 4 spaces, removed empty first lines	2015-07-10 23:34:36 +02:00
SilentSpike	97f3ec4f65	Merge pull request #1835 from jonpas/disableEarRingingOnTheFly ... Exit Ear Ringing PFH when disabled during ringing	2015-07-10 22:08:53 +01:00
jonpas	4826fd5c1c	Exit Ear Rining PFH when disabled during ringing	2015-07-10 22:52:04 +02:00
jonpas	e437fbbacd	Removed safety from binoculars/designators	2015-07-10 22:42:40 +02:00
Joko	8cd8504b3f	Add Posibility to Change Backblast Values in Magazine Config	2015-07-10 22:30:07 +02:00
SilentSpike	a1ec2eb7c3	Update handleRespawn to new function parameters	2015-07-09 21:24:45 +01:00
SilentSpike	1e13758ad8	Better group handling, more functional function	2015-07-09 21:20:09 +01:00
SilentSpike	1e8b869117	Reshuffling toolbar tools	2015-07-09 18:08:34 +01:00
SilentSpike	877d4e7cd9	Using common defines, further cleanup	2015-07-09 17:53:22 +01:00
Glowbal	d3bed7aedb	fixed -1 to disable the revive timer does not work	2015-07-09 13:02:48 +02:00
PabstMirror	499a63e8e3	External - Move to right of head	2015-07-08 15:53:31 -05:00
Ivan Navarro Cabello	78529af60c	Update spanish translation	2015-07-08 20:57:46 +02:00
SilentSpike	46bd42d59e	Cleanup interface config	2015-07-08 15:31:54 +01:00
PabstMirror	ba8c9186bb	Show leveled azimuth/elevation	2015-07-08 01:00:43 -05:00
jonpas	815b7984aa	Fixed event statement arguments, reworded comment	2015-07-07 03:46:54 +02:00
SzwedzikPL	defc82694b	Fix for 'Treat at...' option	2015-07-06 21:30:49 +02:00
PabstMirror	f6973c61fa	Merge branch 'master' into mk6-fixBISleveling	2015-07-06 01:35:55 -05:00
SilentSpike	98e9245ed9	Basic respawning support	2015-07-05 21:53:09 +01:00
SilentSpike	2aebabdb2c	Safeguard against repeat usage	2015-07-05 21:31:26 +01:00
SilentSpike	788c23c940	Allow resetting existing spectators	2015-07-05 21:30:19 +01:00
Joko	fa900452ea	Add DAGR (by Blackpixxel) ... Add QuikClot to Medical (by Blackpixxel) Add QuikClot Litter (by Blackpixxel) Update Blackpixxel at Author Fix IRStrobe Texture Path	2015-07-05 22:21:17 +02:00
PabstMirror	88e0b67364	Merge branch 'master' into fingering	2015-07-05 12:30:31 -05:00
SilentSpike	9026db9b3c	Major cleanup	2015-07-05 16:44:16 +01:00
jonpas	cb210f92a0	Prevented sitting on flipped chairs, Stand when chair gets knocked away/otherwise moves	2015-07-05 17:07:34 +02:00
jonpas	34dea7d971	Fixed #1796 sitting above ground level	2015-07-05 13:55:45 +02:00
Glowbal	e9d51aa57b	Updated repair config	2015-07-05 10:31:12 +02:00
PabstMirror	6e982018d3	Don't use uiNamespace to store PEFH	2015-07-04 23:14:44 -05:00
PabstMirror	183c03a3a4	Add missing PREP	2015-07-04 22:54:21 -05:00
SilentSpike	069ab2432a	Keybinds should always be present	2015-07-05 01:32:06 +01:00
SilentSpike	ad30b28f34	Improved death handling	2015-07-05 01:29:14 +01:00
SilentSpike	bedde2197b	Only cache info on death if not a spectator	2015-07-05 01:12:16 +01:00
SilentSpike	950aec38b7	Fixed macro	2015-07-05 01:04:07 +01:00
SilentSpike	01a5ab619e	handleKilled and handleRespawn	2015-07-05 00:49:47 +01:00
SilentSpike	6596bbdb0a	Coding standards	2015-07-05 00:17:15 +01:00
SilentSpike	83e5309654	Updated side GVAR	2015-07-05 00:11:38 +01:00
SilentSpike	27610b78e1	Blank space cleanup	2015-07-05 00:10:01 +01:00
SilentSpike	5e7c094c98	Cache details on respawn (not at postInit)	2015-07-05 00:09:43 +01:00
Joko	815365fd2e	Small Performace Improvement in Nametags	2015-07-04 23:03:16 +02:00
Joko	0c099dc4d1	Add 3D Object IVBag Blood, Plasma and Saline with 1000ml, 500ml, 250ml(Made by PaxJaromeMalues) ... Add PaxJaromeMalues to AUTHORS	2015-07-04 22:50:32 +02:00
SilentSpike	c09314027f	"isNotSpectator" canInteractWith condition	2015-07-04 19:41:18 +01:00
Joko	240b26b9ac	Add IRStrobe 3D Object to attach ... Add M57 Clacker to explosives Add New LowPoly Earplug to Hearing Add WireCutter to logistics_wirecutter Reduce UAVBattery Texture Size in logistics_uavbattery Add MapTools to maptools	2015-07-04 19:56:54 +02:00
SilentSpike	975bc229c6	Merge branch 'master' into ace_spectator ... Conflicts: addons/spectator/stringtable.xml	2015-07-04 18:53:20 +01:00
SilentSpike	19c16b1f59	Comment out dev branch command	2015-07-04 17:40:23 +01:00
bux578	fcb6383337	remove some empty xml nodes	2015-07-04 16:19:53 +02:00
ProfessorCZ	89a9218e59	CZ Translation - Update	2015-07-04 15:56:00 +02:00
Clon1998	08fecbf1f3	Fixed german translation	2015-07-04 14:30:42 +02:00
Clon1998	93871c4675	Added german translation	2015-07-04 10:01:58 +02:00
voiper	981c961ce1	-Switched to CBA keybinds. ... -Localized keybinds. -Removed fnc_cameraIntro.sqf; superfluous. -Various code clean ups. -Changed: Condition for mission end now checks allUnits (todo: change to allPlayers when available).	2015-07-04 01:00:27 -07:00
Clon1998	c61a0f03cd	Fixed german translation. ... Fixed german translation for Key STR_ACE_Medical_AssignMedicVehicle_EnableList_Description	2015-07-04 09:43:42 +02:00
PabstMirror	ab2ebf5fcf	MissleGuidance - Move PARAMS up to top	2015-07-03 21:06:13 -05:00
voiper	d4b5f88a76	Last remnants of view distance.	2015-07-03 15:00:00 -07:00
SilentSpike	909fbb5dc4	Merge pull request #1732 from acemod/checkPBOfix ... CheckPBO should ensure client isn't running any addons the server isn't	2015-07-03 22:33:17 +01:00
Glowbal	57c4bc453a	Merge pull request #1779 from SzwedzikPL/zeus_no_paineffect ... disable pain effect in zeus camera	2015-07-03 23:20:33 +02:00
Glowbal	071a673f28	Implemented repair action framework ... copied across treatment framework from medical and adjusted it to suit the repair actions	2015-07-03 23:14:23 +02:00
Glowbal	0bf56d64bd	Readding file that git removed	2015-07-03 22:31:30 +02:00
Glowbal	1ad2a5cdf1	Merge branch 'master' into repair ... Conflicts: addons/interaction/CfgVehicles.hpp	2015-07-03 22:29:29 +02:00
Glowbal	44de95ea81	Merge pull request #1790 from acemod/medicalImprovements ... Medical improvements	2015-07-03 22:21:20 +02:00
Glowbal	fd649aee38	Changed default value for surgical kit. Should be use anytime	2015-07-03 22:17:31 +02:00
Glowbal	9edf1b1adf	Implemented use conditions for PAK and SurgicalKit ... It is now possible to only have a treatment action show up for stable (not bleeding) patients	2015-07-03 22:16:18 +02:00
voiper	206a976013	Merge branch 'ace_spectator' into ace_spectator_dev ... Conflicts: addons/spectator/functions/fnc_camera.sqf	2015-07-03 12:59:47 -07:00
Glowbal	07303633e4	Merge pull request #1692 from acemod/fixVanillaDamageEffectsShowing ... Fix vanilla damage effects	2015-07-03 21:41:26 +02:00
voiper	81889aef2d	Viewdistance dialogue remove.	2015-07-03 12:23:49 -07:00
voiper	56aa87ce8b	Removed view distance changing.	2015-07-03 12:14:41 -07:00
SilentSpike	a23f401695	Removing all references to penPos	2015-07-03 19:07:10 +01:00
SilentSpike	58b1c0f3a9	Solve crashing caused by off map position and disableSimulation to stop underwater issues	2015-07-03 18:44:40 +01:00
SilentSpike	bbadc9242b	Further zeus actions cleanup	2015-07-03 14:21:21 +01:00
SilentSpike	ca36b62356	Zeus interactions string cleanup	2015-07-03 13:20:32 +01:00
PabstMirror	1c6b12126e	Merge branch 'master' into mk6-fixBISleveling	2015-07-02 22:03:25 -05:00
Nicolás Badano	8052dd8ea3	Merge pull request #1782 from gienkov/pl-translation ... PL translation	2015-07-02 23:06:13 -03:00
SilentSpike	ff4fce3950	Initial enter/exit function implementation	2015-07-03 02:16:23 +01:00
SilentSpike	d036639b46	Adding hideUnit functions to ace_common	2015-07-03 02:14:58 +01:00
SilentSpike	91ca532496	Preserve equipment, added comments	2015-07-02 23:43:33 +01:00
gienkov	70862c5de9	PL translation	2015-07-02 23:55:26 +02:00
SzwedzikPL	13999fdd31	finddisplay into curatorcamera	2015-07-02 19:36:34 +02:00
SilentSpike	8c98f98472	Fixed end mission code on server	2015-07-02 16:42:40 +01:00
SilentSpike	eeeb543424	Simplified default pen position assignment	2015-07-02 16:30:37 +01:00
SilentSpike	4df1738b43	Don't move respawn markers ... Exit on HC Only run end mission PFH on server	2015-07-02 16:23:25 +01:00
SilentSpike	3a4a32382d	Removed empty stringtables	2015-07-02 15:56:01 +01:00
Nicolás Badano	13f5b08892	Merge pull request #1760 from voiperr/master ... ACE_Spectator	2015-07-02 10:52:59 -03:00
SzwedzikPL	c2e4ee431f	no pain effect in zeus camera	2015-07-02 13:56:56 +02:00
PabstMirror	89305473a2	Add performance note.	2015-07-01 15:50:14 -05:00
PabstMirror	5e80f9d8d3	Merge branch 'master' into userActionPrototype	2015-07-01 15:04:40 -05:00
PabstMirror	b02086ca52	Intersection Check / FOV adjustment	2015-07-01 14:53:59 -05:00
SzwedzikPL	6b4eeedbad	headgear influence on hearing	2015-07-01 21:21:09 +02:00
PabstMirror	319e50a9cc	Viewdistance - Fix Error Missing )	2015-07-01 12:39:49 -05:00
Nicolás Badano	10ef88b655	Merge pull request #1596 from SzwedzikPL/interaction_box_inventory ... Open action for boxes	2015-07-01 12:59:24 -03:00
Nicolás Badano	9d0dcc5ea2	Merge pull request #1757 from Winter259/viewdistance-settings-init ... Viewdistance settingsInitialized	2015-07-01 12:58:07 -03:00
jonpas	8f0101a1d9	Merge branch 'master' into addEarplugsEnhancement ... Conflicts: addons/hearing/functions/fnc_addEarPlugs.sqf	2015-07-01 17:45:00 +02:00
Nicolás Badano	f175490298	Merge pull request #1772 from acemod/aceModuleSyncronizedObjects ... Ace_modules - Pass synced objects to functions	2015-07-01 11:33:03 -03:00
Nicolás Badano	f1f31cd94a	Merge pull request #1769 from acemod/mapShakePanning ... Allow moving map while shake effect active	2015-07-01 11:31:31 -03:00
Nicolás Badano	d06ac6cace	Merge pull request #1771 from acemod/fixRallyPoint ... Rally point object names	2015-07-01 11:30:32 -03:00
Nicolás Badano	1e8d4327df	Merge pull request #1763 from naizarak/patch-1 ... Update fnc_addEarPlugs.sqf	2015-07-01 11:22:59 -03:00
PabstMirror	57f88fe77a	Ace_modules - Pass synced objects to functions	2015-07-01 01:53:15 -05:00
PabstMirror	7eb26c8710	#1699 - Rally point object names	2015-07-01 01:27:06 -05:00
PabstMirror	c58ff8d31d	#1736 - Allow moving map while shake effect active	2015-07-01 00:13:55 -05:00
Joko	30111b4f15	Fix Merge Problems ... Use CString Macro	2015-07-01 03:03:51 +02:00
Joko	a74bc3a748	Merge branch 'master' of https://github.com/acemod/ACE3 into acemod-master ... Conflicts: AUTHORS.txt addons/parachute/CfgVehicles.hpp	2015-07-01 02:49:29 +02:00
PabstMirror	c1dd2df57a	Move grid funcs and map long,lat,altitude to common	2015-06-30 12:26:51 -05:00
PabstMirror	ccebb4f86a	Merge branch 'master' into 10digitGrids2 ... Conflicts: addons/microdagr/functions/fnc_updateDisplay.sqf	2015-06-30 11:25:55 -05:00
PabstMirror	923018a9f6	mdagr use getMapPosFromGrid	2015-06-30 11:18:47 -05:00
PabstMirror	1f47ffc5de	Error checking, handle out of bounds grids	2015-06-30 11:11:53 -05:00
PabstMirror	1f7994e10f	Calc real X and Y offsets	2015-06-29 21:18:21 -05:00
jonpas	f08bd7acc2	Improved Slide Duration module option description	2015-06-29 22:24:16 +02:00
Nicolás Badano	a284cc3f6b	Merge pull request #1755 from ToasterBR/master ... Translation to Brazilian Portuguese (PT-BR)	2015-06-29 17:22:38 -03:00
jonpas	a9c6e3c065	Disabled debug	2015-06-29 22:14:38 +02:00
jonpas	bb3495468e	Replaced PFH for waitAndExecute with PFH-like handling	2015-06-29 22:13:28 +02:00
jonpas	9ee75dbb21	Multiple modules support	2015-06-29 21:54:40 +02:00
jonpas	3ac520eb3e	Corrected typo	2015-06-29 21:23:47 +02:00
naizarak	75e322e6ae	Update fnc_addEarPlugs.sqf ... Do not automatically add earplugs to units if combat deafness is disabled.	2015-06-29 12:23:32 -07:00
jonpas	038de8b5cf	Added Slideshow module icon	2015-06-29 21:22:59 +02:00
jonpas	7e200afa04	Added automatic slide transitions with custom duration	2015-06-29 21:07:51 +02:00
voiper	0d3601da47	Tiny fix to description.	2015-06-29 09:51:19 -07:00
SilentSpike	873936dc31	Simplify addon checking code	2015-06-29 14:15:46 +01:00
voiper	3dab207b65	Add Spectator.	2015-06-28 19:34:21 -07:00
jonpas	475e4673eb	Fixed typo	2015-06-28 22:28:26 +02:00
jonpas	9e6ce52fb6	Added check to addEarplugs if earplugs are used	2015-06-28 21:25:01 +02:00
PabstMirror	fde8f7383f	Map Opened/Closed Events + use in maptools	2015-06-28 13:08:47 -05:00
Simon AM	8bdf243ab9	Removed extra ]	2015-06-28 10:19:21 +02:00
Simon AM	0e7c6a8e19	Set Viewdistance to start on settingsInitialized	2015-06-28 10:18:53 +02:00
ToasterBR	f4a51d57ef	Translation to Brazilian Portuguese (PT-BR) ... Made all remaining translations, including new ones like the sitting module, for example.	2015-06-27 15:48:39 -03:00
SilentSpike	f2e5f729e8	Merge branch 'master' into gm_revamp	2015-06-27 18:26:30 +01:00
jonpas	34b270d89d	Added Flat TV support	2015-06-27 04:23:21 +02:00
jonpas	a7d58f3b9f	Fixed project name	2015-06-27 04:13:20 +02:00
jonpas	77cb278f61	Added Slideshow mission tool	2015-06-27 04:11:57 +02:00
PabstMirror	6bb235f38a	Merge pull request #1711 from acemod/mdagr-ambientBrightness ... mdagr use ambientBrightness	2015-06-26 20:23:32 -05:00
PabstMirror	ca145cce26	Merge pull request #1705 from acemod/animSourceAmmoBox ... #1704 - Add missing AnimationSources	2015-06-26 20:23:09 -05:00
ulteq	241e8acdd9	Merge pull request #1541 from jonpas/sitting ... Sitting	2015-06-26 21:34:34 +02:00
jonpas	c8c1f76e7d	Macro usage, privates fix	2015-06-26 21:31:48 +02:00
ulteq	b78ece7114	Merge pull request #1706 from jonpas/settingsBFT ... Blue Force Tracking ACE_Settings	2015-06-26 20:06:20 +02:00
SilentSpike	5e38ba9b20	Correcting some spacing	2015-06-24 17:09:43 +01:00
ViperMaul	7e6be08153	Improved unloading on roof tops ... Less chance of patient being unloaded directly to the ground instead of the roof top where the helo has landed. Probably not fool proof yet due to randomness. #1728	2015-06-23 16:11:00 -07:00
SilentSpike	e4f89a96b7	CheckPBO should ensure client isn't running any addons the server isn't	2015-06-23 15:01:55 +01:00
ViperMaul	6b6ad93848	Fix for unable to unload from driver seat. ... Improvement for helo's on roof tops and boats. #1728	2015-06-22 19:48:28 -07:00
PabstMirror	d5757c090a	Calc gridOffsets at mission start.	2015-06-22 20:36:37 -05:00
jonpas	293fa4f16b	Coding standards applied to common/CfgVehicles.hpp	2015-06-22 19:29:19 +02:00
jonpas	ec5cc606c3	Fixed CheckPBOs Whitelist default value in module	2015-06-22 19:24:10 +02:00
jonpas	922e88d31e	Fixed handcuffing not breaking sitting animation	2015-06-22 15:25:10 +02:00
SilentSpike	27a4ecd747	Expanded readme	2015-06-22 00:43:39 +01:00
SilentSpike	378b39db77	Merge remote-tracking branch 'upstream/master'	2015-06-22 00:37:28 +01:00
SilentSpike	398f1c768f	Fix the module on dedicated servers	2015-06-22 00:17:29 +01:00
SilentSpike	e3e415c727	Added readme	2015-06-21 23:46:23 +01: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
PabstMirror	2d6e862237	Merge branch 'master' into 10digitGrids2	2015-06-21 13:07:58 -05:00
PabstMirror	ce2a617c7b	#1709 - Remove ACE_Comanche_Test from zeus	2015-06-21 13:00:51 -05:00
PabstMirror	f0adf256a8	#573 - mdagr use ambientBrightness	2015-06-21 12:25:16 -05: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
PabstMirror	4570f77249	Privates / Cleanup	2015-06-20 20:40:17 -05:00
PabstMirror	2c64abb816	#1704 - Add missing AnimationSources	2015-06-20 20:17:27 -05:00
Glowbal	e153e47bb2	Disabled litter on treatment failure. #1403 ... We give back the items, so litter does not make sense at the moment. In the future we need to expand this with conditions for success/failure.	2015-06-20 12:54:00 +02:00
Glowbal	9e00fc479b	CPR local is now also only executed when the target is still alive. ... Otherwise it's quite useless	2015-06-20 12:51:42 +02:00
Glowbal	c4283404e8	Changed CPR to be available for all unconscious units ... Including dead	2015-06-20 12:51:01 +02:00
Glowbal	ea0be1f563	Only execute the local handling of CPR when in a valid state	2015-06-20 12:46:26 +02:00
Glowbal	385baf1331	Using CPR while in revive state will extend the life timer	2015-06-20 12:44:52 +02:00
Glowbal	9795647d9c	While in revive state, ensure vitals are never above 0 for adv medical	2015-06-20 12:44:29 +02:00
Glowbal	3f5a050745	Fixed #1693	2015-06-20 12:38:12 +02:00
Glowbal	c3e2d1bf9c	Removed always unconscious for basic medical	2015-06-20 12:23:40 +02:00
ulteq	8d1d0c5480	Merge pull request #1672 from acemod/hearingAmmoClassCaching ... Improved config caching	2015-06-20 09:48:07 +02:00
Macusercom	cac8dd8b02	German translations fixes	2015-06-20 02:16:30 +02:00
Glowbal	5887c59c05	Made fix properly for advanced medical	2015-06-19 23:03:31 +02:00
Glowbal	300a33ea0a	Initial work	2015-06-19 22:53:25 +02:00
PabstMirror	25df7aad09	Attach use purely virtual object (no setPos)	2015-06-19 13:32:42 -05:00
ulteq	474e694309	Enable interaction with explosives while swimming	2015-06-19 11:49:38 +02:00
PabstMirror	6c7ba7b5ae	Zeus module on dedicated server	2015-06-18 22:43:49 -05:00
PabstMirror	375c81d9b0	Connect Zeus module to Frag	2015-06-18 22:13:06 -05:00
PabstMirror	9c0478ddfd	Cleanup	2015-06-18 22:04:48 -05:00
PabstMirror	e235ebcc15	Fix frag always killing thrower	2015-06-18 21:48:23 -05:00
ViperMaul	394bcafc4a	Set version to 3.1.2	2015-06-18 15:49:27 -07:00
PabstMirror	d7717448fa	#1670 - Laser pointer - pass _brightness to drawFnc	2015-06-18 17:16:53 -05:00
ulteq	5d2905ca42	Improved config caching	2015-06-18 11:56:58 +02:00
ulteq	c3fea42bce	Merge pull request #1622 from acemod/huntirHitpoints ... Added 'parachute' and 'camera' hitpoints to the HuntIR model:	2015-06-18 11:03:15 +02:00
ulteq	bb877bc54c	Added HuntIR and tactical ladder to ACE_Box_Misc	2015-06-18 11:02:04 +02:00
Glowbal	0631a6ae7d	Merge pull request #1647 from acemod/medicalStringtableFix ... Fixes: #1646	2015-06-18 08:34:42 +02:00
Glowbal	160d659523	Merge pull request #1656 from acemod/wireCutterCwire ... Add concertinawire to wirecutters	2015-06-18 08:34:02 +02:00
ViperMaul	85c40a4cf2	Merge pull request #1668 from acemod/release ... Release v3.1.1 merge into Master	2015-06-17 19:15:35 -07:00
Macusercom	500504d93b	Further improvements as suggested for German translation	2015-06-18 00:43:23 +02:00
jonpas	083d34b62b	Removed redundant GVAR	2015-06-18 00:21:56 +02:00
Grey-Soldierman	6f9702b532	Removed Entrenching Tool	2015-06-17 18:25:57 +01:00
Grey-Soldierman	7e5859f6f8	Ports A2 Envelope Small & Envelope Big. ... Adds entrenching tool for use in building trenches (Requires Script to be made)	2015-06-17 18:17:57 +01:00
ViperMaul	bab33bfbe2	Bump the build number from 0 to 1	2015-06-17 08:15:19 -07:00
Grey-Soldierman	d78caf9255	Added Entrenching Tool	2015-06-17 15:05:49 +01:00
Grzegorz	1de569656d	Fix checking vitals anim ... It uses animations that don't match at all what you are doing anyway so I think it's better to just disable anim for that actions which are: * Checking pulse * Checking BP * Checking response	2015-06-17 14:58:35 +02:00
ViperMaul	e5a5832cac	Merge branch 'release' of https://github.com/KoffeinFlummi/ACE3 into release	2015-06-16 22:43:46 -07:00
ViperMaul	47ef53201a	Set version number to 3.1.1	2015-06-16 22:41:04 -07:00
Glowbal	a8998690ea	Merge pull request #1650 from acemod/tacticalladderFixes ... Fixed model.cfg and requiredAddons	2015-06-17 07:36:01 +02:00
PabstMirror	ccb30e0a47	use master pfh for frag	2015-06-16 22:39:37 -05:00
Macusercom	ed4fbb5d33	More corrections	2015-06-16 23:19:47 +02:00
Macusercom	cf2f36a775	Corrections suggested by others	2015-06-16 23:17:34 +02:00
ulteq	82d80359d1	Fixes: https://github.com/acemod/ACE3/issues/1646	2015-06-16 21:57:12 +02:00
Nicolás Badano	2afcf92643	Merge pull request #1440 from legman/akalegman ... IED Class Inheritance Fixes	2015-06-16 13:35:19 -03:00
PabstMirror	196f3bd86b	Add concertinawire to wirecutters	2015-06-15 23:59:21 -05:00
Macusercom	f1691f2562	Fixed a typo	2015-06-16 03:23:32 +02:00
Macusercom	24cea18ae5	Revert "Revert "Added German translations"" ... This reverts commit 4403e3c665.	2015-06-16 03:21:25 +02:00
Macusercom	09f7473d7b	Added German translations	2015-06-16 03:06:47 +02:00
Macusercom	4403e3c665	Revert "Added German translations" ... This reverts commit 0adc07d284.	2015-06-16 03:06:23 +02:00
Macusercom	0adc07d284	Added German translations	2015-06-16 03:06:13 +02:00
AKALegman	c027db2e0e	final fixes	2015-06-15 20:55:49 +01:00
Nicolás Badano	fbf99224c4	Merge pull request #1635 from jonpas/fixCheckPBOkick ... Fixed CheckPBO Kick	2015-06-15 15:43:28 -03:00
jonpas	04c06b51ed	Fixed #1632 - CheckPBOs kick serverCommand changed to display 46	2015-06-15 20:23:16 +02:00
jonpas	f61066f11a	Fixed checkPBO function not executing on server	2015-06-15 19:55:30 +02:00
Glowbal	f8aa9a3171	Merge pull request #1621 from acemod/hrIncrease ... Medical - change hrIncrease random min/max	2015-06-15 10:42:43 +02:00
AKALegman	5915e24f5d	some fixes	2015-06-14 16:09:01 +01:00
ulteq	32f02b72a5	Fixed missing 'HitEngine' RPT warning.	2015-06-14 13:57:38 +02:00
Ivan Navarro Cabello	76f7962dac	Updated spanish stringatable ... Updated spanish stringatable for (Common, Medical, Optionsmenu, Tacticalladder).	2015-06-14 13:52:55 +02:00
ulteq	14fd5c930b	You can no longer connect to destroyed HuntIR cameras	2015-06-14 12:54:10 +02:00
ulteq	af2e2f71fd	Added 'parachute' and 'camera' hitpoints to the HuntIR model: ... * You can now shoot the parachute to make it fall faster * And you can shoot the camera to kill the video feed	2015-06-14 12:25:56 +02:00
PabstMirror	1c5788baab	Medical - change hrIncrease random min/max	2015-06-14 03:54:50 -05:00
ulteq	8d6b7de0ad	Fixed model.cfg and requiredAddons	2015-06-14 10:37:21 +02:00
AKALegman	0690e6f745	fixed conflicts	2015-06-14 09:36:03 +01:00
ulteq	906e365b94	DAGR now supports the new multiple devices framework	2015-06-14 09:59:06 +02:00
ulteq	48d8d5e076	Empty default keys for the DAGR to prevent conflicts	2015-06-14 09:38:25 +02:00
PabstMirror	bb414dd10f	Redo Some UI - Try to fix vectorUp problems	2015-06-14 00:52:30 -05:00
PabstMirror	dff99c4736	Tweak HTML Size	2015-06-13 20:41:57 -05:00
Glowbal	91b54bfc3a	Adds a back up function in sqf to assign open wounds.	2015-06-13 23:20:01 +02:00
ViperMaul	4c572ef298	Set version number to 3.1.0	2015-06-13 13:46:24 -07:00
jonpas	670d23e14c	Fixed Black Cellphone Display after 1.46	2015-06-13 22:12:32 +02:00
jonpas	1eeca28a3d	Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting	2015-06-13 22:08:13 +02:00
PabstMirror	4a8344e1a4	Merge branch 'master' into userActionPrototype ... Conflicts: addons/interact_menu/ACE_Settings.hpp addons/interact_menu/stringtable.xml extensions/CMakeLists.txt	2015-06-13 15:05:57 -05:00
PabstMirror	f811fc797e	Suppress optionsmenu debug	2015-06-13 15:03:22 -05:00
jonpas	254b386805	Allowed Kestrel4500 Inside and Sitting	2015-06-13 21:46:55 +02:00
ViperMaul	1322da5537	Merge pull request #1587 from acemod/fixVehicleUnconcious ... fix animation and consistently unload units from vehicle	2015-06-13 12:44:34 -07:00
jonpas	29ce8f635e	Merge branch 'master' into sitting ... Conflicts: addons/kestrel4500/CfgVehicles.hpp addons/microdagr/CfgVehicles.hpp	2015-06-13 21:43:42 +02:00
ViperMaul	132ec343b0	Suppress debug	2015-06-13 12:39:29 -07:00
ViperMaul	911a18d169	Expand maxDistance for findEmptyPosition from 10 to 13 to support the GhostHawk ... Convert ASLtoPosition #1575 and #1577	2015-06-13 12:37:10 -07:00
PabstMirror	849a45d68b	DAGR - has item check	2015-06-13 14:29:34 -05:00
PabstMirror	b2d69611d7	Merge pull request #1118 from acemod/multipleDevices ... Multiple Devices	2015-06-13 14:20:38 -05:00
PabstMirror	e7347be47b	Increase delete delay for attached IR grenades (#1615)	2015-06-13 14:08:25 -05:00
Nicolás Badano	d262dc790f	Merge pull request #1616 from acemod/addMk16ToClaymore ... Make claymores detonatable by MK16. Close #1603	2015-06-13 16:07:56 -03:00
PabstMirror	0c45d2308a	Merge pull request #1150 from acemod/mainMenuVersionHTML ... Show Version / HTML Git Version on main menu	2015-06-13 14:07:36 -05:00
Nicolás Badano	179ad6c214	Merge pull request #1526 from acemod/rainExperiment ... Update rain each frame	2015-06-13 16:07:25 -03:00
esteldunedain	1237b1cb4a	Make claymores detonatable by MK16. Close #1603	2015-06-13 16:05:18 -03:00
PabstMirror	f68a2310a8	Merge pull request #1589 from acemod/laserPointerSetting ... Optional setting to disable laser pointer system	2015-06-13 13:56:01 -05:00
ulteq	c459a80bcb	Merge pull request #1613 from ProfessorCZ/master ... CZ - Translation (medical, tacticalladder)	2015-06-13 20:48:34 +02:00
Glowbal	5013254769	Merge pull request #1530 from legman/akalegman_zeus_unconscious ... Fixed Zeus Unconscious	2015-06-13 20:48:18 +02:00
esteldunedain	d53ee1cf85	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into removeFrisk ... Conflicts: addons/captives/CfgVehicles.hpp	2015-06-13 15:19:52 -03:00
PabstMirror	fdb30f4e68	Merge pull request #1599 from acemod/captivesFixes ... Captives fixes	2015-06-13 13:15:29 -05:00
Glowbal	1c066a0b3f	Merge pull request #1586 from acemod/dynamicPAKtreatmentTime ... PAK treatment time based on total amount of damage.	2015-06-13 20:14:57 +02:00
PabstMirror	6dba8b33da	Merge pull request #1507 from acemod/fixJavelinLocking ... Fix javelin locking	2015-06-13 12:54:06 -05:00
Glowbal	3e24749948	Merge pull request #1477 from alganthe/longer_flares ... flares modified	2015-06-13 19:51:27 +02:00
ProfessorCZ	c9f29aefa2	CZ - Translation (medical, tacticalladder)	2015-06-13 19:49:59 +02:00
ProfessorCZ	bf464ffe00	CZ - Translation (medical, tacticalladder)	2015-06-13 19:46:31 +02:00
ulteq	c3340b174e	Merge pull request #1609 from acemod/ace2EarRinging ... Ported the ACE2 ear ringing logic	2015-06-13 19:44:15 +02:00
esteldunedain	3d5afd7d8f	Close #1018	2015-06-13 14:32:18 -03:00
PabstMirror	6ab8b129fa	Merge branch 'master' into multipleDevices ... Conflicts: addons/common/XEH_postInit.sqf	2015-06-13 12:30:35 -05:00
ulteq	badfc4017c	Reset 'deaf' on respawn	2015-06-13 19:27:30 +02:00
PabstMirror	e9750ddc9b	Merge pull request #1611 from acemod/refineStaticInteration ... Manual MainActions position for some statics weapons	2015-06-13 12:18:28 -05:00
ulteq	6d6c3a4285	Fixed function header	2015-06-13 19:17:26 +02:00
ulteq	022f9286e2	Fixed a bug in the caching routine	2015-06-13 19:12:24 +02:00
ulteq	3427f655b9	Removed debug output	2015-06-13 19:01:40 +02:00
ulteq	6d4f58c18e	weapon magazines caching	2015-06-13 18:57:02 +02:00
ulteq	d9722db15e	Abort if distance > 50m	2015-06-13 18:42:09 +02:00
ulteq	2509f1d840	Missing privates	2015-06-13 18:34:30 +02:00
ulteq	b6a710d282	Implemented a proper magazine lookup routine	2015-06-13 18:32:48 +02:00
ulteq	38dca2bb9e	New loudness calculation for different ammo types	2015-06-13 18:19:35 +02:00
PabstMirror	2efc095c93	Merge branch 'master' into laserPointerSetting ... Conflicts: addons/laserpointer/XEH_postInit.sqf	2015-06-13 11:02:00 -05:00
ulteq	db68b6c155	Increased loudness of missles and rockets.	2015-06-13 17:43:27 +02:00
Nicolás Badano	b17b44b869	Merge pull request #1601 from acemod/laserpointerCleanup ... Privates, newline braces, typos	2015-06-13 12:25:21 -03:00
ulteq	feec8a14b7	Removed debug output	2015-06-13 17:23:45 +02:00
ulteq	eacd8e5a49	Removed debug output	2015-06-13 17:22:45 +02:00
ulteq	833634f010	Ported the ACE2 ear ringing logic	2015-06-13 17:16:18 +02:00
Nicolás Badano	c168afe8bb	Merge pull request #1598 from acemod/serverModulesFirst ... Fix Server not reading modules	2015-06-13 12:01:22 -03:00
ViperMaul	cb1d016a39	Merge pull request #1592 from ProfessorCZ/master ... CZ - Translation	2015-06-13 07:39:18 -07:00
ViperMaul	cbb620ba98	Change setPos to setPosASL to support roof tops and multi-level objects and faster code. ... #1575 and #1577	2015-06-13 07:24:50 -07:00
gienkov	3d440fc0da	PL tactical ladder translation	2015-06-13 14:36:42 +02:00
Glowbal	e0bb3c0a4e	Merge pull request #1602 from acemod/medicalFallingFix2 ... [Adv. Medical] Improved falling damage	2015-06-13 13:39:22 +02:00
Glowbal	ce908f0fb3	Merge pull request #1579 from acemod/medicalModuleOptions ... [Adv. Medical] New module options	2015-06-13 13:37:02 +02:00
ulteq	1c4566984f	Removed debug output	2015-06-13 12:13:58 +02:00
ulteq	84d20f9794	Further improved the handling of falling damage: ... * Makes sure _projectile is always "falling" * Enables the creation of wounds in multiple body parts at once * Caches the initial impact velocity for later damage calculation * Adjusts the maxDamage value of Large Abrasions	2015-06-13 11:53:30 +02:00
ulteq	234b62b409	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medicalFallingFix2	2015-06-13 11:12:37 +02:00
ulteq	9b2ebfcbe8	Privates, newline braces, typos	2015-06-13 10:41:19 +02:00
ulteq	6eeeb22fcd	Made use of the new stringtable macros	2015-06-13 09:51:49 +02:00
ulteq	b86e6b6043	Merge pull request #1493 from acemod/tacticalladder ... Initial draft of the ACE2 tactical ladder port.	2015-06-13 09:37:41 +02:00
PabstMirror	45912c6ddb	Handcuff icon for passengerActions	2015-06-13 00:12:13 -05:00
PabstMirror	9f15cfb650	Merge branch 'master' into captivesFixes	2015-06-13 00:02:41 -05:00
PabstMirror	58e5bc3581	Switch unload captive to passenger actions	2015-06-13 00:02:30 -05:00
PabstMirror	affe323435	Fix bodybag string macro	2015-06-12 23:19:17 -05:00
PabstMirror	177f590dda	Make "InitSettingsFromModules" pfeh run on dedicated	2015-06-12 22:57:01 -05:00
PabstMirror	1804c6ceab	Merge branch 'master' into serverModulesFirst	2015-06-12 22:40:04 -05:00
ViperMaul	1c0811aa31	Change from globalEvent to targetEvent ... #1575 and #1577	2015-06-12 16:56:13 -07:00
ulteq	4160c7668c	Workaround to prevent accidentally canceling the ladder deployment	2015-06-13 00:01:48 +02:00
ulteq	8336f1d192	Complete overhaul of the ladder interaction routine	2015-06-12 23:54:51 +02:00
ulteq	9499592322	Cleanup	2015-06-12 22:45:41 +02:00
ulteq	fd40c3a947	New backpack model from raspu: ... * Fixes incorrect positioning	2015-06-12 22:14:19 +02:00
ulteq	1cbe972999	Merge pull request #1585 from acemod/huntirParachuteSpeed ... HuntIR parachute falling speed experiment	2015-06-12 21:41:46 +02:00
ulteq	62fc0a90e6	Removed the model.cfg	2015-06-12 21:41:17 +02:00
ulteq	6fe7b15832	Removed debug output	2015-06-12 21:40:44 +02:00
Nicolás Badano	c45b443bbc	Merge pull request #1597 from SzwedzikPL/interact_passengers_icons ... slot icons in passengers menu	2015-06-12 15:38:45 -03:00
SzwedzikPL	ac87a28daa	role icon for passengers	2015-06-12 20:32:10 +02:00
ulteq	1393b79a82	Reduced the descending speed of the parachute: ... * Adjusted the geometry LOD mass in the huntir.p3d * Fixed the calculating of the recording time	2015-06-12 20:22:09 +02:00
SzwedzikPL	19d3cd168c	del extra space	2015-06-12 19:54:45 +02:00
SzwedzikPL	805c0e1c68	Open action for boxes	2015-06-12 19:48:28 +02:00
ulteq	9130546c8c	DAGR overlay auto hide	2015-06-12 18:23:01 +02:00
ulteq	4b0c4b9dd6	handleDamage EH for the HuntIR	2015-06-12 18:01:53 +02:00
ProfessorCZ	acc5f4d29f	CZ - Translation	2015-06-12 15:05:04 +02:00
ProfessorCZ	531372b2a3	CZ - Translation ... Already in README	2015-06-12 14:50:50 +02:00
ulteq	604cd122d3	Experiment	2015-06-12 13:54:52 +02:00
ulteq	f84a936d95	Merge pull request #1504 from acemod/concertina_wire ... Ported the ACE2 Concertina Wire	2015-06-12 13:42:32 +02:00
ulteq	2e0b837190	Merge pull request #1534 from acemod/dagr ... Initial draft of the ACE2 DAGR port	2015-06-12 13:42:25 +02:00
ulteq	6ac2ca9208	Fixes _projectile not being updated	2015-06-12 11:48:49 +02:00
ulteq	46a73f3177	Added a function to calculate the PAK treatmentTime	2015-06-12 11:42:49 +02:00
PabstMirror	b960ae5d6b	Optional setting to disable laser pointer system	2015-06-12 00:58:04 -05:00
PabstMirror	f48777462f	Text Spacing	2015-06-11 23:59:51 -05:00
ViperMaul	072f2cc3a7	fix animation and consistently unload units from vehicle ... #1575 and #1577	2015-06-11 15:56:11 -07:00
ulteq	99b13a584a	PAK treatment time based on total amount of damage.	2015-06-11 22:54:08 +02:00
ulteq	be6d72606a	Pain is always suppressed again	2015-06-11 22:35:50 +02:00
jonpas	b974a63947	Lowercased function, comment	2015-06-11 21:51:41 +02:00
ulteq	eff31db128	HuntIR parachute falling speed experiment	2015-06-11 21:50:43 +02:00
ulteq	d8877d0dbd	Fixed 'spotterscope' typo; Moved m_m1070.paa into \data folder	2015-06-11 21:28:44 +02:00
jonpas	491e2a4429	Handle handcuffing	2015-06-11 20:01:38 +02:00
jonpas	0a71bd6931	Restricted sitting rotation	2015-06-11 19:46:16 +02:00
ulteq	ab85a9ceb6	Merge pull request #1582 from acemod/destroyableHuntIR ... Made the HuntIR camera destroyable:	2015-06-11 19:40:00 +02:00
ulteq	f7a76480f9	Made the HuntIR camera destroyable: ... * Shooting the parachute will increase its damage * The falling speed now increases with damage * Damaged cameras won't be able to transmit video * The HuntIR spawn positions now really depends on the grenade trajectory	2015-06-11 19:37:51 +02:00
Nicolás Badano	0981a8dc3e	Merge pull request #1581 from acemod/execNextFramePFEH ... One PFEH for execNextFrame and waitAndExec	2015-06-11 13:53:08 -03:00
ulteq	35e2047dca	Fixed two RVMAT files	2015-06-11 17:56:25 +02:00
ulteq	eef7c1295a	Added new adv. medical module option 'painIsOnlySuppressed'	2015-06-11 17:36:18 +02:00
jonpas	46020259fd	Fixed typo	2015-06-11 16:48:08 +02:00
ulteq	0c40c1b439	Added Adv. Medical module option 'healHitPointAfterAdvBandage': ... * Changed the default value to '0'	2015-06-11 15:30:39 +02:00
ulteq	5394131fd1	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into tacticalladder	2015-06-11 12:44:15 +02:00
ulteq	0ec729ccd8	Allow configuring the DAGR while the map is opened.	2015-06-11 12:43:42 +02:00
ulteq	292e24e414	Merge pull request #1576 from acemod/keybindExceptions ... Allowed using the ATrag, Kestrel and Rangecards inside of vehicles.	2015-06-11 12:06:01 +02:00
ulteq	ba15db7d6a	Allowed using the ATrag, Kestrel and Rangecards inside of vehicles.	2015-06-11 12:05:46 +02:00
ulteq	b3538c972f	Finished the DAGR port: ... * Added keybinds * Shortened the function names * Made use of the GVAR macro for all global variable names	2015-06-11 11:56:25 +02:00
Glowbal	9d82b9a1f3	Merge pull request #1550 from acemod/medicalVanillaDamageFix ... Attempt to fix #1465 and #1354	2015-06-11 10:25:50 +02:00
Glowbal	b6ed944123	Merge pull request #1563 from acemod/medicalCleanup ... Cleanup	2015-06-11 10:25:28 +02:00
PabstMirror	3e396b416a	One PFEH for execNextFrame and waitAndExec	2015-06-11 02:45:42 -05:00
PabstMirror	84a12bcd56	Can't escort when mounted (passenger actions)	2015-06-10 22:44:54 -05:00
ulteq	eb7a38e137	Merge pull request #1567 from acemod/rangecardMenu ... Reordered the rangecard menu entries:	2015-06-10 22:57:16 +02:00
ulteq	3c753d74ec	Reordered the rangecard menu entries: ... * Also added the ability to copy your own rangecards * Reference: https://github.com/acemod/ACE3/pull/1118	2015-06-10 22:56:35 +02:00
ulteq	3e25a8b4a9	Finished ACE2 port: ... * The concertina wire can now be placed in the editor * Added handleDamage EH to avoid wire destruction with bullets/grenades * Added proper detection routine of what killed the wire	2015-06-10 22:29:33 +02:00
AKALegman	5431ab5e01	fixed conflicts	2015-06-10 20:03:00 +01:00
ulteq	f0f36ea9b2	Fixed incorrect CSTRING	2015-06-10 18:10:12 +02:00
ulteq	249a55d041	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into dagr	2015-06-10 17:44:01 +02:00
ulteq	8a7d3e9ede	handleDamage_advanced cleanup	2015-06-10 17:10:09 +02:00
ulteq	91ce327580	Newline	2015-06-10 17:07:35 +02:00
ulteq	caae62b2af	Reverted handleDamage_advanced	2015-06-10 17:07:00 +02:00
ulteq	245151d8c2	Removed spaces	2015-06-10 17:03:09 +02:00
ulteq	1c2c7ef8d7	Fixed empty selectionNames in vehicle crashes	2015-06-10 17:02:14 +02:00
ulteq	9336e7c9e1	[WIP] Various handleDamage_caching fixes	2015-06-10 16:51:46 +02:00
ulteq	772a1e508b	Cleanup	2015-06-10 16:07:09 +02:00
ulteq	0661d25ae3	Removed debug output	2015-06-10 16:06:46 +02:00
ulteq	3d744be2a8	Fixes the map grid calculation for negative stepY values: ... * On maps like Utes, Chernarus, ...	2015-06-10 15:54:50 +02:00
ulteq	d2ad0255e9	Fixed DAGR icon size	2015-06-10 13:48:39 +02:00
ulteq	c617372612	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into concertina_wire	2015-06-10 13:40:34 +02:00
ulteq	0f6c93852c	Fixed handling of falling damage	2015-06-10 12:59:55 +02:00
ulteq	8bb3dbbaf6	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medicalVanillaDamageFix	2015-06-10 12:59:11 +02:00
ulteq	7318aae629	Cleanup	2015-06-10 12:47:22 +02:00
Glowbal	efa9cf4709	Fix handleDamage caching return value ... Should never return nil. Instead, return a 0 as it's expecting new damage. this may fix the random vanilla damage kicking in.	2015-06-10 12:21:06 +02:00
PabstMirror	e2890b0699	#1473 - Fix Medical Log Localization ... also swap some common EFUNCs	2015-06-09 17:30:02 -05:00
ulteq	9d0c034b72	Merge pull request #1556 from acemod/kestrel_rvmat ... Increased specular of the Kestrel texture	2015-06-09 23:02:23 +02:00
ulteq	b16d341c0d	Increased specular of the Kestrel texture	2015-06-09 23:01:48 +02:00
ulteq	2a929c4c6b	Replaced all spawn, sleep, and fsm code.	2015-06-09 22:46:04 +02:00
PabstMirror	a48aded5e5	Fix Keybind	2015-06-09 15:02:22 -05:00
PabstMirror	c5c36c42e1	GVAR(enabled) - readme	2015-06-09 14:02:19 -05:00
jonpas	51e83ba0fa	Handle kileld and disconnect while sitting	2015-06-09 18:52:12 +02:00
jonpas	5bfa2425bb	Git hates me	2015-06-09 18:33:39 +02:00
jonpas	3a4cd99001	Changed setPos to setPosASL for reliability, Fixed module icon name	2015-06-09 18:33:07 +02:00
jonpas	f1f9ee1365	Added module icon, removed comment	2015-06-09 18:27:58 +02:00
jonpas	36d4d01a30	Adjusted Chair (Plastic) sitting position	2015-06-09 16:55:06 +02:00
jonpas	3e0d4d1f7b	Fixed Rattan Chair position, doAnimation before moving player	2015-06-09 16:48:58 +02:00
jonpas	3510d43a17	Removed isNotInside from Sandbag, SpottingScope and Tripod placement	2015-06-09 16:20:43 +02:00
jonpas	332afb2174	Allow certain self-interactions while sitting	2015-06-09 16:17:05 +02:00
jonpas	951f9d32c3	Allow interaction menu while sitting	2015-06-09 16:04:37 +02:00
jonpas	f9d292e9c2	Missing privates	2015-06-09 15:52:41 +02:00
ulteq	d454a2ccfc	Attempt to fix #1465 and #1354	2015-06-09 15:46:00 +02:00
PabstMirror	8abd488a43	Read server modules before "SettingsInitialized" on clients	2015-06-09 01:27:59 -05:00
PabstMirror	7cf77de8cf	Opps	2015-06-09 00:53:40 -05:00
PabstMirror	5ce7ec48e7	Minor Cleanup	2015-06-09 00:51:48 -05:00
PabstMirror	7d08469df9	Module for setting	2015-06-09 00:00:00 -05:00
PabstMirror	9d914d655a	Convert Finger to CBA/ACE format	2015-06-08 20:34:29 -05:00
jonpas	95ec2ea1f9	Added isNotSitting exception, Renamed sitting QGVAR	2015-06-08 23:39:14 +02:00
jonpas	c6b5c705c7	Added Sitting Settings and Module	2015-06-08 23:25:15 +02:00
PabstMirror	b61bd1fb75	1.46 New RscInfoType (fix UBC)	2015-06-08 13:26:18 -05:00
AKALegman	1ae8e29ac2	updated isPlayer v2	2015-06-08 19:12:16 +01:00
Nicolás Badano	1def1ee7e4	Merge pull request #1546 from SilentSpike/zeusUpdate ... Update ace_zeus with 1.46 changes	2015-06-08 14:44:12 -03:00
SilentSpike	f9d1a39adf	Updated edited BI functions with 1.46 changes	2015-06-08 18:18:40 +01:00
jonpas	2104e5b45f	Optimized condition functions, Removed redundant toLower for animation names	2015-06-08 17:52:33 +02:00
ulteq	fb76cd730f	Proper handling of grid boundaries	2015-06-08 14:32:42 +02:00
ulteq	9fe6f269be	More cleanup	2015-06-08 14:31:55 +02:00
SilentSpike	f193204195	Simplify the renderZeus code	2015-06-08 13:12:27 +01:00
SilentSpike	246d303943	menuClosed event before variable clearing	2015-06-08 13:00:03 +01:00
ulteq	264b05e3ec	Removed unused privates	2015-06-08 13:42:58 +02:00
ulteq	29c55a5495	Cleanup	2015-06-08 12:57:16 +02:00
Ivan Navarro Cabello	d15bae105d	Updated spanish translation ... Updated spanish translation	2015-06-08 12:43:07 +02:00
AKALegman	96fccbedf9	updated isPlayer	2015-06-08 11:09:49 +01:00
ulteq	47d0d98680	Merge pull request #1537 from gienkov/pl-translation-2 ... captives and tripod PL translation	2015-06-08 00:34:56 +02:00
Glowbal	610f74d9d6	Merge pull request #1523 from AgentRev/onSetDead ... Added "medical_onSetDead" local event in fnc_setDead.sqf	2015-06-07 23:58:22 +02:00
AgentRev	f7007b4175	Fixed "medical_onSetDead" event	2015-06-07 17:52:42 -04:00
PabstMirror	6b612a9890	Merge pull request #1520 from acemod/hideFakeWeapon ... Hide fake weapon	2015-06-07 16:37:26 -05:00
jonpas	4cea9bd1bc	Added Sitting README.md	2015-06-07 22:38:23 +02:00
jonpas	eb0541d726	Added icons	2015-06-07 22:36:22 +02:00
jonpas	78c9991f68	Added Polish stringtable	2015-06-07 22:25:43 +02:00
PabstMirror	ebc55ca6cd	Merge pull request #1542 from TheDrill/master ... Base Finger Port	2015-06-07 15:04:45 -05:00
jonpas	c3c2fd0074	Initial Sitting commit	2015-06-07 22:00:43 +02:00
PabstMirror	64d529ed3c	Merge pull request #1538 from acemod/unHolsterWeapon ... #1208 - Holster key also unholsters	2015-06-07 14:25:06 -05:00
SilentSpike	cb1b0c6262	Added zeus exception for interaction conditions	2015-06-07 20:21:51 +01:00
PabstMirror	6eb7497cdf	#1208 - Holster key also unholsters	2015-06-07 12:59:53 -05:00
PabstMirror	3bf9592a5d	Macroize huntIR	2015-06-07 12:39:24 -05:00
PabstMirror	fb9c1e14a3	Merge branch 'master' into allStringtableMacros ... Conflicts: addons/kestrel4500/CfgWeapons.hpp	2015-06-07 12:24:40 -05:00
ulteq	b2221b683f	Introduced ACE_Rain	2015-06-07 18:57:16 +02:00
gienkov	ecf7873f33	captives and tripod PL translation	2015-06-07 18:55:49 +02:00
ulteq	be68284911	Fixed a typo	2015-06-07 18:20:14 +02:00
ulteq	39ba85b213	New low-poly Kestrel model	2015-06-07 18:17:09 +02:00
ulteq	eae8c8cae2	Initial draft of the ACE2 DAGR port	2015-06-07 17:53:37 +02:00
ulteq	5b3fd31b1b	Merge pull request #1525 from acemod/HuntIR ... ACE2 HuntIR port	2015-06-07 17:47:27 +02:00
ulteq	b1b8fe3645	Removed debug output	2015-06-07 14:48:46 +02:00
ulteq	cb2b120023	Reduced the max. transmission range	2015-06-07 14:47:56 +02:00
ulteq	618d557227	Layer IDs are now stored in #defines	2015-06-07 13:55:35 +02:00
ulteq	9ce655dcd2	Fixes stuck camera on remote controlled units.	2015-06-07 13:50:38 +02:00
ulteq	9561957fd6	Merge pull request #1245 from acemod/ChatColours ... Chat visibility enhancement	2015-06-07 13:35:02 +02:00
AKALegman	d3eae58237	Fixed Zeus Unconscious	2015-06-07 12:17:52 +01:00
ulteq	fb1ddb4dd6	Removed HuntIR explosion sound	2015-06-07 12:48:01 +02:00
ulteq	665fa55adf	Further reduced the container shell timeToLive value.	2015-06-07 12:12:06 +02:00
ulteq	5e30c88d11	Made use of the += operator	2015-06-07 11:58:56 +02:00
ulteq	9818f65545	Improved HuntIR descriptions	2015-06-07 11:58:34 +02:00
ulteq	0f186154c0	Tabs -> Spaces	2015-06-07 11:44:28 +02:00
ulteq	4339344aee	Merge branch 'HuntIR' of https://github.com/KoffeinFlummi/ACE3 into HuntIR	2015-06-07 11:43:42 +02:00
ulteq	48f8730415	Removed dead code	2015-06-07 11:43:32 +02:00
ulteq	66193a8c67	Removed duplicate code	2015-06-07 11:36:58 +02:00
Drill	ac40e7cc59	Change default keybinding from Ctrl-Tilda to Shift-Tilda for ... finger-pointing module	2015-06-07 12:15:23 +03:00
Drill	96e073e66d	Initial commit for finger-pointing module	2015-06-07 12:10:50 +03:00
ulteq	6a792a7a82	Merge pull request #1528 from acemod/rangecardGuiFix ... Barrel length is now displayed in half inch accuracy.	2015-06-07 10:17:02 +02:00
ulteq	a9b6af38e1	Barrel length is now displayed in half inch accuracy.	2015-06-07 10:16:30 +02:00
PabstMirror	abf2887826	Manual MainActions position for some statics weapons	2015-06-07 00:25:52 -05:00
PabstMirror	0f03bef5f1	Merge pull request #1524 from acemod/handleFiredCleanup ... Removed some dead code	2015-06-06 23:31:07 -05:00
PabstMirror	24cdf77de0	Move to right side, directly under BIS news	2015-06-06 23:28:52 -05:00
Glowbal	c75ae71adf	Merge pull request #1497 from acemod/Fix-PlayFiremodeChangedSound ... Fixed find file extension in playChangefiremode	2015-06-06 21:39:34 +02:00
KoffeinFlummi	c47e0ce796	Merge https://github.com/ODK-Bn/ACE3 into russian-merge	2015-06-06 21:13:03 +00:00
AKALegman	0e375075ea	improved explosives v2.1	2015-06-06 19:04:58 +01:00
AKALegman	46ed9416ed	improved explosives v2	2015-06-06 18:58:42 +01:00
SilentSpike	85a281d586	Fixed random missing english string	2015-06-06 17:41:24 +01:00
SilentSpike	822dd11ec6	Moved base ACE_ZeusActions to ace_interaction	2015-06-06 17:33:13 +01:00
SilentSpike	5cc6abd49a	Open menu over zeus inerface	2015-06-06 16:20:22 +01:00
ulteq	833335ddb9	Call setRain each frame	2015-06-06 14:16:05 +02:00
ulteq	a870d5d760	ACE2 HuntIR port	2015-06-06 14:13:34 +02:00
AKALegman	f9a7ab5ae0	improved explosives	2015-06-06 10:11:00 +01:00
ulteq	cfc23fe3e7	Removed some dead code	2015-06-06 10:01:30 +02:00
PabstMirror	732dbd315a	Tripod - use addToInventory	2015-06-05 21:13:33 -05:00
AgentRev	4a416a12a2	Added "medical_onSetDead" local event in fnc_setDead.sqf	2015-06-05 22:03:27 -04:00
PabstMirror	32ce0aa6fd	Macroize all stringtables	2015-06-05 21:02:24 -05:00
PabstMirror	560609fbed	Cleanup	2015-06-05 19:46:19 -05:00
PabstMirror	470492759c	Merge branch 'master' into multipleDevices ... Conflicts: addons/atragmx/initKeybinds.sqf addons/common/XEH_postInit.sqf addons/kestrel4500/CfgVehicles.hpp addons/kestrel4500/initKeybinds.sqf addons/microdagr/CfgVehicles.hpp addons/microdagr/XEH_clientInit.sqf	2015-06-05 17:50:04 -05:00
PabstMirror	a0f4ea4e93	Resize, User Option, Localization	2015-06-05 17:23:51 -05:00
PabstMirror	3c3affa69f	Merge branch 'master' into mainMenuVersionHTML	2015-06-05 16:48:59 -05:00
PabstMirror	237b5b4e35	Merge pull request #1239 from acemod/laserPointerAsdgConflict ... ASDG- Fail gracefully if attachments not compatible	2015-06-05 16:40:49 -05:00
PabstMirror	827c51c088	Merge pull request #1488 from acemod/captiveModuleSettings ... Captive module settings	2015-06-05 16:40:36 -05:00
PabstMirror	b6951b7a13	#1022 - reset hearing deafness on respawn	2015-06-05 16:37:27 -05:00
PabstMirror	84428e5e6c	Medical - unconsciousness: fix exitWith scope	2015-06-05 15:43:09 -05:00
PabstMirror	4e8fc49b5e	Always remove fakeWeapon after adding ... Should fix #1500	2015-06-05 15:38:45 -05:00
SilentSpike	8a4b4a7e0c	Added a bunch of basic actions	2015-06-05 18:37:29 +01:00
ulteq	595e4e7529	Merge pull request #1371 from gienkov/pl-translation-1 ... Polish translations	2015-06-05 17:58:14 +02:00
ulteq	c22a66bad4	Merge pull request #1515 from acemod/spotting_scope ... Ported the ACE2 Spotting Scope	2015-06-05 17:03:14 +02:00
ulteq	04ae03695b	Reverted dragging init.	2015-06-05 17:03:09 +02:00
ulteq	7fed1085a6	Merge pull request #1509 from acemod/SSWT_Kit ... Ported the ACE2 Tripod	2015-06-05 16:53:47 +02:00
PabstMirror	3f3ffe117e	Inherit ACE_Actions - addToInventory	2015-06-05 03:32:55 -05:00
gienkov	de13985492	interact_menu translation	2015-06-05 09:55:13 +02:00
gienkov	c1a7374404	Merge remote-tracking branch 'upstream/master' into pl-translation-1 ... Conflicts: addons/interact_menu/stringtable.xml	2015-06-05 09:40:50 +02:00
ulteq	993ee2d498	Ported the ACE2 spotting scope	2015-06-05 09:34:27 +02:00
PabstMirror	e01ba64683	Fix Missing Strings	2015-06-04 22:51:40 -05:00
SilentSpike	25f613b712	Initial implementation of static zeus menu	2015-06-04 23:24:57 +01:00
ulteq	04e6acfc6a	Merge pull request #1479 from acemod/sandbag ... Ported the ACE2 sandbags	2015-06-04 23:02:55 +02:00
ulteq	52b40a50d9	Merge pull request #1491 from acemod/Yardage450 ... Ported the ACE2 Yardage 450 laser rangefinder	2015-06-04 23:02:06 +02:00
ulteq	618e7e6ea1	Added polish translation.	2015-06-04 23:01:07 +02:00
PabstMirror	9997b94fb1	Merge pull request #1510 from acemod/settingInDebug ... Dump settings to debug	2015-06-04 15:54:29 -05:00
jonpas	e7cfda5c77	Added Macro Guard to string macros	2015-06-04 22:46:06 +02:00
PabstMirror	1cb1468183	Remove unused control	2015-06-04 15:40:56 -05:00
Glowbal	e13992d896	Merge pull request #1508 from SilentSpike/strings ... Macroified ACE_Zeus Strings	2015-06-04 22:36:34 +02:00
PabstMirror	1221498357	Dump settings to debug	2015-06-04 15:31:10 -05:00
Glowbal	7f2ada38a2	Merge branch 'checkpboSettings' of github.com:usecforce/ACE3 ... Conflicts: addons/common/CfgVehicles.hpp addons/common/config.cpp	2015-06-04 21:51:54 +02:00
Glowbal	e103007ae7	Merge pull request #1492 from GitHawk/master ... Disabled pain effect while unconscious	2015-06-04 21:45:48 +02:00
ulteq	f88d23d3ca	Update $PBOPREFIX$ ... Fixed a typo	2015-06-04 21:39:39 +02:00
ulteq	91c288123a	Fixed dragging position	2015-06-04 21:20:15 +02:00
ulteq	e7add69556	Ported the ACE2 Tripod	2015-06-04 21:13:44 +02:00
SilentSpike	2b79838555	Use existing disabled string	2015-06-04 19:40:11 +01:00
Nicolás Badano	ddc6688d03	Merge pull request #1505 from alganthe/strobe-intensity ... strobe light more bearable	2015-06-04 15:34:20 -03:00
SilentSpike	94a6eefa32	using new string macros	2015-06-04 19:33:19 +01:00
PabstMirror	cecc133a59	Missing </Key> in stringtable	2015-06-04 13:22:55 -05:00
PabstMirror	b466566104	Switch to new CSTRING	2015-06-04 13:19:05 -05:00
PabstMirror	e5edc0345b	Merge branch 'master' into captiveModuleSettings ... Conflicts: addons/captives/CfgVehicles.hpp	2015-06-04 13:15:53 -05:00
PabstMirror	21db1bcf46	Fix Ammo check / formating	2015-06-04 13:08:01 -05:00
ulteq	fb2f3f8c3f	Added function headers / Fixed requiredAddons	2015-06-04 17:51:04 +02:00
Josuan Albin	70e83707c4	strobe light more bearable ... changed the intensity of the strobe light, it's still VERY visible on a very long distance, (around 1.6k maybe more)	2015-06-04 17:40:49 +02:00
ulteq	e728003725	Removed newline bracket	2015-06-04 17:23:01 +02:00
jonpas	9fbf256acd	Merge branch 'master' into macroSTR ... Conflicts: addons/hearing/functions/fnc_putInEarplugs.sqf addons/interact_menu/ACE_Settings.hpp	2015-06-04 17:13:09 +02:00
ulteq	39a6c29e3e	ACE2 concertina wire port.	2015-06-04 17:11:09 +02:00
Nicolás Badano	aae8f4cf19	Merge pull request #1487 from SzwedzikPL/interact_menu_background ... Interact menu - background options	2015-06-04 11:23:11 -03:00
bux578	ee85aab791	fix #1439	2015-06-04 14:30:38 +02:00
bux578	2bf2b5737a	Merge pull request #1489 from acemod/DocumentationFixes ... fix documenation typos	2015-06-04 13:48:08 +02:00
ulteq	da28aa3c64	More sandbag features: ... * You can now carry sandbags * Different sandbag model during deployment (no geometry) * Deploying sandbags now requires an appropriate surface * Proper PhysX activation chain when you deploy/pickup sandbags * Sandbags are now destructible * Some stringtable fixes	2015-06-04 11:13:12 +02:00
Glowbal	9bbeb7183e	Fixed find file extension in playChangefiremode	2015-06-04 10:39:43 +02:00
gienkov	46dbd3113c	Fix	2015-06-04 01:38:57 +02:00
gienkov	fb10961a9b	PL translation for new things	2015-06-04 01:34:58 +02:00
gienkov	b5eb39291c	Merge remote-tracking branch 'origin' into pl-translation-1 ... Conflicts: addons/advanced_ballistics/stringtable.xml addons/frag/stringtable.xml	2015-06-04 00:52:35 +02:00
ulteq	68b652cee9	Initial draft of the ACE2 tactical ladder port.	2015-06-03 20:27:52 +02:00
ViperMaul	237f5c1130	Merge pull request #1304 from acemod/debugButton ... Export debug report from options menu	2015-06-03 09:28:37 -07:00
IngoKauffmann	ede8d74c54	Disabled pain effect while unconscious ... If the player is unconscious the pain effect is disabled.	2015-06-03 17:53:09 +02:00
IngoKauffmann	e60cfddc77	Limited strength of pain effect while unconscious ... Limited _strength to 0.1 so a player does not have to watch a flashing screen while he can't do anything about it. Otherwise we need to include a serious epilepsy warning!	2015-06-03 17:17:35 +02:00
ulteq	24f70e1012	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into Yardage450 ... Conflicts: addons/apl/data/default.rvmat	2015-06-03 16:28:22 +02:00
ulteq	682af84425	Ported the ACE2 Yardage 450 laser rangefinder	2015-06-03 16:26:30 +02:00
bux578	9096f38777	Ear Plugs -> Earplugs ... http://en.wikipedia.org/wiki/Earplug	2015-06-03 15:29:38 +02:00
ulteq	dc66e6e1d8	Merge pull request #1476 from acemod/mx2a ... Ported the ACE2 MX-2A thermal imaging device	2015-06-03 14:54:03 +02:00
PabstMirror	3a2e32b800	#1444 - Javelin Locking	2015-06-03 02:32:53 -05:00
PabstMirror	701aa7e343	Add New Icons	2015-06-03 00:55:20 -05:00
SzwedzikPL	18940d0787	Interaction menu background options	2015-06-03 06:04:47 +02:00
PabstMirror	5dc94487c5	Module Settings for Captivity ... Setting for handcuffing own team, and allowing surrender.	2015-06-02 20:50:27 -05:00
ulteq	1777719f20	Merge pull request #1485 from acemod/abFixes ... Ab fixes	2015-06-02 23:13:05 +02:00
ulteq	f0849e70ff	Slightly increased the alpha value of the bullet trace effect.	2015-06-02 23:11:44 +02:00
Nicolás Badano	8f15856084	Merge pull request #1415 from GitHawk/master ... runOnHover can now be CODE & SurgicalKits	2015-06-02 18:07:36 -03:00
ulteq	16f6650486	Decreased the velocity threshold for the bullet trace effect	2015-06-02 22:38:44 +02:00
ulteq	c3e7129d13	Removed newline brackets	2015-06-02 22:38:12 +02:00
ulteq	52d304e9f9	Increased the protractor size	2015-06-02 22:37:27 +02:00
jonpas	3206e3b537	Fixed a syntax error, Fixed nametags module order as per last pull request	2015-06-02 22:36:06 +02:00
jonpas	5496333c26	Merge branch 'master' into macroSTR ... Conflicts: addons/nametags/ACE_Settings.hpp addons/nametags/CfgVehicles.hpp addons/nametags/stringtable.xml	2015-06-02 22:22:51 +02:00
jonpas	541f1010a7	Merge branch 'master' into macroSTR ... Conflicts: addons/attach/functions/fnc_attach.sqf addons/captives/functions/fnc_moduleSurrender.sqf addons/common/CfgVehicles.hpp addons/explosives/CfgModule.hpp addons/hearing/CfgVehicles.hpp addons/interaction/CfgVehicles.hpp addons/map/CfgVehicles.hpp addons/microdagr/CfgVehicles.hpp addons/mk6mortar/CfgVehicles.hpp addons/nametags/CfgVehicles.hpp addons/nightvision/functions/fnc_changeNVGBrightness.sqf addons/respawn/CfgVehicles.hpp addons/switchunits/CfgVehicles.hpp addons/vehiclelock/CfgVehicles.hpp addons/winddeflection/stringtable.xml	2015-06-02 22:14:32 +02:00
Nicolás Badano	0022548748	Merge pull request #1204 from usecforce/nametagsToggle ... Disablable NameTags Module option	2015-06-02 17:03:47 -03:00
ulteq	5b2ad32c3f	Added model.cfg	2015-06-02 20:22:37 +02:00
ulteq	81a0f5147e	Stringtable cleanup	2015-06-02 20:18:30 +02:00
ulteq	f767f7eb2b	Removed duplicate code	2015-06-02 20:15:31 +02:00
ulteq	663ae1db4a	Fixed spelling	2015-06-02 20:07:35 +02:00
ulteq	c2be6ffef6	Added additional abort condition.	2015-06-02 20:06:56 +02:00
ulteq	4580168080	Fixed incorrect execution order	2015-06-02 20:01:48 +02:00
ulteq	2b6157bdb8	Fixed a typo	2015-06-02 20:01:00 +02:00
Glowbal	324aee1e57	Merge pull request #1471 from acemod/bodybagCleanup ... Body bag cleanup:	2015-06-02 20:00:12 +02:00
ulteq	3f10eed73c	All TMR code was removed.	2015-06-02 19:56:42 +02:00
ulteq	d733527f71	Ported the ACE2 sandbags	2015-06-02 19:30:50 +02:00
bux578	6ebf9067ef	Merge pull request #1478 from acemod/switchunitscleanup ... cleanup switchunits	2015-06-02 19:20:34 +02:00
PabstMirror	d727cb400a	Modules - fix addEventHandler	2015-06-02 12:15:58 -05:00
bux578	0bd358c415	cleanup switchunits	2015-06-02 19:13:58 +02:00
Josuan Albin	7bc7e51ad7	flares modified ... - all UGL flares have a 60s lifespan now - handheld signals and 20mm flares have smaller flare sizes	2015-06-02 14:02:46 +02:00
ulteq	d0b8a97e79	Fixed requiredAddons[]	2015-06-02 13:40:10 +02:00
ulteq	f1dbe0fffc	Ported the ACE2 MX-2A thermal imaging device	2015-06-02 12:58:47 +02:00
ulteq	048e5b6f6d	Body bag cleanup: ... * Increased the treatment time to match the animation duration * Fixed the body bag alignment with the dead unit	2015-06-01 22:33:25 +02:00
Glowbal	cf0b2c2a52	Merge pull request #1469 from acemod/placeInBodyBagFix ... Fixes random body bag teleports	2015-06-01 22:06:35 +02:00
SilentSpike	e3c09a7099	Added icon to unconscious module	2015-06-01 20:56:58 +01:00
SilentSpike	bfd1f8a102	Localise module names	2015-06-01 20:56:57 +01:00
SilentSpike	a30f6be713	Better module naming convention	2015-06-01 20:56:56 +01:00
SilentSpike	8fe1a65207	Cleaned up event handler	2015-06-01 20:56:54 +01:00
SilentSpike	bfce854be3	Localise module messages	2015-06-01 20:50:19 +01:00
SilentSpike	4c1641b64a	Generalized contextual modules system	2015-06-01 20:44:54 +01:00
SilentSpike	7d71d85ffc	Death to tabs	2015-06-01 20:44:53 +01:00
SilentSpike	e27ac53713	Implemented contextual modules	2015-06-01 20:44:51 +01:00
SilentSpike	eefe995a0c	Transfer curator functionality from ace_captives	2015-06-01 20:44:50 +01:00
SilentSpike	b72512e3f1	Zeus modules require larger icons	2015-06-01 20:44:50 +01:00
SilentSpike	97a1ff9bd6	Include no longer needed	2015-06-01 20:44:48 +01:00
SilentSpike	cd6474c748	Adding module icons	2015-06-01 20:44:47 +01:00
SilentSpike	9619b7d167	Improved naming and removed pointless category	2015-06-01 20:43:21 +01:00
SilentSpike	44ca13fe3a	Implemented capture module	2015-06-01 20:36:06 +01:00
SilentSpike	6251248a09	Fixed conditions	2015-06-01 20:36:05 +01:00
SilentSpike	49ef30ca5b	Corrected macro	2015-06-01 20:36:05 +01:00
SilentSpike	aad56866ea	Forgot my privates	2015-06-01 20:36:04 +01:00
SilentSpike	90033aa591	Updated function headers	2015-06-01 20:36:03 +01:00
SilentSpike	5f1725cf1f	Missing setUnconscious parameter	2015-06-01 20:36:02 +01:00
SilentSpike	0dcfd9f941	Use zeus category	2015-06-01 20:36:02 +01:00
SilentSpike	a4512e4740	Implemented surrender module ... Improved knockout module	2015-06-01 20:36:01 +01:00
SilentSpike	3702d0b671	Implemented knockout module	2015-06-01 20:36:00 +01:00
ulteq	14607f7aba	Fixes random body bag teleports	2015-06-01 21:23:00 +02:00
ulteq	47acb0f470	Merge pull request #1458 from acemod/drag_carry_fix ... Fixes random teleport when dragging/carrying inside of buildings.	2015-06-01 20:22:29 +02:00
PabstMirror	25a597e5fe	Merge pull request #1460 from acemod/hitReactionsMounted ... HitReactions - Don't do when mounted, add setting	2015-06-01 13:17:06 -05:00
PabstMirror	f57427ec96	switch waitAndExecute with 0 delay to execNextFrame ... Should Fix #1463	2015-06-01 13:14:05 -05:00
ulteq	9d4c572261	Fixes build error: "config.cpp has externs but no RequiredAddons"	2015-06-01 20:12:07 +02:00
Nicolás Badano	9ed851a966	Merge pull request #1265 from gienkov/module-translations-2 ... Stringtable Zeus and View Distance	2015-06-01 14:44:04 -03:00
Glowbal	1c0c73be54	Merge pull request #1433 from acemod/fixSettingsFromModules ... Delay initialization of modules until settings are properly setup	2015-06-01 19:18:11 +02:00
ulteq	8de5129313	Merge pull request #1464 from acemod/densityAltitude ... Implemented Density Altitude calculation	2015-06-01 16:22:41 +02:00
ulteq	e626794866	Fixes array init	2015-06-01 16:21:30 +02:00
ulteq	0364975c12	Implemented Density Altitude calculation	2015-06-01 16:09:35 +02:00
KoffeinFlummi	fa73aec15b	Merge https://github.com/Macusercom/ACE3 into german-merge	2015-06-01 14:27:49 +02:00
PabstMirror	473ab7d7c0	Fix mmg UBC	2015-05-31 23:48:20 -05:00
PabstMirror	e2217220eb	HitReactions - Don't do when mounted, add setting	2015-05-31 16:16:14 -05:00
gienkov	a173b5b048	TABS	2015-05-31 22:46:32 +02:00
gienkov	212862a401	Merge remote-tracking branch 'origin' into pl-translation-1 ... Conflicts: addons/advanced_ballistics/stringtable.xml addons/frag/stringtable.xml	2015-05-31 22:45:09 +02:00
Macusercom	53e0b35c12	German 1 correction for Advanced Ballistics	2015-05-31 20:31:38 +02:00
ulteq	4802ffeebf	Fixes random teleport when dragging/carrying inside of buildings.	2015-05-31 18:34:48 +02:00
ulteq	3a2fd9dc08	Merge pull request #1457 from acemod/weatherReadme ... New weather module readme/feature description.	2015-05-31 17:39:52 +02:00
ulteq	a1f199bfdc	New weather module readme/feature description.	2015-05-31 17:39:24 +02:00
ulteq	903fb89d77	Overcast > 0.7 no longer implies rain: ... * The higher the overcast value the higher the chance for rain * But you can end up having no rain with an overcast value of 1.0	2015-05-31 17:30:52 +02:00
ulteq	5c8e79c50a	Updated all airFriction values according to: extras/airFrictionAnalysis.txt	2015-05-31 16:45:59 +02:00
Macusercom	0a47396d10	Corrections for German translation	2015-05-31 14:25:52 +02:00
Glowbal	0b8896239c	Progress bar stops on death - fix for #1449	2015-05-31 09:23:36 +02:00
Macusercom	5d1f2eafaa	Fix German Translation	2015-05-30 23:34:19 +02:00
Macusercom	038880cb01	Additional Translations for German + some corrections	2015-05-30 23:33:51 +02:00
PabstMirror	23d300df52	Merge pull request #1417 from acemod/localDefuseObjects ... Explosives - Local defuse objects	2015-05-30 15:46:07 -05:00
Glowbal	3e3fdcf66e	Merge pull request #1429 from acemod/cseNVGadjustment ... NightVision adjustment - use CSE's gamma	2015-05-30 21:50:56 +02:00
jonpas	66ceaa1d31	Fixed IS_STRING error due to regex replacing it with LSTRING	2015-05-30 20:09:53 +02:00
ulteq	5746128a0f	Further improved error handling when AB is enabled with incomplete configs: ... * Calculates correct solutions when parts of the ammo config are missing * Calculates correct solutions when parts of the weapon config are missing * Performance improvement when AB is enabled	2015-05-30 20:06:55 +02:00
jonpas	d934c25b78	Merge branch 'master' into macroSTR ... Conflicts: addons/interact_menu/ACE_Settings.hpp	2015-05-30 19:54:32 +02:00
AKALegman	3b01da6962	IED Class Inheritance Fixes	2015-05-30 16:57:50 +01:00
PabstMirror	d7d225cebc	Send waiting debug msg only once	2015-05-30 01:28:15 -05:00
PabstMirror	b49b2fa3d1	Send to RPT and Clipboard	2015-05-30 01:21:47 -05:00
PabstMirror	84d940e69d	Fix circular dependency - ModuleDescription	2015-05-30 00:31:07 -05:00
esteldunedain	9d29aa2107	- Change all modules on ACE using settings to type ACE_Module, so we can guarantee that they wait for settings before initing. ... - Make ace_common require ace_modules, so all ACE pbos are guaranteed to have it	2015-05-30 01:37:41 -03:00
esteldunedain	333cb80171	Delay initialization of ACE_Modules until settings are properly setup	2015-05-30 01:18:23 -03:00
esteldunedain	afa6a2fad9	Remove the "ServerSettingsReceived" event, which is not longer needed. As per @pabstmirror solution, the GVAR(Settings) variable is monitored to determine when the server info has arrived. Fix #1273	2015-05-30 00:43:51 -03:00
PabstMirror	5efde25585	Fix ace_settings	2015-05-29 21:03:47 -05:00
Glowbal	552b2f390f	Merge pull request #1256 from acemod/medicalExtension ... Medical Extension for handleDamage wounds	2015-05-29 23:16:00 +02:00
PabstMirror	d457d9ffea	NightVision adjustment - use CSE's gamma	2015-05-29 15:37:53 -05:00
Nicolás Badano	8fbd7e8575	Merge pull request #1426 from alganthe/barrel_swap_fix ... navid and SPMG barrel swapping added	2015-05-29 17:11:01 -03:00
Josuan Albin	7603e71468	removed useless entries	2015-05-29 22:08:13 +02:00
Glowbal	00acbaf44d	Added blur background client setting	2015-05-29 21:56:07 +02:00
ulteq	a57d8486ca	Removed some unneeded code	2015-05-29 20:51:20 +02:00
ulteq	65b9e67991	Refined the abort condition for the range card calculation	2015-05-29 20:11:07 +02:00
PabstMirror	b0bfb7dd43	Fix Ladders - Add User Setting	2015-05-29 13:00:04 -05:00
ulteq	d0e1af6e47	Improved missing config error handling	2015-05-29 19:39:54 +02:00
Josuan Albin	26a9f7f38e	navid and SPMG barrel swapping added ... - added navid class to barrel swapping config - added SPMG class to barrel swapping config	2015-05-29 15:31:48 +02:00
ulteq	6d1e8eebce	Reworked the range card output when AB is disabled	2015-05-29 15:07:30 +02:00
ulteq	a5a96052b8	Made use of the newly implemented speed of sound calculation	2015-05-29 13:34:34 +02:00
ulteq	ade2cc1c56	Refined the reference barometric pressure calculation	2015-05-29 12:55:16 +02:00
ulteq	988a12327f	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rangecard	2015-05-29 12:44:11 +02:00
ulteq	1ec37aabed	Merge pull request #1424 from acemod/barometricPressureFix ... Fixed incorrect barometric pressure calculation	2015-05-29 12:40:17 +02:00
ulteq	abf0149b1d	Added speed of sound calculation: ... * Influences the advanced ballistics transonic instability * Influences the ATragMX range card output	2015-05-29 11:36:37 +02:00
ulteq	69b9d0e122	More in-depth barometric pressure calculation: ... * Temperature is now taken into account	2015-05-29 11:18:40 +02:00
ulteq	83f2e35907	Fixed incorrect unit conversion in the barometric pressure calculation	2015-05-29 10:30:30 +02:00
ulteq	01810b8723	- Altitude is only taken into account when AB is enabled ... - Separate solution caches for Vanilla and AB ballistics	2015-05-29 09:49:07 +02:00
Garth "L-H" de Wet	e2970ab40e	Merge pull request #1414 from acemod/Explosives_ZeusCompatible ... Made explosives Zeus and AI compatible specifically in regards to Dea…	2015-05-29 07:48:50 +02:00
jonpas	763cb07629	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
Glowbal	d34c96038e	Merge branch 'master' of github.com:acemod/ACE3	2015-05-28 20:56:35 +02:00
Glowbal	9135d956f0	Merge branch 'surgicalkit'	2015-05-28 20:54:52 +02:00
Glowbal	27106ce59f	minor refactor	2015-05-28 20:54:13 +02:00
jonpas	baca5a25d5	Merge branch 'master' into checkpboSettings ... Conflicts: addons/common/XEH_postInit.sqf	2015-05-28 20:52:35 +02:00
jonpas	86264a7b7d	Reworked ACE_Settings/Module functions to support both dynamically, Added SettingsInitialized	2015-05-28 20:49:30 +02:00
ulteq	4ad82d9629	Switched to ctrlCreate to avoid aspect ratio problems with the listbox.	2015-05-28 20:13:22 +02:00
jonpas	d597149fc6	Merge branch 'master' into nametagsToggle ... Conflicts: addons/nametags/ACE_Settings.hpp addons/nametags/XEH_postInit.sqf addons/nametags/functions/fnc_onDraw3d.sqf addons/nametags/stringtable.xml	2015-05-28 19:51:40 +02:00
ulteq	697710d40d	Initial draft of the range card implementation.	2015-05-28 19:17:29 +02:00
IngoKauffmann	ab31891b8d	runOnHover can now be CODE ... Expanded render, compileMenu, compileMenuSelfAction so runOnHover can be CODE	2015-05-28 18:16:05 +02:00
Garth L-H de Wet	529e200a4c	Made explosives Zeus and AI compatible specifically in regards to Deadman's switches.	2015-05-28 17:56:45 +02:00
Macusercom	489751f5aa	More German string fixed ... As recommended...	2015-05-28 16:21:53 +02:00
Nicolás Badano	5f70001ac0	Merge pull request #1409 from acemod/gogglesCacheSurfaceDust ... Goggles - Cache Surface Dust	2015-05-28 09:48:42 -03:00
Glowbal	5df9bb4a60	Merge pull request #1322 from acemod/SendSettingsDirectlyInsteadOfSplitting ... Send directly to extension instead of splitting it	2015-05-28 11:54:11 +02:00
PabstMirror	2cf9519702	Send to extension directly	2015-05-28 04:33:13 -05:00
PabstMirror	bfa75b833d	Merge branch 'master' into debugButton	2015-05-28 04:12:30 -05:00
PabstMirror	b29a75b7f6	Use new ace version html	2015-05-28 03:22:19 -05:00
PabstMirror	0c31adab61	Merge branch 'master' into mainMenuVersionHTML	2015-05-28 03:15:38 -05:00
PabstMirror	236ae767b5	Goggles - Cache Surface Dust	2015-05-28 00:18:45 -05:00
PabstMirror	3a4a02e524	#1407 - Make Saline 500ml match mass blood/plasma	2015-05-27 16:23:25 -05:00
jonpas	700c4cb962	Removed mistakenly added quotes in realisticnames comments	2015-05-27 22:57:50 +02:00
jonpas	b85ae8f194	Fixed missed external strings	2015-05-27 22:34:57 +02:00
jonpas	0b0f7274d7	Applied ESTRING and ECSTRING macros	2015-05-27 22:04:41 +02:00
jonpas	a99c02ff02	Added ESTRING and ECSTRING for external module references	2015-05-27 22:02:03 +02:00
jonpas	1c58ff823d	Stringtable fixes medical	2015-05-27 21:58:35 +02:00
jonpas	6f6f2a55f0	Stringtable fixes except medical	2015-05-27 21:43:30 +02:00
jonpas	87db721d4f	Stringtable fixes up to medical	2015-05-27 21:19:14 +02:00
PabstMirror	5f2bee09e4	Create Defuse Helpers on demand	2015-05-27 14:09:06 -05:00
Glowbal	7dd01ebb69	Merge pull request #1389 from acemod/possibleFixMedicalUnloadPatient ... Possible fix medical unload patient	2015-05-27 19:34:23 +02:00
PabstMirror	08aeda11df	Merge branch 'master' into userActionPrototype	2015-05-27 12:33:20 -05:00
PabstMirror	9ed15d9702	Merge pull request #1302 from acemod/nameTagFixes ... Nametags - Use EyePos of target / windows	2015-05-27 12:19:17 -05:00
Macusercom	5cb0953094	Fixed German translations ... Fixed some typos and phrases	2015-05-27 19:11:32 +02:00
jonpas	6072e14077	Changed all strings to macros (except external)	2015-05-27 19:04:25 +02:00
PabstMirror	30adc2d463	Patch Merge of PR #1156 - Optics for tripplehead	2015-05-27 11:28:06 -05:00
Nicolás Badano	c365008330	Merge pull request #1275 from acemod/fixUAVandInteractionInhert ... Fix UAV and Interaction Compile Inheritance	2015-05-27 12:20:46 -03:00
jonpas	600fe61f72	Added STRING and CSTRING Macros	2015-05-27 17:10:34 +02:00
esteldunedain	39fec12528	Merge branch 'master' into reliableSettings	2015-05-27 12:09:06 -03:00
esteldunedain	bb99d5a860	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 ... Conflicts: addons/advanced_ballistics/stringtable.xml	2015-05-27 12:08:47 -03:00
Ivan Navarro Cabello	047a2ee736	added spansih translate ... added spansih translate for (advanced_ballistics, ballistics, captives, common, explosives, frag, hearing, interaction, map, medical, microdagr, missileguidance, missionmodules, mk6mortar, nametags, optionsmenu, respawn, switchunits, vehiclelock, weather, winddeflection). I used the Pull request of #1251 for complete my commit, because #1251 is outdated now.	2015-05-27 15:27:04 +02:00
BaerMitUmlaut	f2e6a98eb4	Killed tabs	2015-05-27 13:51:22 +02:00
BaerMitUmlaut	6894a7433a	Removed duplicate private var	2015-05-27 13:51:15 +02:00
PabstMirror	d2eb08594b	Merge branch 'master' into fixUAVandInteractionInhert ... Conflicts: addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf	2015-05-27 00:36:43 -05:00
PabstMirror	adf29d75e3	Explosives - Local Defuse Helpers	2015-05-26 23:15:50 -05:00
BaerMitUmlaut	f7578a92c9	Reverted in favour of onProgress treatment	2015-05-27 00:52:16 +02:00
BaerMitUmlaut	30df0e8dc9	Switched to callbackPogress for treatment	2015-05-27 00:45:50 +02:00
BaerMitUmlaut	890b568225	Implemented dynamic treatment time	2015-05-27 00:45:22 +02:00
Glowbal	4945f22f3e	Merge branch 'master' into medicalExtension	2015-05-26 22:42:26 +02:00
ulteq	5223455174	New nighttime picture.	2015-05-26 22:26:30 +02:00
Nicolás Badano	32325fc784	Merge pull request #1394 from acemod/sortWaitAndExecute ... Single PFEH for waitAndExecute - using sort	2015-05-26 16:40:17 -03:00
Macusercom	7eeddfbd65	German translations ... Added a lot of German translations and fixed even more typos.	2015-05-26 17:04:53 +02:00
ulteq	5e6e62280e	Fixed a typo	2015-05-26 15:00:52 +02:00
ulteq	dc1bfa9c92	Nighttime GUI for the ATragMX.	2015-05-26 12:32:37 +02:00
ViperMaul	388d6c3519	Change to the proper isAwake function ... #1375	2015-05-25 20:47:28 -07:00
PabstMirror	4e70bf6e83	Single PFEH for waitAndExecute - using sort	2015-05-25 22:46:56 -05:00
BaerMitUmlaut	41892fd6df	Added surgicalKit treatment	2015-05-26 00:33:20 +02:00
PabstMirror	d410350a25	Make code less smelly	2015-05-25 14:01:59 -05:00
ViperMaul	6a1724343d	remove debug ... #1375	2015-05-25 11:38:28 -07:00
ViperMaul	789e92d8ef	Ensuring a proper return value and removing unnecessary code. ... #1375	2015-05-25 10:32:52 -07:00
ViperMaul	3bdb27386c	removing obsolete drag code ... #1375	2015-05-25 10:25:28 -07:00
ViperMaul	9a07a9bfd6	modify unloadPerson to use unloadPersonLocal ... #1375	2015-05-25 09:43:29 -07:00
ViperMaul	7141d251c7	create unloadPersonLocal ... #1375	2015-05-25 09:41:24 -07:00
ViperMaul	cafaef9612	revert missing actionDragUnit file ... #1375	2015-05-25 09:39:12 -07:00
PabstMirror	c7d9074f3f	Javelin - Only run if weapon and ammo supported	2015-05-25 05:38:45 -05:00
PabstMirror	0452270380	Add Javelin CfgAmmo ... Leave M_Titan_AT alone for A3 Vehicles / Mods that use it	2015-05-25 05:34:07 -05:00
ulteq	cc7639ea22	Merge pull request #1386 from acemod/airFrictionUpdate ... airFriction update	2015-05-25 12:00:31 +02:00
ulteq	2327a493c5	Updated the ATragMX gun profiles and optimized the airFrictions some more.	2015-05-25 10:28:20 +02:00
PabstMirror	7dec983397	#1383 - Fix map shake interfering with other anims ... Don't run ctrlMapAnimClear each frame, only when ending the animation	2015-05-24 23:56:22 -05:00
Joko	e0722452b7	add Compatibilty to mods where the Animation are not "para_pilot"	2015-05-25 01:09:28 +02:00
ulteq	21f4fcada3	Updated all airFriction values to minimize the drop difference when AB is disabled.	2015-05-25 00:53:41 +02:00
ViperMaul	06932f0c03	Restore missing actionDragUnit function file ... #1375	2015-05-24 15:14:11 -07:00
Joko	1f5f5a2dcf	ACE_player -> _unit	2015-05-23 23:58:16 +02:00
Grzegorz	d96873b8a0	Fix line ending	2015-05-23 21:16:36 +02:00
gienkov	8ef41b7523	Translate missing frag and adv. ball. strings to PL	2015-05-23 21:16:34 +02:00
gienkov	00c5abecc2	Merge remote-tracking branch 'origin' into module-translations-2 ... Conflicts: addons/viewdistance/ACE_Settings.hpp addons/viewdistance/functions/fnc_changeViewDistance.sqf	2015-05-23 17:55:06 +02:00
ulteq	ee022e1dea	Fixes broken scope config (#1312)	2015-05-23 17:06:46 +02:00
Glowbal	7170db5dc2	Merge pull request #1368 from acemod/medicalBloodBags ... Medical blood bags size matters	2015-05-23 10:07:58 +02:00
PabstMirror	d82fcd1f96	Advanced - Bloodbag lookup by treatment not item	2015-05-23 01:26:13 -05:00
PabstMirror	d752dd50d0	Basic - Bloodbag size matters	2015-05-23 01:16:18 -05:00
bux578	04dd791374	Merge pull request #1367 from jonpas/stringtableABfix ... Fixed missing close tag in Advanced Ballistics stringtable	2015-05-23 07:48:56 +02:00
PabstMirror	437db22ab8	#1364 - Prevent script error if bad muzzle	2015-05-22 23:38:16 -05:00
PabstMirror	e31a49283b	Merge branch 'master' into nameTagFixes ... Conflicts: addons/nametags/functions/fnc_drawNameTagIcon.sqf	2015-05-22 21:56:42 -05:00
jonpas	030b509ec5	Fixed missing close tag in Advanced Ballistics stringtable	2015-05-23 03:34:11 +02:00
PabstMirror	8fd0aef7d4	Medical - Fix Handle Damage ... {} were unmatched so nothing ran. I think this is just leftover from a merge.	2015-05-22 16:35:48 -05:00
Glowbal	48ed51b03c	Merge pull request #1361 from acemod/FixUnconsciousCondition ... Medical - Fix Unconscious Condition	2015-05-22 22:39:18 +02:00
PabstMirror	f785fcc0d4	Merge pull request #1362 from acemod/timeHasComeToday ... Fix Time Calc	2015-05-22 14:32:56 -05:00
PabstMirror	f4bf6ea26d	Fix Time Calc	2015-05-22 14:29:56 -05:00
PabstMirror	537bba1382	Medical - Fix Unconscious Condition	2015-05-22 13:56:45 -05:00
ulteq	308b0aa0f9	Fixed incorrect barrel length.	2015-05-22 20:41:36 +02:00
ulteq	9536423f2e	Merge pull request #1353 from acemod/cleanup_ATragMX_AB ... Removed a deprecated function and fixed some typos.	2015-05-22 18:42:20 +02:00
ulteq	e88c570ef2	Removed a deprecated function and fixed some typos.	2015-05-22 18:42:09 +02:00
jaynus	582ea318d4	Merge remote-tracking branch 'origin/superTime' ... Conflicts: addons/frag/functions/fnc_fired.sqf addons/frag/functions/fnc_trackFragRound.sqf	2015-05-22 07:24:55 -07:00
PabstMirror	72020a43f1	Privates / Remove Debug	2015-05-21 17:53:15 -05:00
PabstMirror	4e92a51cf8	Create Defuse Helpers for spawned Explosives	2015-05-21 17:47:54 -05:00
jaynus	46751fd912	Merge pull request #1163 from acemod/fragSpallOptimization ... Frag spall optimization	2015-05-21 15:08:07 -07:00
jaynus	3cb4094429	Merge branch 'fragSpallOptimization' of github.com:acemod/ACE3 into fragSpallOptimization	2015-05-21 15:07:12 -07:00
jaynus	c297257421	Disable frag by default. Add @pabstmirror fix closes #1339 closes #820	2015-05-21 15:06:55 -07:00
Felix Wiegand	fd2676c7b9	Merge pull request #1135 from acemod/fcsPrivates ... FCS - Privates	2015-05-21 22:18:14 +02:00
Glowbal	8b69b3b1b1	Merge pull request #1332 from acemod/medicalBinocTreatment ... Fix Script Error when treating with bincos	2015-05-21 20:20:41 +02:00
ulteq	24b2fea303	Persistent reference heading for the Kestrel 4500.	2015-05-21 19:28:59 +02:00
ulteq	1816208997	Proper Min/Max storing of negative tailwind values.	2015-05-21 19:18:15 +02:00
jaynus	c924baefd7	All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.	2015-05-21 09:42:44 -07:00
Joko	9a212f0687	Fix gettings anytime a new Parachute	2015-05-21 14:54:00 +02:00
Joko	f8003fd865	fix adding a New Parachute if one already given	2015-05-21 14:06:23 +02:00
Joko	ccd3fb8b4a	Enhance some scripts ... add New Config Parameter has Reserve Parachute	2015-05-21 14:03:52 +02:00
ulteq	db7c2a19e6	Tailwinds are displayed as negative values.	2015-05-21 11:14:37 +02:00
Joko	41c6ea8b4e	Fix Reload Bug	2015-05-21 08:06:59 +02:00
PabstMirror	1aa9520adb	Fix Script Error when treating with bincos	2015-05-20 23:24:44 -05:00
Nicolás Badano	72d955bc0c	Merge pull request #1328 from alef/master ... Fixed: Removed § typo at the end of EH call	2015-05-20 19:01:52 -03:00
Kavinsky	4b048553e2	wops... corrected wrong path	2015-05-20 23:44:50 +02:00
Kavinsky	8e9b35c757	Fixed Capitalized folders on include paths	2015-05-20 23:28:10 +02:00
Joko	8c69ff4573	reset Form SETVAR to setVariable	2015-05-20 22:13:18 +02:00
ulteq	7d3bb526dd	Merge pull request #1263 from acemod/bulletTraceTweak ... Slightly increased the bullet trace effect size	2015-05-20 22:12:37 +02:00
ulteq	149e3ae8b0	Slightly decreased the visibility of the bullet trace effect.	2015-05-20 22:12:02 +02:00
Alessandro Foresi	67319b6808	Fixed: Removed § at the end of EH call	2015-05-20 22:04:19 +02:00
jaynus	e6270f6e39	Fixed: Font config breaking checkPBO	2015-05-20 10:42:24 -07:00
KoffeinFlummi	f16f282abd	Merge remote-tracking branch 'origin/release' into master-fix ... Conflicts: addons/medical/functions/fnc_handleDamage.sqf extensions/common/p3d/animation.cpp extensions/common/p3d/compressed.cpp extensions/common/p3d/compressed.hpp extensions/common/pbo/archive.cpp extensions/common/pbo/search.cpp extensions/common/pbo/search.hpp extensions/common/shared.hpp extensions/common/simplepipe_win32.cpp extensions/common/simplepipe_win32.hpp extensions/common/simulation/object.cpp extensions/common/simulation/object.hpp extensions/common/targetver.h extensions/common/vector.hpp	2015-05-20 19:31:55 +02:00
PabstMirror	64a401ee8c	#1241 closed - Add Editor placeable item	2015-05-20 17:17:10 +02:00
PabstMirror	0d00894d9f	#1318 - isInMedicalVehicle - medicClass is number	2015-05-20 17:17:09 +02:00
Garth L-H de Wet	8edeb45d6d	Changed the animation from medic to put when placing an explosive. Added a put animation when setting the trigger for an explosive.	2015-05-20 17:17:09 +02:00
esteldunedain	23117db401	- Default viewDistance to video settings - Add 500m and 100m as optional view distances	2015-05-20 17:17:08 +02:00
Grzegorz	96322fe689	PL translation for new advanced ballistics option	2015-05-20 17:17:08 +02:00
esteldunedain	22b83826f0	Bandaid for #1281, until we properly solve unreliable init handlers. 1- Menus for CAManBase are precomputed on preInit 2- Class action menus for all men are supposed to be equal to those of CAManBase Note: we loose the capability of defining actions for specific classes from config (which we don't do on ACE annyway)	2015-05-20 17:15:25 +02:00
Glowbal	694a24c970	Only change the color if bleeding (adv)	2015-05-20 17:15:25 +02:00
Glowbal	0a2679846c	Changed: morphine works 15 minutes	2015-05-20 17:15:24 +02:00
Glowbal	e8d169248f	Made atropine less effective	2015-05-20 17:15:23 +02:00
Glowbal	82260e5090	Changed: Made Morphine suppress more pain	2015-05-20 17:15:23 +02:00
Glowbal	2b1468db24	Added pain suppression instead of removal	2015-05-20 17:15:22 +02:00
Glowbal	429c85c9f1	fixed missing parameters for non local unit	2015-05-20 17:15:22 +02:00
Glowbal	913c938a9d	Added force unconscious parameter #1205	2015-05-20 17:15:21 +02:00
Glowbal	6439bf4e3a	Adjusted item mass #1226	2015-05-20 17:15:20 +02:00
Glowbal	808bb6d048	fixes #1195 units do not display injuries ... Is caused because the system thinks medical is disabled for basic units, while this obviously is not the case.	2015-05-20 17:15:20 +02:00
Glowbal	104fcdc589	fixes #1155	2015-05-20 17:15:19 +02:00
jaynus	d57b93c1a4	woops. tabs. path.	2015-05-20 17:15:19 +02:00
jaynus	5b5ea907d2	Custom fonts for ACE.	2015-05-20 17:15:18 +02:00
Glowbal	d6cc1d4b76	Proposed fix for #1158 ... Sent directly to extension instead of splitting it	2015-05-20 10:26:32 +02:00
ulteq	10df66f218	Merge pull request #1312 from acemod/scopeIncrement ... Elevation and windage can now have different adjustment increments:	2015-05-20 10:20:22 +02:00
ulteq	c81446400c	Grammar	2015-05-20 10:14:10 +02:00
PabstMirror	ebeba23834	Nametag Size Option, selectionPosition for tag pos	2015-05-19 16:57:47 -05:00
PabstMirror	6dc81796b5	ambientBrightness effects tag distance	2015-05-19 16:18:10 -05:00
Joko	bc535c95ba	Fixing Privates	2015-05-19 21:46:34 +02:00
ulteq	28c8aba9bd	Added missing !	2015-05-19 20:46:55 +02:00
ulteq	57c37ecb9a	Reorder/Rewrite of some advanced ballistics module options: ... * alwaysSimulateForSnipers -> simulateForSnipers * alwaysSimulateForGroupMembers -> simulateForGroupMembers * onlyActiveForLocalPlayers -> simulateForEveryone	2015-05-19 20:46:13 +02:00
ulteq	bd3b84901f	Merge pull request #1309 from gienkov/patch-17 ... PL translation for new advanced ballistics option	2015-05-19 20:23:34 +02:00
ulteq	458daad5bb	Elevation and windage can now have different adjustment increments: ... * ACE_ScopeAdjust_VerticalIncrement * ACE_ScopeAdjust_HorizontalIncrement	2015-05-19 20:13:31 +02:00
Nicolás Badano	0e7e4e112c	Merge pull request #1311 from acemod/viewDistanceFix ... Fix for the viewDistance module	2015-05-19 15:03:37 -03:00
esteldunedain	e022499068	- Default viewDistance to video settings ... - Add 500m and 100m as optional view distances	2015-05-19 14:48:29 -03:00
Joko	4db9989480	Add Posible to use Mod Parachutes	2015-05-19 19:33:24 +02:00
Grzegorz	e3aabe2c42	PL translation for new advanced ballistics option	2015-05-19 18:52:17 +02:00
jaynus	c4393862aa	Merge pull request #1293 from acemod/nametagFireteamColors ... Add assignedTeam color propagation to nametags from the leader	2015-05-19 09:19:48 -07:00
jaynus	6eec702263	Added isNull check wrapper to nametag color propagation.	2015-05-19 09:19:03 -07:00
Joko	48f44813ea	Update to ACE Standarts ... Fix Adding anytime B_Parachute Fix Reserve Parachute Added if Normal Parachute Open	2015-05-19 18:17:10 +02:00
Joko	7a012a5acb	chuteIsCuted -> chuteIsCut	2015-05-19 14:20:56 +02:00
Joko	e40310189e	Prevent Respawn bug ... Change to Macros	2015-05-19 13:55:25 +02:00
Joko	75be6a1906	TAAAABBBBSSSSSS	2015-05-19 13:47:39 +02:00
Joko	f06f38a107	Add Cut Parachute	2015-05-19 13:45:28 +02:00
PabstMirror	7c8505592b	Chunk Data to Extension, add some extra diag info	2015-05-19 01:57:41 -05:00
PabstMirror	4d877196e4	Missing Parenthesissies	2015-05-19 00:36:54 -05:00
Glowbal	572b46a473	fix for #1297 Being near Campfires messes up basic medical and causes large fps lag ... Should only do a max of 1 PFH at a time. If new damage is received before the PFH is completed, it will reset.	2015-05-19 07:23:44 +02:00
PabstMirror	942066b04a	Nametags - Use EyePos of target	2015-05-19 00:09:49 -05:00
PabstMirror	c4e5e9a7ac	#1298 - Reset handcuffs on respawn	2015-05-18 22:02:50 -05:00
PabstMirror	b727fd79c4	Call Ext Directly ... CBA_fnc_split problems	2015-05-18 19:29:39 -05:00
PabstMirror	bace23c331	Button to dump array info to clipboard	2015-05-18 18:44:52 -05:00
ViperMaul	0a743d847c	Set version number to 3.0.1	2015-05-18 15:42:53 -07:00
Glowbal	5b65d4117d	fixed wrong macro for addEventhandler	2015-05-18 23:02:46 +02:00
Glowbal	539ed2dc79	Fix debug message and prevent Instant death inside vehicles	2015-05-18 22:22:57 +02:00
PabstMirror	559f3cbd0f	#1171 - Safe get variables if settings not defined	2015-05-18 21:34:57 +02:00
esteldunedain	fc5c529772	Fixed object actions not working	2015-05-18 21:34:39 +02:00
esteldunedain	0d0347d3fa	Bandaid for #1281, until we properly solve unreliable init handlers. ... 1- Menus for CAManBase are precomputed on preInit 2- Class action menus for all men are supposed to be equal to those of CAManBase Note: we loose the capability of defining actions for specific classes from config (which we don't do on ACE annyway)	2015-05-18 21:34:29 +02:00
PabstMirror	8b4cc835d8	#1181 - Reset BFT_markers array each time	2015-05-18 21:34:17 +02:00
Glowbal	771b62ed04	Fix medical vehicle return value ... Could fix #1142	2015-05-18 21:33:35 +02:00
PabstMirror	c6991fde54	re-add brackets	2015-05-18 21:33:24 +02:00
Glowbal	2621c5a36c	fixed incorrect private var name	2015-05-18 21:33:12 +02:00
Glowbal	c76e22463a	consistent usage of brackets	2015-05-18 21:32:58 +02:00
PabstMirror	5a4ef610ec	Use PFEH array instead of setVariable	2015-05-18 21:32:47 +02:00
PabstMirror	2c3a5b0603	Start vital tracking after treatment	2015-05-18 21:32:22 +02:00
PabstMirror	f511de0a49	Calculate vitals interval on first run	2015-05-18 21:32:05 +02:00
Glowbal	853c654b4d	fixes #1195 units do not display injuries ... Is caused because the system thinks medical is disabled for basic units, while this obviously is not the case.	2015-05-18 21:00:32 +02:00
Glowbal	fc99d07f7c	fixes #1155	2015-05-18 21:00:18 +02:00
jaynus	c17df2acb8	Change to execNextFrame.	2015-05-18 21:00:06 +02:00
jaynus	1c69f4faa4	Fixed: Litter spawning at huge radius, floating litter over water. Fixes #1112	2015-05-18 20:59:56 +02:00
jaynus	98df03ca27	Changed: checkFiles extension check prints version returned by extension ... Changed: Build changed to SSE2 instead of defaulting to AVX.	2015-05-18 20:59:00 +02:00
VKing	1cab51156a	Made better with Pabstology (tm)	2015-05-18 20:58:16 +02:00
VKing	5c7e59fd29	Hacked order to fix order of comanche zoom levels	2015-05-18 20:58:03 +02:00
jaynus	d8b4b53b80	Added: Monitor 5sec interval to propegate assignedTeams from leader, allowing team colors to be assigned by the team leader and show in the group. Uses vanilla team assignment. Closes #1279	2015-05-18 08:31:29 -07:00
ulteq	3c5eac96ea	Merge pull request #1261 from acemod/ModuleSettings_AB_WD ... Added a new module option for advanced ballistics:	2015-05-18 13:39:21 +02:00
ulteq	8eaf754fdd	Further increased the visibility of the bullet trace effect.	2015-05-18 10:56:34 +02:00
PabstMirror	1e7e5c7aa5	Don't show passenger actions for UAV crew	2015-05-17 17:52:56 -05:00
PabstMirror	53d6d4578b	Explosives - Fix UBC ... Updating base class PipeBombBase->IEDUrbanBig_Remote_Ammo, by z\addons\ace\explosives\config.cpp/CfgAmmo/IEDLandBig_Remote_Ammo/ Updating base class PipeBombBase->IEDUrbanSmall_Remote_Ammo, by z\addons\ace\explosives\config.cpp/CfgAmmo/IEDLandSmall_Remote_Ammo/	2015-05-17 17:21:31 -05:00
gienkov	0993c0f0b0	Fix tabs and errors	2015-05-17 23:28:00 +02:00
ulteq	94453f60f2	Merge pull request #1255 from BullHorn7/vehiclelock ... Documentation: Vehiclelock, Weather	2015-05-17 23:19:20 +02:00
Josuan Albin	836cd9d833	Documentation pass 3 ... - Fixed typos in laser/readme - Documentation guidelines updated - ACE3 mentions updated in - - ai - Updated doc - - fcs - - hearing - -hitreaction - - interaction - - interact_menu - - inventory - - javelin - - laser - - laserpointer - - laser_selfdesignate - - logistics_uavbattery - - logistics_wirecutter - - magazinerepack - - main - - map - - maptools - - markers	2015-05-17 21:01:17 +02:00
PabstMirror	3daec7d98d	Fix UAV and Interaction Compile Inheritance	2015-05-17 13:51:59 -05:00
ODK-Bn	13740d9f32	translated the missing strings into Russian	2015-05-17 13:25:08 +02:00
ulteq	4513b02c10	Experiment with the bullet trace effect size	2015-05-17 12:57:55 +02:00
ulteq	96b92ac172	Added a new module option for advanced ballistics: ... * alwaysSimulateForGroupMembers	2015-05-17 11:45:55 +02:00
ulteq	9e8283ebab	Merge pull request #1260 from acemod/toggleDevices ... ATragMX/Kestrel 4500 dialogs can be toggled on/off with keybinds.	2015-05-17 11:23:56 +02:00
ulteq	ea32aa0265	ATragMX/Kestrel 4500 dialogs can be toggled on/off with keybinds.	2015-05-17 11:23:31 +02:00
PabstMirror	e78c2fd676	Extension framework changes	2015-05-17 04:05:43 -05:00
Glowbal	d9da4211f7	Merge branch 'master' into medicalExtension	2015-05-17 09:51:41 +02:00
Glowbal	2b91d398f0	added extension to config	2015-05-17 09:51:34 +02:00
PabstMirror	78dec5debc	Merge branch 'master' into userActionPrototype ... Conflicts: addons/interact_menu/XEH_preInit.sqf	2015-05-16 22:49:09 -05:00
PabstMirror	1ccf6fb70d	#1181 - Reset BFT_markers array each time	2015-05-16 21:54:11 -05:00
gienkov	4bebedf73e	Stringtable Zeus and View Distance ... * Stringtabled ACE Zeus module * Stringtabled ACE View Distance * Lowered default view distance to 1500 because default value (10000) makes enormous FPS drop at start for low end machines	2015-05-17 00:53:55 +02:00
Glowbal	556b9ad7d8	removed debug prints	2015-05-17 00:47:42 +02:00
Glowbal	4d8f24d2ae	Removed old sqf version.	2015-05-17 00:44:45 +02:00
Glowbal	1d7bfa239f	Temp added old sqf version for easy performance comparison	2015-05-17 00:08:34 +02:00
ulteq	e0f9d3f6e1	Merge pull request #1253 from acemod/kestrelExpansion ... Kestrel Feature Expansion	2015-05-16 23:46:36 +02:00
ulteq	a008c45875	Fixed heading can be negative	2015-05-16 23:34:50 +02:00
ulteq	cdd07a33c9	Fixed some typos	2015-05-16 23:30:16 +02:00
Glowbal	e3dd1eaf47	Using extension for handleDamage wounds instead of sqf	2015-05-16 23:21:03 +02:00
Glowbal	23a1bc86ca	Loading config data to extension	2015-05-16 23:20:38 +02:00
BullHorn	c05e7fb046	Documentation: Vehiclelock - 1st iteration ... Add feature\Vehiclelock.md and add relevant info for players Edit addons\Vehiclelock\readme.md for typos and errors Edit missionmaker\modules.md for additional info	2015-05-16 23:42:54 +03:00
ulteq	1b9b8543d3	Merge pull request #1252 from acemod/typoFixATragMX ... Fixed a minor bug in bullet diameter GUI output	2015-05-16 21:44:58 +02:00
ulteq	01b30c6677	Fixed a minor bug in bullet diameter GUI output	2015-05-16 21:44:43 +02:00
ulteq	f9b7e3c6f7	Fixed clashing MACRO names	2015-05-16 21:10:34 +02:00
ulteq	9116fed415	New main menu: 'date' | New sub menu: 'magnetic heading'	2015-05-16 20:26:52 +02:00
jonpas	ce8d6b683c	Prettified Explosive's CfgAmmo and CfgMagazines	2015-05-16 17:49:31 +02:00
jonpas	c95ecca6a8	Added IED Pressure Plates, closes #1191	2015-05-16 17:44:35 +02:00
Glowbal	f02314e996	Merge pull request #1217 from acemod/medicalFixes2 ... Medical Vitals Fixes	2015-05-16 15:35:42 +02:00
VKing	5f328ce616	Added ace_ui - enchanced chat visibility on the map screen	2015-05-16 15:28:59 +02:00
ulteq	03b478aeee	Reworked dew point, heat index and wind chill calculations	2015-05-16 12:39:52 +02:00
ulteq	ea68e91ef9	Refactored and expanded the kestrel data collection	2015-05-16 11:13:54 +02:00
ulteq	b65ac1f305	Fixed some bugs in the Kestrel 4500 output generation	2015-05-16 11:13:50 +02:00
ulteq	0377526a7c	Finished heat index and wet bulb functions	2015-05-16 11:12:29 +02:00
PabstMirror	bb63882d20	#1238 - open door error	2015-05-15 22:52:54 -05:00
PabstMirror	1dd34199d6	ASDG- Fail gracefully if attachments not compatible	2015-05-15 22:23:46 -05:00
jonpas	c0c4414ec0	Name tags Draw3D variable names consistency	2015-05-16 01:35:48 +02:00
jonpas	1a468cb4ff	Split common ACE_Settings.hpp from config.cpp, shortened sampleSetting	2015-05-16 01:06:29 +02:00
jonpas	cccc741a16	#1123 - Added CheckPBOs to ACE_Settings	2015-05-16 00:54:01 +02:00
ulteq	8b878552cb	Fixed several typos in the heat index coefficients	2015-05-16 00:51:53 +02:00
jonpas	bffe58efd6	Name Tags cleanup	2015-05-16 00:22:23 +02:00
jonpas	7c96c12bd5	Made forced settings through module in original entry, Reworked Draw3D handling, Some strings cleanup	2015-05-16 00:07:38 +02:00
esteldunedain	0b1beed219	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into reliableSettings ... Conflicts: addons/common/XEH_postInit.sqf	2015-05-15 18:18:13 -03:00
PabstMirror	dabd11b9c5	MedicalStringtable - Fill missing languages	2015-05-15 16:01:39 -05:00
PabstMirror	1e1c6a6930	Merge pull request #1230 from gienkov/patch-16 ... Missing Medical module stringtable entries	2015-05-15 15:59:57 -05:00
SilentSpike	38abe1dd02	Using inline code instead of holdover function	2015-05-15 21:09:55 +01:00
SilentSpike	9d0af2138c	Removed old spawn	2015-05-15 21:03:19 +01:00
SilentSpike	84d06bac34	Another fix for moduleCurator	2015-05-15 20:54:17 +01:00
ulteq	56eecfda03	Fixed heat index coefficients syntax	2015-05-15 21:41:07 +02:00
ulteq	8120cef964	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-05-15 21:12:02 +02:00
ulteq	cee775e5ac	Removed spaces in PARAMS macro	2015-05-15 21:11:53 +02:00
ulteq	ef225b366b	Kestrel GUI expansion	2015-05-15 21:11:03 +02:00
ulteq	7f966de28c	Added wet bulb calculation, fixed macros	2015-05-15 21:10:46 +02:00
esteldunedain	89fe91cce0	Fix tap shoulders keybind	2015-05-15 15:52:09 -03:00
esteldunedain	d189cffce6	Fix event names	2015-05-15 15:49:22 -03:00
PabstMirror	eed76d5bcf	Fix mike tyson spelling	2015-05-15 13:47:44 -05:00
ulteq	2f7d7ece56	Added utility function to calculate the dew point	2015-05-15 19:58:24 +02:00
Nicolás Badano	45961314af	Merge pull request #1209 from SilentSpike/zeusEdit ... Fix for curator module	2015-05-15 14:51:16 -03:00
jaynus	e1c3e96eb1	Fixes: Nil scheduled space bug with hashes. This is still a bug everywhere else.	2015-05-15 10:45:07 -07:00
Grzegorz	1e552496d5	Missing strings ... They need to be here otherwise few options are blank inside medical modules.	2015-05-15 19:23:49 +02:00
ulteq	e6ed1e5dbd	Added utility functions to calculate heat index and wind chill	2015-05-15 19:00:11 +02:00
jonpas	02b9df1bc3	Fixed client setting Draw3D installation/removal handling	2015-05-15 18:13:10 +02:00
jonpas	1ccc7e1e0a	CBA Macro for addEventHandler	2015-05-15 17:44:58 +02:00
jonpas	2edbacd15b	Added SettingChanged EH and proper handling	2015-05-15 17:16:55 +02:00
jonpas	a7cd36bc3e	Added Force setting	2015-05-15 16:52:27 +02:00
jonpas	62d7ea0b03	Fixed module entry not taking effect	2015-05-15 16:31:06 +02:00
SAM	bed35b1ac8	Fixed safemode module indentation	2015-05-15 15:41:41 +02:00
jonpas	58ad012433	Merge branch 'master' into nametagsToggle ... Conflicts: addons/nametags/ACE_Settings.hpp	2015-05-15 15:37:18 +02:00
ulteq	b609b0fec1	Merge branch 'module-cleanup' of https://github.com/Winter259/ACE3 into Winter259-module-cleanup	2015-05-15 14:59:54 +02:00
SAM	736c4f94e1	Revered macro on fnc_throwGrenade	2015-05-15 14:47:37 +02:00
ulteq	7a95e2a7bd	Weather module macro cleanup	2015-05-15 14:20:18 +02:00
SAM	8199a4ad34	Removed extra private	2015-05-15 10:30:15 +02:00
SAM	ca17e71200	Safemode macro cleanup	2015-05-15 10:06:11 +02:00
SAM	7c099c1009	Weaponselect module macro cleanup	2015-05-15 09:59:57 +02:00
PabstMirror	1d64e5917f	re-add brackets	2015-05-15 02:32:19 -05:00
Glowbal	56aec85616	fixed incorrect private var name	2015-05-15 09:25:57 +02:00
Glowbal	4b245c0fc4	consistent usage of brackets	2015-05-15 09:25:00 +02:00
PabstMirror	39bc7d06be	Use PFEH array instead of setVariable	2015-05-15 02:15:03 -05:00
PabstMirror	8dbca1d3de	Start vital tracking after treatment	2015-05-14 22:18:53 -05:00
PabstMirror	8abd3c1fef	Calculate vitals interval on first run	2015-05-14 22:16:44 -05:00
esteldunedain	ca94fd4c78	Remove the pfh	2015-05-14 20:58:45 -03:00
esteldunedain	6774739854	Fix #1201	2015-05-14 20:54:11 -03:00
PabstMirror	297cbaef08	#1212 - Add PREP for explosive's module function	2015-05-14 18:49:11 -05:00
esteldunedain	5e3b6f389a	Reliable settings framework	2015-05-14 20:45:53 -03:00
PabstMirror	a07f6091f1	Merge pull request #1207 from acemod/commongPrivates2 ... Common Privates 2	2015-05-14 18:34:22 -05:00
PabstMirror	666db5e245	Fix Typo	2015-05-14 18:13:20 -05:00
SilentSpike	60ade8deaa	Providing correct parameters	2015-05-15 00:09:03 +01:00
SilentSpike	c458deeae2	End of file newline	2015-05-15 00:02:12 +01:00
esteldunedain	032a2f3778	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into viewdistancetweaks ... Conflicts: addons/viewdistance/XEH_postInit.sqf	2015-05-14 19:54:58 -03:00
SilentSpike	0ca8a373d1	BIS_fnc_ActivateAddons must run during mission init	2015-05-14 23:50:58 +01:00
PabstMirror	8cab041806	Missing Nametag Settings File from #1196	2015-05-14 17:24:37 -05:00
PabstMirror	d5db268fc0	Clean unused privates	2015-05-14 17:17:41 -05:00
PabstMirror	c27d84e382	Common Privates Redo	2015-05-14 17:12:40 -05:00
jonpas	22c5c03f6f	Removed redundant defaultValue and checks	2015-05-15 00:04:20 +02:00
jonpas	6ba4289511	Merge branch 'master' into nametagsToggle ... Conflicts: addons/nametags/config.cpp	2015-05-14 23:38:11 +02:00
jonpas	d7b617f49e	Stringtables fixed, variable macro fixed	2015-05-14 23:33:35 +02:00
Nicolás Badano	d9b6636221	Merge pull request #1196 from Winter259/common-cleanup ... Cleanup of nearly all common functions	2015-05-14 18:31:19 -03:00
jonpas	446ad378ca	Fixed variable incosistency, string added for new module option	2015-05-14 23:27:41 +02:00
jonpas	8a2a53ddac	Show player names module option added	2015-05-14 23:26:37 +02:00
jonpas	77e13ca5be	Seperated ACE_Settings	2015-05-14 23:18:38 +02:00
PabstMirror	fd8d68c451	Merge branch 'master' into multipleDevices ... Conflicts: addons/common/stringtable.xml	2015-05-14 15:38:13 -05:00
PabstMirror	2158f467f4	#1171 - Safe get variables if settings not defined	2015-05-14 15:29:09 -05:00
SAM	b2371b1278	Fixed missing nametags config	2015-05-14 22:21:55 +02:00
PabstMirror	03130ab3c9	#1187 - canInteractWith was failing vehicle actions	2015-05-14 15:00:03 -05:00
esteldunedain	e76db653e8	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-05-14 16:56:51 -03:00
esteldunedain	f17c7c12a6	Fixed object actions not working	2015-05-14 16:56:32 -03:00
esteldunedain	a9197a8e33	Make viewdistance disabable through settings and module	2015-05-14 16:36:12 -03:00
SAM	31adb5a9fc	Second batch of settings files	2015-05-14 20:59:25 +02:00
SAM	021679208b	First batch of settings files ... Separating ACE_Settings.hpp from config.cpp	2015-05-14 20:46:35 +02:00
esteldunedain	195643d557	Handle player not existing	2015-05-14 15:24:35 -03:00
esteldunedain	2027a28959	Modify changeViewDistance so: ... - Displays objects distance percentage instead of coeficient - Only display that if not off	2015-05-14 15:16:02 -03:00
esteldunedain	7a6fb54654	Small tweaks to viewdistance	2015-05-14 15:15:07 -03:00
SAM	0b6f02f45e	Second batch of cleaned up files.	2015-05-14 20:06:06 +02:00
SAM	9b55dd0b57	First batch of cleaned up files	2015-05-14 20:02:42 +02:00
PabstMirror	f0b7b34321	Cleanup	2015-05-14 13:00:56 -05:00
PabstMirror	ec38c8c951	Merge branch 'master' into interactionPrivates ... Conflicts: addons/interaction/functions/fnc_addPassengerActions.sqf addons/interaction/functions/fnc_getDoorAnimations.sqf addons/interaction/functions/fnc_moduleInteraction.sqf addons/interaction/functions/fnc_moveDown.sqf addons/interaction/functions/fnc_removeTag.sqf addons/interaction/functions/fnc_showMouseHint.sqf addons/interaction/functions/fnc_updateTooltipPosition.sqf	2015-05-14 12:53:18 -05:00
esteldunedain	0b8992a503	Small tweaks to viewdistance	2015-05-14 14:45:31 -03:00
esteldunedain	32f7854bf6	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into viewdistance	2015-05-14 14:09:12 -03:00
esteldunedain	7191778402	Merge branch 'viewdistance' of https://github.com/Winter259/ACE3 into viewdistance	2015-05-14 14:08:43 -03:00
jaynus	d5a8f21480	Merge pull request #1087 from SilentSpike/zeustemp ... Added zeus changes module as per #1082	2015-05-14 09:32:03 -07:00
SAM	8c7d752fcc	Made final adjustments ... Centred prompts, fixed erroneous if statement, adjusted function headers.	2015-05-14 18:25:41 +02:00
SAM	3480168e05	Integrated new function into module	2015-05-14 17:44:35 +02:00
esteldunedain	54325b4591	Merge branch 'viewdistance' of https://github.com/Winter259/ACE3 into viewdistance	2015-05-14 12:43:47 -03:00
jaynus	92799719b6	Spall off by default.	2015-05-14 08:30:06 -07:00
SAM	853333ac49	Added new function, updated settings	2015-05-14 17:19:14 +02:00
SAM	7fe73c2c80	Added Object View Distance Coefficient setting	2015-05-14 17:11:52 +02:00
jaynus	035277aafc	removed illegal character	2015-05-14 08:11:08 -07:00
SAM	d8cce9ece4	Removed redundant settings	2015-05-14 17:07:20 +02:00
jonpas	5a17b39a7e	Merge remote-tracking branch 'origin/master' into interactionCodingGuidelines ... Conflicts: addons/interaction/CfgVehicles.hpp	2015-05-14 16:57:49 +02:00
ulteq	7474d7f313	Merge pull request #1193 from acemod/getTemperatureAtHeight ... Moved all temperature calculations into the weather module.	2015-05-14 16:41:16 +02:00
ulteq	6a0f7343d8	Merge pull request #1192 from acemod/persistentKestrelMenu ... Made the Kestrel menu persistent	2015-05-14 16:41:12 +02:00
jaynus	cac70762f5	Merge pull request #1149 from acemod/extBuildFix ... Extensions build system updates, changes and crash fixes	2015-05-14 07:25:49 -07:00
Glowbal	d42d0ef69d	Merge pull request #1164 from acemod/litterFixes ... Litter distribution fix and "floating litter over water" fix (medical)	2015-05-14 16:17:10 +02:00
jaynus	20bd5957e3	Change to execNextFrame.	2015-05-14 07:15:52 -07:00
ulteq	cf487b544e	Moved all temperature calculations into the weather module.	2015-05-14 16:07:41 +02:00
Glowbal	abadf05342	Merge remote-tracking branch 'gienkov/module-translations' ... Conflicts: addons/medical/stringtable.xml	2015-05-14 16:01:41 +02:00
esteldunedain	5b856e0966	Merge branch 'master' into viewdistance ... Conflicts: AUTHORS.txt	2015-05-14 10:55:31 -03:00
esteldunedain	4a074d4e31	Replace BIS_fnc_sortBy by sort for interact_menu occlusion	2015-05-14 10:54:22 -03:00
ulteq	a167336b40	Made the Kestrel menu persistent	2015-05-14 15:39:29 +02:00
esteldunedain	5ef29c2354	Merge remote-tracking branch 'origin/master' into interactionOclusion ... Conflicts: addons/interact_menu/functions/fnc_keyDown.sqf	2015-05-14 10:39:02 -03:00
Nicolás Badano	2fb317d3bd	Merge pull request #1120 from acemod/syncAmmoOnBeltReload ... Manually sync ammo globably on belt reload.	2015-05-14 10:32:16 -03:00
Nicolás Badano	dddd571a70	Merge pull request #1185 from Legolasindar/master ... fixed some spanish translation	2015-05-14 09:38:52 -03:00
Grzegorz	ca1ff8382c	Tabs fixed	2015-05-14 14:33:33 +02:00
Ivan Navarro Cabello	43c5afac55	fixed some spanish translation ... I fixed some spanish translation.	2015-05-14 14:32:35 +02:00
ulteq	7fcaa5bbcf	Fixed 'input parsing' corrupting 'relative click memory'	2015-05-14 12:52:48 +02:00
ulteq	ddbf274c89	ace_ballistics README.md update	2015-05-14 11:23:44 +02:00
jaynus	b13d44fb6b	Fixed: Litter spawning at huge radius, floating litter over water. Fixes #1112	2015-05-13 17:29:09 -07:00
jaynus	58a55313cd	Changed: Entire frag system re-optimized to a single tracking/GC index-based PFH. ... Changed: Spalling calculations now throttled across frames and limited; accurate but performant Changed: All lookups are now index-based on a global projectiles array. This reduced runtime dramatically for all fragmentation.	2015-05-13 17:06:10 -07:00
jaynus	aef896cc21	Merge remote-tracking branch 'origin/explosive_reflection' into fragSpallOptimization ... Conflicts: addons/frag/XEH_preInit.sqf	2015-05-13 15:52:18 -07:00
jaynus	553942bbc7	Initial commit of frag/spalling optimization rewrite. Now tracks in single PFH, with index-based referencing instead of searches. TODO: Break spall calculation up to multiple frames. Needs testing.	2015-05-13 14:33:14 -07:00
Alessandro Foresi	8de611d559	Fixed: Safe mode Italian translation	2015-05-13 23:20:33 +02:00
jaynus	cf635d4564	Merge pull request #1129 from usecforce/removeTitanRealisticName ... Removed Titan realistic name as it's not implemented yet as a Spike	2015-05-13 13:31:01 -07:00
PabstMirror	87d258ff05	Fix Scaling on small resolutions	2015-05-13 14:19:28 -05:00
PabstMirror	8e842c694b	Show Version and HTML on main menu	2015-05-13 14:05:13 -05:00
jaynus	9f3a57bf32	Changed: checkFiles extension check prints version returned by extension ... Changed: Build changed to SSE2 instead of defaulting to AVX.	2015-05-13 09:57:24 -07:00
Glowbal	be09a5cecd	Merge pull request #1145 from acemod/MedicalVehicleCheckFix ... Fix medical vehicle return value	2015-05-13 18:32:49 +02:00
jaynus	890849fcd1	Merge pull request #1139 from acemod/fragPrivates ... Frag Privates	2015-05-13 08:06:02 -07:00
Glowbal	a4d0af4b67	Fix medical vehicle return value ... Could fix #1142	2015-05-13 15:55:03 +02:00
ulteq	26843dad88	Merge pull request #1057 from acemod/abConfigCaching ... Config caching (advanced ballistics)	2015-05-13 11:30:21 +02:00
ulteq	d04ebef519	Merge pull request #1106 from acemod/refactorCalcWindSpeed ... Moved all wind calculations into the weather module	2015-05-13 11:23:32 +02:00
commy2	8f35b9b7a4	Merge pull request #1138 from acemod/dragPrivates ... Draggin Privates	2015-05-13 10:57:03 +02:00
PabstMirror	58ee797a94	Merge branch 'master' into userActionPrototype	2015-05-13 00:00:55 -05:00
PabstMirror	4185874a9a	Frag Privates	2015-05-12 23:19:31 -05:00
jaynus	ed2f73d4d9	Merge pull request #1117 from acemod/waveHeightAtFunc ... Added: waveHeightAt Function	2015-05-12 21:15:35 -07:00
PabstMirror	3978445837	Draggin Privates	2015-05-12 23:01:59 -05:00
PabstMirror	54dcbb9ef4	FCS - Privates	2015-05-12 22:15:52 -05:00
PabstMirror	245a6da6f6	Merge pull request #1027 from acemod/sortForMagRepack ... Sort for mag repack	2015-05-12 21:56:12 -05:00
jaynus	d972f14649	Merge pull request #1092 from acemod/superTime ... ACE_time variables for accurate purposeful time use	2015-05-12 19:34:20 -07:00
jaynus	d28f2b0f2c	Merge pull request #1113 from acemod/ComancheZoomLevels ... Fix for Comanche zoom levels	2015-05-12 19:31:28 -07:00
PabstMirror	1827d8ad95	Fix #1024 - Adjust self iMenu for wave height	2015-05-12 16:04:42 -05:00
PabstMirror	e613db1fea	Add missing script_component include	2015-05-12 15:40:12 -05:00
jonpas	e58d23d885	Removed Titan realistic name as it's not implemented yet as a Spike	2015-05-12 21:32:30 +02:00
SilentSpike	2620f5ebd9	Made module also default to disabled	2015-05-12 19:55:38 +01:00
GieNkoV	1610221a70	Remove duplicated strings	2015-05-12 20:01:10 +02:00
GieNkoV	ed1acd8c15	Some small errors fixed #2 ... Mainly tabs and wrong italian strings (got those from newest master)	2015-05-12 19:42:35 +02:00
GieNkoV	bc72c71e8e	Fix small errors inside stringtables	2015-05-12 19:11:56 +02:00
Grzegorz Sikora	44466e8be8	Remove tabs and repair errors @Glowbal found ... Conflicts: addons/map/CfgVehicles.hpp addons/medical/CfgVehicles.hpp Conflicts: addons/map/CfgVehicles.hpp addons/medical/CfgVehicles.hpp addons/optionsmenu/stringtable.xml	2015-05-12 18:27:27 +02:00
GieNkoV	5bbf875ef2	Tabs removed ... Conflicts: addons/missileguidance/stringtable.xml addons/optionsmenu/stringtable.xml	2015-05-12 18:27:02 +02:00
Grzegorz Sikora	63c5308cd9	Missed one Yes/no to BOOL	2015-05-12 18:26:41 +02:00
Grzegorz Sikora	156bba3321	Yes/No to BOOL ... Conflicts: addons/common/CfgVehicles.hpp addons/common/stringtable.xml addons/explosives/stringtable.xml addons/hearing/CfgVehicles.hpp addons/hearing/stringtable.xml addons/interaction/stringtable.xml addons/map/CfgVehicles.hpp addons/map/stringtable.xml addons/medical/CfgVehicles.hpp addons/medical/stringtable.xml addons/nametags/stringtable.xml addons/respawn/stringtable.xml addons/switchunits/CfgVehicles.hpp addons/switchunits/stringtable.xml Conflicts: addons/common/CfgVehicles.hpp addons/common/stringtable.xml addons/explosives/stringtable.xml addons/hearing/stringtable.xml addons/interaction/stringtable.xml addons/map/CfgVehicles.hpp addons/map/stringtable.xml addons/medical/CfgVehicles.hpp addons/medical/stringtable.xml addons/nametags/stringtable.xml addons/respawn/stringtable.xml addons/switchunits/CfgVehicles.hpp addons/switchunits/stringtable.xml	2015-05-12 18:26:24 +02:00
Grzegorz Sikora	6a821715a0	Stringtable modules ... Conflicts: addons/missionmodules/CfgVehicles.hpp addons/respawn/CfgVehicles.hpp	2015-05-12 18:25:40 +02:00
ViperMaul	ab580dd1c7	Set version number to 3.0.0.3	2015-05-12 07:08:45 -07:00
VKing	3ddc8569bb	Made better with Pabstology (tm)	2015-05-12 15:53:49 +02:00
SilentSpike	228786f3ad	Putting the bird in its cage	2015-05-12 12:26:24 +01:00
PabstMirror	ddbb6ab2bb	#1119 - Manually sync ammo globably on belt reload.	2015-05-11 23:51:42 -05:00
PabstMirror	043fee03bd	Return Valid bool for keybind	2015-05-11 22:48:03 -05:00
PabstMirror	de2a89613c	ATragMX	2015-05-11 22:22:24 -05:00
PabstMirror	ffce1f6386	Condense mDagr interactions - intergrate kestral	2015-05-11 21:49:13 -05:00
jaynus	7efe8ccba5	Added: waveHeightAt Function, refs #1024 for use.	2015-05-11 16:44:17 -07:00
ViperMaul	e75c4594e6	Added missing $PBOPREFIX$ for respawn	2015-05-11 15:17:44 -07:00
VKing	ef836d1191	Hacked order to fix order of comanche zoom levels	2015-05-11 23:17:17 +02:00
jaynus	8e7763af08	Removed: systemChat debug in captive	2015-05-11 13:50:24 -07:00
jaynus	991ecdfe01	Removed: Debug sidechat in laser seeker code.	2015-05-11 13:37:50 -07:00
ViperMaul	0bb158bd14	Merge pull request #1109 from acemod/makeNewVersionStamping ... Make new version stamping	2015-05-11 11:16:14 -07:00
SilentSpike	f6cdad62ca	Added parenthesis	2015-05-11 19:04:04 +01:00
SilentSpike	7cf52d13ca	Disable zeus settings by default ... Fixed newline characters	2015-05-11 18:15:45 +01:00
ViperMaul	5092d586fd	Exception handling and clean up. ... #1105	2015-05-11 10:06:40 -07:00
commy2	c0e2af2e66	quotes in config arrays	2015-05-11 18:50:04 +02:00
SilentSpike	b09ebc9c79	QGVAR was meant to be GVAR ... Improved module text Forgot about script_component	2015-05-11 17:08:25 +01:00
jaynus	9660978b92	Changed: search for ace_server, not ace_serverconfig	2015-05-11 09:02:13 -07:00
ViperMaul	9c288ffa12	Merge pull request #1108 from acemod/missingPBOPREFIX ... Added missing PBOPREFIX files	2015-05-11 08:54:03 -07:00
ViperMaul	b0051a6638	Merge pull request #1094 from acemod/fixUnSurrender ... Fix not being able to UnSurrender (currentWeapon)	2015-05-11 08:39:39 -07:00
ViperMaul	4e1370cbc3	Merge pull request #1093 from acemod/fixDisarming ... Fix disarming	2015-05-11 08:38:56 -07:00
ulteq	0b3d3b8793	Added missing PBOPREFIX files	2015-05-11 17:37:08 +02:00
SilentSpike	e16ea007e4	Add ACE settings	2015-05-11 16:30:46 +01:00
SilentSpike	755581be40	Changed BI functions to check for settings	2015-05-11 16:23:46 +01:00
SilentSpike	3118666f80	Added settings module to config ... Started functionality	2015-05-11 16:02:24 +01:00
SilentSpike	519aba57b5	Transfered ballistics support (as discussed with glowbal)	2015-05-11 14:45:37 +01:00
ulteq	b03333c9e8	Moved all wind calculations into the weather module	2015-05-11 10:59:07 +02:00
jaynus	d6dde3c73f	Merge pull request #1077 from acemod/fixSwitchUnits ... Fix switch units	2015-05-10 23:38:56 -07:00
ulteq	9fe8d6f40a	Merge pull request #1097 from acemod/dispersionFix ... Rifle dispersion overhaul:	2015-05-11 00:31:23 +02:00
PabstMirror	2e91f45273	#1104 - Fix legend in editor	2015-05-10 16:57:05 -05:00
PabstMirror	57d6ad988b	Kestral WIP	2015-05-10 16:54:24 -05:00
Glowbal	e6a8f0b295	Merge pull request #1103 from SilentSpike/medical_typofix ... Trivial variable name fix for moduleAssignMedicalVehicle function	2015-05-10 22:37:54 +02:00
PabstMirror	05f1b884fa	Localization/ headers	2015-05-10 15:17:50 -05:00
PabstMirror	f7ff4a2f36	Base Device Handler Framework ... Multiple devices share Home/Ctrl-home keys	2015-05-10 14:59:53 -05:00
SilentSpike	eff5ce03d6	false -> 0	2015-05-10 20:58:17 +01:00
VKing	8d61b42e87	Changed MicroDAGR position and target display to 10-digit grids	2015-05-10 21:47:05 +02:00
VKing	2dd42f828d	"Borrowed" pabst's UTM zone/band function and moved it from microdagr to map	2015-05-10 21:45:49 +02:00
SilentSpike	518cfdab9e	isMedic -> medicClass	2015-05-10 20:19:32 +01:00
ulteq	09c19e4ec2	Subtle recoil reduction when using a suppressor	2015-05-10 20:58:36 +02:00
SilentSpike	d321ed2753	Changed function variable to match other medical vehicle functions	2015-05-10 19:56:35 +01:00
ViperMaul	9be22ee8b5	Merge pull request #1088 from acemod/makeNOBIN_improvements ... Make Improvements	2015-05-10 11:46:16 -07:00
ulteq	82f3c65c31	Tuned down the dispersion reduction of suppressors some more	2015-05-10 20:06:27 +02:00
VKing	bcac56874b	Moved functions to ace_map	2015-05-10 19:58:09 +02:00
SilentSpike	c1c10f43b2	Fixed typo	2015-05-10 17:41:43 +01:00
SilentSpike	a40277f6f1	Module configs and function headers	2015-05-10 17:32:01 +01:00
SilentSpike	5166e73cc0	Added commented out code and function prep	2015-05-10 17:26:24 +01:00
SilentSpike	9dd163ac3d	Use moduleProjectile with ballistics support	2015-05-10 17:21:18 +01:00
SilentSpike	eaa0f16e30	Transferring rest of function files	2015-05-10 17:17:17 +01:00
VKing	4e09681c9e	Added getMGRSdata to PostInit	2015-05-10 18:10:03 +02:00
VKing	fe40452c8e	Added optional parameter to run for any map. Writes information for current map to GVAR in prep for postinit runs	2015-05-10 18:06:37 +02:00
VKing	4cf54799ab	Optional parameter to select return value; array or string	2015-05-10 18:05:28 +02:00
VKing	5f809476c3	VR is a special place	2015-05-10 17:35:40 +02:00
VKing	39e851df03	Added functions to create MGRS grid zone designator and 100km grid for given world. ... *probably* not very accurate, but it should be close enough for fluff	2015-05-10 17:26:28 +02:00
jaynus	c39b5931c7	ACE tickTime based on ACE_time.	2015-05-10 07:56:14 -07:00
jaynus	e1c3c40cdd	I need more coffee. this should be more accurate.	2015-05-10 07:50:58 -07:00
jaynus	318b2437f9	Applied virtual time acceleration to the master ACE_time. Created ACE_tickTime macro, to provide same-frame millisecond resolution.	2015-05-10 07:42:53 -07:00
ViperMaul	1cc5bd1c50	removing unneeded debug files	2015-05-10 07:41:24 -07:00
ulteq	235534292f	Rifle dispersion overhaul: ... *Added dispersion values for the new marksmen rifles (when needed) *Overworked some of the (ridiculous) existing values *Made use of the vanilla values whenever possible	2015-05-10 16:31:56 +02:00
KoffeinFlummi	2bb3a0f139	Cleanup #1095 ... - Fix tabs - Remove tabler comments - Restore one removed Russian string	2015-05-10 16:19:46 +02:00
KoffeinFlummi	9e982fe958	Merge branch 'translation/15bn/alef' of https://github.com/alef/ACE3 into italian-merge	2015-05-10 16:09:31 +02:00
commy2	ba6ffe8c2f	Merge pull request #946 from acemod/fcsInitSpeedFix ... Fcs init speed fix	2015-05-10 14:57:50 +02:00
SAM	cb64f7d1a9	Adjusted PBOPREFIX	2015-05-10 13:28:18 +02:00
SAM	495e94f3f0	Merged fnc_init.sqf into XEH_postInit.sqf	2015-05-10 13:04:08 +02:00
SAM	283768fabb	Fixed code style in switch statement	2015-05-10 12:56:05 +02:00
SAM	6a6681872c	Replaced player with ACE_player	2015-05-10 12:54:53 +02:00
VKing	c6dbe6d39d	tabs to space	2015-05-10 12:51:18 +02:00
VKing	e6f27f9612	Fix offset, remove debug	2015-05-10 12:36:44 +02:00
SAM	2ce133675a	Removed terrain grid related configs	2015-05-10 12:28:58 +02:00
VKing	9d527bf6d2	Added function that gets 10 digit grids from a position	2015-05-10 12:20:42 +02:00
SAM	c05a91f530	Suppress prompts when changing vehicle. ... They're only shown when the player changes the setting.	2015-05-10 12:15:34 +02:00
SAM	69648f0e1b	Added adaptive view distance depending on vehicle	2015-05-10 12:00:19 +02:00
Glowbal	f861466882	Merge pull request #1075 from acemod/ambianceSoundModuleDescAndDoc ... adjust ambiance sound module description and docs	2015-05-10 11:46:53 +02:00
Alessandro Foresi	2dd06babec	Added: Italian translations completed. ... Fixed: BOM markers where missing	2015-05-10 11:44:46 +02:00
ulteq	d32e1024d3	Fixed a typo	2015-05-10 11:09:14 +02:00
Alessandro Foresi	643df71932	Added: Italian translation from Blackedsoul p#20	2015-05-10 11:05:16 +02:00
ulteq	718c38098e	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into abConfigCaching	2015-05-10 10:38:12 +02:00
PabstMirror	59adf92862	Fix not being able to UnSurrender (currentWeapon)	2015-05-10 01:47:50 -05:00
jaynus	7fb7b04a85	And one final bugfix for fast machines.	2015-05-09 23:13:02 -07:00
jaynus	8e34b99c0f	Optimization of variables.	2015-05-09 23:09:33 -07:00
jaynus	b3833c665d	Time magic.	2015-05-09 22:53:20 -07:00
PabstMirror	2da2794e20	ACE_isUnique config for mags instead of static list	2015-05-09 17:08:47 -05:00
Alessandro Foresi	7e7c3ed053	Added: More italian translations	2015-05-10 00:04:42 +02:00
Alessandro Foresi	9e093b9459	Added: More italian translations	2015-05-09 23:52:01 +02:00
Alessandro Foresi	6695a8793b	Added: Some italian translastions	2015-05-09 23:43:03 +02:00
SilentSpike	212b8528fa	Bird locality code no longer needed	2015-05-09 21:30:52 +01:00
jonpas	1a2e7d0596	Tabs to Spaces, Removed unused GUI class	2015-05-09 22:25:48 +02:00
jonpas	633e94a114	CBA Macros to Interaction functions	2015-05-09 22:14:00 +02:00
PabstMirror	4733818e9b	Fix weather array for zargabad	2015-05-09 15:10:01 -05:00
ulteq	3a10c77f08	Minor cleanup	2015-05-09 22:09:36 +02:00
PabstMirror	2e3e203d9f	#1081 - Fix binocular dupe ... binocs are weapons and items at the same time. need to properly drop binocs because stuff like deisgnator can have ammo	2015-05-09 14:41:46 -05:00
jaynus	6b5d95906d	Disables multiple openings of the kestrel & atrag. Allows the overlay toggle, but disables the opening of multiple ones. Used onUnload handlers. Supports both limiting interact and keybinds. Fixes #1086	2015-05-09 12:41:01 -07:00
SilentSpike	3544ee57f8	Added removed script within comments	2015-05-09 20:35:07 +01:00
SilentSpike	079b8489ce	Missing spaces 😉	2015-05-09 20:30:49 +01:00
SilentSpike	f685ec2257	added zeus changes module	2015-05-09 20:24:39 +01:00
ViperMaul	21ea667463	$NOBIN$ file must not be a zero-byte file in order to affect the cache to trigger a proper rebuild.	2015-05-09 11:07:27 -07:00
ulteq	00c28dd146	Merge pull request #1085 from acemod/cleanupScopesFiredEH ... scope firedEH cleanup	2015-05-09 20:02:29 +02:00
ulteq	253ed6946e	scope firedEH cleanup	2015-05-09 20:02:22 +02:00
commy2	aa6c3ddf2c	fix: check files script, order in activatedAddons is not guaranteed	2015-05-09 19:34:35 +02:00
ulteq	b80602fbae	Fixed a typo	2015-05-09 18:55:00 +02:00
SAM	737b1cc216	Renamed variable limit to limitViewDistance ... For future limiting of terraingrid	2015-05-09 18:42:02 +02:00
ulteq	30ff90453b	wind deflection has wrong version number macro setup	2015-05-09 18:32:19 +02:00
Glowbal	d3e2bd45d7	Merge pull request #1065 from acemod/fixMedicalSettingMistake ... Fixed medical setting spelling mistake	2015-05-09 18:09:27 +02:00
commy2	4dc0b41c4b	Merge pull request #1076 from acemod/checkfiles ... check for outdated pbo files	2015-05-09 17:50:29 +02:00
Nicolás Badano	b32729978f	Merge pull request #1026 from acemod/wavesFix ... Fixes bugged waves	2015-05-09 12:42:28 -03:00
commy2	7fb56d4fd5	simple check to compare client and server version of ace	2015-05-09 17:03:51 +02:00
commy2	3976c4d64f	the spaces	2015-05-09 16:06:44 +02:00
commy2	f0cca5b33e	ignore ace in checkPBO module, also fix #1020	2015-05-09 16:01:53 +02:00
commy2	52a904478b	laser selfdesignate has wrong version number macro setup	2015-05-09 15:32:34 +02:00
SAM	cad86280c1	Fixed module value not overriding.	2015-05-09 14:51:23 +02:00
bux578	f1798aa739	fix switchunits	2015-05-09 14:05:58 +02:00
bux578	8c937a707d	starting to fix switchunits	2015-05-09 13:49:26 +02:00
commy2	57131496f2	check for outdated pbo files	2015-05-09 13:25:19 +02:00
SAM	f4d7c6818b	Attempted fix #2	2015-05-09 13:05:36 +02:00
SAM	a9d6fbd841	Attempting to fix module value not being read	2015-05-09 12:36:11 +02:00
SAM	f64f76e92f	Fixed wrong file name	2015-05-09 12:07:05 +02:00
SAM	2dfaaa047a	Reworked limiting system ... Module limit still not being set properly.	2015-05-09 11:56:27 +02:00
SAM	bba216ebd2	Rewrote switch statement ... Per @Glowbal's comment	2015-05-09 10:53:09 +02:00
SAM	7201a23d41	Adjusted post init, removed redundant settings	2015-05-09 10:44:01 +02:00
SAM	9e40e16c4a	Adjusted XEH_preinit accordingly	2015-05-09 10:43:20 +02:00
SAM	ae1628ef03	Renamed init file for neatness	2015-05-09 10:41:55 +02:00
bux578	fb284faa66	adjust ambiance sound module description and docs	2015-05-09 08:18:44 +02:00
bux578	ddf32052c4	fix removeWhiteSpace function name ... used `string_removeWhiteSpace` but had to be `stringRemoveWhiteSpace` due to 612fa69c1c	2015-05-09 08:02:13 +02:00
Nicolás Badano	19e8d7bbe7	Merge pull request #1066 from acemod/scopes-usefiredBisEH ... Switch scopes to use firedBIS	2015-05-09 01:21:10 -03:00
commy2	b57f731dd0	disable laserpointer inheritance for rhs	2015-05-09 04:59:10 +02:00
jonpas	e9abd8c27a	Fixed lowercasing, improved examples	2015-05-09 04:55:41 +02:00
jonpas	2ff372e2a1	Function headers per Coding Guidelines for Interaction	2015-05-09 04:47:15 +02:00
jonpas	50d5e845ee	Lowercased beginning of functions pt2	2015-05-09 03:12:28 +02:00
jonpas	2a9f4d779d	Lowercased beginning of function names	2015-05-09 03:09:26 +02:00
PabstMirror	a4c710bd28	Switch scopes to use firedBIS	2015-05-08 13:36:24 -05:00
commy2	2ffabec250	Merge pull request #1040 from acemod/disableCfgAISkill ... Disables the CfgAISkill class to prevent it from affecting players.	2015-05-08 20:27:31 +02:00
jaynus	b7b6cb6086	Fixed: Adds an enabler config to ace_frag, disabling the PFH for any round not enabled.	2015-05-08 11:27:17 -07:00
commy2	7294056da0	keep ai tweaks except of relaod	2015-05-08 20:13:20 +02:00
Glowbal	e674229dde	enabledFor > enableFor	2015-05-08 20:10:40 +02:00
ulteq	0a9dbfba87	Privates cleanup	2015-05-08 18:47:17 +02:00
ulteq	03fd740f8e	Config caching is now done in the uiNamespace	2015-05-08 18:43:26 +02:00
SAM	0b4137763d	Cleaned up code	2015-05-08 18:41:32 +02:00
SAM	45992e5e7f	All working except module returning any. ... ace_viewdistance_moduleViewDistanceLimit always returning as any. No error in the RPT relating to readSettingfromModule failing	2015-05-08 18:30:28 +02:00
ulteq	9a0fcd4fec	AB config read caching	2015-05-08 17:20:56 +02:00
SAM	6cda97e3a0	Adding required files for module integration	2015-05-08 16:07:57 +02:00
ulteq	1f15e68c30	Global variable cleanup	2015-05-08 16:00:41 +02:00
SAM	5732015370	Added moduleViewDistance file	2015-05-08 15:36:47 +02:00
SAM	bb625aac58	Used ACE common function instead of hint	2015-05-08 15:27:13 +02:00
ulteq	fd0ca58fe6	Fixes broken bullet trace effect (caliber is now in mm, not inches)	2015-05-08 15:25:32 +02:00
SAM	a5d68f122d	Added working limiter (config based)	2015-05-08 14:49:52 +02:00
SAM	6b604c101c	First working version	2015-05-08 14:14:15 +02:00
ulteq	f9b6916456	Merge pull request #1053 from acemod/fixATragMX ... Fixes broken ATragMX (calculateStabilityFactor now requires metric in…	2015-05-08 13:57:59 +02:00
ulteq	3495196f40	Fixes broken ATragMX (calculateStabilityFactor now requires metric input)	2015-05-08 13:56:38 +02:00
ulteq	0e74fa56f7	Corrected several armour piercing round configs	2015-05-08 13:45:00 +02:00
Felix Wiegand	6589cdfb0e	Merge pull request #1041 from acemod/metric-units ... Metric units	2015-05-08 13:09:31 +02:00
KoffeinFlummi	5e33176b52	Convert ACE_barrelLength(s) to millimeters	2015-05-08 12:47:45 +02:00
KoffeinFlummi	aa9561f287	Convert ACE_barrelTwist to millimeters	2015-05-08 12:46:44 +02:00
KoffeinFlummi	adc758cd14	Convert ACE_bulletLength to millimeters	2015-05-08 12:45:17 +02:00
KoffeinFlummi	ce8e192a01	Convert ACE_caliber to millimeters	2015-05-08 12:44:06 +02:00
ulteq	fa07110311	The stability factor calculation is all metric now	2015-05-08 10:46:59 +02:00
SAM	2c8dddfc47	Adding required files	2015-05-08 09:28:48 +02:00
SAM	c2bb6386af	Added required files for new module	2015-05-07 22:41:44 +02:00
Glowbal	518dfb4373	Added missing privates	2015-05-07 21:51:03 +02:00
KoffeinFlummi	a8c4068b56	Remove unnecessary comment	2015-05-07 18:51:18 +02:00
KoffeinFlummi	db07de31af	Whoops; back to the roots.	2015-05-07 18:49:40 +02:00
KoffeinFlummi	4b3a111681	Convert ACE_barrelLength to meters	2015-05-07 18:44:01 +02:00
KoffeinFlummi	3313582aec	Convert ACE_barrelTwist to meters	2015-05-07 18:41:54 +02:00
KoffeinFlummi	68c9127753	Convert ACE_barrelLengths to meters	2015-05-07 18:39:57 +02:00
KoffeinFlummi	27c8255987	Convert ACE_bulletMass to grams	2015-05-07 18:33:34 +02:00
KoffeinFlummi	b20c42398b	Convert ACE_bulletLength to meters	2015-05-07 18:29:02 +02:00
KoffeinFlummi	4eaab93fd1	Convert ACE_caliber to meters	2015-05-07 18:21:15 +02:00
ulteq	cea6d0063d	Disables the CfgAISkill class to prevent it from affecting players.	2015-05-07 17:49:59 +02:00
ViperMaul	996c342087	Merge pull request #994 from acemod/imenumisclick ... don't close menu when no action is selected	2015-05-06 13:31:07 -07:00
PabstMirror	5f43cffecd	Sort for mag repack	2015-05-05 20:35:08 -05:00
ulteq	05f34e5d6a	Attempt to fix https://github.com/acemod/ACE3/issues/1025	2015-05-05 22:21:29 +02:00
Glowbal	f6dae4f6ba	Merge pull request #1016 from acemod/fixRespawnModule ... Fix undefined variable in respawn module	2015-05-05 20:30:46 +02:00
Glowbal	50cc5db92f	fixes #1017	2015-05-05 20:05:31 +02:00
Glowbal	a49feee76b	should have been defaultValue	2015-05-05 19:47:17 +02:00
Glowbal	cee83113d2	lets use proper module config for this	2015-05-05 19:44:56 +02:00
Glowbal	9abf8a15c1	Make certain that GVAR(BodyRemoveTimer) exists	2015-05-05 19:44:44 +02:00
Glowbal	d88d71e2b3	Merge pull request #1015 from alganthe/master ... New anim update	2015-05-05 19:35:31 +02:00
jaynus	8f19c13d85	Merge pull request #1009 from acemod/fixMissleGuidanceInhertiacnes ... MissleGuidance - fix Inheritance check	2015-05-05 10:31:40 -07:00
Josuan Albin	dd2ea99d15	pak ... pak anim	2015-05-05 19:26:11 +02:00
Josuan Albin	f063e45e60	medical advanced added ... animations added for advanced	2015-05-05 19:04:08 +02:00
Josuan Albin	b781264212	New anim update ... new healing animation added to animationCaller, animationCallerSelf stays the same	2015-05-05 18:53:17 +02:00
PabstMirror	76f540409f	Fix 1.44 Updating Base Class ... Updating base class VestItem->ItemInfo, by z\addons\ace\protection\config.cpp/CfgWeapons/V_PlateCarrierIAGL_dgtl/ItemInfo/	2015-05-05 10:46:56 -05:00
Nicolás Badano	83304a0622	Merge pull request #1011 from acemod/moveContourLegend ... #940 - Map Tweak (contor legend) for brefing	2015-05-05 08:14:34 -03:00
ulteq	19864d5be6	Fixed a bug in the humidity calculation	2015-05-05 10:37:51 +02:00
ulteq	4f44bcdf46	Added wind data for Chernarus (Prag)	2015-05-05 10:36:12 +02:00
bux578	bd69405cf4	fix czech typo in medical, fix #1010	2015-05-05 08:37:41 +02:00
PabstMirror	dafff4e63e	#940 - Map Tweak (contor legend) for brefing	2015-05-04 23:50:03 -05:00
PabstMirror	21552caee7	Opps- Not the same as javelin	2015-05-04 23:01:19 -05:00
PabstMirror	3fa218848d	MissleGuidance - fix Inheritance check	2015-05-04 22:46:58 -05:00
ulteq	f81e53bb33	Added wind data for Takistan (Kabul)	2015-05-04 22:17:26 +02:00
ulteq	be7391bf47	Added wind data for F.A.T.A	2015-05-04 21:28:12 +02:00
PabstMirror	6c45292e89	Merge branch 'master' into userActionPrototype ... Conflicts: addons/interact_menu/functions/fnc_renderBaseMenu.sqf	2015-05-04 14:23:21 -05:00
PabstMirror	e6889f1634	Merge branch 'master' into userActionPrototype	2015-05-04 14:21:49 -05:00
PabstMirror	6c5d72640c	Caching, Optimzations	2015-05-04 14:06:33 -05:00
ulteq	76eaa5ded1	Added wind data for Bornholm	2015-05-04 20:35:39 +02:00
ViperMaul	032424b23e	Merge pull request #1006 from acemod/skipLOSCheckBodyparts ... Interact menu: Increase the minimum distance required for LOS checks to 1.5m	2015-05-04 10:14:59 -07:00
esteldunedain	d07b69aca4	Increase the minimum distance required to perform LOS checks to 1.5m; should avoid LOS checks for medical bodyparts entirely, thus avoiding problems with weaponholders obstructing actions.	2015-05-04 13:37:14 -03:00
ulteq	d78be0fa23	Merge pull request #998 from Bla1337/master ... Translation fixes/improvements (RU)	2015-05-04 10:28:35 +02:00
Bla1337	6c6cb9128a	Reverted the abbreviation changes ... Abbreviation only used when necessary for the text clipping prevention.	2015-05-04 09:54:54 +03:00
Glowbal	f6e815fbaf	Merge pull request #1003 from acemod/fixMedicalLitterError ... Fix treatment script error	2015-05-04 00:25:46 +02:00
Glowbal	ae47c78552	Make treatment execute before createLitter	2015-05-04 00:20:28 +02:00
Glowbal	b86012a6b1	Ensure that litterCondition is always code #1000	2015-05-04 00:16:12 +02:00
ulteq	061b77e375	Fixed completely fucked up temperature day/night cycle	2015-05-03 23:32:53 +02:00
ulteq	30c27bf689	Added weather data for kunduz map	2015-05-03 23:21:56 +02:00
PabstMirror	bdc967d3a9	Extension to parse text for image path	2015-05-03 13:44:02 -05:00
ulteq	3fda9e7e7b	Merge pull request #997 from ProfessorCZ/master ... Czech translation - Update	2015-05-03 17:03:47 +02:00
Bla1337	bf592ce0a9	nightvision edits	2015-05-03 17:35:58 +03:00
Bla1337	73d0be88fb	nametags edits	2015-05-03 14:57:59 +03:00
Bla1337	a7d66b59cf	transaltions	2015-05-03 14:01:35 +03:00
Lukas	3434964f4f	Update stringtable.xml	2015-05-03 11:54:18 +02:00
Lukas	da309e6682	Update stringtable.xml	2015-05-03 11:53:12 +02:00
ProfessorCZ	a0e443cfc6	Czech translation - Update	2015-05-03 11:48:56 +02:00
ulteq	4d4604da28	Fixed two typos in the ATragMX gun profile list	2015-05-03 10:47:49 +02:00
ulteq	d653aa262a	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ballisticsTranslationFix ... Conflicts: addons/ballistics/stringtable.xml	2015-05-03 10:21:57 +02:00
PabstMirror	5c556647ab	Some Cleanup	2015-05-03 02:06:49 -05:00
PabstMirror	5147f9f584	Ladder Actions	2015-05-03 00:33:20 -05:00
PabstMirror	d4225e03d2	Split into functions (for future caching)	2015-05-02 23:13:35 -05:00
KoffeinFlummi	f678fb8fbf	Merge branch 'spanish-merge'	2015-05-03 02:40:56 +02:00
KoffeinFlummi	7633f406ae	Merge branch 'patch-2' of https://github.com/Dimaslg/ACE3 into spanish-merge ... Conflicts: addons/laser/stringtable.xml	2015-05-03 02:40:44 +02:00
PabstMirror	d0975b4c0f	Laserpointer Stringtable - fix swapped eng/czk	2015-05-02 18:55:23 -05:00
KoffeinFlummi	697656da92	Merge branch 'master' of https://github.com/acemod/ACE3	2015-05-03 01:08:39 +02:00
KoffeinFlummi	a1d2bd62a4	Merge branch 'patch-1' of https://github.com/FreeZbe/ACE3 into french-merge ... Conflicts: addons/interaction/stringtable.xml	2015-05-03 01:08:22 +02:00
jaynus	27c66ba631	Merge pull request #993 from acemod/clipboardExtension ... ACE clipboard extension to bypass clipboard limit of arma. Close #991	2015-05-02 15:29:18 -07:00
jaynus	717d7c874f	Data chunking. Feature complete.	2015-05-02 15:28:40 -07:00
KoffeinFlummi	e918e1d661	Merge https://github.com/ruPaladin/ACE3 into russian-merge ... Conflicts: addons/interaction/stringtable.xml addons/medical/stringtable.xml	2015-05-02 23:43:33 +02:00
KoffeinFlummi	d0c7fce7f3	Merge https://github.com/adam3adam/ACE3 into czech-merge ... Conflicts: addons/interaction/stringtable.xml addons/medical/stringtable.xml addons/mk6mortar/stringtable.xml	2015-05-02 23:29:45 +02:00
esteldunedain	8d92d9cc7d	Add ace_clipboard to ACE_Extensions	2015-05-02 18:25:35 -03:00
KoffeinFlummi	298e1d88bd	Merge branch 'hu-catchup' of https://github.com/Harakhti/ACE3 into hungarian-merge ... Conflicts: addons/ballistics/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/laser/stringtable.xml addons/medical/stringtable.xml addons/respawn/stringtable.xml	2015-05-02 23:17:39 +02:00
commy2	f44aaee7c7	also in cursor mode	2015-05-02 23:02:40 +02:00
commy2	0fd783082d	don't close menu when no action is selected	2015-05-02 22:53:23 +02:00
esteldunedain	233ca37219	Export settings to clipboard using ace_clipboard. Deprecate exporting through diag_log	2015-05-02 17:52:37 -03:00
ulteq	e6187adfc7	Removed a trailing space	2015-05-02 22:09:38 +02:00
ulteq	b5ec13b992	Fixed some inconsistencies in the stringtable	2015-05-02 22:07:25 +02:00
Felix Wiegand	7678919e8d	Merge pull request #982 from ToasterBR/master ... Translation to Portuguese	2015-05-02 21:40:14 +02:00
esteldunedain	aad108a6a3	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into interactionOclusion	2015-05-02 14:55:35 -03:00
esteldunedain	e6c333bff4	Fix oclusion when self-interacting	2015-05-02 14:54:57 -03:00
esteldunedain	1735047e3c	Make closer action points oclude farther ones. Improves the clutter of the interact menu when interating with a person from the side. Close #738	2015-05-02 14:37:58 -03:00
Harakhti	6c2717be7f	More more translations ... Stope.	2015-05-02 18:06:01 +02:00
jaynus	980be9f55b	Merge pull request #972 from acemod/javFixInheritanceCheck ... Javelin - Fix configProperties	2015-05-02 08:50:18 -07:00
adam3adam	05a6389acd	Czech translation v2 ... mk6mortar and some medical translation	2015-05-02 12:46:28 +02:00
ruPaladin	219735611f	interaction2	2015-05-02 12:47:06 +03:00
ruPaladin	3aad0904cd	medical2	2015-05-02 12:45:27 +03:00
ruPaladin	3b6e491f5c	interaction	2015-05-02 12:42:44 +03:00
ruPaladin	ca03637a54	medical	2015-05-02 12:42:02 +03:00
FreeZbe	66f39fc1dc	French : update / fix stringtable	2015-05-02 10:12:28 +02:00
ToasterBR	021b00c722	Translation to Portuguese ... Done all remaining portuguese translations, including some minor corrections	2015-05-02 03:38:53 -03:00
PabstMirror	d2fdeb5e96	Allow Skipping LOS Check (Because of doors)	2015-05-02 00:13:09 -05:00
esteldunedain	fae10aa731	Replace dialog by display.	2015-05-02 01:33:28 -03:00
PabstMirror	334647fa60	Merge branch 'master' into userActionPrototype	2015-05-01 22:55:35 -05:00
PabstMirror	436e50411a	Medical - Fix Uncon PFEH argument changes	2015-05-01 22:42:43 -05:00
Felix Wiegand	4dce2b8841	Merge pull request #978 from licht-im-Norden87/patch-7 ... Added german strings to interaction	2015-05-02 04:08:37 +02:00
licht-im-Norden87	f93ac12807	Added german strings to laser	2015-05-02 03:28:54 +02:00
licht-im-Norden87	106f2ab89b	Added german strings to interaction	2015-05-02 03:25:28 +02:00
Dimas	b350d234e2	Addes spanish translation ... Added spanish translation for three strings. Did it manually here.	2015-05-02 02:44:39 +02:00
esteldunedain	b8d8aeae5c	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-05-01 20:32:51 -03:00
esteldunedain	be07fd2c82	Avoid ACE_Comanche_Test from showing on Zeus. #943	2015-05-01 20:32:20 -03:00
Grzegorz	c9cf1d2455	Update CfgVehicles.hpp ... another typo few lines below	2015-05-02 01:26:54 +02:00
Grzegorz	5b9e6de6f1	Update CfgVehicles.hpp ... missing "s"	2015-05-02 01:21:49 +02:00
PabstMirror	675b76f569	Privates - Interaction	2015-05-01 18:12:24 -05:00
PabstMirror	ce1255bb2f	Fix configProperties	2015-05-01 17:56:04 -05:00
KoffeinFlummi	97a9bffe98	Set version number to 3.0.0.2	2015-05-02 00:49:43 +02:00
ulteq	4239772ce9	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-05-02 00:36:34 +02:00
ulteq	884da7742e	Disabled AB terrain init, if AB is not enabled	2015-05-02 00:36:23 +02:00
Felix Wiegand	07ec7b96c4	Merge pull request #954 from acemod/medicalFixVehAnimation ... Medical fix veh animation	2015-05-02 00:35:13 +02:00
KoffeinFlummi	f1ba0cff26	Merge https://github.com/ProfessorCZ/ACE3 into czech-merge ... Conflicts: AUTHORS.txt addons/advanced_ballistics/stringtable.xml addons/ballistics/stringtable.xml addons/interact_menu/stringtable.xml addons/kestrel4500/stringtable.xml addons/laserpointer/stringtable.xml addons/medical/stringtable.xml addons/respawn/stringtable.xml	2015-05-02 00:26:25 +02:00
KoffeinFlummi	e05f1b557a	Merge branch 'master' of https://github.com/acemod/ACE3	2015-05-02 00:19:39 +02:00
KoffeinFlummi	debfe990e8	Fix duplicates	2015-05-02 00:19:10 +02:00
KoffeinFlummi	13b99ed53f	Merge https://github.com/adam3adam/ACE3 into czech-merge ... Conflicts: AUTHORS.txt addons/interact_menu/stringtable.xml	2015-05-02 00:17:01 +02:00
Lukas	1d3f5cc312	Czceh translation	2015-05-02 00:04:50 +02:00
Felix Wiegand	f16e02b003	Merge pull request #959 from licht-im-Norden87/patch-6 ... Update Stringtable: missileguidance	2015-05-02 00:03:13 +02:00
Grzegorz	c1d87f2a75	PL translation ... interaction	2015-05-01 23:50:27 +02:00
Felix Wiegand	a211bcfacf	Merge pull request #689 from acemod/group ... Reword the group action names	2015-05-01 23:30:10 +02:00
Tachii	60c02f4051	added 2 missing ru strings	2015-05-02 00:21:00 +03:00
FreeZbe	6f5e64b4a5	French : update / fix stringtable	2015-05-01 23:10:06 +02:00
FreeZbe	7e12c97317	French : update / fix stringtable	2015-05-01 23:09:09 +02:00
FreeZbe	d1da3a82d7	French : update / fix stringtable	2015-05-01 23:08:36 +02:00
Felix Wiegand	58a67a2f77	Merge pull request #962 from gienkov/patch-10 ... PL translation	2015-05-01 22:51:36 +02:00
KoffeinFlummi	cc627b4a92	Merge branch 'master' of https://github.com/acemod/ACE3	2015-05-01 22:50:11 +02:00
Dimaslg	339cd8febd	Add spanish translation for removing tournis	2015-05-01 22:49:52 +02:00
Glowbal	937b20f551	Merge branch 'master' of github.com:acemod/ACE3	2015-05-01 22:49:24 +02:00
Glowbal	09a0158fa4	This should not be 1	2015-05-01 22:49:13 +02:00
Grzegorz	3b321c7bf2	PL translation ... laser	2015-05-01 22:46:51 +02:00
KoffeinFlummi	a002c796da	Merge branch 'patch-9' of https://github.com/gienkov/ACE3 into polish-merge ... Conflicts: addons/medical/stringtable.xml	2015-05-01 22:46:49 +02:00
KoffeinFlummi	d8299332e4	Merge branch 'master' of https://github.com/acemod/ACE3 ... Conflicts: addons/respawn/stringtable.xml	2015-05-01 22:44:42 +02:00
KoffeinFlummi	fb807cbb86	Merge branch 'master' into spanish-merge ... Conflicts: addons/interact_menu/stringtable.xml addons/respawn/stringtable.xml	2015-05-01 22:44:10 +02:00
Dimaslg	6f2caec6ec	Last touches to Spanish translation	2015-05-01 22:42:09 +02:00
bux578	1a946acc30	German Translation / Typo	2015-05-01 22:33:26 +02:00
Grzegorz	8828704e76	PL translation ... STR_ACE_Medical_RemovingTourniquet	2015-05-01 22:32:53 +02:00
Glowbal	0a300f3385	Merge pull request #960 from acemod/medicalMissingProgressText ... Added missing progress bar display text	2015-05-01 22:31:41 +02:00
Glowbal	e8ccddfc2c	Added missing progress bar display text	2015-05-01 22:29:52 +02:00
adam3adam	f5303d455c	Translation of some stuff into czech language ... adv. ballistics, atragmx, interaction menu, kestrel4500, laser pointer and little part of medical	2015-05-01 22:23:03 +02:00
PabstMirror	bded34fa23	I suck at git ... redo reverted stuff here	2015-05-01 15:03:05 -05:00
licht-im-Norden87	5e8096f29c	Update Stringtable: missileguidance	2015-05-01 21:29:49 +02:00
PabstMirror	e67e15c3fa	Merge branch 'master' into medicalFixVehAnimation ... Conflicts: addons/common/functions/fnc_getDeathAnim.sqf addons/common/functions/fnc_loadPersonLocal.sqf	2015-05-01 14:29:21 -05:00
licht-im-Norden87	d12c7ff048	Update Stringtable: Rallypoint ... Angleichung	2015-05-01 21:25:39 +02:00
KoffeinFlummi	c9ff497c83	Merge branch 'master' into polish-merge ... Conflicts: addons/respawn/stringtable.xml	2015-05-01 21:13:36 +02:00
Felix Wiegand	90275b272e	Merge pull request #950 from Tachii/patch-19 ... Added few missing ru strings	2015-05-01 21:11:37 +02:00
Felix Wiegand	b0094ff8e6	Merge pull request #949 from Tachii/patch-18 ... added 1 RU string	2015-05-01 21:11:17 +02:00
Felix Wiegand	3d45a26334	Merge pull request #957 from evromalarkey/master ... Few Czech strings	2015-05-01 21:07:27 +02:00
jaynus	2bd0acb621	Revert "GetDeathAnim" ... This reverts commit 0f736ae684.	2015-05-01 12:00:38 -07:00
jaynus	6603806c77	Revert "Save and replay valid awake animations" ... This reverts commit 8d1ac26e24.	2015-05-01 12:00:21 -07:00
jaynus	c1ba4966f9	Test confirm no bouncy.	2015-05-01 11:53:55 -07:00
Lubomír Blažek	dcb3196e58	Czech strings	2015-05-01 20:52:41 +02:00
jaynus	5bf763a08e	quote, not var.	2015-05-01 11:47:49 -07:00
Tachii	bed298d5b3	Update stringtable.xml	2015-05-01 21:38:05 +03:00
jaynus	2ed05ed469	Merge remote-tracking branch 'origin/master' into laserCodeSelection	2015-05-01 11:35:11 -07:00
jaynus	dcf4f3b53e	Resolved. Conflicts: ... addons/missileguidance/functions/fnc_onFired.sqf	2015-05-01 11:35:03 -07:00
jaynus	dfbfb4ace2	Laser code selection, hotkeys and locking. Turrets & designator, and gunner. Closes #751	2015-05-01 11:31:37 -07:00
Glowbal	e1d0ac4b9e	Added author	2015-05-01 20:16:34 +02:00
PabstMirror	d8a6dd1bbd	Stuff	2015-05-01 12:58:56 -05:00
Tachii	66eda924ac	Update stringtable.xml	2015-05-01 20:48:37 +03:00
Glowbal	722c459c1e	added APL pbo	2015-05-01 19:37:17 +02:00
Grzegorz	7e87c3a250	Update stringtable.xml	2015-05-01 19:32:59 +02:00
Grzegorz	e36fbe9da7	Update stringtable.xml	2015-05-01 19:32:43 +02:00
Grzegorz Sikora	4668869959	PL translation	2015-05-01 19:30:30 +02:00
Tachii	b1a23fd3c7	Update stringtable.xml	2015-05-01 20:29:57 +03:00
Tachii	43dea56ae6	Update stringtable.xml	2015-05-01 20:29:00 +03:00
Tachii	66818e0a74	Update stringtable.xml	2015-05-01 20:26:05 +03:00
Tachii	889275091e	Update stringtable.xml	2015-05-01 20:24:13 +03:00
Tachii	1771b61578	added 2 missing ru strings	2015-05-01 20:23:05 +03:00
Tachii	43655d0cec	Update stringtable.xml	2015-05-01 20:18:51 +03:00
Tachii	caf301ac99	Update stringtable.xml ... Added 1 RU string	2015-05-01 20:15:35 +03:00
PabstMirror	8d1ac26e24	Save and replay valid awake animations	2015-05-01 12:12:13 -05:00
ulteq	ff2d7fdb72	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into fcsInitSpeedFix ... Conflicts: addons/fcs/functions/fnc_firedEH.sqf	2015-05-01 19:00:27 +02:00
ulteq	aa21962f8b	Allowed positive weapon initSpeed values	2015-05-01 18:55:44 +02:00
Glowbal	80162627ec	Fixed spelling of enableUnconsciousnessAI	2015-05-01 18:49:59 +02:00
Felix Wiegand	23bb96e514	Merge pull request #948 from ruPaladin/patch-7 ... Russian translation (interact_menu)	2015-05-01 18:39:34 +02:00
ruPaladin	2aa788bba2	Update stringtable.xml	2015-05-01 19:26:23 +03:00
ruPaladin	a883517a5e	Update stringtable.xml	2015-05-01 19:18:06 +03:00
KoffeinFlummi	30e90a377e	Fix duplicate entries	2015-05-01 17:51:31 +02:00
KoffeinFlummi	48e59f0d71	Merge branch 'master' of https://github.com/acemod/ACE3 ... Conflicts: addons/interact_menu/stringtable.xml addons/medical/stringtable.xml	2015-05-01 17:46:58 +02:00
KoffeinFlummi	1e786d4a92	Merge https://github.com/FreeZbe/ACE3 into french-merge ... Conflicts: addons/ballistics/stringtable.xml addons/interact_menu/stringtable.xml addons/medical/stringtable.xml	2015-05-01 17:45:00 +02:00
ulteq	a42dec6760	Added more missing privates	2015-05-01 17:40:30 +02:00
ulteq	5dcb45bd33	Finds the corresponding weapon class for each magazine type.	2015-05-01 17:39:38 +02:00
KoffeinFlummi	e46eba673f	Merge branch 'master' into german-translation ... Conflicts: addons/interact_menu/stringtable.xml addons/medical/stringtable.xml	2015-05-01 17:36:40 +02:00
KoffeinFlummi	954e4ef549	Merge branch 'master' of https://github.com/acemod/ACE3 ... Conflicts: addons/interact_menu/stringtable.xml addons/medical/stringtable.xml	2015-05-01 17:32:19 +02:00
KoffeinFlummi	e96f23c197	Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge ... Conflicts: addons/atragmx/stringtable.xml addons/interact_menu/stringtable.xml addons/laserpointer/stringtable.xml addons/medical/stringtable.xml addons/mk6mortar/stringtable.xml addons/realisticnames/stringtable.xml addons/respawn/stringtable.xml	2015-05-01 17:30:59 +02:00
ulteq	6dc28f026f	Added missing private	2015-05-01 17:15:49 +02:00
Felix Wiegand	526b0a2d59	Merge pull request #931 from gienkov/master ... PL translation	2015-05-01 17:15:22 +02:00
KoffeinFlummi	5f60321a69	Merge https://github.com/Legolasindar/ACE3 into spanish-merge ... Conflicts: addons/ballistics/stringtable.xml addons/interact_menu/stringtable.xml addons/medical/stringtable.xml addons/mk6mortar/stringtable.xml	2015-05-01 17:12:00 +02:00
KoffeinFlummi	761e23001f	Merge https://github.com/Dimaslg/ACE3 into spanish-merge ... Conflicts: addons/medical/stringtable.xml addons/missileguidance/stringtable.xml addons/optionsmenu/stringtable.xml	2015-05-01 16:51:20 +02:00
ulteq	800ccc07f3	Removed duplicate code	2015-05-01 16:24:16 +02:00
Nicolás Badano	65dcbce25e	Merge pull request #945 from acemod/revert-937-fcsMuzzleVelocityCorrection ... Revert "Takes negative initSpeed values into account"	2015-05-01 11:07:57 -03:00
ulteq	3ad668605a	Fix for last fcs change	2015-05-01 16:02:34 +02:00
jaynus	e4567fb59f	Merge remote-tracking branch 'origin/master' into guidanceClassFixes ... Conflicts: addons/javelin/functions/fnc_onOpticDraw.sqf	2015-05-01 06:59:28 -07:00
jaynus	9997b6d464	action is select 1	2015-05-01 06:57:49 -07:00
Nicolás Badano	cde80b2901	Revert "Takes negative initSpeed values into account"	2015-05-01 10:38:41 -03:00
commy2	b255d1040b	scope 1 for ACE_Comanche_Test, #943	2015-05-01 15:30:11 +02:00
FreeZbe	68d62b0005	Update stringtable.xml	2015-05-01 14:20:21 +02:00
FreeZbe	518614ec0b	Update stringtable.xml	2015-05-01 14:20:03 +02:00
FreeZbe	79ac41bd95	Update stringtable.xml	2015-05-01 14:19:43 +02:00
bux578	bfb68fe368	fix spelling errors	2015-05-01 14:19:30 +02:00
FreeZbe	80ae016021	Update stringtable.xml	2015-05-01 14:19:15 +02:00
FreeZbe	acf74dd2ae	Update stringtable.xml	2015-05-01 14:13:32 +02:00
FreeZbe	7a397459ae	Update stringtable.xml	2015-05-01 14:13:08 +02:00
FreeZbe	371aa381ec	Update stringtable.xml	2015-05-01 14:12:45 +02:00
FreeZbe	820c841b35	Update stringtable.xml	2015-05-01 14:12:10 +02:00
FreeZbe	53be70f661	French : update stringtable	2015-05-01 14:07:08 +02:00
ulteq	a6f4c68ef4	Removed obsolete comment	2015-05-01 13:50:01 +02:00
ulteq	6d0e2cc464	Merge pull request #936 from acemod/explosivesSleepReplacement ... Replaced sleep with waitAndExecute	2015-05-01 12:55:14 +02:00
Glowbal	f0efba09e5	Merge pull request #814 from acemod/basic-med-options ... Basic medical module options	2015-05-01 12:27:22 +02:00
ulteq	a9cde188ea	Merge pull request #937 from acemod/fcsMuzzleVelocityCorrection ... Takes negative initSpeed values into account	2015-05-01 12:24:22 +02:00
bux578	2acc10ba70	meh	2015-05-01 12:19:42 +02:00
Glowbal	e9a86da8e0	Should be in same order as the module	2015-05-01 12:18:21 +02:00
bux578	aa2e5077e4	missing german translation	2015-05-01 12:17:28 +02:00
ulteq	4c0bed609e	Fixed a typo	2015-05-01 11:53:53 +02:00
Glowbal	5beca63ae2	Added missing private	2015-05-01 11:51:23 +02:00
ulteq	940f8e8349	Cleanup++: ... *Removed spawn *Added, moved and renamed some privates	2015-05-01 11:38:09 +02:00
commy2	a97c934688	fix ubc, fix #938	2015-05-01 11:01:07 +02:00
ulteq	d3b36c2b56	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-05-01 10:26:48 +02:00
ulteq	723ffc21d1	Removed unneeded TODO	2015-05-01 10:26:37 +02:00
ulteq	2219339e24	Fixed a typo	2015-05-01 10:25:59 +02:00
ulteq	965e45a53c	Takes negative initSpeed values into account	2015-05-01 10:25:33 +02:00
commy2	b859956604	rename category ace <blank> to ace common	2015-05-01 10:19:47 +02:00
PabstMirror	0f736ae684	GetDeathAnim	2015-05-01 03:13:26 -05:00
ulteq	e8264110bb	Replaced sleep with waitAndExecute	2015-05-01 10:12:41 +02:00
commy2	c52278c11f	Merge branch 'feature/laserpointer-3rdparty' of https://github.com/11thmeu/ACE3 into 11thmeu-feature/laserpointer-3rdparty	2015-05-01 09:52:03 +02:00
esteldunedain	a0923aa5c3	Tweak the position for rally point actions. Fix #837	2015-05-01 01:57:37 -03:00
esteldunedain	324b9510e3	Allow positions for actions to be computed dynamically. Also leverage that for the position of the "Weapon" action, instead of hard coding an exception for that.	2015-05-01 01:56:39 -03:00
esteldunedain	fc02bb4e06	Stylistic changes	2015-05-01 00:32:16 -03:00
esteldunedain	aa4a5539d4	Merge branch 'master' into interactMoreOptions ... Conflicts: addons/interact_menu/functions/fnc_renderIcon.sqf	2015-05-01 00:04:22 -03:00
KoffeinFlummi	984a1fe337	Rename breakLine to break_line	2015-05-01 02:14:23 +02:00
KoffeinFlummi	e06e1a2f89	Make preventDeath work	2015-05-01 01:38:36 +02:00
KoffeinFlummi	cb82b20464	Let setUncon handle AI unconsciousness	2015-05-01 01:38:16 +02:00
KoffeinFlummi	48770f77d2	Rename caching variables in basic HD	2015-05-01 01:37:58 +02:00
KoffeinFlummi	67bd2b4e2f	Reduce animation forcing delay	2015-05-01 01:36:09 +02:00
KoffeinFlummi	98e44e86d8	Offload ejecting to unloadPerson	2015-05-01 01:35:50 +02:00
KoffeinFlummi	f7f416c8d3	Proper privates and alignment	2015-05-01 01:34:38 +02:00
KoffeinFlummi	aa9f1c53c7	Whoops	2015-05-01 01:34:18 +02:00
KoffeinFlummi	53835605ea	Merge remote-tracking branch 'origin/master' into basic-med-options ... Conflicts: addons/medical/functions/fnc_getBloodLoss.sqf addons/medical/functions/fnc_handleDamage_basic.sqf	2015-05-01 01:25:16 +02:00
Kavinsky	f301491c7a	changed variable name to use QGVAR macro	2015-04-30 23:18:45 +02:00
Grzegorz	3f932c0a93	Update stringtable.xml	2015-04-30 22:55:51 +02:00
Grzegorz	1e0eaa1971	Update stringtable.xml	2015-04-30 22:55:43 +02:00
Grzegorz Sikora	03973f3dcf	PL translation	2015-04-30 22:54:15 +02:00
Glowbal	eb48048a58	Merge pull request #930 from acemod/keybindingCategories ... Split keybindings into different sub-categories	2015-04-30 22:51:39 +02:00
commy2	2ae5538df5	change wrong strings	2015-04-30 22:46:08 +02:00
Glowbal	131468f0d8	plurals	2015-04-30 22:39:33 +02:00
PabstMirror	090062153c	Merge branch 'master' into interactMoreOptions ... Conflicts: addons/interact_menu/config.cpp	2015-04-30 15:36:00 -05:00
KoffeinFlummi	d59436c588	Only force animation when necessary	2015-04-30 22:19:31 +02:00
KoffeinFlummi	8fda984903	Fix missing semicolon	2015-04-30 22:17:25 +02:00
KoffeinFlummi	965a976daf	Reorganize AI unconsciousness	2015-04-30 22:16:45 +02:00
KoffeinFlummi	f28a806938	Remove max unconsciousness time again	2015-04-30 22:15:40 +02:00
Glowbal	7106093f1c	Merge pull request #929 from acemod/medical-lowercase ... Convert Medical stringtable key names to lowercase	2015-04-30 22:10:54 +02:00
commy2	bc0d95765a	Merge pull request #849 from acemod/menuonclick ... add option to only use action when clicking	2015-04-30 22:08:37 +02:00
KoffeinFlummi	270c3adc1e	Do it again, but properly this time	2015-04-30 22:06:10 +02:00
Glowbal	1ca0d66f30	Initial categories	2015-04-30 22:02:20 +02:00
KoffeinFlummi	85669a9e92	Convert Medical stringtable key names to lowercase	2015-04-30 22:01:09 +02:00
Glowbal	e7290feaa2	disabled radial option, so it isn't server selectable either	2015-04-30 21:20:04 +02:00
Glowbal	2f763a2310	Disabled client setting for menu style	2015-04-30 21:17:33 +02:00
Glowbal	1bee48214e	Merge branch 'master' into medicalMenuClientSetting ... Conflicts: addons/medical/ACE_Medical_Actions.hpp addons/medical/CfgVehicles.hpp addons/medical/stringtable.xml	2015-04-30 21:08:46 +02:00
PabstMirror	ba18f8b430	Handle Scaling	2015-04-30 14:07:19 -05:00
commy2	8c8e310d66	handle cursor mode	2015-04-30 21:00:30 +02:00
Glowbal	349d723fea	Merge pull request #928 from acemod/AdjustUnloadPerson ... Adjust unload person	2015-04-30 20:55:17 +02:00
Glowbal	67370f3340	Handles waking up	2015-04-30 20:49:38 +02:00
Glowbal	8d358f3ab5	can only carry/drag units that are not in a vehicle	2015-04-30 20:44:59 +02:00
Glowbal	432a0102e8	Improved unloadPerson function ... Removed caller parameter.	2015-04-30 20:44:43 +02:00
commy2	5ec8b6d36c	Merge branch 'master' of https://github.com/acemod/ACE3 into menuonclick	2015-04-30 20:01:58 +02:00
PabstMirror	a46d4e11ab	Remove linebreak from teamManagement, fix leaveteam	2015-04-30 12:38:19 -05:00
bux578	367da1f4bf	cleaned up insignias	2015-04-30 19:36:35 +02:00
PabstMirror	5ca75f9973	Action names Join->Assign	2015-04-30 12:20:01 -05:00
PabstMirror	ca57a4e168	Merge branch 'master' into group ... Conflicts: addons/interaction/CfgVehicles.hpp addons/interaction/stringtable.xml	2015-04-30 11:59:53 -05:00
Kavinsky	b9c1936efc	changed laserpointer to allow 3rd party laser pointers. now there is a new config option for CfgWeapons called ace_laserpointer, number with value 0 no laser, 1 red laser, 2 green laser	2015-04-30 18:51:30 +02:00
KoffeinFlummi	fd152c580b	Merge branch 'master' into basic-med-options ... Conflicts: addons/medical/ACE_Settings.hpp addons/medical/functions/fnc_setUnconscious.sqf	2015-04-30 18:39:33 +02:00
PabstMirror	9c02f915ec	Merge pull request #922 from acemod/medicalPrivates ... Medical Private Variables	2015-04-30 11:34:33 -05:00
jaynus	21cc0db28f	Correctly look up configs.	2015-04-30 09:04:29 -07:00
jaynus	7568773ece	class localize and disable all guidance/locking.	2015-04-30 09:00:09 -07:00
bux578	0f135c5dab	fix ballistics stringtable	2015-04-30 15:23:52 +02:00
ulteq	ac33ad109f	Merge pull request #923 from Bla1337/master ... Localization update (Russian)	2015-04-30 13:44:54 +02:00
Harakhti	4e165e2572	Update Hungarian translations ... Let us match the current revision. At the time of making, the Ballistics XML was broken.	2015-04-30 13:25:25 +02:00
ulteq	2c97b20781	Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master ... Conflicts: addons/atragmx/stringtable.xml addons/ballistics/stringtable.xml addons/medical/stringtable.xml addons/missileguidance/stringtable.xml addons/overheating/stringtable.xml addons/realisticnames/stringtable.xml addons/vehiclelock/stringtable.xml	2015-04-30 13:20:31 +02:00
Bla1337	5d1478b733	interact and medical system localization upd	2015-04-30 14:01:22 +03:00
ulteq	50a8a89b28	Added missing privates	2015-04-30 10:50:49 +02:00
ulteq	d2aa28715d	Merge pull request #874 from acemod/fragCleanup ... Frag cleanup	2015-04-30 10:35:25 +02:00
ulteq	e77ddcf837	Added Sh_105mm_HEAT_MP frag config	2015-04-30 10:35:06 +02:00
ulteq	59017ed79d	Added more frag configs: ... * R_Hydra_HE * Sh_120mm_HE * Sh_125mm_HE * Missile_AGM_02_F * M_Hellfire_AT	2015-04-30 10:26:00 +02:00
Glowbal	8f3d8707cc	Should be select ... Should fix the new script error after last fix.	2015-04-30 08:53:43 +02:00
PabstMirror	48f7455ef1	Opps2	2015-04-30 01:23:23 -05:00
PabstMirror	d71bba0359	opps	2015-04-30 01:21:41 -05:00
PabstMirror	eb5af0cd89	Medical Private Variables	2015-04-30 01:17:26 -05:00
PabstMirror	11aafe013b	Localization	2015-04-29 23:53:00 -05:00
PabstMirror	9aa2e3130a	Options for Shadow/Outline and Text Size	2015-04-29 23:37:52 -05:00
PabstMirror	e40a2a524d	Merge branch 'master' into interactMoreOptions	2015-04-29 22:57:35 -05:00
commy2	8e54e6ec13	fix setFWS locality issues, fix #892	2015-04-30 00:53:49 +02:00
PabstMirror	f90834eeab	Unused	2015-04-29 16:57:24 -05:00
PabstMirror	5fef446c00	EFUNC for dragging calls	2015-04-29 16:53:09 -05:00
PabstMirror	a39e869728	Fix extra {} wraped ... Error position: <if ({[_unit] call ace_medical_fnc_setDea> Error if: Type code, expected Bool File z\ace\addons\medical\functions\fnc_handleDamage.sqf, line 50	2015-04-29 16:44:47 -05:00
Glowbal	581c64f66f	Implemented unloading from vehicles #740	2015-04-29 23:12:47 +02:00
Glowbal	943d2cbd72	Merge branch 'master' into medicalImprovements	2015-04-29 23:01:38 +02:00
Glowbal	aaa8171457	Implemented prevent instant death #839	2015-04-29 22:54:58 +02:00
Glowbal	614a93ef12	fixes #838	2015-04-29 22:04:46 +02:00
bux578	fce91279b5	add ace3 and banana insignia ... `[this,"ACE_insignia_logo"] call BIS_fnc_setUnitInsignia;` and `[this,"ACE_insignia_banana"] call BIS_fnc_setUnitInsignia;`	2015-04-29 22:04:31 +02:00
Glowbal	87465b8b10	fixes #829	2015-04-29 21:49:24 +02:00
ulteq	4eec4da37c	Merge pull request #912 from acemod/explosiveFixAttachDeleteVehicleFix ... Explosive fix attach delete vehicle fix	2015-04-29 21:32:28 +02:00
Dimaslg	864c3ea03b	Conflicts resolve again ... Conflicts resolve again	2015-04-29 21:23:32 +02:00
ulteq	608af39a67	Added proper dummy object cleanup code	2015-04-29 21:22:07 +02:00
Dimaslg	f8d5c423ae	Merge conflicts resolved	2015-04-29 21:15:22 +02:00
PabstMirror	41bef1e58c	Merge pull request #903 from acemod/vehLockFix ... Veh lock fix	2015-04-29 13:34:38 -05:00
PabstMirror	2beaf8ddeb	Merge pull request #905 from acemod/fixDragAnim ... Fix Dragging StanceChange Anim	2015-04-29 13:34:16 -05:00
ulteq	00dc0ef01e	Added frag classes array for 82mm shell	2015-04-29 17:48:19 +02:00
ulteq	989332831f	Added frag configs for 82mm and 155mm shells	2015-04-29 17:42:37 +02:00
NukeDev	d4dc5e6d85	Other Fixes 2	2015-04-29 17:22:20 +02:00
ulteq	4e171c2988	Merge pull request #916 from FreeZbe/master ... French: update and fix stringtable	2015-04-29 16:46:49 +02:00
NukeDev	73772d9de1	Other Fixes	2015-04-29 16:44:42 +02:00
FreeZbe	ca7aeece90	French: update stringtable	2015-04-29 16:28:59 +02:00
FreeZbe	5ec6bea71d	French: update stringtable	2015-04-29 16:19:23 +02:00
jaynus	283e34779f	Don't inherit	2015-04-29 07:05:48 -07:00
Glowbal	dfbc9b74fd	Added arsenalScope #913	2015-04-29 15:14:37 +02:00
ulteq	2068eaea75	Added G_40mm_HE config, changed 40mm gurney_k values	2015-04-29 13:53:38 +02:00
ulteq	a8f37a4c72	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into fragCleanup	2015-04-29 13:33:07 +02:00
commy2	d149db61e8	ace insignia, #906	2015-04-29 13:01:08 +02:00
KoffeinFlummi	b263ac6847	Merge branch 'patch-5' of https://github.com/VyMajoris/ACE3 into portuguese-merge ... Conflicts: addons/common/stringtable.xml	2015-04-29 12:57:48 +02:00
KoffeinFlummi	c854d2208f	Merge branch 'patch-4' of https://github.com/VyMajoris/ACE3 into portuguese-merge ... Conflicts: addons/captives/stringtable.xml	2015-04-29 12:54:20 +02:00
KoffeinFlummi	a1e709047e	Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge ... Conflicts: AUTHORS.txt addons/aircraft/stringtable.xml addons/attach/stringtable.xml addons/captives/stringtable.xml addons/common/stringtable.xml addons/disposable/stringtable.xml addons/dragging/stringtable.xml addons/explosives/stringtable.xml addons/fcs/stringtable.xml addons/frag/stringtable.xml addons/grenades/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/inventory/stringtable.xml addons/kestrel/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/laserpointer/stringtable.xml addons/logistics_uavbattery/stringtable.xml addons/logistics_wirecutter/stringtable.xml addons/magazinerepack/stringtable.xml addons/maptools/stringtable.xml addons/markers/stringtable.xml addons/medical/stringtable.xml addons/microdagr/stringtable.xml addons/movement/stringtable.xml addons/nametags/stringtable.xml addons/nightvision/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/parachute/stringtable.xml addons/realisticnames/stringtable.xml addons/reload/stringtable.xml addons/reloadlaunchers/stringtable.xml addons/respawn/stringtable.xml addons/safemode/stringtable.xml addons/switchunits/stringtable.xml addons/vehiclelock/stringtable.xml addons/weaponselect/stringtable.xml addons/wep_javelin/stringtable.xml addons/winddeflection/stringtable.xml	2015-04-29 12:52:55 +02:00
Legolasindar	1c8137a7e5	fixed spanish translate for opened pull #893 ... fixed spanish translate for opened pull #893	2015-04-29 12:46:32 +02:00
ulteq	87d1f7c281	Fixes: https://github.com/acemod/ACE3/pull/909#issuecomment-97377112	2015-04-29 12:24:56 +02:00
ulteq	0dd23df7dc	Merge pull request #911 from Bla1337/master ... Russian localization update.	2015-04-29 10:47:35 +02:00
Glowbal	7ca35bf823	prevent multiple detonators of same type to be displayed #835 ... As per @CorruptedHeart suggestion. > Just needs a > if (getNumber (_config >> "ACE_Detonator") == 1 && {!(_x in _result)}) then {	2015-04-29 10:44:10 +02:00
Bla1337	cfbf3bd053	Localization update	2015-04-29 11:20:21 +03:00
PabstMirror	47d4446520	Don't check intersection if distance < 1m ... Related to #869	2015-04-29 02:34:47 -05:00
ulteq	f83f8dad0e	Fixes: https://github.com/acemod/ACE3/issues/904	2015-04-29 09:27:49 +02:00
PabstMirror	d7d43ce3b1	#828 - Private Variables for Interact Menu	2015-04-29 01:26:13 -05:00
PabstMirror	e56838be36	Private Variables	2015-04-29 00:05:02 -05:00
PabstMirror	409851dd8c	Attach the real explosive	2015-04-28 23:57:11 -05:00
PabstMirror	3eb2bdfc84	Display Name Progress Text	2015-04-28 21:17:29 -05:00
ulteq	a80e11d025	Fixed some 7.62 tracer magazines: ... *Made use of the ACE_20Rnd_762x51_Mag_Tracer magazine *Fixed ACE_10Rnd_762x54_Tracer_mag (inheritance, stringtable, tracersEvery)	2015-04-29 01:33:26 +02:00
PabstMirror	414a50fb9b	Fix Dragging StanceChange Anim	2015-04-28 15:40:36 -05:00
Glowbal	a854b90b00	Increased level at which a lot of blood message gets shown in basic medical	2015-04-28 22:19:30 +02:00
PabstMirror	1512e4c367	isClientSettable spelling	2015-04-28 14:09:26 -05:00
PabstMirror	9e8b13cd2b	Merge branch 'master' into altSelfInteract ... Conflicts: addons/interact_menu/functions/fnc_renderIcon.sqf addons/interact_menu/functions/fnc_renderSelector.sqf addons/interact_menu/stringtable.xml	2015-04-28 14:02:03 -05:00
Dimaslg	956b5e3558	Spanish Translation ... Minor fixes and some things at the Medical system translated.	2015-04-28 21:01:48 +02:00
Glowbal	f606c24854	fixes #901	2015-04-28 20:47:11 +02:00
Glowbal	dbf748ba93	Merge branch 'master' into medicalImprovements	2015-04-28 20:33:39 +02:00
Glowbal	c06caa7209	Only add JIP event for player clients	2015-04-28 20:33:01 +02:00
Glowbal	ebbb88deff	Join in progress players will now be initialized	2015-04-28 20:32:29 +02:00
Glowbal	95d83554da	Added local treatment through remoteExec for basic	2015-04-28 20:32:02 +02:00
PabstMirror	9e0932eb56	Opps	2015-04-28 13:31:47 -05:00
PabstMirror	270f9f3662	Fix init order problem	2015-04-28 13:26:52 -05:00
bux578	621e1513a0	ballistic stringtable fixes	2015-04-28 20:24:59 +02:00
bux578	4cc6db47de	fix merge conflic	2015-04-28 20:15:56 +02:00
ulteq	85ce5e3729	Unified spacing	2015-04-28 19:43:36 +02:00
NukeDev	0b4bb6e4c9	Italian's Translation fixes ... atragmx, attach, ballistics, captives languages fixes	2015-04-28 19:40:36 +02:00
simon84	b119c85c57	found some errors	2015-04-28 19:36:31 +02:00
ulteq	4cc2d072e6	Merge pull request #898 from simon84/german-translations ... German translations fixes	2015-04-28 19:36:29 +02:00
ulteq	e759989d33	Removed debug output	2015-04-28 19:33:00 +02:00
ulteq	76393f31db	Fixes: https://github.com/acemod/ACE3/issues/896	2015-04-28 19:31:38 +02:00
Glowbal	c38fe384e3	added default values for getvar's	2015-04-28 19:30:35 +02:00
simon84	a244660930	German translation fixes ... Unified some translations in "ballistics" e.g. unit mm, Schuss->Patronen, decimal seperator	2015-04-28 19:25:45 +02:00
ulteq	2a759aba70	Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master ... Conflicts: addons/interact_menu/stringtable.xml addons/medical/stringtable.xml	2015-04-28 18:55:23 +02:00
ulteq	d0c7a37841	Minor stringtable fix	2015-04-28 18:31:14 +02:00
ulteq	908c204893	Replaced Tabs with Spaces	2015-04-28 18:24:24 +02:00
ulteq	236fc10a0f	Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master ... Conflicts: addons/medical/stringtable.xml	2015-04-28 18:15:05 +02:00
NukeDev	db82df6214	Italian's Translation's Changes v2	2015-04-28 18:10:35 +02:00
Grzegorz	feeb897fb6	Update stringtable.xml	2015-04-28 18:05:43 +02:00
Grzegorz	b88618563d	Update stringtable.xml	2015-04-28 18:05:27 +02:00
Grzegorz Sikora	bcda77c5c7	PL translation	2015-04-28 18:03:35 +02:00
Josuan Albin	b5524fb3ee	French pass ... * fixed ramp in /aircraft * added aragmx entry * added multiple medical entries * translated missileguidance * completed mk6mortar * changed Sanitaire to Médical in realisticnames also fixed some typos in there and had to rename some of the explosives (weren't fitting in boxes in game) * added myself to contributors	2015-04-28 18:00:09 +02:00
NukeDev	1d434949de	Some Italian Translation's Changes	2015-04-28 17:46:35 +02:00
ulteq	dc09c554c0	Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master ... Conflicts: addons/medical/stringtable.xml addons/mk6mortar/stringtable.xml	2015-04-28 17:44:58 +02:00
Ivan Navarro Cabello	8a55c69cd7	added spanish translation ... added spanish translation	2015-04-28 17:03:49 +02:00
ulteq	2e8070facb	Merge pull request #886 from simon84/german-translations ... German translations	2015-04-28 16:54:39 +02:00
PabstMirror	f8b8d7dd16	Set Lock on postInit so spawned vehicles are set	2015-04-28 00:08:28 -05:00
simon84	8ac6f61fcf	added some translations ... added some translations	2015-04-28 00:36:37 +02:00
ulteq	79a5077941	Merge pull request #878 from Brisse89/patch-1 ... Less fictional weapon names	2015-04-28 00:02:55 +02:00
PabstMirror	7e0fa18ce7	#770 - Hopefully fix LOS check on flashbang	2015-04-27 16:07:31 -05:00
ulteq	416a914253	More vector math replacements	2015-04-27 22:14:08 +02:00
ulteq	0d6d96e76c	Cleanup++: ... * Added missing privates * Removed unused privates * Replaced some old vector calculations with new vector commands	2015-04-27 22:04:35 +02:00
ruPaladin	59aba3fb34	Update stringtable.xml	2015-04-27 19:33:22 +03:00
ulteq	fa6a2566e3	Fixed a syntax error	2015-04-27 17:48:06 +02:00
Glowbal	450e324f7b	adjusted damage handling (adv medical)	2015-04-27 16:42:12 +02:00
Glowbal	e4db44d73c	adjusted damage parsing	2015-04-27 16:36:00 +02:00
Josuan Albin	e8dec708bc	Some french entries and a german duplicate ... Added some french entries and removed a german duplicate	2015-04-27 16:18:28 +02:00
Glowbal	b520a1072b	Merge branch 'master' into medicalImprovements	2015-04-27 15:41:20 +02:00
Brisse89	26bd75084d	Update stringtable.xml ... Khaybar -> Sama	2015-04-27 14:56:57 +02:00
ulteq	3c92cab7af	Reverted the addBlackList function	2015-04-27 14:02:59 +02:00
ulteq	f54f0cd1fa	Renamed init functions	2015-04-27 13:58:18 +02:00
Brisse89	4ebdd88369	Less fictional weapon names ... ACP-C2 -> Custom Covert II KT2002 Katiba -> KH2002 Khaybar	2015-04-27 13:55:50 +02:00
ulteq	1b5756d33c	Added weather update interval module setting	2015-04-27 12:47:26 +02:00
ulteq	79ff3146b5	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-27 12:40:28 +02:00
ulteq	04d3a31b5b	Fixed a typo	2015-04-27 12:34:21 +02:00
ulteq	3c91f6abe3	Added ace/module settings for ace_weather: ... *enableServerController // weather propagation on the server *useACEWeather // disable ace weather *syncRain *syncWind *syncMisc	2015-04-27 12:28:56 +02:00
ulteq	135157419e	Merge pull request #876 from Brisse89/patch-2 ... Realistic weapon names: Update stringtable.xml	2015-04-27 12:20:43 +02:00
Brisse89	ecaa23ada2	Update stringtable.xml ... Removed the space in HK121	2015-04-27 12:17:36 +02:00
Brisse89	faa17d0e56	Update stringtable.xml ... Noreen Bad News -> Noreen "Bad News" ULR	2015-04-27 12:13:09 +02:00
Brisse89	3339759321	Update stringtable.xml ... Is this better? SIG 762 -> SIG 556 HK 122 -> HK 121	2015-04-27 11:58:39 +02:00
ulteq	579936c781	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into fragCleanup	2015-04-27 11:22:49 +02:00
ulteq	b0876ca394	Enables: d64783fca1	2015-04-27 11:06:16 +02:00
ulteq	d6f757e096	Enabled scope adjustments for the Khalia (old) optic	2015-04-27 11:04:12 +02:00
Brisse89	db553644aa	Update stringtable.xml ... Is this okay? MAR-10 -> Noreen Bad news EMR-1 -> SIG 762 Navid -> HK 122	2015-04-27 10:24:42 +02:00
commy2	d64783fca1	remove the calibers from the weapon names	2015-04-27 02:40:04 +02:00
ulteq	1fc044dfa9	Cleanup++: ... *Moved GVAR(enabled) into ACE_Settings.hpp *Replaced BIS_fnc_magnitude with vectorMagnitude *Renamed Nou_GBU12 *Added G_40mm_HE config data	2015-04-26 23:14:54 +02:00
ulteq	6170ef0d50	Code cleanup	2015-04-26 23:05:58 +02:00
Grzegorz	3b9019e363	Update stringtable.xml	2015-04-26 23:01:42 +02:00
Grzegorz	3d5f7b1bf0	Update stringtable.xml	2015-04-26 23:01:31 +02:00
Grzegorz	78329110a1	Update stringtable.xml	2015-04-26 23:01:18 +02:00
Grzegorz	5add444026	Update stringtable.xml	2015-04-26 23:01:10 +02:00
Grzegorz	cfd9c6b3e9	Update stringtable.xml	2015-04-26 23:01:02 +02:00
Grzegorz Sikora	a272258500	PL translation	2015-04-26 22:59:20 +02:00
ulteq	3e5462f3d4	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-26 22:50:54 +02:00
ulteq	af2dc62705	Improved a module setting description	2015-04-26 22:44:18 +02:00
Grzegorz Sikora	0f47d8bfb2	PL translation	2015-04-26 22:33:25 +02:00
ulteq	9bd32f5797	Fixed an incorrect module setting description	2015-04-26 22:33:11 +02:00
KoffeinFlummi	365f1e025b	Merge remote-tracking branch 'origin/GermanMedicalTranslation' into german-merge ... Conflicts: addons/medical/stringtable.xml	2015-04-26 22:04:39 +02:00
commy2	aabe532829	manual merge	2015-04-26 21:26:57 +02:00
KoffeinFlummi	b472292b20	Remove tabler comments. ... sed is awesome.	2015-04-26 21:05:41 +02:00
KoffeinFlummi	1bb8628109	Merge https://github.com/simon84/ACE3 into german-merge	2015-04-26 21:00:22 +02:00
commy2	ac51d45f11	Merge pull request #848 from acemod/recoiltweaks ... tweaking recoil	2015-04-26 20:59:27 +02:00
commy2	f5d7331847	no team management on the dead or unconscious units, fix #803	2015-04-26 20:57:55 +02:00
commy2	9b8e130b1f	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-26 19:33:23 +02:00
commy2	5320f4c6b7	fix broken parse text cache in some cases	2015-04-26 19:33:08 +02:00
commy2	6aea424f6d	Merge pull request #872 from acemod/muteuncon ... mute unconsious units	2015-04-26 17:40:51 +02:00
commy2	7319a3dbc6	remove obsolete config entries	2015-04-26 17:38:48 +02:00
commy2	31ae05dd6e	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-26 17:26:16 +02:00
commy2	90f1d1f3fa	those damn mine detectors, also fix advanced medical box not showing up in zeus	2015-04-26 17:25:56 +02:00
Glowbal	4612298917	Merge pull request #864 from acemod/Add-translations-for-adv.-medical ... Add translations for adv. medical	2015-04-26 17:06:36 +02:00
commy2	d6f2ac95dd	fix ace ammo box doesn't show up in zeus	2015-04-26 17:04:49 +02:00
commy2	8976b6983d	mute unconsious units	2015-04-26 16:47:36 +02:00
bux578	28a8fbc4fe	fix vector name ... it's the vector 21 not the vector IV	2015-04-26 15:36:47 +02:00
bux578	6cc4f48eb2	Uppercase Injuries	2015-04-26 14:19:28 +02:00
bux578	67dc600cae	Merge branch 'master' of https://github.com/acemod/ACE3 into Add-translations-for-adv.-medical	2015-04-26 14:02:47 +02:00
bux578	b3c461b9da	last few translations	2015-04-26 14:02:14 +02:00
commy2	f96deadd20	imenu: remove shadow, fix caching	2015-04-26 12:41:15 +02:00
bux578	b2dd065429	remove comment	2015-04-26 12:27:06 +02:00
Glowbal	b266734f6e	Merge branch 'master' into medicalImprovements	2015-04-26 11:20:04 +02:00
Glowbal	fc08ebb0a5	added "isNotInside" exception to unload	2015-04-26 11:19:25 +02:00
bux578	dec47dade8	ups, remove test code	2015-04-26 09:38:56 +02:00
bux578	0aa2b31dd4	gj git	2015-04-26 09:37:02 +02:00
bux578	171cea998e	add most of the translations	2015-04-26 09:36:51 +02:00
ulteq	5ed7cee6fd	Fixed a copy&paste typo	2015-04-26 09:22:04 +02:00
VyMajoris	ba89bc8faa	Added - Myself to AUTHORS.txt	2015-04-26 03:15:25 -03:00
VyMajoris	523cb49ff1	Added - Portuguese translation to lots of things. ... Also fixed a typo the english key for STR_ACE_microdagr_configure.	2015-04-26 03:09:16 -03:00
KoffeinFlummi	9a8dd5ee41	Merge branch 'patch-4' of https://github.com/ruPaladin/ACE3 into russian-merge ... Conflicts: addons/medical/stringtable.xml	2015-04-26 01:03:29 +02:00
KoffeinFlummi	9ac662ea7c	Lowercase curator ammo frag entries	2015-04-26 00:01:48 +02:00
KoffeinFlummi	59bdc23a95	Merge branch 'master' into curatorFragmentation	2015-04-25 23:55:29 +02:00
commy2	986d2ee168	fix c&p error	2015-04-25 23:41:20 +02:00
PabstMirror	ca980379c8	Minor captive cleanup	2015-04-25 16:03:21 -05:00
PabstMirror	898d6c74a8	#854 - No canInteractWith check for Ace_MainAction ... Was preventing subactions from showing.	2015-04-25 16:02:59 -05:00
Glowbal	11d86248a7	Reorganised module and settings #809	2015-04-25 22:20:28 +02:00
ulteq	ca6a559557	Fixed a typo	2015-04-25 21:18:09 +02:00
Felix Wiegand	057c060212	Merge pull request #822 from acemod/frag-lowercase ... Convert frag config entry names to lowercase	2015-04-25 20:46:59 +02:00
Felix Wiegand	dc7c7fcaf5	Merge pull request #811 from gienkov/master ... PL translation	2015-04-25 20:46:47 +02:00
PabstMirror	2d3606302f	Merge pull request #464 from acemod/fixFiredNear ... Hearing: Fix firedNear not working in vehicles	2015-04-25 13:34:18 -05:00
Felix Wiegand	6b5fa25ba9	Merge pull request #334 from acemod/mk6tweaks ... Vanilla Mortars - Rangetables/Tweaks	2015-04-25 20:27:20 +02:00
Dimaslg	4b7daaa840	Spanish translation ... Minor fixes and spelling mistakes.	2015-04-25 19:18:04 +02:00
ulteq	78eba4e703	Moved weather randomization back to postInit	2015-04-25 18:56:55 +02:00
Dimaslg	274663e1b9	Spanish Translation ... Minor fixes and spelling mistakes.	2015-04-25 18:53:45 +02:00
ulteq	71df545d52	Improved the Mk248 muzzle velocity shift table	2015-04-25 18:30:58 +02:00
PabstMirror	f0477b8e95	Make PARAM/Explode_X faster ... skips the IS_ARRAY check normaly found in EXPLODE_1_SYS	2015-04-25 10:25:08 -05:00
ulteq	4a8153b757	Replaced EXPLODE_4_PVT macro inside of ABs PFH	2015-04-25 17:19:43 +02:00
Nicolás Badano	74867230d6	Merge pull request #853 from acemod/cacheparsetext ... cache ctrlSetStructedText parseText	2015-04-25 10:54:15 -03:00
esteldunedain	fc49814689	Use FUNC(ctrlSetParsedTextCached) for the selector too. Eliminates glitches	2015-04-25 10:52:52 -03:00
Glowbal	8d12f57d0f	Merge pull request #687 from acemod/streamlinedBasicDiagnosis ... Streamlined basic diagnosis	2015-04-25 15:19:29 +02:00
Grzegorz	3427bc5bbb	Update stringtable.xml	2015-04-25 14:37:03 +02:00
Grzegorz	a7e1d1c1c8	Update stringtable.xml	2015-04-25 14:36:53 +02:00
Grzegorz	f3d360d3d8	Update stringtable.xml	2015-04-25 14:36:42 +02:00
commy2	b7763331d6	the index	2015-04-25 14:34:09 +02:00
ulteq	eca7657ffa	Removed a bunch of obsolete code: ... *Obsolete, as of: 6fdaf4c400	2015-04-25 13:34:47 +02:00
commy2	73b17efa2f	cache ctrlSetStructedText parseText	2015-04-25 13:28:21 +02:00
ulteq	b053a641d9	Improved bullet trace visibility check	2015-04-25 13:15:54 +02:00
ulteq	d8eee168aa	Improved onlyActiveForLocalPlayers abort condition check: ... *Fixed alwaysSimulateForSnipers abort condition	2015-04-25 12:59:26 +02:00
Glowbal	6799903e4b	Also display different color for advanced	2015-04-25 12:45:04 +02:00
ulteq	2d14ae61f9	Simplified muzzle velocity shift calculation: ... *Also added some missing privates	2015-04-25 12:36:04 +02:00
Glowbal	1415adc2bd	removed local diagnose action. Added localization	2015-04-25 12:35:07 +02:00
Glowbal	4cef2a1fa4	Merge branch 'master' into streamlinedBasicDiagnosis	2015-04-25 12:12:24 +02:00
ulteq	d414e5a3a1	Removed unused define	2015-04-25 12:08:31 +02:00
commy2	73f387d3e3	outline interaction menu text	2015-04-25 11:55:39 +02:00
ulteq	6fdaf4c400	Completely removed the SQF version of the advanced ballistics PFH	2015-04-25 10:59:48 +02:00
ulteq	f645672281	At least set GVAR(extensionAvailable) to true	2015-04-25 10:38:28 +02:00
commy2	0658620181	disable vanilla repair near trucks	2015-04-25 10:17:18 +02:00
Nou	7c857a5a7e	Make sure load spawns the function, not calls it.	2015-04-25 00:52:51 -07:00
Nou	c8e6e7018c	Moved infinite spawned loop to Loaded event for handing save game loads. Events for the win! diag_activeSQFScripts as of this build returns empty on a bare mission.	2015-04-25 00:49:47 -07:00
Glowbal	55529d0396	Added support for switching from 3d selections to radial menu	2015-04-25 09:41:55 +02:00
commy2	c59263450b	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into repair	2015-04-25 09:38:24 +02:00
commy2	664d08d4aa	add option to only use action when clicking	2015-04-25 08:23:54 +02:00
commy2	12280bbcad	revive tmr camshake	2015-04-25 07:21:11 +02:00
commy2	d7d0f00592	tweaking recoil	2015-04-25 05:51:44 +02:00
KoffeinFlummi	d7b961043b	Remove animation reset before falling unconscious ... This caused the unit to briefly move to the default animation, which looked shite.	2015-04-24 22:20:16 +02:00
Grzegorz	aa0b1ecba0	PL translation fix	2015-04-24 21:35:20 +02:00
PabstMirror	3b9b09a7af	UpdateFiringTable-ChangesFromWeather	2015-04-24 13:26:09 -05:00
Glowbal	7dc8a08b89	Replaced _currentshooter by _this ... Fixes script error `Error Undefined variable in expression: _currentshooter`	2015-04-24 20:03:04 +02:00
commy2	e207a11851	fix: Cannot zero when looking through optics of static weapons and vehicle mg/gmg, fix #836	2015-04-24 19:02:29 +02:00
commy2	1a9f8d86e0	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into repair	2015-04-24 18:25:34 +02:00
ulteq	b405f17df2	Added missing ;	2015-04-24 17:19:18 +02:00
ulteq	6361bda3e9	Removed unused function	2015-04-24 13:01:11 +02:00
ulteq	eb88f94cf7	Removed unused privates	2015-04-24 11:53:06 +02:00
ulteq	b3bf44fa1e	Code cleanup	2015-04-24 10:58:55 +02:00
ulteq	b3f4bf306d	Moved the global weather controls into preInit	2015-04-24 10:46:33 +02:00
ulteq	66e4c742b4	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-24 10:25:47 +02:00
ulteq	062aeae6e6	Fixed several bugs in the rain simulation: ... *Added missing rain initialization based on overcast value *Added proper fade out when the overcast changes from >=0.7 to <0.7 *Removed duplicate code	2015-04-24 10:25:31 +02:00
ulteq	50546646fa	Added missing rain_period_count reset to 0	2015-04-24 10:05:13 +02:00
ulteq	5a90ef6207	Added global variables (syncRain, syncWind, syncMisc) which give some control over the weather module: ... *Removed duplicate debug output	2015-04-24 10:03:48 +02:00
ulteq	709fdcdd08	Merge pull request #821 from Brisse89/master ... Added realistic tracer burn times for several ammo types	2015-04-24 08:28:43 +02:00
Glowbal	0146439925	increasing the text box height #834 ... Temporary solution until we get something properly done. Ideally we would calculate the height of the box through the amount of characters. For that we would need a font with a consistent width across each character, or figure out the width for each character ourselves.	2015-04-24 07:46:01 +02:00
esteldunedain	e3a06999c3	Reduce MainActions distance for CAManBase from 5m to 4m	2015-04-24 00:57:49 -03:00
esteldunedain	c8563ce484	Add LOS check for actions points. Close #785	2015-04-24 00:57:22 -03:00
Grzegorz	e8a48fa81c	PL translation fix ... Apparently mini-spike AT still wants to shoot down planes and choppers :)	2015-04-24 01:54:36 +02:00
PabstMirror	aa7de84783	Merge branch 'master' into mk6tweaks	2015-04-23 13:34:25 -05:00
PabstMirror	55732d4262	Text Shadow should have been black.	2015-04-23 13:33:38 -05:00
ulteq	ddf62b6db4	Added missing privates	2015-04-23 16:08:02 +02:00
KoffeinFlummi	24efbf731d	Convert frag config entry names to lowercase	2015-04-23 15:46:50 +02:00
ulteq	b0eadf83c7	Fixed incorrect typicalSpeed	2015-04-23 14:04:01 +02:00
Brisse89	91dfd9802a	Update CfgAmmo.hpp	2015-04-23 13:58:42 +02:00
Brisse89	8d4fff6359	Update CfgAmmo.hpp	2015-04-23 13:56:46 +02:00
Brisse89	5bfa97f490	Update CfgAmmo.hpp	2015-04-23 13:55:26 +02:00
Brisse89	f0a1900ad4	Update CfgAmmo.hpp	2015-04-23 13:53:42 +02:00
Brisse89	ae8a512e8f	Update CfgAmmo.hpp	2015-04-23 13:47:25 +02:00
Brisse89	0001609791	Update CfgAmmo.hpp ... Added realistic tracer burn times for several ammo types: B_556x45_Ball (parent for several tracer rounds) ACE_545x39_Ball_7T3M B_762x51_Ball (parent for several tracer rounds) ACE_762x54_Ball_7T2 ACE_762x39_Ball_57N231P Also changed color on russian tracer rounds from yellow to green, which is what they are in the real world.	2015-04-23 13:44:55 +02:00
ulteq	b1521345c2	Added magazines for the new AP rounds: ... *Fixed some stringtable inconsistencies *Removed some obsolete stringtable entries	2015-04-23 13:35:57 +02:00
ulteq	dd72fced36	Added M955, M993, MK316 Mod 0, 127x99mm API ammo classes: ... *Recalculated the vanilla calibers based on (6.5mm ~ 1.0)	2015-04-23 12:42:01 +02:00
ulteq	be595d9c9e	Made the wind speed change less often during good weather	2015-04-23 11:54:24 +02:00
KoffeinFlummi	d1c95ba8a1	Add maximum unconsciousness time option	2015-04-23 11:31:27 +02:00
ulteq	e9bb1eea4c	Minor muzzle velocity correction for the 6.5mm Creedmor	2015-04-23 11:27:43 +02:00
Brisse89	c975213579	Update CfgAmmo.hpp ... Added missing data to 40mm grenades.	2015-04-23 11:11:38 +02:00
KoffeinFlummi	84e1937515	Add damage threshold to basic	2015-04-22 23:50:37 +02:00
ulteq	860b4a446a	Updated the 6.5mm Creedmor airFriction: ... *Also added it to the ATRagMX gun list	2015-04-22 22:48:38 +02:00
KoffeinFlummi	d10f4d543d	Enable unit specific bleeding coefficient	2015-04-22 22:38:48 +02:00
KoffeinFlummi	74ca85cbd9	Change getBloodLoss to expect an array	2015-04-22 22:36:41 +02:00
KoffeinFlummi	f6eeb5e3ba	Add pain coefficient	2015-04-22 22:29:31 +02:00
commy2	6d92a0fe88	abort if stuff changes	2015-04-22 21:31:42 +02:00
ulteq	09ff217e93	Improved the init process	2015-04-22 21:16:01 +02:00
commy2	f72e171247	work on repairing vehicles	2015-04-22 21:01:22 +02:00
ulteq	74888b4fff	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into windWeatherOverhaul	2015-04-22 19:47:06 +02:00
ulteq	a9726d2b60	Simplified the wind direction change calculation	2015-04-22 19:46:27 +02:00
ulteq	caf2f12eb9	Improved the wind direction selection based on the probability array	2015-04-22 19:46:09 +02:00
jaynus	0c6786a138	use the vehicle of the player for variables, not the player. allows static optics. FIxes #808	2015-04-22 08:07:58 -07:00
jaynus	d63de3a09e	restart PFH on optic reload. Fixes #812	2015-04-22 07:49:18 -07:00
Grzegorz Sikora	1063d4bb2c	PL translation	2015-04-22 13:17:43 +02:00
ulteq	ac5d593271	Switched to an improved version of the old getWind function	2015-04-22 12:56:07 +02:00
ulteq	e7bc0c26bc	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into windWeatherOverhaul	2015-04-22 11:54:18 +02:00
ulteq	1d108f42a7	Added a magazine for the new 6.5 Creedmor cartridge ... *Fixed the 65x47mm short name	2015-04-22 11:53:22 +02:00
ulteq	2ec95c2862	Brackets	2015-04-22 11:32:16 +02:00
ulteq	f8006eaac9	Expanded the ammo database: ... *30-06 Springfield (.30 Cal M1 Ball 174 grain) *6.5 Creedmore (Berger .264 cal 140 grain Hybrid) *7mm Rem Mag (Berger .284 cal 180 grain Hybrid) *.243 Win (Berger .243 cal 105 grain Hybrid)	2015-04-22 11:31:11 +02:00
ulteq	e479557f8a	Some magazine Stringtable fixes	2015-04-22 10:48:45 +02:00
ulteq	b4ec13aa8c	Merge branch 'feature/realname_extend' of https://github.com/rlex/ACE3 into rlex-feature/realname_extend ... Conflicts: addons/realisticnames/stringtable.xml	2015-04-22 10:10:00 +02:00
Glowbal	fedbf84d5f	Merge pull request #800 from acemod/fixDraggingAvailableWithoutMedical ... Fixed dragging always available when medical module is removed	2015-04-22 07:43:23 +02:00
PabstMirror	8ec86a337f	Show Loaded Ammo for static weapons	2015-04-21 19:35:04 -05:00
jaynus	b2c5e5e9f1	Remove AB verison check until versioning is complete.	2015-04-21 17:04:16 -07:00
jaynus	b384d62edd	Fixes typos in medical strings causing missing strings.	2015-04-21 17:02:50 -07:00
commy2	68749136c9	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into repair	2015-04-22 01:45:35 +02:00
Nicolás Badano	b6d7e12507	Merge pull request #779 from gienkov/master ... PL translation fix	2015-04-21 19:25:53 -03:00
commy2	1facca2ba9	fix: missing authors on flares, remove inert duplicate of handgrenade from zeus	2015-04-22 00:24:54 +02:00
Grzegorz	485fd7078f	Update stringtable.xml	2015-04-22 00:22:44 +02:00
Nicolás Badano	1bfb13abac	Revert "remove author from items inheriting ACE_ItemCore"	2015-04-21 19:07:42 -03:00
commy2	d74dfed89b	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into repair	2015-04-21 23:50:02 +02:00
commy2	cfda0e17c6	Merge pull request #788 from acemod/animfix ... put weapon on back without having to stand up	2015-04-21 23:40:52 +02:00
ulteq	a886afb7d0	Added a model for the ACE_Box_Ammo	2015-04-21 23:26:38 +02:00
Nicolás Badano	3105cef364	Merge pull request #787 from acemod/interactionHighVisibility ... User changeable text/shadow colors for interaction	2015-04-21 17:31:11 -03:00
Nicolás Badano	18bb40b72b	Merge pull request #798 from acemod/fixMapAir ... Illuminate map for gunner of helicopters. Fixes #558	2015-04-21 16:52:17 -03:00
jaynus	d8d658602f	Apply to all aircraft gunner and pilot	2015-04-21 12:50:42 -07:00
Glowbal	0ab25a2866	fixed #659	2015-04-21 21:41:00 +02:00
ulteq	2fa39615f3	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into windWeatherOverhaul	2015-04-21 21:06:30 +02:00
jaynus	b2f978da3c	Added unstabalized optic mode to comanche for following the chopper. Is the first optic, all other zoom levels are stabalized. Fixes #556	2015-04-21 12:01:30 -07:00
jaynus	08203b26c7	Illuminate map for gunner of helicopters. Fixes #558	2015-04-21 11:58:07 -07:00
ulteq	d7f67970a4	Fixed a bug in the wind direction init code	2015-04-21 20:55:04 +02:00
ulteq	1db9f055e2	Removed debug output	2015-04-21 20:54:47 +02:00
ulteq	428baefc2c	Added random temperatureShift, badWeatherShift, humidityShift	2015-04-21 20:41:50 +02:00
ulteq	30d1b1b5e5	Fixed a typo in the updateTemperature function	2015-04-21 20:20:22 +02:00
ulteq	af4fdda477	Continued work on the new wind system: ... * Moved the wind data into CfgWorlds.hpp * Modified the contents of ACE_WIND_PARAMS * new getWind function for the clients * new wind init based on the real world weather data	2015-04-21 20:20:05 +02:00
Nicolás Badano	ce3cc71869	Merge pull request #795 from acemod/fixAuthor ... remove author from items inheriting ACE_ItemCore	2015-04-21 15:08:53 -03:00
Nicolás Badano	421954c829	Merge pull request #794 from Legolasindar/master ... updated stringtable for spanish	2015-04-21 15:07:12 -03:00
bux578	3897b73d56	remove author from items inheriting ACE_ItemCore	2015-04-21 19:16:54 +02:00
PabstMirror	be031801ab	#770 - m84 - don't add pain if strength is low	2015-04-21 12:09:58 -05:00
Ivan Navarro Cabello	55887b7cfe	updated stringtable for spanish ... added some spanish translate	2015-04-21 19:03:55 +02:00
bux578	7b4f451d8a	reduce m84 mass ... m84 weighs ~260g compared to a m18 with ~520g. Ingame the m18 has a mass of 4 but giving the m84 a mass of 2 seems odd to me. That's why I've reduced it from 10 to 4.	2015-04-21 19:00:13 +02:00
commy2	78470d804a	insert icon for repair module	2015-04-21 18:34:08 +02:00
commy2	84566f9fe6	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into repair	2015-04-21 18:28:46 +02:00
ulteq	7c57ad25bd	Fixes a recently introduced bug in the relative click memory	2015-04-21 16:54:26 +02:00
ulteq	287c0d62ca	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into windWeatherOverhaul	2015-04-21 16:03:28 +02:00
ulteq	e22a7e1aad	Improved the range card column spacing	2015-04-21 16:01:53 +02:00
ulteq	c27f3fb131	Added target speed direction switch / Improved the solution result output	2015-04-21 15:46:53 +02:00
ulteq	4833193860	Added a new solution setup menu	2015-04-21 15:01:23 +02:00
commy2	9e3d9f23a5	add module options	2015-04-21 13:17:09 +02:00
commy2	665aa37898	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into repair	2015-04-21 12:41:12 +02:00
ulteq	c24586ce02	Reworked the result output GUI on the main page	2015-04-21 11:53:28 +02:00
ulteq	0cf2374475	Atmospheric Calc Method GUI improvement	2015-04-21 11:43:16 +02:00
ulteq	f98a0cdfae	Overworked the scope click number GUI	2015-04-21 11:24:59 +02:00
ulteq	6c4b078dce	Updated the default gun profile used for adding new profiles	2015-04-21 09:46:57 +02:00
commy2	616eee6aa4	remove broken launcher anim	2015-04-21 06:22:41 +02:00
commy2	5093307756	experiment with launcher anim	2015-04-21 06:10:30 +02:00
commy2	de660cf45f	messing with animations	2015-04-21 05:21:04 +02:00
commy2	5e440686bb	put weapon on back without having to stand up	2015-04-21 04:43:24 +02:00
PabstMirror	96be881ea9	User changeable text/shadow colors for interaction	2015-04-20 18:28:01 -05:00
Glowbal	166c8147cf	Using ace_frag_fnc_addManualTrack instead of fired function	2015-04-20 23:55:23 +02:00
Glowbal	4543bab7fb	added nil check for function ace_frag_fnc_fired	2015-04-20 23:41:22 +02:00
Glowbal	fb93e9e9bc	wrapped track in debug define	2015-04-20 23:38:50 +02:00
esteldunedain	1fa9ba1cbf	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-20 18:24:50 -03:00
esteldunedain	90288b495e	Interactions inside vehicles. Skip the "Main Interactions" level; mount its children intead.	2015-04-20 18:24:12 -03:00
Glowbal	24c32d8e3f	added configuration	2015-04-20 23:18:53 +02:00
PabstMirror	fdbd0c1905	#777 - mDagr - Update map pos each frame.	2015-04-20 16:12:01 -05:00
Glowbal	7b790ffb1a	staged work	2015-04-20 22:48:11 +02:00
Nicolás Badano	2a945df150	Merge pull request #782 from acemod/nobag ... hide open bag option when it's not selected via scroll wheel	2015-04-20 17:25:11 -03:00
Glowbal	1df42b17c2	close all dialogs	2015-04-20 22:22:09 +02:00
Glowbal	89a1306605	Merge branch 'master' into KeyPressesWhileUnconscious	2015-04-20 22:19:40 +02:00
Glowbal	362051e2db	Merge pull request #717 from acemod/medicalFixes ... Medical fixes	2015-04-20 22:16:57 +02:00
Glowbal	f7719f0e0a	tab	2015-04-20 22:08:31 +02:00
commy2	afc8abce85	hide open bag option when it's not selected via scroll wheel	2015-04-20 22:00:13 +02:00
Glowbal	842bfe0b98	enabled advanced wounds setting	2015-04-20 22:00:11 +02:00
Glowbal	90cf882e02	Using setvar instead of event sync again	2015-04-20 21:58:27 +02:00
Glowbal	8be7ccaab7	setting for moving unit from group on unconscious	2015-04-20 21:37:30 +02:00
commy2	ae3c8e3d88	weapon select keys are optional	2015-04-20 21:10:56 +02:00
commy2	43707342a8	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into wselect	2015-04-20 20:07:48 +02:00
commy2	438b6a1adb	Merge pull request #618 from acemod/recoil ... Recoil overhaul	2015-04-20 19:47:02 +02:00
commy2	ed72697141	Merge pull request #728 from acemod/error ... Show error message and quit mission if a dll isn't present	2015-04-20 19:41:38 +02:00
esteldunedain	66af69def8	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-20 13:55:42 -03:00
esteldunedain	9295393dd6	Allow cursor for interactions	2015-04-20 13:54:51 -03:00
commy2	ea368511b7	ace extensions class for modularity	2015-04-20 18:48:58 +02:00
commy2	14214090dc	manual merge	2015-04-20 18:22:17 +02:00
commy2	16c6a3ee78	tweaking recoil	2015-04-20 17:38:45 +02:00
Grzegorz Sikora	222aceaf56	PL fix	2015-04-20 17:11:22 +02:00
ulteq	ac74e6c611	More WIP	2015-04-20 16:33:36 +02:00
commy2	6c00aef6e8	coeficients for recoil configs	2015-04-20 16:02:36 +02:00
ulteq	8aa69663d6	More WIP	2015-04-20 16:01:13 +02:00
KoffeinFlummi	06a4f3d10e	Remove tabler comments.	2015-04-20 15:48:50 +02:00
KoffeinFlummi	e8cd918b90	Merge https://github.com/gienkov/ACE3 into polish-merge	2015-04-20 15:46:36 +02:00
esteldunedain	7953919b89	Merge branch 'simpleDiagnosis' into streamlinedBasicDiagnosis	2015-04-20 10:24:59 -03:00
esteldunedain	1e3b44e32e	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into streamlinedBasicDiagnosis	2015-04-20 10:24:24 -03:00
commy2	d8fbb49bbd	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into recoil	2015-04-20 15:14:57 +02:00
ulteq	9155056a50	Proof of concept wind code (custom debug output enabled)	2015-04-20 15:11:14 +02:00
ruPaladin	08caf0c695	Updated russian translation (medical) ... Перевел как смог, вероятно данная настройка будет в ACE3 Настройки. Нужно проверить влезет ли туда. Если влезет, то подкорректировать перевод. Правки строго приветствуются.	2015-04-20 15:18:17 +03:00
ulteq	be378adfee	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-20 13:54:28 +02:00
ulteq	89e33dc177	Refactored the weather module: ... * No changes in functionality	2015-04-20 13:54:22 +02:00
bux578	89f6b6bfd0	Merge pull request #766 from ruPaladin/patch-3 ... Rus translation (nametags)	2015-04-20 13:23:04 +02:00
bux578	13b11d7225	Merge pull request #768 from Tachii/patch-17 ... Update stringtable.xml	2015-04-20 13:02:38 +02:00
ulteq	6c2982548f	Fixed incorrect function header	2015-04-20 12:35:08 +02:00
ulteq	0e08fd4457	Incremented the ATragMX profile namespace version	2015-04-20 11:09:12 +02:00
ulteq	de0414803e	Fixed some more airFriction values in the ATragMX gun list	2015-04-20 11:08:28 +02:00
ulteq	c049ee5c08	Fixed incorrect .408 Chey Tac airFriction value	2015-04-20 11:02:28 +02:00
ulteq	2bf47ca0c4	Added two more asterix (*) meter indicator GUI elements	2015-04-20 10:36:20 +02:00
ulteq	8ff72e7fc8	Fixed another bug in the unit conversion code	2015-04-20 10:35:29 +02:00
PabstMirror	822bd22c97	gj git	2015-04-20 02:18:46 -05:00
PabstMirror	e747234443	Cleanup Spelling	2015-04-20 02:17:47 -05:00
PabstMirror	8c449a454b	merge conflict	2015-04-19 23:57:15 -05:00
esteldunedain	f928f37e26	Eliminate interact_menu fps drops due to high nearby object counts. ... Instead of reanalizing every frame which actions points should be rendered based on distance, that job is now done only 5 times per second. The rest of the frames the action points from the last frame are rerendered.. Close #434	2015-04-20 01:16:51 -03:00
Tachii	20293bd11b	Update stringtable.xml	2015-04-20 00:26:20 +03:00
Grzegorz Sikora	8530684fa6	PL fix #2	2015-04-19 23:09:11 +02:00
Tachii	6c8b587890	Update stringtable.xml	2015-04-20 00:02:01 +03:00
ulteq	f7d35d5593	The ATragMX now also accounts for vertical coriolis drift (Eötvös effect)	2015-04-19 22:30:13 +02:00
Tachii	5038674aef	Update stringtable.xml	2015-04-19 23:01:38 +03:00
Tachii	60cab963bf	Update stringtable.xml	2015-04-19 23:00:51 +03:00
Glowbal	17899db086	added some missing privates	2015-04-19 19:49:56 +02:00
Glowbal	5e82c51926	Merge branch 'master' into medicalFixes	2015-04-19 18:45:07 +02:00
jaynus	aad8d6b785	Fixed: max litter scalar array, have internal values.	2015-04-19 09:04:42 -07:00
Tachii	a7d913b80e	Update stringtable.xml	2015-04-19 18:54:47 +03:00
Tachii	596fadcba0	ru translations fixes ... Не стоит додумывать правильные значения или то, как вы думаете это должно интерпертироваться. Нужно переводить то, что написано. Как пример Very Light Wounds - это не царапины, это очень лёгкие ранения. Царапины - это scratches	2015-04-19 18:51:35 +03:00
Tachii	a83925dd2d	Update stringtable.xml	2015-04-19 18:43:05 +03:00
ulteq	20740679cc	Fixed inconsistent 'workingMemory' initialization	2015-04-19 17:40:49 +02:00
Glowbal	f6bbeb6bd6	switched back to old init method	2015-04-19 17:28:47 +02:00
Glowbal	d1fabf9733	Merge branch 'master' into medicalFixes	2015-04-19 17:26:10 +02:00
Grzegorz Sikora	4283e07942	PL fix	2015-04-19 13:50:08 +02:00
Glowbal	8a7b3a1b33	Removed damage thresholds from basic medical	2015-04-19 13:08:28 +02:00
ulteq	a73c0bc429	Sord is now able to transmit the direction of fire	2015-04-19 12:40:13 +02:00
ulteq	2b5b89604e	Removed unused RscControlsGroup	2015-04-19 12:29:26 +02:00
ulteq	f6263e9e8b	Overworked the scope click feature: ... *TODO: Add the "Setting Up a Solution for Your Scope" screen	2015-04-19 12:07:27 +02:00
Glowbal	b71ac1485d	Merge branch 'master' into medicalFixes	2015-04-19 12:06:54 +02:00
ulteq	874858ebb4	Added a sanity check to the cycle gun list function ... *Top/Down buttons only cycle the gun list in the main/gun list menu	2015-04-19 11:43:20 +02:00
ulteq	5195271894	Fixes: https://github.com/acemod/ACE3/commit/4235163 ... *The asterix needs to be shown on distances shown in meters not yards	2015-04-19 11:32:02 +02:00
ulteq	4430e8a0ee	Increased the minimum barometric pressure value that is accepted	2015-04-19 11:18:37 +02:00
ulteq	4235163801	Added asterix (*) prefix to distances in yards on the main page	2015-04-19 11:14:18 +02:00
ulteq	de5c5139c0	Moved a private declaration out of the hot path	2015-04-19 11:02:25 +02:00
ulteq	8f20303a08	Fixed a bug in the atmosphere unit conversion	2015-04-19 11:02:06 +02:00
ulteq	336a192302	The range card setup data is now also restored on mission start	2015-04-19 10:57:55 +02:00
ulteq	51590d39ad	Cleaned up the ATragMX postInit routine	2015-04-19 10:47:43 +02:00
ruPaladin	d8b96066e6	Rus translation (nametags)	2015-04-19 11:01:41 +03:00
ruPaladin	45fd90c6e0	Rus translation (medical)	2015-04-19 10:49:06 +03:00
commy2	c9a2505031	Merge pull request #755 from acemod/fixoptics2 ... Fix for PIP scopes, fix #547	2015-04-19 07:46:41 +02:00
bux578	2dfbd0a5cd	Merge pull request #761 from Tachii/patch-16 ... Update stringtable.xml	2015-04-19 07:11:39 +02:00
bux578	daf2fbb906	Merge pull request #760 from Tachii/patch-15 ... Update stringtable.xml	2015-04-19 07:11:27 +02:00
bux578	25ac90ef8b	Merge pull request #759 from Tachii/patch-14 ... Update stringtable.xml	2015-04-19 07:11:06 +02:00
bux578	5ed0dfe463	Merge pull request #758 from Tachii/patch-13 ... Update stringtable.xml	2015-04-19 07:10:55 +02:00
bux578	fa8e954d27	Merge pull request #757 from Tachii/patch-12 ... Update stringtable.xml	2015-04-19 07:10:45 +02:00
commy2	275da6f40a	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-19 07:09:21 +02:00
commy2	9cb27c8fb2	fix: error when getting killed with FF-messages module, fix #745	2015-04-19 07:08:57 +02:00
bux578	0d86374bee	Merge pull request #754 from gienkov/master ... PL translation	2015-04-19 07:08:54 +02:00
PabstMirror	54c5070569	isNull	2015-04-18 22:23:19 -05:00
jaynus	dccc869a6a	Merge pull request #753 from acemod/fixSettingsLocalization ... Fix settings localization is done by the server instead of client	2015-04-18 20:09:56 -07:00
KoffeinFlummi	65fd6b0937	Merge https://github.com/EpMAK/ACE3 into russian-merge ... Conflicts: addons/ballistics/stringtable.xml addons/medical/stringtable.xml addons/nametags/stringtable.xml addons/respawn/stringtable.xml	2015-04-19 01:04:32 +02:00
KoffeinFlummi	46bd51ffdf	Merge branch 'master' of https://github.com/acemod/ACE3	2015-04-19 00:51:33 +02:00
KoffeinFlummi	592e0d2dd3	Merge https://github.com/ruPaladin/ACE3 into russian-merge ... Conflicts: addons/ballistics/stringtable.xml addons/interact_menu/stringtable.xml addons/medical/stringtable.xml	2015-04-19 00:51:09 +02:00
jaynus	14faabb677	Merge branch 'master' of github.com:acemod/ACE3	2015-04-18 15:44:25 -07:00
jaynus	2fe7122b3e	Disable handoff until completed.	2015-04-18 15:44:07 -07:00
commy2	5558a6491d	remove weapon select in favor of the new controls from bi	2015-04-19 00:40:29 +02:00
KoffeinFlummi	8015aca0c3	Merge branch 'master' of https://github.com/acemod/ACE3	2015-04-19 00:40:18 +02:00
KoffeinFlummi	3aafa2082d	Merge https://github.com/nomisum/ACE3 into german-merge ... Conflicts: addons/atragmx/stringtable.xml addons/scopes/stringtable.xml addons/weather/stringtable.xml	2015-04-19 00:39:44 +02:00
Tachii	e62a476a90	Update stringtable.xml	2015-04-19 01:37:08 +03:00
Tachii	dc2c3e246e	Update stringtable.xml	2015-04-19 01:25:30 +03:00
Tachii	8f9796f488	Update stringtable.xml	2015-04-19 01:23:37 +03:00
Tachii	a9d38f5970	Update stringtable.xml	2015-04-19 01:19:32 +03:00
Tachii	560646e1e1	Update stringtable.xml	2015-04-19 01:18:53 +03:00
commy2	ae80da7492	fix cameras breaking pip scope camera r2t texture, reenable PIP scopes in arsenal	2015-04-19 00:05:54 +02:00
esteldunedain	8b389949bc	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-18 18:42:11 -03:00
esteldunedain	bce0d84989	Fix interact menu object ordering	2015-04-18 18:41:36 -03:00
jaynus	9618fefa67	Merge pull request #384 from acemod/fixmass ... fix falling over static weapons	2015-04-18 14:36:20 -07:00
ulteq	21c772aa8d	Fixed scope adjustment conflicting with vehicle weapon zeroing	2015-04-18 23:14:40 +02:00
ulteq	454c6dfbfe	Added more GUI elements to structure the ATragMX main page	2015-04-18 22:58:23 +02:00
ulteq	ae3dad4f36	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-18 22:12:45 +02:00
ulteq	283388eb7c	Fixed a small calculation error in the wind speed output	2015-04-18 22:12:37 +02:00
commy2	7ac7bc3f29	eventhandler for creating and deleting cameras	2015-04-18 22:06:42 +02:00
Grzegorz	8dac6d3f3d	Update stringtable.xml	2015-04-18 22:03:36 +02:00
Grzegorz Sikora	0629b59184	Merge branch 'master' of https://github.com/gienkov/ACE3 ... Conflicts: addons/optionsmenu/stringtable.xml	2015-04-18 22:02:44 +02:00
Grzegorz Sikora	c08125e0f3	PL translation	2015-04-18 22:00:37 +02:00
Glowbal	9825d030e3	Merge pull request #714 from acemod/localMedicalGarbage ... ACE JIP data and event synchronization (Tested with Litter change)	2015-04-18 21:25:53 +02:00
ulteq	c950324c75	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-18 21:18:18 +02:00
ulteq	d8b461db91	Enabled wind deflection for grenades and vehicle gunners: ... *Added a new module option to disable WD for vehicle gunners *Fixed enabled setting not being initialized	2015-04-18 21:17:37 +02:00
bux578	0f2e4c22b7	Merge pull request #749 from FreeZbe/master ... French: updates / fixes stringtable	2015-04-18 21:16:07 +02:00
bux578	1cbd854412	Merge pull request #748 from gienkov/patch-6 ... PL translation fix	2015-04-18 21:15:30 +02:00
jaynus	f5705a91e6	oops.	2015-04-18 12:04:48 -07:00
jaynus	ca74ce721d	Use cleanup settings, and force server TTL on the events.	2015-04-18 11:48:44 -07:00
jaynus	e54c68f7f9	handle cleanup	2015-04-18 11:37:06 -07:00
jaynus	852b4df61d	Settings changes. createVehicleLocal derp.	2015-04-18 11:16:18 -07:00
jaynus	c438d9e790	Merge remote-tracking branch 'origin/master' into localMedicalGarbage	2015-04-18 11:12:22 -07:00
Glowbal	54a70f26b1	Moved to own function.	2015-04-18 20:06:01 +02:00
Glowbal	85e5293c37	Fix settings localization is done by the server instead of client #744	2015-04-18 19:59:41 +02:00
jaynus	dea95f7947	ace_laser_selfdesignate	2015-04-18 10:57:35 -07:00
jaynus	8361ec3812	ace_lasers	2015-04-18 10:57:11 -07:00
jaynus	953faf3d4b	ace_missileguidance privates.	2015-04-18 10:53:21 -07:00
jaynus	87337bcb7a	ace_javelin privates	2015-04-18 10:50:22 -07:00
Glowbal	22456a4301	use pain instead	2015-04-18 19:49:29 +02:00
jaynus	11336cdade	Merge remote-tracking branch 'origin/master' into guidanceHandoff	2015-04-18 10:37:16 -07:00
jaynus	26e2917f79	Merge remote-tracking branch 'origin/master' into laserCodes ... Conflicts: addons/javelin/CfgWeapons.hpp	2015-04-18 10:36:07 -07:00
jaynus	1d908c2f70	Merge pull request #677 from acemod/titanCompat ... Titan static & variant compatability with missile guidance	2015-04-18 10:32:57 -07:00
ulteq	c1ee623808	Added a few static gui elements	2015-04-18 19:22:24 +02:00
jaynus	9c076364ec	Titan AA asset functionality is now vanilla, locking doesn't override AA/AP stuff.	2015-04-18 10:18:33 -07:00
FreeZbe	f55bd5a629	French: updates / fixes stringtable	2015-04-18 18:49:46 +02:00
Grzegorz	34cf11e022	PL translation fix ... Did not saw that one	2015-04-18 18:48:56 +02:00
jaynus	d1e03d8e7a	Slight tweaks.	2015-04-18 09:40:46 -07:00
jaynus	e14ee45249	debug checking.	2015-04-18 09:29:58 -07:00
ulteq	1b578b8835	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-18 17:45:39 +02:00
ulteq	fc39b81c95	*Fixed a minor bug in the dual inclination calculation ... *Added a profile namespace format version *The profileNamespace data is now automatically reset on version mismatch	2015-04-18 17:45:32 +02:00
commy2	370e6bd9a7	maybe fix for #741, Speedlimiter locking vehicle controls	2015-04-18 17:42:13 +02:00
jaynus	d1993836ae	Cleanup. missing string.	2015-04-18 08:40:28 -07:00
jaynus	c5f5b11d31	strings.	2015-04-18 08:37:21 -07:00
jaynus	f31e3c1fd4	litter simulation createVehicleLocal /w temporal network sync.	2015-04-18 08:31:03 -07:00
Nicolás Badano	4a76b0e5c9	Merge pull request #686 from acemod/modifiableActions ... Allow to dynamically modify actions at runtime.	2015-04-18 11:24:01 -03:00
Grzegorz Sikora	170a8d0641	PL translation	2015-04-18 16:01:07 +02:00
ulteq	5e45734cf4	Implemented the dual inclination angle input method	2015-04-18 15:52:06 +02:00
ulteq	422e175f09	Implemented the dual wind speed feature	2015-04-18 15:08:54 +02:00
ulteq	4449c99eba	Removed debug output	2015-04-18 12:13:27 +02:00
ulteq	2a6dcbfbcb	Added automatic unit conversion for the target data	2015-04-18 12:12:19 +02:00
ulteq	9057edb1e2	Added a new module option for wind deflection: ... *enabled - true/false	2015-04-18 11:10:05 +02:00
commy2	4264f78128	player has to put weapon on back before climbing, check if still can climb	2015-04-18 10:16:10 +02:00
commy2	fd821de353	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-18 09:27:07 +02:00
commy2	9633547d6b	tweak ability to climb	2015-04-18 09:26:47 +02:00
PabstMirror	060dc22ad5	Merge pull request #721 from acemod/privatesPass1 ... Privates Var Fixing	2015-04-17 23:51:23 -05:00
PabstMirror	d7da259c11	Merge pull request #688 from acemod/optionMenuStuff ... Option menu stuff	2015-04-17 23:49:37 -05:00
bux578	e2185d2d4a	Merge pull request #725 from Tachii/patch-9 ... Update stringtable.xml	2015-04-18 06:44:37 +02:00
bux578	a610872863	Merge pull request #724 from Tachii/patch-8 ... Update stringtable.xml	2015-04-18 06:44:20 +02:00
bux578	55cd6536a8	Merge pull request #727 from Tachii/patch-11 ... Update stringtable.xml	2015-04-18 06:44:05 +02:00
bux578	386802cc16	Merge pull request #726 from Tachii/patch-10 ... Update stringtable.xml	2015-04-18 06:42:48 +02:00
bux578	ed242fdea4	Merge pull request #723 from Tachii/patch-7 ... Update stringtable.xml	2015-04-18 06:42:39 +02:00
PabstMirror	caef5c105f	More Privates	2015-04-17 22:40:37 -05:00
PabstMirror	71e62711c6	#731 - stop error if target offscreen	2015-04-17 22:02:23 -05:00
jaynus	c952a97de8	Revert "synced events implemented into litter." ... This reverts commit 32df4a2adc.	2015-04-17 19:38:05 -07:00
jaynus	32df4a2adc	synced events implemented into litter.	2015-04-17 19:33:07 -07:00
jaynus	93d03b404f	JIP Sync events complete.	2015-04-17 19:26:27 -07:00
jaynus	da09b74fe4	Don't JIP check server side, but still have it fire for HC.	2015-04-17 18:27:35 -07:00
jaynus	8fa0c91632	Added PlayerJIP event, handled full requests on JIP.	2015-04-17 18:23:26 -07:00
Tachii	ad61557557	Update stringtable.xml	2015-04-18 03:10:28 +03:00
Tachii	711be038fc	Update stringtable.xml	2015-04-18 03:09:51 +03:00
Tachii	b7c7d2ff15	Update stringtable.xml	2015-04-18 03:04:14 +03:00
commy2	708a2aa374	check if ddls are present on mission start	2015-04-18 01:44:53 +02:00
Tachii	04858bb673	Update stringtable.xml	2015-04-18 02:19:09 +03:00
PabstMirror	ed2e847247	More Privates	2015-04-17 18:13:09 -05:00
Tachii	7f942a06f8	Update stringtable.xml	2015-04-18 02:11:16 +03:00
Tachii	0bb3238db1	Update stringtable.xml	2015-04-18 02:09:59 +03:00
esteldunedain	faa7513a79	Merge branch 'streamlinedBasicDiagnosis' of github.com:KoffeinFlummi/ACE3 into simpleDiagnosis	2015-04-17 20:09:04 -03:00
esteldunedain	15720dce31	Yellow and Red medical crosses	2015-04-17 20:08:30 -03:00
Tachii	bd3ef35c88	Update stringtable.xml	2015-04-18 02:07:49 +03:00
commy2	ad287d3d23	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into error	2015-04-18 01:05:42 +02:00
commy2	3ec5acbdb0	stuff	2015-04-18 01:05:30 +02:00
esteldunedain	cba00e7b5d	Merge remote-tracking branch 'origin/master' into simpleDiagnosis	2015-04-17 20:03:04 -03:00
esteldunedain	c423e9d743	Merge remote-tracking branch 'origin/medicalFixes' into simpleDiagnosis ... Conflicts: addons/medical/ACE_Medical_Actions.hpp addons/medical/ACE_Medical_SelfActions.hpp	2015-04-17 20:02:51 -03:00
Tachii	1e446fb060	Update stringtable.xml	2015-04-18 02:01:09 +03:00
esteldunedain	a5c3e86cd3	Fixes	2015-04-17 20:00:43 -03:00
esteldunedain	cce9e1f04c	Simple diagnose	2015-04-17 19:38:03 -03:00
esteldunedain	1d208b4efc	Modify Function for medical actions	2015-04-17 19:36:03 -03:00
ulteq	b32a2b7495	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-18 00:12:04 +02:00
ulteq	314b0d23d6	ATragMX Feature Expansion: ... *Added Gun and Ammo Data Screen *Added Atomospheric and Environmental Data Screen *Added Target Data Screen *Added support for coriolis- and spin drift *Added a second option (AT) to enter atmospheric data *Target data is now saved/restored in/from the profileNamespace *Atmosphere data is now saved/restored in/from the profileNamespace *Selected gun profile is now saved/restored in/from the profileNamespace *Fixed several bugs in the dual-/imperial unit systems *Minor bug fixes in the target range assist screen *Minor bug fix in the target speed assist screen	2015-04-18 00:11:53 +02:00
PabstMirror	dce344c85f	Ignore Case	2015-04-17 16:51:27 -05:00
commy2	25d8c6c93e	function to show error message box	2015-04-17 23:24:43 +02:00
Glowbal	d1a09ae7fc	fixed vehicle crashes for adv	2015-04-17 23:15:41 +02:00
PabstMirror	00f26144ec	More Privates	2015-04-17 15:45:00 -05:00
Glowbal	bc4d102d08	changed variable initialization - everything is now done local	2015-04-17 22:43:31 +02:00
Glowbal	cbc3584f9d	removed duplicate condition attribute	2015-04-17 22:24:42 +02:00
Glowbal	9670267d20	Fixed wrong classnames for IV treatments	2015-04-17 22:21:54 +02:00
Glowbal	f5effca216	fixed handleDamage basic	2015-04-17 22:21:15 +02:00
Glowbal	6d18e484c1	Cache condition for target instead of caller	2015-04-17 22:02:43 +02:00
Glowbal	0e858be1b1	Changed conditions for body parts are now always true. ... This way the medical information is always available, and should help a bit with performance as well.	2015-04-17 22:00:07 +02:00
Grzegorz Sikora	7489e514ce	PL translation	2015-04-17 21:48:04 +02:00
Glowbal	fa7bb5f9c6	Added unconscious state check	2015-04-17 21:28:47 +02:00
Glowbal	008c36ac76	fixes #699	2015-04-17 21:27:57 +02:00
Glowbal	eb731b1169	fixes #653	2015-04-17 21:07:09 +02:00
Glowbal	31bc09a9a3	fixed AI standing up before being killed ... Doesn't matter if we enable AI again on dead units	2015-04-17 21:06:30 +02:00
Glowbal	9b4435827e	Added setting for unconscious animations on treatment	2015-04-17 20:51:57 +02:00
Glowbal	80139521bc	fixes #691	2015-04-17 20:49:24 +02:00
Glowbal	b333e6e662	Keep units longer unconscious, instead of quickly fading in/out	2015-04-17 20:40:24 +02:00
Glowbal	847ee7e229	Moved unconscious event, so it won't conflict in case the unit is still being carried	2015-04-17 20:38:02 +02:00
Glowbal	0234eedd54	Changed, only drop unit is player goes unconscious, otherwise keep carrying/dragging unit	2015-04-17 20:33:13 +02:00
commy2	0e90199e23	remove debug message	2015-04-17 20:29:01 +02:00
Glowbal	8b7e46c45f	fixes #656	2015-04-17 20:26:28 +02:00
Glowbal	c86be12668	fixes #599	2015-04-17 20:24:05 +02:00
simon84	9f2dd61613	Revert "minor FCS changes (privatized variables, unnecessary counters)" ... This reverts commit ff0fb12ca3.	2015-04-17 20:22:49 +02:00
Glowbal	111a350a84	Merge branch 'master' into advMedicalEventSync	2015-04-17 20:11:53 +02:00
Aleksey Yermakov	8a669c390a	Update stringtable.xml	2015-04-17 20:35:34 +03:00
Aleksey Yermakov	2f1ee94d91	Update stringtable.xml	2015-04-17 20:24:32 +03:00
jaynus	2be38c493c	ACE JIP synchronized event infastructure.	2015-04-17 10:21:41 -07:00
Aleksey Yermakov	bf7a7b5bc9	Update stringtable.xml	2015-04-17 20:18:41 +03:00
PabstMirror	6e077de829	Medical - Use default value instead of 0 for getVar ... #683 - should prevent people getting knocked out from any damage source if the variables are undefined	2015-04-17 12:13:23 -05:00
EpMAK	c88bda487b	Merge remote-tracking branch 'upstream/master' ... Conflicts: addons/weaponselect/stringtable.xml	2015-04-17 19:48:01 +03:00
EpMAK	31a2f1b279	Russian translations ... Again, filling strings, fixing errors	2015-04-17 19:36:07 +03:00
PabstMirror	bb2383cffd	#700 - ProgressBar Visual Improvement	2015-04-17 09:51:47 -05:00
ruPaladin	2698490569	medical (patient status semantic fixes)	2015-04-17 17:49:03 +03:00
jaynus	e83ab4049f	Fixed: Tabs everywhere.	2015-04-17 07:30:55 -07:00
jaynus	3a94753645	tab	2015-04-17 07:28:59 -07:00
jaynus	6c3e699fdb	tabs	2015-04-17 07:28:19 -07:00
jaynus	469dafd0c0	tab	2015-04-17 07:25:49 -07:00
KoffeinFlummi	1d93589ebc	Merge branch 'master' of https://github.com/acemod/ACE3	2015-04-17 15:45:22 +02:00
KoffeinFlummi	20e4858a0d	Merge https://github.com/ramius86/ACE3 into italian-merge	2015-04-17 15:44:50 +02:00
commy2	f8f2748d28	Merge pull request #646 from acemod/wireCuttersSoundEffect ... Wire cutters sound effect	2015-04-17 15:40:42 +02:00
commy2	7e275a43f4	Merge pull request #693 from acemod/parafix ... hide height / velocity while parachuting, freefallig in expert mode, fix #692	2015-04-17 15:40:34 +02:00
commy2	77b057e188	Merge pull request #698 from acemod/dispofix ... disposable cleanup, fix #696	2015-04-17 15:40:28 +02:00
ruPaladin	874cc75271	medical (semantic correction)	2015-04-17 16:22:02 +03:00
ruPaladin	52dc5d66a4	nametags (fix text overlapping, semantic correct)	2015-04-17 16:09:17 +03:00
ruPaladin	a4980a91e1	inventory (semantic correction)	2015-04-17 16:04:26 +03:00
ruPaladin	a6e0cac734	interact_menu (fixes to prevent text overlapping)	2015-04-17 16:02:46 +03:00
ruPaladin	766321224b	hearing	2015-04-17 15:59:29 +03:00
ruPaladin	b80ec3f790	ballistics russian fixes + multilanguage fix	2015-04-17 15:57:25 +03:00
Lex Rivera	163ac7bd4a	[realisticnames] Adjust MK-I. Enable actual names	2015-04-17 15:28:30 +03:00
ruPaladin	af876e3370	attach	2015-04-17 15:27:53 +03:00
EpMAK	c2214efeb1	Russian stringtables finished ... Filled all the missing lines, little errors fixed.	2015-04-17 14:54:28 +03:00
Lex Rivera	2ca20f740e	[realisticnames] adjust M14	2015-04-17 14:53:55 +03:00
Lex Rivera	8fc2e96367	[realisticnames] Adjust SPMG name, fix some russian	2015-04-17 14:49:43 +03:00
commy2	26944ea84e	make altimeter actually usable with parachutes	2015-04-17 13:01:38 +02:00
commy2	73fd9ac62e	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into parafix	2015-04-17 12:55:07 +02:00
commy2	558a4fb363	Merge pull request #461 from Tenga/altimeter-fix ... Altimeter fix, division by zero when no time has passed (game paused, etc.)	2015-04-17 12:49:06 +02:00
commy2	45d639b395	disposable cleanup, fix #696	2015-04-17 12:28:06 +02:00
nomisum	d865e9c038	fixed typo	2015-04-17 11:42:47 +02:00
nomisum	8813315f36	added missing translations german	2015-04-17 11:40:31 +02:00
ulteq	e04a0c438a	Fixed deprecated delete_gun function	2015-04-17 11:05:24 +02:00
commy2	20565e8b02	hide height / velocity while parachuting, freefallig in expert mode, fix 692	2015-04-17 11:02:01 +02:00
ruPaladin	e38a6fc62b	one more russian fix	2015-04-17 12:01:01 +03:00
esteldunedain	54daa02aa4	Weather: headers + privates	2015-04-17 01:44:38 -03:00
esteldunedain	80f37b9ad9	Reword team actions on AI	2015-04-17 01:13:05 -03:00
esteldunedain	c8ebed234f	Reword the group actions	2015-04-17 01:01:31 -03:00
PabstMirror	7d5a70246b	Remove unnecessary cfgSounds	2015-04-16 22:10:33 -05:00
esteldunedain	9de834e156	Prototype of simplified diagnosis for basic medical. The left gui is completely scraped. Instead, the medical interaction points are color coded to reflect theier damage (bleeding rate).	2015-04-17 00:04:27 -03:00
esteldunedain	bdd3422150	Allow to dynamically modify actions at runtime. An optional code entry called modifierFunction can be added. That code is called before evaluating the action, allowing to dynamically change the actions name, icon, etc	2015-04-16 23:53:54 -03:00
PabstMirror	1729c781bd	Cleanup / private vars	2015-04-16 19:46:42 -05:00
PabstMirror	53af014eab	Fix Localization in value[] array	2015-04-16 19:29:39 -05:00
PabstMirror	4e5c2ef187	option menu ui scaling	2015-04-16 19:11:42 -05:00
simon84	ff0fb12ca3	minor FCS changes (privatized variables, unnecessary counters) ... - added some variables to the private statement - removed an iteration counter, which was only used for debugging	2015-04-16 23:05:48 +02:00
simon84	e7f9bc09df	German translations ... Conflicts: addons/disarming/stringtable.xml addons/hearing/stringtable.xml addons/medical/stringtable.xml addons/microdagr/stringtable.xml addons/nametags/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/winddeflection/stringtable.xml	2015-04-16 22:52:49 +02:00
simon84	cc75928cc0	Merge remote-tracking branch 'acemod/master' ... Conflicts: addons/disarming/stringtable.xml addons/hearing/stringtable.xml addons/medical/stringtable.xml addons/microdagr/stringtable.xml addons/nametags/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/winddeflection/stringtable.xml	2015-04-16 22:47:51 +02:00
PabstMirror	e12831bee4	#678 - Missing Text Height in settingMenu	2015-04-16 15:17:56 -05:00
simon84	c18284d964	German translation	2015-04-16 22:04:24 +02:00
bux578	5764310833	german translation ... double checked by bw medic	2015-04-16 21:58:39 +02:00
jaynus	ce4a9c3676	Apply javelin guidance to static titans.	2015-04-16 11:32:47 -07:00
ulteq	4ef80ab3a3	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-16 20:14:33 +02:00
PabstMirror	fa6cb3e75c	#672 - Don't show speaking icon for unconc players	2015-04-16 12:58:54 -05:00
ulteq	a7507fefef	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-16 19:55:48 +02:00
ulteq	1794606304	Got rid of the __DSP macro	2015-04-16 19:52:20 +02:00
PabstMirror	638433614c	Some missing private defines.	2015-04-16 12:36:16 -05:00
Nicolás Badano	95cab9d0e7	Merge pull request #671 from Legolasindar/master ... added spanish translation	2015-04-16 14:18:41 -03:00
jaynus	3d7ae5e3a1	Merge branch 'master' of github.com:acemod/ACE3	2015-04-16 10:10:31 -07:00
jaynus	6a942ac820	Fixed: ACE_Fake**** Was showing in arsenal. Fixes #670	2015-04-16 10:10:24 -07:00
jaynus	8837355d29	Merge remote-tracking branch 'origin/master' into guidanceHandoff	2015-04-16 10:04:57 -07:00
Ivan Navarro Cabello	61d1e6854e	added spanish translation ... added spanish translation to ballistics and respawn	2015-04-16 19:03:15 +02:00
ulteq	668888de81	Fixed constant name not following the coding-guideline	2015-04-16 19:00:37 +02:00
ulteq	aeffc55859	Added missing privates	2015-04-16 18:52:48 +02:00
jaynus	bce4f14cc8	Merge remote-tracking branch 'origin/laserCodes' into guidanceHandoff	2015-04-16 09:40:47 -07:00
jaynus	6d93fe45a6	Guidance handoff to guiding unit/laser shooter. This needs LOBL vs. LOAL capability.	2015-04-16 09:35:21 -07:00
KoffeinFlummi	bf0aa6f344	Merge branch 'spanish-merge'	2015-04-16 18:32:37 +02:00
KoffeinFlummi	11f9478035	Merge https://github.com/Legolasindar/ACE3 into spanish-merge ... Conflicts: addons/advanced_ballistics/stringtable.xml addons/atragmx/stringtable.xml addons/ballistics/stringtable.xml addons/javelin/stringtable.xml addons/kestrel4500/stringtable.xml addons/laserpointer/stringtable.xml addons/medical/stringtable.xml addons/scopes/stringtable.xml addons/weather/stringtable.xml	2015-04-16 18:31:31 +02:00
ulteq	4e4dee18df	Added missing privates / Removed unused privates	2015-04-16 18:21:19 +02:00
ulteq	fa39e8f001	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-16 18:14:42 +02:00
ulteq	e35d3dab49	Overworked the ATragMX target slot logic: ... *Added missing privates *Solutions are now automatically calculated on target/gun selection	2015-04-16 18:14:32 +02:00
ulteq	5117595ecc	Minor performance improvement	2015-04-16 17:52:21 +02:00
ulteq	defe46b769	Added new PFH abort condition (velocity < 100 m/s)	2015-04-16 17:30:50 +02:00
Tachii	2466d83cac	Update stringtable.xml	2015-04-16 18:19:11 +03:00
Tachii	def2f9c28e	Update stringtable.xml	2015-04-16 18:13:53 +03:00
Tachii	dca11e523b	Update stringtable.xml	2015-04-16 18:08:58 +03:00
Nicolás Badano	8cb167d1be	Merge pull request #663 from ruPaladin/patch-1 ... addons/realisticnames translation to Russian	2015-04-16 10:06:12 -03:00
Coren4	4ff68eabd4	Update stringtable.xml	2015-04-16 14:59:19 +02:00
ulteq	55d9f7a3da	The previous GUI state is now restored when you open the ATragMX	2015-04-16 13:46:32 +02:00
ulteq	d6cadb593a	Enabled the ATragMX to use the advanced ballistics extension	2015-04-16 13:44:54 +02:00
ulteq	ca3293aa1a	Added ACE_Box_Ammo (WIP): ... *TODO: Define a model	2015-04-16 13:43:41 +02:00
ulteq	15240ac87c	Minor code change in the extension detection logic	2015-04-16 13:42:28 +02:00
ruPaladin	e00dd1c2f2	addons/realisticnames translation to Russian	2015-04-16 14:10:48 +03:00
ulteq	aa724129d1	Tuned down the default timeToLive value.	2015-04-16 10:51:33 +02:00
Marco	00c0839ce5	Update stringtable.xml ... IT	2015-04-16 10:33:15 +02:00
Marco	ba510facbd	Update stringtable.xml ... IT	2015-04-16 10:29:17 +02:00
Marco	23cb1058fc	Update stringtable.xml ... IT	2015-04-16 10:26:55 +02:00
Marco	500098d061	Update stringtable.xml ... IT	2015-04-16 10:25:39 +02:00
Marco	66ba74e79d	Update stringtable.xml ... IT	2015-04-16 10:24:17 +02:00
Marco	13de953aab	Update stringtable.xml ... IT	2015-04-16 10:23:34 +02:00
Marco	0655c3f3b6	Update stringtable.xml ... IT	2015-04-16 10:22:32 +02:00
Marco	fda1febc30	Update stringtable.xml ... IT	2015-04-16 10:21:49 +02:00
Marco	59643152bd	Update stringtable.xml ... IT	2015-04-16 10:19:43 +02:00
Marco	5e7fb0fb64	Update stringtable.xml ... IT	2015-04-16 10:18:49 +02:00
Marco	c1655aa9a9	Update stringtable.xml ... IT	2015-04-16 10:16:17 +02:00
Marco	b3d4e2f48f	Update stringtable.xml ... IT	2015-04-16 10:14:18 +02:00
Marco	a129f18a2a	Update stringtable.xml ... Italian	2015-04-16 10:13:50 +02:00
PabstMirror	9c9136ae91	Stringtable cleanup	2015-04-16 02:54:50 -05:00
PabstMirror	58dfc6aa97	Add item to ace misc box	2015-04-15 22:34:24 -05:00
PabstMirror	80516f4f61	Increase Sound Volume	2015-04-15 22:27:12 -05:00
PabstMirror	b2625c43e7	#644 - Extra Space in macro	2015-04-15 20:30:09 -05:00
commy2	8d8ae3dadb	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-16 02:00:55 +02:00
commy2	4169351b1a	fix addActionEH didn't work after respawn	2015-04-16 02:00:37 +02:00
PabstMirror	23f47f97ae	Wirecutter - better sound effects, cleanup	2015-04-15 18:32:47 -05:00
Glowbal	59ae4623ff	Derp	2015-04-16 00:17:17 +02:00
Glowbal	f3ca1a85b9	Merge branch 'master' of github.com:acemod/ACE3	2015-04-16 00:15:57 +02:00
Glowbal	0f4b7d0977	fixes #347 ... Please??	2015-04-16 00:14:05 +02:00
PabstMirror	0076be6a86	Fix stringtables	2015-04-15 17:08:35 -05:00
PabstMirror	c0c5af2957	ballistics - fix ubc	2015-04-15 17:07:06 -05:00
PabstMirror	361efe4147	Missing NoVoice words ... Protocol bin\config.bin/ACE_RadioProtocolNoRadio/: Missing word RallyUp / UnderFireE	2015-04-15 17:04:03 -05:00
Tachii	dd09cc4d06	Update fnc_createAction.sqf ... typo	2015-04-16 00:57:15 +03:00
ulteq	0b7ceea64e	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-15 22:50:19 +02:00
ulteq	25e1fd2df3	Completely overworked the ATragMX gun list	2015-04-15 22:50:04 +02:00
ulteq	60c54733cc	Polished the ammo classes some more	2015-04-15 22:49:47 +02:00
KoffeinFlummi	8aeeff616e	Merge branch 'master' of https://github.com/acemod/ACE3	2015-04-15 22:21:21 +02:00
KoffeinFlummi	1b67b2df26	Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge ... Conflicts: addons/disposable/stringtable.xml addons/explosives/stringtable.xml addons/fcs/stringtable.xml addons/frag/stringtable.xml addons/hearing/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/inventory/stringtable.xml addons/javelin/stringtable.xml addons/kestrel4500/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/laserpointer/stringtable.xml addons/magazinerepack/stringtable.xml addons/maptools/stringtable.xml addons/markers/stringtable.xml addons/microdagr/stringtable.xml addons/movement/stringtable.xml	2015-04-15 22:20:47 +02:00
commy2	fb3ba51fe5	port alternative wirecutter sound	2015-04-15 22:19:43 +02:00
commy2	6f6d080dbd	port inject sound	2015-04-15 22:16:54 +02:00
KoffeinFlummi	f020ff7c53	Merge branch 'patch-7' of https://github.com/ramius86/ACE3 into italian-merge ... Conflicts: addons/disarming/stringtable.xml	2015-04-15 22:08:15 +02:00
KoffeinFlummi	9e6ae52ca5	Merge branch 'patch-6' of https://github.com/ramius86/ACE3 into italian-merge ... Conflicts: addons/captives/stringtable.xml	2015-04-15 22:07:42 +02:00
KoffeinFlummi	5c3b06b1bf	Merge branch 'patch-1' of https://github.com/ramius86/ACE3 into italian-merge ... Conflicts: addons/medical/stringtable.xml	2015-04-15 22:06:18 +02:00
KoffeinFlummi	234e8e5c40	Merge branch 'patch-1' of https://github.com/Clon1998/ACE3 into german-merge ... Conflicts: addons/interaction/stringtable.xml	2015-04-15 21:55:52 +02:00
jaynus	ea3475d388	Merge pull request #631 from FreeZbe/patch-9 ... French : update / fix stringtable	2015-04-15 12:31:03 -07:00
jaynus	9c4e217822	Merge pull request #633 from FreeZbe/patch-10 ... French : update stringtable	2015-04-15 12:29:56 -07:00
jaynus	185f9379fd	Merge pull request #639 from FreeZbe/patch-16 ... French : update stringtable	2015-04-15 12:29:37 -07:00
jaynus	ddaf05262e	Merge pull request #638 from FreeZbe/patch-15 ... French : update stringtable	2015-04-15 12:29:02 -07:00
jaynus	0a3a650437	Merge pull request #634 from FreeZbe/patch-11 ... French : update stringtable	2015-04-15 12:28:26 -07:00
FreeZbe	5a7ad82170	French : update stringtable	2015-04-15 21:26:12 +02:00
jaynus	2d189e6199	Merge branch 'master' of github.com:acemod/ACE3	2015-04-15 12:26:03 -07:00
jaynus	10cf02e856	Slower climb phase.Refs #630	2015-04-15 12:25:57 -07:00
FreeZbe	18c65108c3	French : update stringtable	2015-04-15 21:24:24 +02:00
Nicolás Badano	3e205a70d8	Merge pull request #636 from FreeZbe/patch-13 ... French : update stringtable	2015-04-15 16:18:58 -03:00
Nicolás Badano	e6cc26cc96	Merge pull request #635 from FreeZbe/patch-12 ... French : update stringtable	2015-04-15 16:18:39 -03:00
Nicolás Badano	1678a6d695	Merge pull request #628 from ruPaladin/master ... Russian translation fixes	2015-04-15 16:17:59 -03:00
FreeZbe	56f6c60e1a	French : update stringtable	2015-04-15 21:17:35 +02:00
FreeZbe	df61f5c995	French : update stringtable	2015-04-15 21:15:57 +02:00
FreeZbe	c0dbf10971	French : update stringtable	2015-04-15 21:14:00 +02:00
jaynus	5bcb0ec493	Forgot to set terminal on short-range attacks. Fixes #630	2015-04-15 12:09:47 -07:00
commy2	f40373bb78	Merge pull request #550 from acemod/rallypointfix ... fix rallypoints being broken, fix #522	2015-04-15 21:03:13 +02:00
FreeZbe	550c32e801	French : update stringtable	2015-04-15 20:53:41 +02:00
commy2	d68cc8f40e	sync rallypoint marker on jip	2015-04-15 20:50:03 +02:00
ulteq	3ca37baf44	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-15 20:33:19 +02:00
ulteq	3a062a4ff9	Fixed incorrect Mk319 Mod 0 BC/airFriction	2015-04-15 20:33:11 +02:00
FreeZbe	bc5b9bdfe9	French : update / fix strintable	2015-04-15 20:11:08 +02:00
PabstMirror	e54d8dc827	ProgressBar - Fixed Alignment	2015-04-15 12:55:20 -05:00
PabstMirror	134f48ba55	Merge pull request #602 from acemod/nametagsIsSpeakingPerf ... Nametags - isSpeaking reduce network traffic	2015-04-15 12:55:15 -05:00
ulteq	d9b3255e21	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-15 19:51:40 +02:00
ulteq	3cff85e85d	Added Mk319 Mod 0 ammo and magazines	2015-04-15 19:51:34 +02:00
Glowbal	c88479d54d	staged work	2015-04-15 19:45:42 +02:00
commy2	18be5276a9	rally point moved eh, markers at rallypoint positions	2015-04-15 19:18:42 +02:00
jaynus	743a6d82a5	Merge branch 'master' of github.com:acemod/ACE3	2015-04-15 10:11:18 -07:00
jaynus	25b7f779f1	Difficulty magic.	2015-04-15 10:11:13 -07:00
ruPaladin	26d53d255f	Update stringtable.xml	2015-04-15 20:08:39 +03:00
ulteq	396bd3954e	Fixed a typo	2015-04-15 19:04:41 +02:00
ruPaladin	fe72eef3da	Update stringtable.xml	2015-04-15 20:02:41 +03:00
ulteq	b5a82e313e	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-15 19:00:24 +02:00
ulteq	0c4734637b	Fixed the GM6 barrel length and updated the magazines array	2015-04-15 19:00:14 +02:00
ruPaladin	92031cc354	Update stringtable.xml	2015-04-15 19:59:45 +03:00
ulteq	f8061922f7	Added ACE_10Rnd_338_API526_Mag, ACE_5Rnd_127x99_Mag, ACE_5Rnd_127x99_AMAX_Mag	2015-04-15 18:59:41 +02:00
ulteq	e0c34f22bf	Added ACE_338_Ball_API526 and updated some airFriction values	2015-04-15 18:59:11 +02:00
ruPaladin	3773238e25	Update stringtable.xml	2015-04-15 19:56:34 +03:00
jaynus	2e3545f3d0	Merge branch 'master' of github.com:acemod/ACE3	2015-04-15 09:55:48 -07:00
jaynus	ea2281616e	Enable all variants of Titan. Can now vanilla-lock in cadet mode.	2015-04-15 09:55:40 -07:00
ulteq	64d6bbaf26	Fixed an incorrect BC in an ATragMX gun profile	2015-04-15 18:55:20 +02:00
ruPaladin	7051152d93	Update stringtable.xml	2015-04-15 19:53:42 +03:00
ruPaladin	d8eb564c65	Update stringtable.xml	2015-04-15 19:52:29 +03:00
ruPaladin	252fb67119	Update stringtable.xml	2015-04-15 19:50:32 +03:00
PabstMirror	e84689a771	#544 - Change ERROR warning to debug trace	2015-04-15 11:46:06 -05:00
PabstMirror	6ea38a9946	Only check A3 VON if no radio mods running	2015-04-15 11:34:27 -05:00
Nicolás Badano	fecb2f37c0	Merge pull request #621 from ruPaladin/patch-5 ... Kestrel 4500NV translation to Russian	2015-04-15 13:28:44 -03:00
Nicolás Badano	0a6604a94f	Merge pull request #622 from ruPaladin/patch-6 ... addons/interact_menu translation to Russian	2015-04-15 13:28:33 -03:00
jaynus	a5700540bb	Merge pull request #623 from ruPaladin/patch-7 ... addons/weather/ translation to Russian	2015-04-15 09:28:04 -07:00
Nicolás Badano	7589b8b13d	Merge pull request #626 from ruPaladin/patch-11 ... addons/medical translation to Russian	2015-04-15 13:27:22 -03:00
jaynus	5923f246fd	Fixed: only exit on shooter.	2015-04-15 09:25:19 -07:00
jaynus	c793df4848	Changed: Safety mode on Titan, it now doesnt show as unloaded Fixed: Some TOP shots would miss, Fixed: Lock constraints would show on fast weapon switch.	2015-04-15 09:10:00 -07:00
ruPaladin	a3965424b9	addons/medical translation to Russian	2015-04-15 19:09:10 +03:00
Marco	ad67fca8f4	Update stringtable.xml	2015-04-15 17:45:48 +02:00
Ivan Navarro Cabello	40b784fb7a	update stringtable ... added spanish translate	2015-04-15 17:41:10 +02:00
ruPaladin	9caba1e3a3	addons/weather/ translation to Russian	2015-04-15 18:29:38 +03:00
ruPaladin	64504a9515	addons/interact_menu translation to Russian	2015-04-15 18:27:28 +03:00
ruPaladin	6fca601759	Kestrel 4500NV translation to Russian	2015-04-15 18:24:57 +03:00
jaynus	0d28a890e1	Fixes: Cycle fire mode on Titan was not working. Closes #603	2015-04-15 08:19:21 -07:00
Legolasindar	bbc24b6d02	Update stringtable.xml ... added spanish translate	2015-04-15 16:49:43 +02:00
commy2	9c1b40f5a3	preparing for improved positions of action points	2015-04-15 16:40:20 +02:00
ulteq	98d0c06ce3	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-15 16:22:50 +02:00
ulteq	95b04d0840	Added custom airFriction values for the new marksmen ammo types.	2015-04-15 16:22:42 +02:00
commy2	6710040633	toLower in, always follow your own advice	2015-04-15 16:13:53 +02:00
KoffeinFlummi	250d6acb22	Merge https://github.com/Legolasindar/ACE3 into spanish-merge	2015-04-15 16:09:40 +02:00
commy2	bf8f9b4818	all I need is a $	2015-04-15 15:34:01 +02:00
KoffeinFlummi	1fc546a700	Merge branch 'polish-merge'	2015-04-15 15:10:41 +02:00
KoffeinFlummi	79934cfb78	Merge https://github.com/Coren4/ACE3 into polish-merge	2015-04-15 15:10:28 +02:00
ulteq	1e326c17ad	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-15 15:06:35 +02:00
commy2	eecf405fda	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix	2015-04-15 15:06:29 +02:00
ulteq	238cf1cc63	Added keybinds for ATragMX and Kestrel 4500 (empty by default)	2015-04-15 15:06:28 +02:00
commy2	5eededd3e1	Recoil overhaul initial commmit	2015-04-15 15:01:07 +02:00
Nicolás Badano	69489df910	Merge pull request #610 from ramius86/patch-3 ... Update stringtable.xml	2015-04-15 09:57:27 -03:00
Nicolás Badano	527385e6e1	Merge pull request #609 from ramius86/patch-2 ... Update stringtable.xml	2015-04-15 09:57:15 -03:00
KoffeinFlummi	21305629ed	Merge branch 'patch-1' of https://github.com/nomisum/ACE3 into german-merge	2015-04-15 14:53:27 +02:00
commy2	e3d1946924	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix	2015-04-15 14:37:49 +02:00
KoffeinFlummi	8b915380b7	Merge branch 'hungarian-merge'	2015-04-15 13:55:02 +02:00
KoffeinFlummi	2ffbccbf20	Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge	2015-04-15 12:59:56 +02:00
ulteq	9f289e1721	Fixed incorrect return values in some key handlers: ... *Wind info *Protractor	2015-04-15 12:53:02 +02:00
ulteq	42dbd8f5d2	Continued work on the magazine classes: ... *Fixed Katiba using the wrong magazine *Added ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim *Added ACE_10Rnd_338_300gr_HPBT_Mag *Changed some of the .338 magazine initSpeeds to match the new Mar-10 barrel length *Added the new caseless green ir dim magazine to the ammo crates *Allowed the Mar-10 to shoot .300 Win Mag	2015-04-15 12:30:48 +02:00
ulteq	bd5ed13621	Added ACE_65x39_Caseless_green_Tracer_Dim	2015-04-15 12:27:20 +02:00
Marco	bc62891122	Update stringtable.xml ... Italian	2015-04-15 11:24:20 +02:00
Marco	76ff1da57a	Update stringtable.xml ... Italian	2015-04-15 11:19:54 +02:00
Marco	47f8161855	Update stringtable.xml ... Italian	2015-04-15 11:18:22 +02:00
Marco	924cd80e60	Update stringtable.xml ... ITalian	2015-04-15 11:13:47 +02:00
Marco	cb2e1c5116	Update stringtable.xml ... Italian	2015-04-15 11:13:19 +02:00
Marco	5238647021	Update stringtable.xml ... Italian	2015-04-15 11:12:15 +02:00
Marco	f931c1a42c	Update stringtable.xml ... Italian	2015-04-15 11:10:05 +02:00
Marco	96be1baddc	Update stringtable.xml ... Italian	2015-04-15 11:08:43 +02:00
Marco	8c0f52e615	Update stringtable.xml ... Italian	2015-04-15 11:08:04 +02:00
Marco	d1936d8e1b	Update stringtable.xml ... Italian	2015-04-15 11:06:42 +02:00
Marco	5c7b8247c5	Update stringtable.xml ... Italian	2015-04-15 11:05:57 +02:00
Marco	6e7c1ce9d2	Update stringtable.xml ... Ita	2015-04-15 11:04:18 +02:00
Marco	544894a05e	Update stringtable.xml ... Italian	2015-04-15 10:59:44 +02:00
Marco	9a8dd905f2	Update stringtable.xml	2015-04-15 10:56:39 +02:00
Marco	eceb759523	Update stringtable.xml ... Italian	2015-04-15 10:53:35 +02:00
Marco	b28ef3d22d	Update stringtable.xml ... Italian	2015-04-15 10:52:40 +02:00
Marco	45fec0409d	Update stringtable.xml ... Italian	2015-04-15 10:51:26 +02:00
Marco	c9e452a000	Update stringtable.xml ... Italian	2015-04-15 10:48:52 +02:00
Marco	aaee9c72c1	Update stringtable.xml ... Italian translation	2015-04-15 10:44:13 +02:00
Marco	f328d302e1	Update stringtable.xml ... Italian translation	2015-04-15 10:42:25 +02:00
Marco	2daa0e2d29	Update stringtable.xml ... Italian translation	2015-04-15 10:32:01 +02:00
Marco	532ee16411	Update stringtable.xml ... Italian translation	2015-04-15 10:30:56 +02:00
Marco	af3fdf9b91	Update stringtable.xml ... Italian translation	2015-04-15 10:28:09 +02:00
commy2	09289fbf48	only on server though	2015-04-15 08:34:30 +02:00
commy2	6c4e50a98d	localized names for rallypoints, auto assign slot of group leader at the start of the mission as JIP persistant rallypoint mover slot	2015-04-15 08:31:40 +02:00
PabstMirror	1f13d229a8	Stagger creating actions over time	2015-04-15 00:13:23 -05:00