Commit Graph

4830 Commits

Author SHA1 Message Date
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
jaynus
1f105a9596 Merge remote-tracking branch 'origin/master' into superTime 2015-05-21 09:36:20 -07:00
bux578
4c5f20fa1a shields.io is down atm 2015-05-21 17:12:30 +02:00
bux578
af5b7779b2 version update for readme.md 2015-05-21 17:07:29 +02:00
bux578
4f944bbf04 Merge pull request #1327 from BullHorn7/installation
Docs: Installation guide
2015-05-21 16:57:08 +02:00
Glowbal
a4e5bfff95 Merge pull request #1323 from gienkov/patch-18
Update medical guide
2015-05-21 12:31:06 +02:00
BullHorn
74d146078b Update installation-guide.md - style 2015-05-21 13:22:09 +03:00
BullHorn
1054dc0654 Docs: installation - rename file 2015-05-21 10:44:52 +03:00
Nicolás Badano
72d955bc0c Merge pull request #1328 from alef/master
Fixed: Removed § typo at the end of EH call
2015-05-20 19:01:52 -03:00
Nicolás Badano
e322d5f541 Merge pull request #1331 from kavinsky/fixPathCapitalization
Fixed Capitalized folders on include paths
2015-05-20 18:58:24 -03:00
Kavinsky
4b048553e2 wops... corrected wrong path 2015-05-20 23:44:50 +02:00
Kavinsky
8e9b35c757 Fixed Capitalized folders on include paths 2015-05-20 23:28:10 +02:00
ulteq
7d3bb526dd Merge pull request #1263 from acemod/bulletTraceTweak
Slightly increased the bullet trace effect size
2015-05-20 22:12:37 +02:00
ulteq
149e3ae8b0 Slightly decreased the visibility of the bullet trace effect. 2015-05-20 22:12:02 +02:00
BullHorn
542c606946 Docs: installation - fix url
Replace ACE3 release URL with /latest/
2015-05-20 23:10:22 +03:00
Alessandro Foresi
67319b6808 Fixed: Removed § at the end of EH call 2015-05-20 22:04:19 +02:00
BullHorn
c1d01e8963 Docs: Installation guide
First draft.
Need to add PWS guide
Verify nothing important is missing
2015-05-20 22:01:58 +03:00
jaynus
e6270f6e39 Fixed: Font config breaking checkPBO 2015-05-20 10:42:24 -07:00
KoffeinFlummi
f16f282abd Merge remote-tracking branch 'origin/release' into master-fix
Conflicts:
	addons/medical/functions/fnc_handleDamage.sqf
	extensions/common/p3d/animation.cpp
	extensions/common/p3d/compressed.cpp
	extensions/common/p3d/compressed.hpp
	extensions/common/pbo/archive.cpp
	extensions/common/pbo/search.cpp
	extensions/common/pbo/search.hpp
	extensions/common/shared.hpp
	extensions/common/simplepipe_win32.cpp
	extensions/common/simplepipe_win32.hpp
	extensions/common/simulation/object.cpp
	extensions/common/simulation/object.hpp
	extensions/common/targetver.h
	extensions/common/vector.hpp
