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
4,420 Commits 73 Branches 88 Tags 752 MiB
85b99ad626
Commit Graph

4420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KoffeinFlummi
e7807c009f Use playerInventoryChanged instead of Take 
This makes sure to also fire when other mods, like TFAR (when adding
backpacks) add items via script.
 2015-04-14 21:28:18 +02:00
Glowbal
af255604ac Switched to event based sync system for open wounds 2015-04-14 21:17:36 +02:00
ViperMaul
f9630f3a1c Merge pull request #582 from acemod/build_check_for_obsolete_pbos 
Added Obsolete PBO removal support added to build.py
 2015-04-14 12:01:46 -07:00
jaynus
2f2eab87e2 Merge branch 'master' of github.com:acemod/ACE3 2015-04-14 11:42:38 -07:00
jaynus
739807303b Fix script error for canceling designation and dying while designating. 2015-04-14 11:42:26 -07:00
KoffeinFlummi
71b19b4621 Remove duplicate bleeding code 2015-04-14 20:40:38 +02:00
KoffeinFlummi
ba377dfd3a Show seperate message for "scratches"; localize 2015-04-14 20:40:17 +02:00
KoffeinFlummi
c6118901b4 Merge branch 'master' into basic-medical-tweaks 2015-04-14 20:35:17 +02:00
KoffeinFlummi
7ca36cdb65 Always show wounds, even for very low damage 2015-04-14 20:28:19 +02:00
KoffeinFlummi
a4c93ab2e2 Add seperate crates for basic and advanced 2015-04-14 20:28:00 +02:00
KoffeinFlummi
c379f2775e Style fixes 2015-04-14 20:27:42 +02:00
jaynus
0ae27d16c5 Merge pull request #580 from acemod/seeker_fov 
Seeker FOV check optimizations
 2015-04-14 11:19:00 -07:00
jaynus
24830f815f random lock interval was causing phasing. 2015-04-14 11:18:16 -07:00
ulteq
cf7caf4549 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-14 20:18:03 +02:00
ulteq
837f155ad7 Fixed incorrect key handler return value 2015-04-14 20:17:54 +02:00
Nicolás Badano
5a84e65128 Merge pull request #581 from meat147/patch-1 
Update AUTHORS.txt
 2015-04-14 15:12:08 -03:00
Pierre (meat)
c76abbe98a Update AUTHORS.txt 
blackpixxel was twice listed
 2015-04-14 19:57:23 +02:00
ViperMaul
db890f3b48 #576 - Obsolete PBO removal support added to build.py 2015-04-14 10:52:30 -07:00
jaynus
1dd41a00ba integration. 2015-04-14 10:51:53 -07:00
jaynus
226312c504 Merge remote-tracking branch 'origin/master' into seeker_fov 
Conflicts:
	addons/missileguidance/functions/fnc_checkSeekerAngle.sqf
 2015-04-14 10:47:40 -07:00
jaynus
511ca860e0 Merge pull request #579 from acemod/moreJavelinLockingFixes 
More javelin locking + UI fixes
 2015-04-14 10:40:51 -07:00
jaynus
fb5b524023 Loosen DAGR curve 2015-04-14 10:39:00 -07:00
jaynus
f0940707be Disable locking on unloaded. Closes #539 2015-04-14 10:27:37 -07:00
jaynus
6f3ce27894 Javelin refined, working, locking fixes, UI fixes, missile guidance rewrite 2015-04-14 10:25:08 -07:00
jaynus
c436541f1c Reworked, fun fun. 2015-04-14 09:36:39 -07:00
jaynus
376f924999 Finish guidance rewrite. 2015-04-14 08:24:13 -07:00
nomisum
128a6f3e0f added myself to authors.txt 2015-04-14 16:09:04 +02:00
Grzegorz
bef637cb22 Merge pull request #3 from acemod/master 
Update original
 2015-04-14 15:25:48 +02:00
Nicolás Badano
a93cb310d4 Merge pull request #513 from acemod/mainCleanup 
ACE_Main major cleanup
 2015-04-14 10:25:14 -03:00
esteldunedain
c827c72412 AB and Kestrel: Move macros from defines.h to script_component 2015-04-14 10:22:26 -03:00
KoffeinFlummi
57c526c04d Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-14 15:12:46 +02:00
KoffeinFlummi
c1fccecb21 Merge branch 'patch-4' of https://github.com/ruPaladin/ACE3 into russian-merge 2015-04-14 15:12:24 +02:00
Nicolás Badano
85d253cdc1 Merge pull request #574 from gienkov/master 
Advanced Ballistics PL translation
 2015-04-14 10:10:59 -03:00
KoffeinFlummi
b563bf8a8e Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge 2015-04-14 15:04:42 +02:00
KoffeinFlummi
63fe4118d4 Merge https://github.com/FreeZbe/ACE3 into french-merge 2015-04-14 14:48:13 +02:00
commy2
ea7659a36e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-14 13:36:02 +02:00
commy2
f89e02a5ca fix no laser in ffv slots 2015-04-14 13:24:17 +02:00
commy2
83ce3fa2bd remove drawline3d 2015-04-14 13:14:37 +02:00
ulteq
994071960c Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-14 12:52:30 +02:00
ulteq
1a39005e72 Removed debug output. 2015-04-14 12:52:21 +02:00
KoffeinFlummi
96319c8799 Merge https://github.com/ruPaladin/ACE3 into russian-merge 2015-04-14 12:50:14 +02:00
Coren4
83c8abb3ba Update stringtable.xml 2015-04-14 12:41:35 +02:00
ulteq
44232987b0 Commented out deprecated icon paths 2015-04-14 12:34:27 +02:00
ulteq
3d558f376f Fixed some icon path names 2015-04-14 12:16:29 +02:00
Grzegorz Sikora
1be197728e AdvBal PL translation 2015-04-14 11:42:52 +02:00
Grzegorz Sikora
d94f89da10 Merge branch 'master' of https://github.com/gienkov/ACE3 2015-04-14 11:31:38 +02:00
ulteq
5f5820039e Merge pull request #373 from acemod/Kestrel4500 
Kestrel4500
 2015-04-14 11:14:38 +02:00
ulteq
864a3c3cda Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 
Conflicts:
	addons/weather/XEH_postInit.sqf
 2015-04-14 11:14:27 +02:00
ulteq
5a7078ad2c Removed a deprecated workaround 2015-04-14 11:12:58 +02:00
ulteq
3fc539bdf3 Merge pull request #320 from acemod/AdvancedBallistics 
AdvancedBallistics
 2015-04-14 11:11:46 +02:00