Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,766 Commits 73 Branches 88 Tags 752 MiB
f07949cf19
Commit Graph

518 Commits

Author SHA1 Message Date
KoffeinFlummi
f07949cf19 Remove some old todos 2015-04-14 22:57:18 +02:00
KoffeinFlummi
676f7c8732 Remove hitpart from action names for non-self 2015-04-14 22:50:06 +02:00
KoffeinFlummi
13d7649c4a Buff colour flashing effect 2015-04-14 22:49:26 +02:00
KoffeinFlummi
2391c5e6d6 Tweak crate names 2015-04-14 22:34:19 +02:00
KoffeinFlummi
91e25dc215 Missing stringtable entries 2015-04-14 22:34:08 +02:00
KoffeinFlummi
7af6ea36a6 Fix missing pain effect option name 2015-04-14 22:07:43 +02:00
KoffeinFlummi
684c36f8a5 Add pain effect option 2015-04-14 21:49:56 +02:00
KoffeinFlummi
e7807c009f Use playerInventoryChanged instead of Take 
This makes sure to also fire when other mods, like TFAR (when adding
backpacks) add items via script.
 2015-04-14 21:28:18 +02:00
KoffeinFlummi
71b19b4621 Remove duplicate bleeding code 2015-04-14 20:40:38 +02:00
KoffeinFlummi
ba377dfd3a Show seperate message for "scratches"; localize 2015-04-14 20:40:17 +02:00
KoffeinFlummi
c6118901b4 Merge branch 'master' into basic-medical-tweaks 2015-04-14 20:35:17 +02:00
KoffeinFlummi
7ca36cdb65 Always show wounds, even for very low damage 2015-04-14 20:28:19 +02:00
KoffeinFlummi
a4c93ab2e2 Add seperate crates for basic and advanced 2015-04-14 20:28:00 +02:00
KoffeinFlummi
c379f2775e Style fixes 2015-04-14 20:27:42 +02:00
KoffeinFlummi
63fe4118d4 Merge https://github.com/FreeZbe/ACE3 into french-merge 2015-04-14 14:48:13 +02:00
KoffeinFlummi
96319c8799 Merge https://github.com/ruPaladin/ACE3 into russian-merge 2015-04-14 12:50:14 +02:00
Kllrt
1c611ba2db Added another new CZ strings 2015-04-13 21:15:04 +02:00
bux578
8c24d9ec35 fix invalid xml, fix duplicate keys 2015-04-13 15:25:30 +02:00
KoffeinFlummi
8d4003a396 Merge https://github.com/HerrStein/ACE3 into german-merge 2015-04-13 14:21:00 +02:00
KoffeinFlummi
f6c7d444e1 Merge https://github.com/Anthariel/ACE3 into french-merge 2015-04-13 13:31:48 +02:00
KoffeinFlummi
b93cf4fb4a Merge branch 'polish-merge' 2015-04-13 13:01:17 +02:00
KoffeinFlummi
118b5509ea Merge https://github.com/gienkov/ACE3 into polish-merge 2015-04-13 13:00:59 +02:00
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
Anthariel
77058857e6 Update stringtable.xml 
Wrong translation
 2015-04-13 02:02:19 +02:00
KoffeinFlummi
664cc7077d Reduce blood loss rate 2015-04-12 18:06:57 +02:00
KoffeinFlummi
6062128436 Remove tourniquet option, add check pulse/response 2015-04-12 18:01:29 +02:00
KoffeinFlummi
f794eaac43 Merge branch 'master' into basic-medical-tweaks 
Conflicts:
	addons/medical/ACE_Medical_Actions.hpp
	addons/medical/functions/fnc_handleDamage_basic.sqf
	addons/medical/stringtable.xml
 2015-04-12 18:00:22 +02:00
Anthariel
3f84ac4817 Update stringtable.xml 2015-04-12 17:59:53 +02:00
Anthariel
3842272c43 Update stringtable.xml 
Fixing French & English translation error that I've made on the line : 780 and 781 (thanks KoffeinFlummi)
 2015-04-12 17:55:53 +02: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
FreeZbe
45ff6c7ce9 French: (Nearly) Complete French translations 
Some entries (3 or 4) are still missing.
I dont understand what you mean / what the input is related to.
 2015-04-12 14:15:45 +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
FreeZbe
4a996bf147 Update stringtable.xml 2015-04-10 21:22:07 +02: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