Dharma Bellamkonda
|
bdc3b20624
|
Merge branch 'master' into doc-ballistics
Merge upstream in to make upstream merge easier
|
2015-05-14 14:31:48 -06:00 |
|
PabstMirror
|
2158f467f4
|
#1171 - Safe get variables if settings not defined
|
2015-05-14 15:29:09 -05:00 |
|
Dharma Bellamkonda
|
ca99b61b62
|
Improve advanced ballistics documenation
Incorporated feedback from @ulteq
|
2015-05-14 14:27:09 -06:00 |
|
PabstMirror
|
03130ab3c9
|
#1187 - canInteractWith was failing vehicle actions
|
2015-05-14 15:00:03 -05:00 |
|
esteldunedain
|
e76db653e8
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2015-05-14 16:56:51 -03:00 |
|
esteldunedain
|
f17c7c12a6
|
Fixed object actions not working
|
2015-05-14 16:56:32 -03:00 |
|
PabstMirror
|
3bd856dd4f
|
Merge pull request #973 from acemod/interactionPrivates
Privates - Interaction
|
2015-05-14 13:15:47 -05:00 |
|
PabstMirror
|
f0b7b34321
|
Cleanup
|
2015-05-14 13:00:56 -05:00 |
|
PabstMirror
|
ec38c8c951
|
Merge branch 'master' into interactionPrivates
Conflicts:
addons/interaction/functions/fnc_addPassengerActions.sqf
addons/interaction/functions/fnc_getDoorAnimations.sqf
addons/interaction/functions/fnc_moduleInteraction.sqf
addons/interaction/functions/fnc_moveDown.sqf
addons/interaction/functions/fnc_removeTag.sqf
addons/interaction/functions/fnc_showMouseHint.sqf
addons/interaction/functions/fnc_updateTooltipPosition.sqf
|
2015-05-14 12:53:18 -05:00 |
|
esteldunedain
|
0b8992a503
|
Small tweaks to viewdistance
|
2015-05-14 14:45:31 -03:00 |
|
esteldunedain
|
32f7854bf6
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into viewdistance
|
2015-05-14 14:09:12 -03:00 |
|
esteldunedain
|
7191778402
|
Merge branch 'viewdistance' of https://github.com/Winter259/ACE3 into viewdistance
|
2015-05-14 14:08:43 -03:00 |
|
jaynus
|
d5a8f21480
|
Merge pull request #1087 from SilentSpike/zeustemp
Added zeus changes module as per #1082
|
2015-05-14 09:32:03 -07:00 |
|
SAM
|
8c7d752fcc
|
Made final adjustments
Centred prompts, fixed erroneous if statement, adjusted function
headers.
|
2015-05-14 18:25:41 +02:00 |
|
SAM
|
3480168e05
|
Integrated new function into module
|
2015-05-14 17:44:35 +02:00 |
|
esteldunedain
|
54325b4591
|
Merge branch 'viewdistance' of https://github.com/Winter259/ACE3 into viewdistance
|
2015-05-14 12:43:47 -03:00 |
|
bux578
|
de4e41ffd5
|
fix duplicate feature entry
|
2015-05-14 17:23:13 +02:00 |
|
SAM
|
853333ac49
|
Added new function, updated settings
|
2015-05-14 17:19:14 +02:00 |
|
SAM
|
7fe73c2c80
|
Added Object View Distance Coefficient setting
|
2015-05-14 17:11:52 +02:00 |
|
SAM
|
d8cce9ece4
|
Removed redundant settings
|
2015-05-14 17:07:20 +02:00 |
|
Nicolás Badano
|
9c216a69c0
|
Merge pull request #1071 from usecforce/interactionCodingGuidelines
Interaction coding guidelines
|
2015-05-14 11:58:17 -03:00 |
|
jonpas
|
5a17b39a7e
|
Merge remote-tracking branch 'origin/master' into interactionCodingGuidelines
Conflicts:
addons/interaction/CfgVehicles.hpp
|
2015-05-14 16:57:49 +02:00 |
|
KoffeinFlummi
|
e5c0caed9d
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-05-14 16:45:28 +02:00 |
|
KoffeinFlummi
|
37500187ba
|
Merge branch 'doc-dependencies' of https://github.com/dharmab/ACE3 into docs-merge
|
2015-05-14 16:44:44 +02:00 |
|
jaynus
|
c08082bef6
|
Merge branch 'master' of github.com:acemod/ACE3
|
2015-05-14 07:42:37 -07:00 |
|
jaynus
|
99c04d0ed3
|
Fixed: shared_ptr vs. unique_ptr behavior in VS2013
|
2015-05-14 07:42:21 -07:00 |
|
ulteq
|
7474d7f313
|
Merge pull request #1193 from acemod/getTemperatureAtHeight
Moved all temperature calculations into the weather module.
|
2015-05-14 16:41:16 +02:00 |
|
ulteq
|
6a0f7343d8
|
Merge pull request #1192 from acemod/persistentKestrelMenu
Made the Kestrel menu persistent
|
2015-05-14 16:41:12 +02:00 |
|
jaynus
|
cac70762f5
|
Merge pull request #1149 from acemod/extBuildFix
Extensions build system updates, changes and crash fixes
|
2015-05-14 07:25:49 -07:00 |
|
Glowbal
|
d42d0ef69d
|
Merge pull request #1164 from acemod/litterFixes
Litter distribution fix and "floating litter over water" fix (medical)
|
2015-05-14 16:17:10 +02:00 |
|
jaynus
|
20bd5957e3
|
Change to execNextFrame.
|
2015-05-14 07:15:52 -07:00 |
|
KoffeinFlummi
|
53bc8ca9e5
|
Change H1s to H2
|
2015-05-14 16:13:04 +02:00 |
|
ulteq
|
cf487b544e
|
Moved all temperature calculations into the weather module.
|
2015-05-14 16:07:41 +02:00 |
|
KoffeinFlummi
|
14ca9f2e4e
|
Merge branch 'documentation-merge'
|
2015-05-14 16:06:29 +02:00 |
|
KoffeinFlummi
|
011570535f
|
Change H2s to H3s
|
2015-05-14 16:04:45 +02:00 |
|
KoffeinFlummi
|
33b94be5ff
|
Insert additional newlines
|
2015-05-14 16:04:20 +02:00 |
|
Glowbal
|
abadf05342
|
Merge remote-tracking branch 'gienkov/module-translations'
Conflicts:
addons/medical/stringtable.xml
|
2015-05-14 16:01:41 +02:00 |
|
esteldunedain
|
5b856e0966
|
Merge branch 'master' into viewdistance
Conflicts:
AUTHORS.txt
|
2015-05-14 10:55:31 -03:00 |
|
esteldunedain
|
4a074d4e31
|
Replace BIS_fnc_sortBy by sort for interact_menu occlusion
|
2015-05-14 10:54:22 -03:00 |
|
Nicolás Badano
|
20e45b6d1e
|
Merge pull request #981 from acemod/makeDisplaysNotDialogs
Interact_menu with cursor: Replace dialogs by displays
|
2015-05-14 10:41:36 -03:00 |
|
Nicolás Badano
|
4e7194174d
|
Merge pull request #989 from acemod/interactionOclusion
Action point oclusion
|
2015-05-14 10:40:54 -03:00 |
|
ulteq
|
a167336b40
|
Made the Kestrel menu persistent
|
2015-05-14 15:39:29 +02:00 |
|
esteldunedain
|
5ef29c2354
|
Merge remote-tracking branch 'origin/master' into interactionOclusion
Conflicts:
addons/interact_menu/functions/fnc_keyDown.sqf
|
2015-05-14 10:39:02 -03:00 |
|
Nicolás Badano
|
2fb317d3bd
|
Merge pull request #1120 from acemod/syncAmmoOnBeltReload
Manually sync ammo globably on belt reload.
|
2015-05-14 10:32:16 -03:00 |
|
KoffeinFlummi
|
a0ae11b761
|
Merge https://github.com/alganthe/ACE3 into documentation-merge
|
2015-05-14 15:21:14 +02:00 |
|
Nicolás Badano
|
dddd571a70
|
Merge pull request #1185 from Legolasindar/master
fixed some spanish translation
|
2015-05-14 09:38:52 -03:00 |
|
Felix Wiegand
|
9e67839f73
|
Merge pull request #1152 from dharmab/doc-agm-to-ace
Remove outdated references to AGM in documentation
|
2015-05-14 14:35:33 +02:00 |
|
Grzegorz
|
ca1ff8382c
|
Tabs fixed
|
2015-05-14 14:33:33 +02:00 |
|
Ivan Navarro Cabello
|
43c5afac55
|
fixed some spanish translation
I fixed some spanish translation.
|
2015-05-14 14:32:35 +02:00 |
|
Glowbal
|
57bac7369d
|
Merge pull request #1177 from acemod/settingsFrameworkDoc
Settings framework documentation
|
2015-05-14 13:17:39 +02:00 |
|