2015-05-20 19:31:55 +02:00
PabstMirror
64a401ee8c #1241 closed - Add Editor placeable item 2015-05-20 17:17:10 +02:00
PabstMirror
0d00894d9f #1318 - isInMedicalVehicle - medicClass is number 2015-05-20 17:17:09 +02:00
Garth L-H de Wet
8edeb45d6d Changed the animation from medic to put when placing an explosive. Added a put animation when setting the trigger for an explosive. 2015-05-20 17:17:09 +02:00
esteldunedain
23117db401 - Default viewDistance to video settings - Add 500m and 100m as optional view distances 2015-05-20 17:17:08 +02:00
Grzegorz
96322fe689 PL translation for new advanced ballistics option 2015-05-20 17:17:08 +02:00
esteldunedain
22b83826f0 Bandaid for #1281, until we properly solve unreliable init handlers. 1- Menus for CAManBase are precomputed on preInit 2- Class action menus for all men are supposed to be equal to those of CAManBase Note: we loose the capability of defining actions for specific classes from config (which we don't do on ACE annyway) 2015-05-20 17:15:25 +02:00
Glowbal
694a24c970 Only change the color if bleeding (adv) 2015-05-20 17:15:25 +02:00
Glowbal
0a2679846c Changed: morphine works 15 minutes 2015-05-20 17:15:24 +02:00
Glowbal
e8d169248f Made atropine less effective 2015-05-20 17:15:23 +02:00
Glowbal
82260e5090 Changed: Made Morphine suppress more pain 2015-05-20 17:15:23 +02:00
Glowbal
2b1468db24 Added pain suppression instead of removal 2015-05-20 17:15:22 +02:00
Glowbal
429c85c9f1 fixed missing parameters for non local unit 2015-05-20 17:15:22 +02:00
Glowbal
913c938a9d Added force unconscious parameter #1205 2015-05-20 17:15:21 +02:00
Glowbal
6439bf4e3a Adjusted item mass #1226 2015-05-20 17:15:20 +02:00
Glowbal
808bb6d048 fixes #1195 units do not display injuries
Is caused because the system thinks medical is disabled for basic units, while this obviously is not the case.
2015-05-20 17:15:20 +02:00
Glowbal
104fcdc589 fixes #1155 2015-05-20 17:15:19 +02:00
jaynus
d57b93c1a4 woops. tabs. path. 2015-05-20 17:15:19 +02:00
jaynus
5b5ea907d2 Custom fonts for ACE. 2015-05-20 17:15:18 +02:00
Grzegorz
911c7693b2 Update medical guide
Fix errors, some additions.
2015-05-20 13:18:35 +02:00
ulteq
3a3b2bc1dc Merge pull request #1317 from BullHorn7/proofread
Proofread docs: AB to Explosives
2015-05-20 10:23:18 +02:00
ulteq
10df66f218 Merge pull request #1312 from acemod/scopeIncrement
Elevation and windage can now have different adjustment increments:
2015-05-20 10:20:22 +02:00
ulteq
0d3d4a9bdd Merge pull request #1315 from acemod/abModuleOptionReordering
AB module option reordering
2015-05-20 10:19:42 +02:00
ulteq
c81446400c Grammar 2015-05-20 10:14:10 +02:00
BullHorn
4eeb5a0e6c Docs: fix capital letters
Remove capital letters of first words inside parentheses
fix difficulties.md grammar
2015-05-19 23:56:35 +03:00
BullHorn
37ad56bfa8 Docs: fix typos
Fix a couple more typos
2015-05-19 23:29:33 +03:00
Glowbal
527f89fc32 Merge pull request #1303 from acemod/fixBasicMedPFHSpam
fix for #1297
2015-05-19 22:23:37 +02:00
BullHorn
0b793ccf99 Docs: proofread continues
Perform proofread on all \documentation\feature\ starting from AB till
Explosives.
All mentioned docs are uniform/standardized.
Improve grammar, typos, etc.
2015-05-19 23:15:26 +03:00
BullHorn
1a833101e2 Docs - continue proofreading 2015-05-19 21:54:51 +03:00
ulteq
28c8aba9bd Added missing ! 2015-05-19 20:46:55 +02:00
ulteq
57c37ecb9a Reorder/Rewrite of some advanced ballistics module options:
* alwaysSimulateForSnipers -> simulateForSnipers
* alwaysSimulateForGroupMembers -> simulateForGroupMembers
* onlyActiveForLocalPlayers -> simulateForEveryone
2015-05-19 20:46:13 +02:00
BullHorn
2c8906ece8 Docs: proofreading 1st iteration continued
Continue improving standardization, typos, grammar
Update modules.md Advanced Ballistics according to new module settings
2015-05-19 21:40:00 +03:00