Commit Graph

4750 Commits

Author SHA1 Message Date
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
ulteq
6e1fba450b Merge pull request #1180 from acemod/atragmxClickMemoryFix
Fixed 'input parsing' corrupting 'relative click memory'
2015-05-14 12:53:04 +02:00
ulteq
7fcaa5bbcf Fixed 'input parsing' corrupting 'relative click memory' 2015-05-14 12:52:48 +02:00
Grzegorz
1f556bb1c4 Some more improvements 2015-05-14 12:44:23 +02:00
Legolasindar
683b06f317 Merge pull request #7 from acemod/master
update my master fork
2015-05-14 12:01:54 +02:00
ulteq
ddbf274c89 ace_ballistics README.md update 2015-05-14 11:23:44 +02:00
Glowbal
d2f05827a1 removed GVAR 2015-05-14 10:11:02 +02:00
Glowbal
3f8e9476dc Settings documentation 2015-05-14 10:08:47 +02:00
Dharma Bellamkonda
bb947c0204 Fix <kbd> tag
Thanks, MDN :/
2015-05-14 01:03:32 -06:00
Dharma Bellamkonda
dd02133472 Use <kbd> tag for keyboard shortcuts 2015-05-14 01:02:25 -06:00
Dharma Bellamkonda
b930dfe6ba Fix typo 2015-05-14 01:00:37 -06:00
Dharma Bellamkonda
1d446c5eba Improve ballistics/advanced ballistics docs 2015-05-13 23:20:36 -06:00
Nicolás Badano
560d6f09a0 Merge pull request #1160 from alef/translation/15bn/alef
Fixed: Safe mode Italian translation
2015-05-13 22:54:10 -03:00
Grzegorz
6b1e7c5030 Medical guide improvements
Mainly based on my community experience with CMS, translated from exact same PL guide.
2015-05-14 03:04:41 +02:00
jaynus
b13d44fb6b Fixed: Litter spawning at huge radius, floating litter over water. Fixes #1112 2015-05-13 17:29:09 -07:00
Josuan Albin
95bcb15779 Documentation pass : typos
fixed some typos and removed some lines that dharmab is going to add.
2015-05-14 00:45:46 +02:00
PabstMirror
72715dd34d Fix RHS_Javelin Comp Path 2015-05-13 17:04:27 -05:00
Alessandro Foresi
8de611d559 Fixed: Safe mode Italian translation 2015-05-13 23:20:33 +02:00
jaynus
cf635d4564 Merge pull request #1129 from usecforce/removeTitanRealisticName
Removed Titan realistic name as it's not implemented yet as a Spike
2015-05-13 13:31:01 -07:00
Dharma Bellamkonda
5c7fd9cf90 Correct module name in documentation 2015-05-13 13:42:14 -06:00
Dharma Bellamkonda
990c5f021b Merge branch 'doc-agm-to-ace' into doc-dependencies
Merging doc branches locally to prevent upstream merge conflicts.
2015-05-13 13:34:57 -06:00
Dharma Bellamkonda
aa0940e180 Document module dependencies
Add a list of dependencies to each module's documentation. Also add a
note to the documenation of modules which are a dependency for many
other modules. Dependency lists are pulled from each module's
config.cpp.
2015-05-13 13:31:53 -06:00
Josuan Albin
ea6f3ad786 Merge pull request #2 from alganthe/documentation
Documentation pass
2015-05-13 21:29:32 +02:00
Josuan Albin
ea157ac0a7 Documentation pass
Documentation improved for
- ai
- aircraft
- attach
- captives
2015-05-13 21:26:51 +02:00
jaynus
021d277b12 Added class. 2015-05-13 12:19:00 -07:00
jaynus
a57ea7dc79 Changed: Enabled ace_javelin to the RHS javelin optionals compat pbo. 2015-05-13 12:18:40 -07:00
Dharma Bellamkonda
fb1c27bdc5 Remove outdated references to AGM in documentation 2015-05-13 12:28:11 -06:00
jaynus
524f622bf4 Rebuilt DLL's for testing. 2015-05-13 11:19:37 -07:00