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
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
PabstMirror
b02086ca52
Intersection Check / FOV adjustment
2015-07-01 14:53:59 -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
Nicolás Badano
d06ac6cace
Merge pull request #1771 from acemod/fixRallyPoint
...
Rally point object names
2015-07-01 11:30:32 -03:00
Nicolás Badano
1e8d4327df
Merge pull request #1763 from naizarak/patch-1
...
Update fnc_addEarPlugs.sqf
2015-07-01 11:22:59 -03:00
ulteq
f7a866fa2a
Merge pull request #1770 from FadiCBB/master
...
Correcting RHS class inheritence from my previous PR
2015-07-01 12:45:14 +02:00
PabstMirror
57f88fe77a
Ace_modules - Pass synced objects to functions
2015-07-01 01:53:15 -05:00
