Commit Graph

3469 Commits

Author SHA1 Message Date
commy2
6d92a0fe88 abort if stuff changes 2015-04-22 21:31:42 +02:00
commy2
f72e171247 work on repairing vehicles 2015-04-22 21:01:22 +02:00
commy2
68749136c9 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into repair 2015-04-22 01:45:35 +02:00
Nicolás Badano
b6d7e12507 Merge pull request #779 from gienkov/master
PL translation fix
2015-04-21 19:25:53 -03:00
commy2
1facca2ba9 fix: missing authors on flares, remove inert duplicate of handgrenade from zeus 2015-04-22 00:24:54 +02:00
Grzegorz
485fd7078f Update stringtable.xml 2015-04-22 00:22:44 +02:00
Nicolás Badano
6e2463b2d5 Merge pull request #802 from acemod/revert-795-fixAuthor
Revert "remove author from items inheriting ACE_ItemCore"
2015-04-21 19:08:33 -03:00
Nicolás Badano
1bfb13abac Revert "remove author from items inheriting ACE_ItemCore" 2015-04-21 19:07:42 -03:00
commy2
d74dfed89b Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into repair 2015-04-21 23:50:02 +02:00
commy2
cfda0e17c6 Merge pull request #788 from acemod/animfix
put weapon on back without having to stand up
2015-04-21 23:40:52 +02:00
ulteq
a886afb7d0 Added a model for the ACE_Box_Ammo 2015-04-21 23:26:38 +02:00
Nicolás Badano
3105cef364 Merge pull request #787 from acemod/interactionHighVisibility
User changeable text/shadow colors for interaction
2015-04-21 17:31:11 -03:00
Nicolás Badano
18bb40b72b Merge pull request #798 from acemod/fixMapAir
Illuminate map for gunner of helicopters. Fixes #558
2015-04-21 16:52:17 -03:00
jaynus
d8d658602f Apply to all aircraft gunner and pilot 2015-04-21 12:50:42 -07:00
jaynus
b2f978da3c Added unstabalized optic mode to comanche for following the chopper. Is the first optic, all other zoom levels are stabalized. Fixes #556 2015-04-21 12:01:30 -07:00
jaynus
08203b26c7 Illuminate map for gunner of helicopters. Fixes #558 2015-04-21 11:58:07 -07:00
Nicolás Badano
ce3cc71869 Merge pull request #795 from acemod/fixAuthor
remove author from items inheriting ACE_ItemCore
2015-04-21 15:08:53 -03:00
Nicolás Badano
421954c829 Merge pull request #794 from Legolasindar/master
updated stringtable for spanish
2015-04-21 15:07:12 -03:00
ViperMaul
c64b4fc230 Merge pull request #792 from acemod/handleUserConfig
Userconfig folder is now properly added to the release folder
2015-04-21 11:02:14 -07:00
bux578
3897b73d56 remove author from items inheriting ACE_ItemCore 2015-04-21 19:16:54 +02:00
PabstMirror
be031801ab #770 - m84 - don't add pain if strength is low 2015-04-21 12:09:58 -05:00
PabstMirror
369357d6cf Merge pull request #793 from acemod/m84MassFix
reduce m84 mass
2015-04-21 12:06:12 -05:00
ViperMaul
e605a8dbca Trimming more trailing spaces #783 2015-04-21 10:05:11 -07:00
Ivan Navarro Cabello
55887b7cfe updated stringtable for spanish
added some spanish translate
2015-04-21 19:03:55 +02:00
ViperMaul
ced0d3d576 Removing extra spaces from the end of line #783 2015-04-21 10:02:56 -07:00
bux578
7b4f451d8a reduce m84 mass
m84 weighs ~260g compared to a m18 with ~520g. Ingame the m18 has a mass
of 4 but giving the m84 a mass of 2 seems odd to me. That's why I've
reduced it from 10 to 4.
2015-04-21 19:00:13 +02:00
commy2
78470d804a insert icon for repair module 2015-04-21 18:34:08 +02:00
commy2
84566f9fe6 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into repair 2015-04-21 18:28:46 +02:00
Legolasindar
b2201c546e Merge pull request #5 from acemod/master
update my master fork
2015-04-21 18:09:16 +02:00
ViperMaul
cebe520513 Userconfig folder is now properly added to the release folder for final distribution.
#783
2015-04-21 08:47:55 -07:00
jaynus
f888dcdb88 Carry & Drag documentation. 2015-04-21 08:22:50 -07:00
ulteq
7c57ad25bd Fixes a recently introduced bug in the relative click memory 2015-04-21 16:54:26 +02:00
ulteq
e22a7e1aad Improved the range card column spacing 2015-04-21 16:01:53 +02:00
ulteq
f69b86d02b Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-21 15:47:01 +02:00
ulteq
c27f3fb131 Added target speed direction switch / Improved the solution result output 2015-04-21 15:46:53 +02:00
ulteq
4833193860 Added a new solution setup menu 2015-04-21 15:01:23 +02:00
bux578
8a55c282e1 add repair module icon 2015-04-21 13:27:45 +02:00
commy2
9e3d9f23a5 add module options 2015-04-21 13:17:09 +02:00
ViperMaul
aabec2aea2 Converting Tabs to Spaces. Confirming UTF-8 2015-04-21 04:02:10 -07:00
commy2
665aa37898 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into repair 2015-04-21 12:41:12 +02:00
ulteq
c24586ce02 Reworked the result output GUI on the main page 2015-04-21 11:53:28 +02:00
ulteq
0cf2374475 Atmospheric Calc Method GUI improvement 2015-04-21 11:43:16 +02:00
ulteq
f98a0cdfae Overworked the scope click number GUI 2015-04-21 11:24:59 +02:00
ulteq
6c4b078dce Updated the default gun profile used for adding new profiles 2015-04-21 09:46:57 +02:00
commy2
616eee6aa4 remove broken launcher anim 2015-04-21 06:22:41 +02:00
commy2
5093307756 experiment with launcher anim 2015-04-21 06:10:30 +02:00
commy2
de660cf45f messing with animations 2015-04-21 05:21:04 +02:00
commy2
5e440686bb put weapon on back without having to stand up 2015-04-21 04:43:24 +02:00
PabstMirror
96be881ea9 User changeable text/shadow colors for interaction 2015-04-20 18:28:01 -05:00
esteldunedain
1fa9ba1cbf Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-20 18:24:50 -03:00