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
11,510 Commits 73 Branches 88 Tags 752 MiB
c4863c756c
Commit Graph

9468 Commits

Author SHA1 Message Date
BaerMitUmlaut
c4863c756c Moved statemachine into seperate component 2017-04-01 19:50:26 +02:00
PabstMirror
690e415ffe Minor cleanup 2017-03-25 11:36:37 -05:00
PabstMirror
80d7ef5b67 blood effects moved to UI 2017-03-25 11:27:18 -05:00
Zakant
1fb6521021 Added checkItem on loadout change (#5021) 2017-03-25 11:08:47 -05:00
PabstMirror
169df1ed3b Merge branch 'master' into medical-rewrite 
Conflicts:
	addons/medical/stringtable.xml
 2017-03-25 11:03:50 -05:00
11RDP-LoupVert
fc860e7b43 French loc improvement (#5017) 
* French loc improvement

(French) text as it is clutters the interface interface, making it
uneasy for medic to use the it smoothly.
https://i.gyazo.com/8d7a5bb2f15dd1332cec36f2eef510c8.png

Hopefully suggested changes fixes that.

There were a few typos and, in my opinion, unaccurate or missing
translation.
Based on French Army Field Manual, actual paramedical personnel and past
work on XMedSys.

* Pull 5017 with spaces instead of tabs

https://github.com/acemod/ACE3/pull/5017

* Fixes a minor typo

Selectioner -> Sélectionner

* Duplicate entry (French)

Removes a duplicate entry, didn't saw first time
 2017-03-25 10:52:37 -05:00
PabstMirror
d47ea1d25a Merge pull request #4754 from acemod/medical-rewrite-effects 
Medical Rewrite - Post Process Effects
 2017-03-25 10:50:48 -05:00
11RDP-LoupVert
fcd57a9492 Duplicate French entry (#5032) 
Removes a duplicate French entry, didn't saw it :/
 2017-03-25 10:46:23 -05:00
PabstMirror
15346d0919 Add custom CfgUIGrids for microDagr (#5014) 2017-03-23 11:15:42 -05:00
11RDP-LoupVert
5d8cf43199 Dupplicate Polish entry (#5018) 
https://i.gyazo.com/c7557980d7d4c36709be78ef1f2c2a8f.png
 2017-03-22 11:05:43 -05:00
Glowbal
bb228fa2b3 Merge branch 'release' 2017-03-21 20:49:11 +01:00
Glowbal
b143af0b8c Prep 3.9.1 release 2017-03-21 20:42:39 +01:00
classic
67a4e4e5ab Jpn translate to v391 (#5011) 
* jpn translate slideshow

Add the Japanese translation for slideshow for v3.9.1

* jpn translate for cookoff

Add the Japanese translation for cookoff of the v3.9.1
 2017-03-20 12:20:45 -05:00
simpo
c162739d4f Translation: Missing 3 strings in Polish (#5008) 2017-03-19 23:37:36 -05:00
PabstMirror
ecbca20c3a Recompile medical dll for x64 2017-03-18 14:03:30 -05:00
PabstMirror
46be89eda6 Cleanup 2017-03-18 11:55:40 -05:00
PabstMirror
2e61cc32e1 Locailzation, tweak fast heart rate 2017-03-18 11:53:57 -05:00
PabstMirror
e3af1b55a5 Merge branch 'medical-rewrite' into medical-rewrite-effects 2017-03-18 09:56:42 -05:00
PabstMirror
5f9f672f7f Fix russian translation for avulsion wounds 
Ref #4994
 2017-03-18 09:36:42 -05:00
PabstMirror
15d62ca27f Add #4941 for rewrite 2017-03-18 09:13:08 -05:00
PabstMirror
672be73bae Merge branch 'master' into medical-rewrite 
Conflicts:
    addons/medical/XEH_preInit.sqf
 2017-03-18 09:09:45 -05:00
PabstMirror
1208e441ac Fix unarmed sprint->prone + minor perf improvments (#4887) 2017-03-15 10:12:07 -05:00
jonpas
b31abee4fd Sandbags surfaces update (#4971) 
* Use private keyword, move surface blacklist to script_component.hpp

* Check height above terrain

* Add Tanoa surfaces, Check if in water

* Use 'dust' config entry to determine surface, Add common canDig (checks dustyness)

* Re-enable compile cache

* Revert to surface blacklist with dust as fallback

* Move surface blacklist to script_component because SQF validator complains
 2017-03-15 10:11:37 -05:00
PabstMirror
9e27960b86 Add rearm config for Nemmera (#4992) 2017-03-15 10:10:53 -05:00
commy2
c51b755770 also fix cooking off ammo boxes 2017-03-15 09:09:42 +01:00
commy2
371caaa623 Fix cookoff desynch, fix #4900 
Randomness would be calculated on every machine, but only vehicle explosion and sound are done by the server. Smoke, light and fire sfx are done by each client.
 2017-03-15 09:09:02 +01:00
commy2
81f3387dbb Merge pull request #4991 from acemod/fix-cookoff-2 
also fix cooking off ammo boxes
 2017-03-14 10:09:13 +01:00
commy2
2c4f286593 also fix cooking off ammo boxes 2017-03-14 10:08:06 +01:00
commy2
2334d501d0 Fix cookoff desynch, fix #4900 
Randomness would be calculated on every machine, but only vehicle explosion and sound are done by the server. Smoke, light and fire sfx are done by each client.
 2017-03-14 10:04:56 +01:00
Glowbal
71d9694eb6 Prep 3.9.1 release 2017-03-13 20:48:02 +01:00
jonpas
27ef320542 Fix vehicle lock lockpick condition, Fix lockpicking from inside (#4985) 2017-03-13 20:43:55 +01:00
Mark Ruffner
6403132a9b Add validation on group id for map gesture color mapping (#4976) 2017-03-13 20:43:06 +01:00
PabstMirror
11de1326ef Cleanup use of ACE_HashLocation (#4975) 2017-03-13 20:42:43 +01:00
PabstMirror
d18ad0c087 Give options menu list focus (#4965) 2017-03-13 20:42:25 +01:00
PabstMirror
d9be3c0ffc Fix rangecard not showing wind/lead (#4964) 2017-03-13 20:42:05 +01:00
J3aLeiNe
ca5f3fa1cf Update maps' latitude (#4961) 
- add Dingor
 - add MSKE 2017
 - add G.O.S Leskovets
 - add Trung Si
 - add I44: Omaha v2
 - add I44: Neaville and Neaville (Winter)
 - add I44: Battle of the Bulge
 2017-03-13 20:41:37 +01:00
PabstMirror
43786786de Fix gforce avg on switching to aircraft (#4955) 
* Fix gforce avg on switching to aircraft

* Dont use for-loop for neutral g-forces array
 2017-03-13 20:41:14 +01:00
jonpas
ca4060b852 Require CBA v3.2.1 (#4954) 
Conflicts:
	addons/main/script_mod.hpp
 2017-03-13 20:40:52 +01:00
PabstMirror
a1853e0d52 Fix intergrated scopes (#4945) 2017-03-13 20:40:11 +01:00
PabstMirror
76e9b132d7 Add RHS GREF compat for RKG-3 grenade (#4944) 2017-03-13 20:39:42 +01:00
PabstMirror
bda09296ed Fix lost magazines when restoring gunbag mags (#4942) 2017-03-13 20:39:24 +01:00
PabstMirror
1952dc5798 Reload medical configs into extension on save load (#4941) 2017-03-13 20:39:01 +01:00
PabstMirror
2c7a5fee76 Fix setVariablePublic reseting to old values (#4938) 
* Fix setVariablePublic reseting to old values

* Don't drop delay time
 2017-03-13 20:38:41 +01:00
PabstMirror
863d54973d Verify params in atragmx profile gunlist (#4917) 2017-03-13 20:38:12 +01:00
PabstMirror
19e1a1f4c5 Pass map gestures draw by reference (#4914) 2017-03-13 20:37:47 +01:00
PabstMirror
0c479859af Hide earplug actions if setting disabled (#4913) 
* Hide earplug actions if setting disabled

* Add lines that are new
 2017-03-13 20:37:29 +01:00
Mark Ruffner
cd526b7f5e Medical/Repair 3den Toolbox State Fix (Bug fix for #4902) (#4905) 
* Update medical/repair 3den away from missionNamespace

* Simplify save
 2017-03-13 20:37:11 +01:00
Glowbal
5240c225e6 Update CBA required version (#4899) 
* prep v3.9.0

* Update required CBA version
 2017-03-13 20:36:49 +01:00
PabstMirror
f3d6a4d90d Use createSimpleObject to create tags (#4892) 2017-03-13 20:35:39 +01:00
PabstMirror
b0741f48d7 Fix getPos order (#4889) 2017-03-13 20:35:15 +01:00