Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,128 Commits 73 Branches 88 Tags 752 MiB
e3c09a7099
Commit Graph

5128 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
esteldunedain
5e3b6f389a Reliable settings framework 2015-05-14 20:45:53 -03:00
PabstMirror
a07f6091f1 Merge pull request #1207 from acemod/commongPrivates2 
Common Privates 2
 2015-05-14 18:34:22 -05:00
David
a8da880870 Update captives.md 2015-05-15 02:31:41 +03:00
David
7fe431113c Fix typos/grammar/redundancy 2015-05-15 02:24:53 +03:00
David
94138df4f2 Fix typos/grammar/redundancy 2015-05-15 02:15:54 +03:00
PabstMirror
666db5e245 Fix Typo 2015-05-14 18:13:20 -05:00
David
3313177d64 Fix typos 2015-05-15 02:11:55 +03:00
SilentSpike
60ade8deaa Providing correct parameters 2015-05-15 00:09:03 +01:00
David
049a708464 Fix typos 2015-05-15 02:05:39 +03:00
ulteq
6ca2be5247 Overworked the advanced ballistics documentation 2015-05-15 01:04:57 +02:00
SilentSpike
c458deeae2 End of file newline 2015-05-15 00:02:12 +01:00
esteldunedain
032a2f3778 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into viewdistancetweaks 
Conflicts:
	addons/viewdistance/XEH_postInit.sqf
 2015-05-14 19:54:58 -03:00
SilentSpike
0ca8a373d1 BIS_fnc_ActivateAddons must run during mission init 2015-05-14 23:50:58 +01:00
ulteq
53ab091ffc Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-05-15 00:27:59 +02:00
ulteq
20756ff29a Merge branch 'dharmab-doc-ballistics' 2015-05-15 00:27:05 +02:00
ulteq
2574e517b9 Merge branch 'doc-ballistics' of https://github.com/dharmab/ACE3 into dharmab-doc-ballistics 2015-05-15 00:26:41 +02:00
PabstMirror
8cab041806 Missing Nametag Settings File from #1196 2015-05-14 17:24:37 -05:00
PabstMirror
d5db268fc0 Clean unused privates 2015-05-14 17:17:41 -05:00
PabstMirror
c27d84e382 Common Privates Redo 2015-05-14 17:12:40 -05:00
Nicolás Badano
d9b6636221 Merge pull request #1196 from Winter259/common-cleanup 
Cleanup of nearly all common functions
 2015-05-14 18:31:19 -03:00
Dharma Bellamkonda
fdabce85ac Improve ballistics documenation 
Thanks @ulteq and vking for feedback and help
 2015-05-14 15:30:50 -06:00
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
SAM
b2371b1278 Fixed missing nametags config 2015-05-14 22:21:55 +02: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
esteldunedain
a9197a8e33 Make viewdistance disabable through settings and module 2015-05-14 16:36:12 -03:00
SAM
31adb5a9fc Second batch of settings files 2015-05-14 20:59:25 +02:00
SAM
021679208b First batch of settings files 
Separating ACE_Settings.hpp from config.cpp
 2015-05-14 20:46:35 +02:00
esteldunedain
195643d557 Handle player not existing 2015-05-14 15:24:35 -03:00
esteldunedain
2027a28959 Modify changeViewDistance so: 
- Displays objects distance percentage instead of coeficient
- Only display that if not off
 2015-05-14 15:16:02 -03:00
PabstMirror
3bd856dd4f Merge pull request #973 from acemod/interactionPrivates 
Privates - Interaction
 2015-05-14 13:15:47 -05:00
esteldunedain
7a6fb54654 Small tweaks to viewdistance 2015-05-14 15:15:07 -03:00
SAM
0b6f02f45e Second batch of cleaned up files. 2015-05-14 20:06:06 +02:00
SAM
9b55dd0b57 First batch of cleaned up files 2015-05-14 20:02:42 +02: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
Glowbal
eb2383a6f0 tabs 2015-05-14 18:56:23 +02:00
Glowbal
5756c8530f Ported over handleDamage_wounds 2015-05-14 18:52:12 +02: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
Grzegorz
6cc446e69e Update medical-system.md 2015-05-14 18:16:47 +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
Glowbal
e98c7cd1b7 Made handleDamage a singleton 2015-05-14 17:41:50 +02:00