Commit Graph

5768 Commits

Author SHA1 Message Date
BaerMitUmlaut
1532fe3ced Added spray and animation, eyepos cached 2015-07-10 21:08:49 +02:00
BaerMitUmlaut
0d2db27b17 Merge remote-tracking branch 'upstream/master' into tagging
Conflicts:
	AUTHORS.txt
2015-07-08 19:15:57 +02:00
BaerMitUmlaut
e4f1a41082 Updated model 2015-07-08 18:49:54 +02:00
BaerMitUmlaut
a0202c4429 Config fix 2015-07-07 18:41:46 +02:00
BaerMitUmlaut
1748d23613 Config improvements 2015-07-07 18:34:12 +02:00
BaerMitUmlaut
86fbe3c423 Added myself to contributors 2015-07-07 17:31:40 +02:00
BaerMitUmlaut
7eb7722d73 Added readme 2015-07-07 17:30:13 +02:00
BaerMitUmlaut
150f888d85 Removed dummy model for now 2015-07-07 17:22:36 +02:00
BaerMitUmlaut
fbb066d291 Added interaction and item 2015-07-07 16:10:21 +02:00
BaerMitUmlaut
22a4e213ac Added function headers, removed debug stuff 2015-07-07 16:10:00 +02:00
BaerMitUmlaut
22dfeef850 Tagging initial commit 2015-07-07 01:40:32 +02:00
SilentSpike
86a8fb0b64 Merge pull request #1800 from jokoho48/ImproveNametags
Small Improvement in Nametags
2015-07-04 23:27:10 +01:00
Joko
815365fd2e Small Performace Improvement in Nametags 2015-07-04 23:03:16 +02:00
SilentSpike
19c16b1f59 Comment out dev branch command 2015-07-04 17:40:23 +01:00
bux578
e56f022f5b Fix anchor link in documentation 2015-07-04 16:21:59 +02:00
bux578
fcb6383337 remove some empty xml nodes 2015-07-04 16:19:53 +02:00
bux578
7cf458fb48 Merge pull request #1797 from ProfessorCZ/master
Czech Translation - Update
2015-07-04 16:13:50 +02:00
ProfessorCZ
89a9218e59 CZ Translation - Update 2015-07-04 15:56:00 +02: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
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
Glowbal
07303633e4 Merge pull request #1692 from acemod/fixVanillaDamageEffectsShowing
Fix vanilla damage effects
2015-07-03 21:41:26 +02: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
Nicolás Badano
8052dd8ea3 Merge pull request #1782 from gienkov/pl-translation
PL translation
2015-07-02 23:06:13 -03:00
Nicolás Badano
40b780220e Merge pull request #1783 from acemod/hideUnit
Adding hideUnit functions to ace_common
2015-07-02 23:05:18 -03:00
SilentSpike
d036639b46 Adding hideUnit functions to ace_common 2015-07-03 02:14:58 +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
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
Nicolás Badano
cabddf89b7 Merge pull request #1007 from acemod/userActionPrototype
Add Actions to buildings (UserActions - Ladders)
2015-07-01 18:11:38 -03:00
PabstMirror
89305473a2 Add performance note. 2015-07-01 15:50:14 -05:00
Nicolás Badano
6157deb904 Merge pull request #1776 from SzwedzikPL/rhs_compat
RHS Headgear compat to hearing
2015-07-01 17:42:45 -03:00
SzwedzikPL
46e51f6788 rhs headgear compat 2015-07-01 22:25:19 +02:00
PabstMirror
5e80f9d8d3 Merge branch 'master' into userActionPrototype 2015-07-01 15:04:40 -05:00
Nicolás Badano
790d8d404e Merge pull request #1773 from alganthe/documentation_pass_8
Documentation pass 8
2015-07-01 16:34:45 -03:00
Nicolás Badano
6cfaba04cb Merge pull request #1775 from SzwedzikPL/hearing_headgear
Headgear influence on hearing
2015-07-01 16:32:14 -03:00
SzwedzikPL
6b4eeedbad headgear influence on hearing 2015-07-01 21:21:09 +02:00
Josuan Albin
d1187ad82e Documentation pass 8
- Finished: MicroDAGR doc, note that the images can't be viewed properly on GitHub.
- Coding guidelines are more readable now, added the STRING family of macros to it.
- How to enable dragging / carrying added to dragging / carrying framework with a BIG disclaimer that the functions are not public and may change.
- Shortcut updated to fit the convention established in the shortcut page.
2015-07-01 21:19:26 +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
Nicolás Badano
e01ff79e41 Merge pull request #1759 from jonpas/addEarplugsEnhancement
Exit addEarplugs if earplugs are used
2015-07-01 12:48:14 -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
86b9174b6c Merge pull request #1764 from jonpas/extrasCleanup
Organized extras/assets/icons, Added Thumbs.db to .gitignore
2015-07-01 11:33:26 -03: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