Commit Graph

11513 Commits

Author SHA1 Message Date
BaerMitUmlaut
54291b3b3b Renamed menu to gui, moved more gui stuff into it 2017-04-01 20:45:05 +02:00
BaerMitUmlaut
676c9a5451 Added seperate status component 2017-04-01 20:41:45 +02:00
BaerMitUmlaut
3840cbdac4 Renamed UI to feedback 2017-04-01 20:31:19 +02:00
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
Laid3acK
3291059621 Wiki scope updated (#5028)
* Update scopes.md

* Update scopes.md

* Update scopes.md

* Add files via upload

* Update scopes.md

* fix links and `alt` texts
2017-03-25 10:49:46 -05:00
Laid3acK
10168e9e90 Wiki Kestrel 4500 updated (#5027)
* Update kestrel4500.md

* Update kestrel4500.md

* Update kestrel4500.md

* Update kestrel4500.md

* Update kestrel4500.md

* Update kestrel4500.md

* Update kestrel4500.md

* fix links and `alt` texts
2017-03-25 10:49:14 -05:00
Laid3acK
24fd37c9a6 Wiki Advanced Ballistics updated (#5030)
* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Add files via upload

* Update advanced-ballistics.md

* fix links and `alt` texts
2017-03-25 10:48:35 -05:00
Laid3acK
b5030d90b7 Wiki range card updated (#5029)
* Update rangecard.md

* Update rangecard.md

* Update rangecard.md

* Add files via upload

* Update rangecard.md

* fix links and `alt` texts
2017-03-25 10:47:11 -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
bux
ec9e4e952d update user url 2017-03-20 08:06:09 +01:00
bux
5ec665c3a6 Merge pull request #5006 from J3aLeiNe/master
AB: AtragMx wiki updated bis
2017-03-20 07:55:23 +01:00
simpo
c162739d4f Translation: Missing 3 strings in Polish (#5008) 2017-03-19 23:37:36 -05:00
J3aLeiNe
d8cdbcdbc9 Add files via upload 2017-03-19 11:37:44 +01:00
J3aLeiNe
720f6a1ed2 Delete atragmx1.jpg 2017-03-19 11:36:23 +01:00
J3aLeiNe
70aa0e0676 Update atragmx.md 2017-03-19 11:35:37 +01: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
eb963f20f5 Update publish.py for RHS Gref Compat (#4999) 2017-03-18 08:53:56 -05:00
J3aLeiNe
a5cb451f76 AB : AtragMx wiki updated (#4982)
* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md

* Add files via upload

* Update atragmx.md

* Update atragmx.md

* Update atragmx.md
2017-03-18 13:37:36 +01: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
bux
70b9f6fe99 Merge pull request #4990 from acemod/fix-cookoff-desynch
Fix cookoff desync
2017-03-15 09:06:10 +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