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 |
|
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 |
|
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 |
|
jaynus
|
0bfd084024
|
extensions recompiled
|
2015-04-18 14:54:32 -07:00 |
|
jaynus
|
b3b172e13b
|
drop bad docs.
|
2015-04-18 14:46:01 -07:00 |
|
jaynus
|
41bd3cb6f5
|
documented synchronized events.
|
2015-04-18 14:43:22 -07:00 |
|
esteldunedain
|
8b389949bc
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2015-04-18 18:42:11 -03:00 |
|
esteldunedain
|
bce0d84989
|
Fix interact menu object ordering
|
2015-04-18 18:41:36 -03:00 |
|
jaynus
|
43e287dc0f
|
Added PlayerJIP event.
|
2015-04-18 14:41:17 -07:00 |
|
jaynus
|
365d6c81c4
|
Update javelin.md
Small description update just so something is here.
|
2015-04-18 14:39:51 -07:00 |
|
jaynus
|
9618fefa67
|
Merge pull request #384 from acemod/fixmass
fix falling over static weapons
|
2015-04-18 14:36:20 -07:00 |
|
jaynus
|
a428abea84
|
Merge pull request #711 from usecforce/wiki-wording
Wiki wording
|
2015-04-18 14:24:31 -07: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 |
|
PabstMirror
|
43dee5643f
|
Python3 compatibility: parentheses for print
|
2015-04-18 13:20:10 -05: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 |
|
Glowbal
|
54a70f26b1
|
Moved to own function.
|
2015-04-18 20:06:01 +02:00 |
|
Glowbal
|
85e5293c37
|
Fix settings localization is done by the server instead of client #744
|
2015-04-18 19:59:41 +02:00 |
|
jaynus
|
952666ab90
|
Merge pull request #752 from acemod/jaynusPrivates
Jaynus privates
|
2015-04-18 10:59:26 -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
|
34b62a0a86
|
Print privates declaration for file.
|
2015-04-18 10:50:16 -07:00 |
|
jaynus
|
d80d340eaf
|
Merge pull request #710 from acemod/guidanceHandoff
Guidance handoff
|
2015-04-18 10:37:40 -07:00 |
|
jaynus
|
11336cdade
|
Merge remote-tracking branch 'origin/master' into guidanceHandoff
|
2015-04-18 10:37:16 -07:00 |
|
jaynus
|
364c270f58
|
Merge pull request #709 from acemod/laserCodes
Laser codes
|
2015-04-18 10:36:51 -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 |
|