479 Commits

Author	SHA1	Message	Date
PabstMirror	bf3e3d3b64	#542 - ACE_fakeWeapon not found	2015-04-13 03:46:42 -05:00
PabstMirror	70dbae5a25	#527 - Unconscious switching groups	2015-04-13 00:32:07 -05:00
Glowbal	019163c9ce	Merge pull request #489 from acemod/medicalPerformanceImprovements ... Medical performance improvements	2015-04-12 14:44:18 +02:00
KoffeinFlummi	8f2a1735ae	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-12 14:28:28 +02:00
KoffeinFlummi	614afa8537	Merge https://github.com/Kllrt/ACE3 into czech-merge ... Conflicts: addons/attach/stringtable.xml addons/captives/stringtable.xml addons/common/stringtable.xml addons/dragging/stringtable.xml addons/explosives/stringtable.xml addons/goggles/stringtable.xml addons/grenades/stringtable.xml addons/hearing/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/medical/stringtable.xml addons/microdagr/stringtable.xml addons/nametags/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/realisticnames/stringtable.xml addons/reload/stringtable.xml addons/reloadlaunchers/stringtable.xml addons/weaponselect/stringtable.xml addons/wep_javelin/stringtable.xml addons/winddeflection/stringtable.xml	2015-04-12 14:27:59 +02:00
Legolasindar	b665781399	Update stringtable.xml ... updated spanish translation and added some english missed translation	2015-04-12 13:58:06 +02:00
KoffeinFlummi	59952441d8	Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge	2015-04-12 06:22:17 +02:00
KoffeinFlummi	c6efd4e546	Merge https://github.com/EpMAK/ACE3 into russian-merge	2015-04-12 05:39:46 +02:00
Glowbal	e00f0ea4c3	No longer creates a new waitAndExec for every handleDamage call	2015-04-11 22:47:10 +02:00
Glowbal	97fa40b4c1	Make use of new global variables for selections and hitpoints	2015-04-11 22:31:38 +02:00
Glowbal	6cc115a628	We already determine the new damage in caching, so we will use that value instead of recalculating it here	2015-04-11 22:31:17 +02:00
Glowbal	e8d2a00994	Added GVAR(HITPOINTS) and GVAR(SELECTIONS) variables ... No longer have to recreate the selection and hitpoint arrays every time	2015-04-11 22:30:52 +02:00
Glowbal	c69f71ba71	formatting	2015-04-11 22:29:32 +02:00
Glowbal	51906e341d	Removed unused variables	2015-04-11 22:29:11 +02:00
Glowbal	082ab5155e	Minor performance improvements ... Before avg: 0.0858495ms After avg: 0.0701045ms	2015-04-11 21:27:49 +02:00
EpMAK	21abff3713	Revert "Revert "Russian Translation"" ... This reverts commit ea04f4ab3e.	2015-04-11 21:33:34 +03:00
EpMAK	ea04f4ab3e	Revert "Russian Translation" ... This reverts commit 17a552bb80.	2015-04-11 21:33:07 +03:00
Kllrt	38adfbcb70	Added missing CZ strings and made little revision	2015-04-11 16:33:00 +02:00
PabstMirror	adc7db9ae9	#456 - Fix AI rotating while dead (disableAI func) ... Still some small head movements, but I don't know how to fix that.	2015-04-10 15:02:40 -05:00
esteldunedain	d6e70cfe6b	Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3 ... Conflicts: addons/common/stringtable.xml addons/explosives/stringtable.xml addons/frag/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/inventory/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/logistics_wirecutter/stringtable.xml addons/medical/stringtable.xml	2015-04-10 16:20:18 -03:00
EpMAK	17a552bb80	Russian Translation ... Russian translation of stringtables: new lines + old lines fixed a bit, realistic names for armory are not yet filled.	2015-04-10 19:55:57 +03:00
EpMAK	68d08b8c7b	Revert "Translation" ... This reverts commit fab5605ad5.	2015-04-10 19:46:18 +03:00
EpMAK	fab5605ad5	Translation ... Russian translation of the texts	2015-04-10 17:51:48 +03:00
Legolasindar	52d476abd3	Update stringtable.xml ... Added spanisth translation, and two lines of english translation	2015-04-10 12:29:44 +02:00
Jo David	c258c6c00d	fixing translation	2015-04-10 09:05:37 +02:00
Jo David	33a14076fc	Merge branch 'master' of https://github.com/acemod/ACE3 into translations ... Conflicts: addons/captives/stringtable.xml addons/medical/stringtable.xml	2015-04-10 09:01:24 +02:00
licht-im-Norden87	6323a85f17	Update stringtable.xml ... <English>Field Dressing</English> <German>Notverband</German> I dont know if a Notverband is the same as a Field Dressing.	2015-04-10 00:23:20 +02:00
licht-im-Norden87	4522b45939	Update stringtable.xml	2015-04-10 00:03:46 +02:00
Glowbal	093d340ee7	Changed: Dragging/carrying now works for units with broken legs ... Added unload and load of unconscious units	2015-04-09 21:23:10 +02:00
Glowbal	0926397ab4	Removed deadcode and obvious comments	2015-04-09 20:13:46 +02:00
Glowbal	39cbf21278	Removed deprecated carry functions	2015-04-09 20:12:30 +02:00
commy2	5ea35a01bb	sorting out required addons for modularity	2015-04-09 13:23:29 +02:00
PabstMirror	c3564ee883	undef to Make PBO-Project Happy	2015-04-08 14:38:29 -05:00
Glowbal	3702679ee4	fixed wrong value for radio disabled on waking up	2015-04-08 21:31:59 +02:00
Glowbal	ffbe9f0c71	Setting for getting rid of hitpoint damage after adv medical damage	2015-04-07 21:06:48 +02:00
Glowbal	c823826f17	Merge branch 'master' into medicalImprovements	2015-04-07 20:53:24 +02:00
Glowbal	2b341c2a8b	left over CSE function calls removed	2015-04-07 20:50:44 +02:00
Glowbal	545014b073	missing return value	2015-04-07 20:47:36 +02:00
Glowbal	ac3bda3135	improvements to displayPatientInformation. Bandaged wounds should be more clear now	2015-04-07 20:19:32 +02:00
esteldunedain	765ae4ee64	Merge branch 'master' into tabCleanup ... Conflicts: addons/explosives/functions/fnc_addClacker.sqf addons/explosives/functions/fnc_detonateExplosive.sqf addons/explosives/functions/fnc_getPlacedExplosives.sqf addons/explosives/functions/fnc_openDetonateUI.sqf addons/explosives/functions/fnc_openPlaceUI.sqf addons/explosives/functions/fnc_openTransmitterUI.sqf addons/explosives/functions/fnc_openTriggerSelectionUI.sqf addons/explosives/functions/fnc_placeExplosive.sqf addons/explosives/functions/fnc_place_Approve.sqf addons/explosives/functions/fnc_setPosition.sqf	2015-04-07 15:00:56 -03:00
Glowbal	526e24f133	formatting	2015-04-07 19:56:54 +02:00
Glowbal	3d82cb8eac	Removed deprecated onTreatmentCompleted event	2015-04-07 19:54:24 +02:00
Glowbal	7fb3ac6740	Added _x_ca suffixes to all item pictures	2015-04-07 19:16:56 +02:00
Pierre Humberdroz (meat)	4c49765c8f	translation changes ... #370	2015-04-07 10:39:41 +02:00
bux578	92da20ce62	translations ... #367	2015-04-07 10:02:33 +02:00
jaynus	99008ac729	Merge pull request #332 from KoffeinFlummi/medicalBox ... Added: Generic placeholder medical box.	2015-04-06 19:09:16 -07:00
Glowbal	12493f8595	Improved wounds configuration (missing maxDamage values added)	2015-04-07 00:57:05 +02:00
Glowbal	c7549a13a4	Improved pain reduction	2015-04-07 00:41:53 +02:00
Glowbal	bdb5c8e728	Merge pull request #349 from KoffeinFlummi/medicalBugFixes ... Exit displayPatientInformation PFH when a different selection is selected.	2015-04-06 19:49:12 +02:00
Glowbal	4c6dad69f9	Should fix #347. Could not reproduce but this at least fixes some issues (which most likely caused the error)	2015-04-06 19:43:27 +02:00