Commit Graph

5742 Commits

Author SHA1 Message Date
SilentSpike
c09314027f "isNotSpectator" canInteractWith condition 2015-07-04 19:41:18 +01: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
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
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
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
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
ff4fce3950 Initial enter/exit function implementation 2015-07-03 02:16:23 +01:00
SilentSpike
91ca532496 Preserve equipment, added comments 2015-07-02 23:43:33 +01: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
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
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
PabstMirror
7eb26c8710 #1699 - Rally point object names 2015-07-01 01:27:06 -05:00
Fadi
acc8a08d52 Cleaning up unnessecary spaces 2015-07-01 00:36:46 -05:00
Fadi
9c2009217b Correcting RHS class inheritence for ace_isbelt 2015-07-01 00:34:49 -05:00
PabstMirror
c58ff8d31d #1736 - Allow moving map while shake effect active 2015-07-01 00:13:55 -05:00
Nicolás Badano
a284cc3f6b Merge pull request #1755 from ToasterBR/master
Translation to Brazilian Portuguese (PT-BR)
2015-06-29 17:22:38 -03:00
jonpas
71609c70e6 Properly moved PNGs and shortened folder tree of extras/assets/icons, Added Thumbs.db to .gitignore 2015-06-29 22:21:07 +02:00
naizarak
75e322e6ae Update fnc_addEarPlugs.sqf
Do not automatically add earplugs to units if combat deafness is disabled.
2015-06-29 12:23:32 -07:00
voiper
0d3601da47 Tiny fix to description. 2015-06-29 09:51:19 -07:00
voiper
3dab207b65 Add Spectator. 2015-06-28 19:34:21 -07:00
jonpas
475e4673eb Fixed typo 2015-06-28 22:28:26 +02:00