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,481 Commits 73 Branches 88 Tags 752 MiB
c8badaec5d
Commit Graph

3481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jaynus
aad8d6b785 Fixed: max litter scalar array, have internal values. 2015-04-19 09:04:42 -07:00
Tachii
a7d913b80e Update stringtable.xml 2015-04-19 18:54:47 +03:00
Tachii
596fadcba0 ru translations fixes 
Не стоит додумывать правильные значения или то, как вы думаете это должно интерпертироваться. Нужно переводить то, что написано. Как пример Very Light Wounds - это не царапины, это очень лёгкие ранения. Царапины - это scratches
 2015-04-19 18:51:35 +03:00
Tachii
a83925dd2d Update stringtable.xml 2015-04-19 18:43:05 +03:00
ulteq
20740679cc Fixed inconsistent 'workingMemory' initialization 2015-04-19 17:40:49 +02:00
Glowbal
f6bbeb6bd6 switched back to old init method 2015-04-19 17:28:47 +02:00
Glowbal
d1fabf9733 Merge branch 'master' into medicalFixes 2015-04-19 17:26:10 +02:00
Grzegorz Sikora
4283e07942 PL fix 2015-04-19 13:50:08 +02:00
Grzegorz
fe9d495614 Merge pull request #4 from acemod/master 
Update master
 2015-04-19 13:38:31 +02:00
Glowbal
8a7b3a1b33 Removed damage thresholds from basic medical 2015-04-19 13:08:28 +02:00
ulteq
a73c0bc429 Sord is now able to transmit the direction of fire 2015-04-19 12:40:13 +02:00
ulteq
2b5b89604e Removed unused RscControlsGroup 2015-04-19 12:29:26 +02:00
ulteq
f6263e9e8b Overworked the scope click feature: 
*TODO: Add the "Setting Up a Solution for Your Scope" screen
 2015-04-19 12:07:27 +02:00
Glowbal
b71ac1485d Merge branch 'master' into medicalFixes 2015-04-19 12:06:54 +02:00
ulteq
874858ebb4 Added a sanity check to the cycle gun list function 
*Top/Down buttons only cycle the gun list in the main/gun list menu
 2015-04-19 11:43:20 +02:00
ulteq
5195271894 Fixes: https://github.com/acemod/ACE3/commit/4235163 
*The asterix needs to be shown on distances shown in meters not yards
 2015-04-19 11:32:02 +02:00
ulteq
4430e8a0ee Increased the minimum barometric pressure value that is accepted 2015-04-19 11:18:37 +02:00
ulteq
4235163801 Added asterix (*) prefix to distances in yards on the main page 2015-04-19 11:14:18 +02:00
ulteq
de5c5139c0 Moved a private declaration out of the hot path 2015-04-19 11:02:25 +02:00
ulteq
8f20303a08 Fixed a bug in the atmosphere unit conversion 2015-04-19 11:02:06 +02:00
ulteq
336a192302 The range card setup data is now also restored on mission start 2015-04-19 10:57:55 +02:00
ulteq
51590d39ad Cleaned up the ATragMX postInit routine 2015-04-19 10:47:43 +02:00
ruPaladin
d8b96066e6 Rus translation (nametags) 2015-04-19 11:01:41 +03:00
bux578
b6c3cabff9 Merge pull request #765 from ruPaladin/patch-2 
Rus translation (medical)
 2015-04-19 09:56:09 +02:00
ruPaladin
45fd90c6e0 Rus translation (medical) 2015-04-19 10:49:06 +03:00
commy2
c9a2505031 Merge pull request #755 from acemod/fixoptics2 
Fix for PIP scopes, fix #547
 2015-04-19 07:46:41 +02:00
bux578
2dfbd0a5cd Merge pull request #761 from Tachii/patch-16 
Update stringtable.xml
 2015-04-19 07:11:39 +02:00
bux578
daf2fbb906 Merge pull request #760 from Tachii/patch-15 
Update stringtable.xml
 2015-04-19 07:11:27 +02:00
bux578
25ac90ef8b Merge pull request #759 from Tachii/patch-14 
Update stringtable.xml
 2015-04-19 07:11:06 +02:00
bux578
5ed0dfe463 Merge pull request #758 from Tachii/patch-13 
Update stringtable.xml
 2015-04-19 07:10:55 +02:00
bux578
fa8e954d27 Merge pull request #757 from Tachii/patch-12 
Update stringtable.xml
 2015-04-19 07:10:45 +02:00
commy2
275da6f40a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-19 07:09:21 +02:00
commy2
9cb27c8fb2 fix: error when getting killed with FF-messages module, fix #745 2015-04-19 07:08:57 +02:00
bux578
0d86374bee Merge pull request #754 from gienkov/master 
PL translation
 2015-04-19 07:08:54 +02:00
PabstMirror
54c5070569 isNull 2015-04-18 22:23:19 -05:00
jaynus
dccc869a6a Merge pull request #753 from acemod/fixSettingsLocalization 
Fix settings localization is done by the server instead of client
 2015-04-18 20:09:56 -07:00
ViperMaul
fe92110b4d Make sure you build missing files. 
Even if cache says the source files has not changed.
#735
 2015-04-18 19:16:12 -07:00
KoffeinFlummi
65fd6b0937 Merge https://github.com/EpMAK/ACE3 into russian-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/medical/stringtable.xml
	addons/nametags/stringtable.xml
	addons/respawn/stringtable.xml
 2015-04-19 01:04:32 +02:00
KoffeinFlummi
46bd51ffdf Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-19 00:51:33 +02:00
KoffeinFlummi
592e0d2dd3 Merge https://github.com/ruPaladin/ACE3 into russian-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-04-19 00:51:09 +02:00
jaynus
14faabb677 Merge branch 'master' of github.com:acemod/ACE3 2015-04-18 15:44:25 -07:00
jaynus
2fe7122b3e Disable handoff until completed. 2015-04-18 15:44:07 -07:00
commy2
5558a6491d remove weapon select in favor of the new controls from bi 2015-04-19 00:40:29 +02:00
KoffeinFlummi
8015aca0c3 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-19 00:40:18 +02:00
KoffeinFlummi
3aafa2082d Merge https://github.com/nomisum/ACE3 into german-merge 
Conflicts:
	addons/atragmx/stringtable.xml
	addons/scopes/stringtable.xml
	addons/weather/stringtable.xml
 2015-04-19 00:39:44 +02:00
Tachii
e62a476a90 Update stringtable.xml 2015-04-19 01:37:08 +03:00
Tachii
dc2c3e246e Update stringtable.xml 2015-04-19 01:25:30 +03:00
Tachii
8f9796f488 Update stringtable.xml 2015-04-19 01:23:37 +03:00
Tachii
a9d38f5970 Update stringtable.xml 2015-04-19 01:19:32 +03:00
Tachii
560646e1e1 Update stringtable.xml 2015-04-19 01:18:53 +03:00