Commit Graph

6220 Commits

Author SHA1 Message Date
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
Joko
0c099dc4d1 Add 3D Object IVBag Blood, Plasma and Saline with 1000ml, 500ml, 250ml(Made by PaxJaromeMalues)
Add PaxJaromeMalues to AUTHORS
2015-07-04 22:50:32 +02:00
SilentSpike
c09314027f "isNotSpectator" canInteractWith condition 2015-07-04 19:41:18 +01:00
Joko
240b26b9ac Add IRStrobe 3D Object to attach
Add M57 Clacker to explosives
Add New LowPoly Earplug to Hearing
Add WireCutter to logistics_wirecutter
Reduce UAVBattery Texture Size in logistics_uavbattery
Add MapTools to maptools
2015-07-04 19:56:54 +02:00
SilentSpike
975bc229c6 Merge branch 'master' into ace_spectator
Conflicts:
	addons/spectator/stringtable.xml
2015-07-04 18:53:20 +01:00
SilentSpike
97d1553841 Merge pull request #1794 from voiperr/ace_spectator_dev
[ace_spectator] Implement CBA Keybinds
2015-07-04 17:47:14 +01: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
Clon1998
08fecbf1f3 Fixed german translation 2015-07-04 14:30:42 +02:00
Clon1998
93871c4675 Added german translation 2015-07-04 10:01:58 +02:00
voiper
981c961ce1 -Switched to CBA keybinds.
-Localized keybinds.
-Removed fnc_cameraIntro.sqf; superfluous.
-Various code clean ups.
-Changed: Condition for mission end now checks allUnits (todo: change to allPlayers when available).
2015-07-04 01:00:27 -07:00
Clon1998
c61a0f03cd Fixed german translation.
Fixed german translation for Key STR_ACE_Medical_AssignMedicVehicle_EnableList_Description
2015-07-04 09:43:42 +02:00
PabstMirror
ab2ebf5fcf MissleGuidance - Move PARAMS up to top 2015-07-03 21:06:13 -05:00
Nicolás Badano
9d2b147ad7 Merge pull request #1791 from voiperr/ace_spectator_dev
[ace_spectator] Remove last remnants of view distance
2015-07-03 19:02:53 -03:00
voiper
d4b5f88a76 Last remnants of view distance. 2015-07-03 15:00:00 -07: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
SilentSpike
cfadcb1f97 Merge pull request #1789 from voiperr/ace_spectator_dev
[ace_spectator] Remove viewdistance changing
2015-07-03 21:13:33 +01:00
voiper
206a976013 Merge branch 'ace_spectator' into ace_spectator_dev
Conflicts:
	addons/spectator/functions/fnc_camera.sqf
2015-07-03 12:59:47 -07:00
Glowbal
07303633e4 Merge pull request #1692 from acemod/fixVanillaDamageEffectsShowing
Fix vanilla damage effects
2015-07-03 21:41:26 +02:00
voiper
81889aef2d Viewdistance dialogue remove. 2015-07-03 12:23:49 -07:00
voiper
56aa87ce8b Removed view distance changing. 2015-07-03 12:14:41 -07:00
SilentSpike
a23f401695 Removing all references to penPos 2015-07-03 19:07:10 +01:00
SilentSpike
58b1c0f3a9 Solve crashing caused by off map position and disableSimulation to stop underwater issues 2015-07-03 18:44:40 +01: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
PabstMirror
1c6b12126e Merge branch 'master' into mk6-fixBISleveling 2015-07-02 22:03:25 -05: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
ff4fce3950 Initial enter/exit function implementation 2015-07-03 02:16:23 +01:00
SilentSpike
d036639b46 Adding hideUnit functions to ace_common 2015-07-03 02:14:58 +01:00
SilentSpike
91ca532496 Preserve equipment, added comments 2015-07-02 23:43:33 +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
SilentSpike
8c98f98472 Fixed end mission code on server 2015-07-02 16:42:40 +01:00
SilentSpike
eeeb543424 Simplified default pen position assignment 2015-07-02 16:30:37 +01:00
SilentSpike
4df1738b43 Don't move respawn markers
Exit on HC
Only run end mission PFH on server
2015-07-02 16:23:25 +01:00
SilentSpike
3a4a32382d Removed empty stringtables 2015-07-02 15:56:01 +01: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