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 |
|
ulteq
|
21c772aa8d
|
Fixed scope adjustment conflicting with vehicle weapon zeroing
|
2015-04-18 23:14:40 +02:00 |
|
ulteq
|
454c6dfbfe
|
Added more GUI elements to structure the ATragMX main page
|
2015-04-18 22:58:23 +02:00 |
|
ulteq
|
ae3dad4f36
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-18 22:12:45 +02:00 |
|
ulteq
|
283388eb7c
|
Fixed a small calculation error in the wind speed output
|
2015-04-18 22:12:37 +02:00 |
|
Glowbal
|
9825d030e3
|
Merge pull request #714 from acemod/localMedicalGarbage
ACE JIP data and event synchronization (Tested with Litter change)
|
2015-04-18 21:25:53 +02:00 |
|
ulteq
|
c950324c75
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-18 21:18:18 +02:00 |
|
ulteq
|
d8b461db91
|
Enabled wind deflection for grenades and vehicle gunners:
*Added a new module option to disable WD for vehicle gunners
*Fixed enabled setting not being initialized
|
2015-04-18 21:17:37 +02:00 |
|
bux578
|
0f2e4c22b7
|
Merge pull request #749 from FreeZbe/master
French: updates / fixes stringtable
|
2015-04-18 21:16:07 +02:00 |
|
bux578
|
1cbd854412
|
Merge pull request #748 from gienkov/patch-6
PL translation fix
|
2015-04-18 21:15:30 +02:00 |
|
jaynus
|
f5705a91e6
|
oops.
|
2015-04-18 12:04:48 -07:00 |
|
jaynus
|
ca74ce721d
|
Use cleanup settings, and force server TTL on the events.
|
2015-04-18 11:48:44 -07:00 |
|
jaynus
|
e54c68f7f9
|
handle cleanup
|
2015-04-18 11:37:06 -07:00 |
|
jaynus
|
852b4df61d
|
Settings changes. createVehicleLocal derp.
|
2015-04-18 11:16:18 -07:00 |
|
jaynus
|
c438d9e790
|
Merge remote-tracking branch 'origin/master' into localMedicalGarbage
|
2015-04-18 11:12:22 -07:00 |
|
jaynus
|
dea95f7947
|
ace_laser_selfdesignate
|
2015-04-18 10:57:35 -07:00 |
|
jaynus
|
8361ec3812
|
ace_lasers
|
2015-04-18 10:57:11 -07:00 |
|
jaynus
|
953faf3d4b
|
ace_missileguidance privates.
|
2015-04-18 10:53:21 -07:00 |
|
jaynus
|
87337bcb7a
|
ace_javelin privates
|
2015-04-18 10:50:22 -07:00 |
|
jaynus
|
11336cdade
|
Merge remote-tracking branch 'origin/master' into guidanceHandoff
|
2015-04-18 10:37:16 -07:00 |
|
jaynus
|
26e2917f79
|
Merge remote-tracking branch 'origin/master' into laserCodes
Conflicts:
addons/javelin/CfgWeapons.hpp
|
2015-04-18 10:36:07 -07:00 |
|
jaynus
|
1d908c2f70
|
Merge pull request #677 from acemod/titanCompat
Titan static & variant compatability with missile guidance
|
2015-04-18 10:32:57 -07:00 |
|
ulteq
|
c1ee623808
|
Added a few static gui elements
|
2015-04-18 19:22:24 +02:00 |
|
jaynus
|
9c076364ec
|
Titan AA asset functionality is now vanilla, locking doesn't override AA/AP stuff.
|
2015-04-18 10:18:33 -07:00 |
|
FreeZbe
|
f55bd5a629
|
French: updates / fixes stringtable
|
2015-04-18 18:49:46 +02:00 |
|
Grzegorz
|
34cf11e022
|
PL translation fix
Did not saw that one
|
2015-04-18 18:48:56 +02:00 |
|
jaynus
|
d1e03d8e7a
|
Slight tweaks.
|
2015-04-18 09:40:46 -07:00 |
|
jaynus
|
e14ee45249
|
debug checking.
|
2015-04-18 09:29:58 -07:00 |
|
ulteq
|
1b578b8835
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-18 17:45:39 +02:00 |
|
ulteq
|
fc39b81c95
|
*Fixed a minor bug in the dual inclination calculation
*Added a profile namespace format version
*The profileNamespace data is now automatically reset on version mismatch
|
2015-04-18 17:45:32 +02:00 |
|
commy2
|
370e6bd9a7
|
maybe fix for #741, Speedlimiter locking vehicle controls
|
2015-04-18 17:42:13 +02:00 |
|
jaynus
|
d1993836ae
|
Cleanup. missing string.
|
2015-04-18 08:40:28 -07:00 |
|
jaynus
|
c5f5b11d31
|
strings.
|
2015-04-18 08:37:21 -07:00 |
|
jaynus
|
f31e3c1fd4
|
litter simulation createVehicleLocal /w temporal network sync.
|
2015-04-18 08:31:03 -07:00 |
|
Nicolás Badano
|
4a76b0e5c9
|
Merge pull request #686 from acemod/modifiableActions
Allow to dynamically modify actions at runtime.
|
2015-04-18 11:24:01 -03:00 |
|
ulteq
|
5e45734cf4
|
Implemented the dual inclination angle input method
|
2015-04-18 15:52:06 +02:00 |
|
ulteq
|
422e175f09
|
Implemented the dual wind speed feature
|
2015-04-18 15:08:54 +02:00 |
|
ulteq
|
4449c99eba
|
Removed debug output
|
2015-04-18 12:13:27 +02:00 |
|
ulteq
|
2a6dcbfbcb
|
Added automatic unit conversion for the target data
|
2015-04-18 12:12:19 +02:00 |
|
ulteq
|
9057edb1e2
|
Added a new module option for wind deflection:
*enabled - true/false
|
2015-04-18 11:10:05 +02:00 |
|
commy2
|
4264f78128
|
player has to put weapon on back before climbing, check if still can climb
|
2015-04-18 10:16:10 +02:00 |
|
commy2
|
fd821de353
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-18 09:27:07 +02:00 |
|
commy2
|
9633547d6b
|
tweak ability to climb
|
2015-04-18 09:26:47 +02:00 |
|
PabstMirror
|
060dc22ad5
|
Merge pull request #721 from acemod/privatesPass1
Privates Var Fixing
|
2015-04-17 23:51:23 -05:00 |
|
PabstMirror
|
d7da259c11
|
Merge pull request #688 from acemod/optionMenuStuff
Option menu stuff
|
2015-04-17 23:49:37 -05:00 |
|
bux578
|
e2185d2d4a
|
Merge pull request #725 from Tachii/patch-9
Update stringtable.xml
|
2015-04-18 06:44:37 +02:00 |
|
bux578
|
a610872863
|
Merge pull request #724 from Tachii/patch-8
Update stringtable.xml
|
2015-04-18 06:44:20 +02:00 |
|
bux578
|
55cd6536a8
|
Merge pull request #727 from Tachii/patch-11
Update stringtable.xml
|
2015-04-18 06:44:05 +02:00 |
|
bux578
|
386802cc16
|
Merge pull request #726 from Tachii/patch-10
Update stringtable.xml
|
2015-04-18 06:42:48 +02:00 |
|
bux578
|
ed242fdea4
|
Merge pull request #723 from Tachii/patch-7
Update stringtable.xml
|
2015-04-18 06:42:39 +02:00 |
|