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
3,422 Commits 73 Branches 88 Tags 752 MiB
cfda0e17c6
Commit Graph

3422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ulteq
9f0388fa12 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 2015-04-14 11:09:38 +02:00
ulteq
1c98b97d1a Merge pull request #355 from acemod/ATragMX 
ATragMX
 2015-04-14 11:08:02 +02:00
ulteq
983a36e52d Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX 2015-04-14 11:06:32 +02:00
ulteq
81c510f230 Merge pull request #449 from acemod/largerScopeaAdjustments 
Scope adjustment overhaul
 2015-04-14 11:05:10 +02:00
ulteq
d931745f5c Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into largerScopeaAdjustments 2015-04-14 11:02:37 +02:00
ulteq
2f39067cb3 Removed TABs 2015-04-14 10:47:09 +02:00
ViperMaul
f422d1059a #572 - We now always build common.pbo to make sure we always display the accurate version number in the RPT. 2015-04-13 18:51:39 -07:00
jaynus
22d90fee9a Begin modelToWorld work. 2015-04-13 16:47:09 -07:00
jaynus
761fef39c8 working save. 2015-04-13 15:34:51 -07:00
commy2
3da3543381 toggle laser vs ir laser 2015-04-14 00:32:09 +02:00
Harakhti
35044fa16b Contribution! 
It feels awkward to add myself on a list.
 2015-04-14 00:06:50 +02:00
Harakhti
e7e46b3b59 Translation: S to W 
That's all I've found so far.
 2015-04-14 00:05:39 +02:00
Harakhti
8bfd915ec4 Translation: N to R 
This was a lot more fun than the previous two were. 12 folders left...
 2015-04-13 23:45:44 +02:00
commy2
c95bd42a19 Merge pull request #548 from acemod/opticsfix 
fix misc issues with optics, fix #537
 2015-04-13 23:22:12 +02:00
ulteq
acc021c11c Replaced TABs and newline braces 2015-04-13 23:10:55 +02:00
Harakhti
1b60a335a5 Translation: J to M 
I feel burned out. This was very specifically long and tedious.
 2015-04-13 23:03:09 +02:00
commy2
b72366f0f6 hide laser beam during day 2015-04-13 22:34:43 +02:00
commy2
ada62fca7d reloading launchers didn't work on remote clients 2015-04-13 21:38:01 +02:00
ulteq
c2ac7fc547 Removed magazines module 2015-04-13 21:37:19 +02:00
ulteq
33a06c5706 Updated stringtable 2015-04-13 21:36:47 +02:00
ulteq
2332f19274 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/magazines/CfgAmmo.hpp
	addons/magazines/CfgMagazines.hpp
	addons/magazines/CfgVehicles.hpp
	addons/magazines/CfgWeapons.hpp
	addons/magazines/newclasses.txt
 2015-04-13 21:35:53 +02:00
ulteq
6f5a03d4e2 Merged Blackpixxel back into the contributor list 2015-04-13 21:33:48 +02:00
ulteq
1073f4e484 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX 
Conflicts:
	AUTHORS.txt
 2015-04-13 21:33:12 +02:00
ulteq
032d745334 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into largerScopeaAdjustments 2015-04-13 21:32:09 +02:00
ulteq
fa88ab484e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 
Conflicts:
	addons/kestrel/stringtable.xml
 2015-04-13 21:31:04 +02:00
Nicolás Badano
db6361a086 Merge pull request #565 from Kllrt/master 
Added another new CZ strings
 2015-04-13 16:25:32 -03:00
ulteq
ea78a6325f Changed the module setting defaults 2015-04-13 21:20:07 +02:00
ulteq
1b2691ff1c Fixed incorrect calculation of the scope adjustment limits 2015-04-13 21:17:30 +02:00
Kllrt
1c611ba2db Added another new CZ strings 2015-04-13 21:15:04 +02:00
ulteq
8edb2d2c49 Complete overhaul of all ammo/magazine and weapon classes: 
*Merged the magazines- into the ballistics module
*Adjusted all magazine class initSpeeds
*Adjusted all weapon class initSpeeds
 2015-04-13 21:08:31 +02:00
commy2
18157414b7 Merge branch '11thmeu-master' 2015-04-13 20:41:46 +02:00
commy2
f4f69deb83 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into 11thmeu-master 2015-04-13 20:22:36 +02:00
commy2
804079cfae manual merge 2015-04-13 20:20:55 +02:00
Nicolás Badano
291b55e17c Merge pull request #563 from meat147/master 
Update AUTHORS.txt
 2015-04-13 15:14:40 -03:00
Pierre (meat)
c9e048e6b3 Update AUTHORS.txt 2015-04-13 20:03:19 +02:00