jaynus
|
717d7c874f
|
Data chunking. Feature complete.
|
2015-05-02 15:28:40 -07:00 |
|
KoffeinFlummi
|
e918e1d661
|
Merge https://github.com/ruPaladin/ACE3 into russian-merge
Conflicts:
addons/interaction/stringtable.xml
addons/medical/stringtable.xml
|
2015-05-02 23:43:33 +02:00 |
|
KoffeinFlummi
|
d0c7fce7f3
|
Merge https://github.com/adam3adam/ACE3 into czech-merge
Conflicts:
addons/interaction/stringtable.xml
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
|
2015-05-02 23:29:45 +02:00 |
|
esteldunedain
|
8d92d9cc7d
|
Add ace_clipboard to ACE_Extensions
|
2015-05-02 18:25:35 -03:00 |
|
KoffeinFlummi
|
298e1d88bd
|
Merge branch 'hu-catchup' of https://github.com/Harakhti/ACE3 into hungarian-merge
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/laser/stringtable.xml
addons/medical/stringtable.xml
addons/respawn/stringtable.xml
|
2015-05-02 23:17:39 +02:00 |
|
commy2
|
f44aaee7c7
|
also in cursor mode
|
2015-05-02 23:02:40 +02:00 |
|
commy2
|
0fd783082d
|
don't close menu when no action is selected
|
2015-05-02 22:53:23 +02:00 |
|
esteldunedain
|
233ca37219
|
Export settings to clipboard using ace_clipboard. Deprecate exporting through diag_log
|
2015-05-02 17:52:37 -03:00 |
|
ulteq
|
e6187adfc7
|
Removed a trailing space
|
2015-05-02 22:09:38 +02:00 |
|
ulteq
|
b5ec13b992
|
Fixed some inconsistencies in the stringtable
|
2015-05-02 22:07:25 +02:00 |
|
Felix Wiegand
|
7678919e8d
|
Merge pull request #982 from ToasterBR/master
Translation to Portuguese
|
2015-05-02 21:40:14 +02:00 |
|
Harakhti
|
6c2717be7f
|
More more translations
Stope.
|
2015-05-02 18:06:01 +02:00 |
|
jaynus
|
980be9f55b
|
Merge pull request #972 from acemod/javFixInheritanceCheck
Javelin - Fix configProperties
|
2015-05-02 08:50:18 -07:00 |
|
adam3adam
|
05a6389acd
|
Czech translation v2
mk6mortar and some medical translation
|
2015-05-02 12:46:28 +02:00 |
|
ruPaladin
|
219735611f
|
interaction2
|
2015-05-02 12:47:06 +03:00 |
|
ruPaladin
|
3aad0904cd
|
medical2
|
2015-05-02 12:45:27 +03:00 |
|
ruPaladin
|
3b6e491f5c
|
interaction
|
2015-05-02 12:42:44 +03:00 |
|
ruPaladin
|
ca03637a54
|
medical
|
2015-05-02 12:42:02 +03:00 |
|
FreeZbe
|
66f39fc1dc
|
French : update / fix stringtable
|
2015-05-02 10:12:28 +02:00 |
|
ToasterBR
|
021b00c722
|
Translation to Portuguese
Done all remaining portuguese translations, including some minor
corrections
|
2015-05-02 03:38:53 -03:00 |
|
PabstMirror
|
436e50411a
|
Medical - Fix Uncon PFEH argument changes
|
2015-05-01 22:42:43 -05:00 |
|
Felix Wiegand
|
4dce2b8841
|
Merge pull request #978 from licht-im-Norden87/patch-7
Added german strings to interaction
|
2015-05-02 04:08:37 +02:00 |
|
licht-im-Norden87
|
f93ac12807
|
Added german strings to laser
|
2015-05-02 03:28:54 +02:00 |
|
licht-im-Norden87
|
106f2ab89b
|
Added german strings to interaction
|
2015-05-02 03:25:28 +02:00 |
|
Dimas
|
b350d234e2
|
Addes spanish translation
Added spanish translation for three strings. Did it manually here.
|
2015-05-02 02:44:39 +02:00 |
|
esteldunedain
|
b8d8aeae5c
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2015-05-01 20:32:51 -03:00 |
|
esteldunedain
|
be07fd2c82
|
Avoid ACE_Comanche_Test from showing on Zeus. #943
|
2015-05-01 20:32:20 -03:00 |
|
Grzegorz
|
c9cf1d2455
|
Update CfgVehicles.hpp
another typo few lines below
|
2015-05-02 01:26:54 +02:00 |
|
Grzegorz
|
5b9e6de6f1
|
Update CfgVehicles.hpp
missing "s"
|
2015-05-02 01:21:49 +02:00 |
|
PabstMirror
|
ce1255bb2f
|
Fix configProperties
|
2015-05-01 17:56:04 -05:00 |
|
KoffeinFlummi
|
97a9bffe98
|
Set version number to 3.0.0.2
|
2015-05-02 00:49:43 +02:00 |
|
ulteq
|
4239772ce9
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-05-02 00:36:34 +02:00 |
|
ulteq
|
884da7742e
|
Disabled AB terrain init, if AB is not enabled
|
2015-05-02 00:36:23 +02:00 |
|
Felix Wiegand
|
07ec7b96c4
|
Merge pull request #954 from acemod/medicalFixVehAnimation
Medical fix veh animation
|
2015-05-02 00:35:13 +02:00 |
|
KoffeinFlummi
|
f1ba0cff26
|
Merge https://github.com/ProfessorCZ/ACE3 into czech-merge
Conflicts:
AUTHORS.txt
addons/advanced_ballistics/stringtable.xml
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/respawn/stringtable.xml
|
2015-05-02 00:26:25 +02:00 |
|
KoffeinFlummi
|
e05f1b557a
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-05-02 00:19:39 +02:00 |
|
KoffeinFlummi
|
debfe990e8
|
Fix duplicates
|
2015-05-02 00:19:10 +02:00 |
|
KoffeinFlummi
|
13b99ed53f
|
Merge https://github.com/adam3adam/ACE3 into czech-merge
Conflicts:
AUTHORS.txt
addons/interact_menu/stringtable.xml
|
2015-05-02 00:17:01 +02:00 |
|
Lukas
|
1d3f5cc312
|
Czceh translation
|
2015-05-02 00:04:50 +02:00 |
|
Felix Wiegand
|
f16e02b003
|
Merge pull request #959 from licht-im-Norden87/patch-6
Update Stringtable: missileguidance
|
2015-05-02 00:03:13 +02:00 |
|
Grzegorz
|
c1d87f2a75
|
PL translation
interaction
|
2015-05-01 23:50:27 +02:00 |
|
Felix Wiegand
|
a211bcfacf
|
Merge pull request #689 from acemod/group
Reword the group action names
|
2015-05-01 23:30:10 +02:00 |
|
Tachii
|
60c02f4051
|
added 2 missing ru strings
|
2015-05-02 00:21:00 +03:00 |
|
FreeZbe
|
6f5e64b4a5
|
French : update / fix stringtable
|
2015-05-01 23:10:06 +02:00 |
|
FreeZbe
|
7e12c97317
|
French : update / fix stringtable
|
2015-05-01 23:09:09 +02:00 |
|
FreeZbe
|
d1da3a82d7
|
French : update / fix stringtable
|
2015-05-01 23:08:36 +02:00 |
|
Felix Wiegand
|
58a67a2f77
|
Merge pull request #962 from gienkov/patch-10
PL translation
|
2015-05-01 22:51:36 +02:00 |
|
KoffeinFlummi
|
cc627b4a92
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-05-01 22:50:11 +02:00 |
|
Dimaslg
|
339cd8febd
|
Add spanish translation for removing tournis
|
2015-05-01 22:49:52 +02:00 |
|
Glowbal
|
937b20f551
|
Merge branch 'master' of github.com:acemod/ACE3
|
2015-05-01 22:49:24 +02:00 |
|
Glowbal
|
09a0158fa4
|
This should not be 1
|
2015-05-01 22:49:13 +02:00 |
|
Grzegorz
|
3b321c7bf2
|
PL translation
laser
|
2015-05-01 22:46:51 +02:00 |
|
KoffeinFlummi
|
a002c796da
|
Merge branch 'patch-9' of https://github.com/gienkov/ACE3 into polish-merge
Conflicts:
addons/medical/stringtable.xml
|
2015-05-01 22:46:49 +02:00 |
|
KoffeinFlummi
|
d8299332e4
|
Merge branch 'master' of https://github.com/acemod/ACE3
Conflicts:
addons/respawn/stringtable.xml
|
2015-05-01 22:44:42 +02:00 |
|
KoffeinFlummi
|
fb807cbb86
|
Merge branch 'master' into spanish-merge
Conflicts:
addons/interact_menu/stringtable.xml
addons/respawn/stringtable.xml
|
2015-05-01 22:44:10 +02:00 |
|
Dimaslg
|
6f2caec6ec
|
Last touches to Spanish translation
|
2015-05-01 22:42:09 +02:00 |
|
bux578
|
1a946acc30
|
German Translation / Typo
|
2015-05-01 22:33:26 +02:00 |
|
Grzegorz
|
8828704e76
|
PL translation
STR_ACE_Medical_RemovingTourniquet
|
2015-05-01 22:32:53 +02:00 |
|
Glowbal
|
0a300f3385
|
Merge pull request #960 from acemod/medicalMissingProgressText
Added missing progress bar display text
|
2015-05-01 22:31:41 +02:00 |
|
Glowbal
|
e8ccddfc2c
|
Added missing progress bar display text
|
2015-05-01 22:29:52 +02:00 |
|
adam3adam
|
f5303d455c
|
Translation of some stuff into czech language
adv. ballistics, atragmx, interaction menu, kestrel4500, laser pointer
and little part of medical
|
2015-05-01 22:23:03 +02:00 |
|
PabstMirror
|
bded34fa23
|
I suck at git
redo reverted stuff here
|
2015-05-01 15:03:05 -05:00 |
|
licht-im-Norden87
|
5e8096f29c
|
Update Stringtable: missileguidance
|
2015-05-01 21:29:49 +02:00 |
|
PabstMirror
|
e67e15c3fa
|
Merge branch 'master' into medicalFixVehAnimation
Conflicts:
addons/common/functions/fnc_getDeathAnim.sqf
addons/common/functions/fnc_loadPersonLocal.sqf
|
2015-05-01 14:29:21 -05:00 |
|
licht-im-Norden87
|
d12c7ff048
|
Update Stringtable: Rallypoint
Angleichung
|
2015-05-01 21:25:39 +02:00 |
|
KoffeinFlummi
|
c9ff497c83
|
Merge branch 'master' into polish-merge
Conflicts:
addons/respawn/stringtable.xml
|
2015-05-01 21:13:36 +02:00 |
|
Felix Wiegand
|
90275b272e
|
Merge pull request #950 from Tachii/patch-19
Added few missing ru strings
|
2015-05-01 21:11:37 +02:00 |
|
Felix Wiegand
|
b0094ff8e6
|
Merge pull request #949 from Tachii/patch-18
added 1 RU string
|
2015-05-01 21:11:17 +02:00 |
|
Felix Wiegand
|
3d45a26334
|
Merge pull request #957 from evromalarkey/master
Few Czech strings
|
2015-05-01 21:07:27 +02:00 |
|
jaynus
|
2bd0acb621
|
Revert "GetDeathAnim"
This reverts commit 0f736ae684.
|
2015-05-01 12:00:38 -07:00 |
|
jaynus
|
6603806c77
|
Revert "Save and replay valid awake animations"
This reverts commit 8d1ac26e24.
|
2015-05-01 12:00:21 -07:00 |
|
jaynus
|
c1ba4966f9
|
Test confirm no bouncy.
|
2015-05-01 11:53:55 -07:00 |
|
Lubomír Blažek
|
dcb3196e58
|
Czech strings
|
2015-05-01 20:52:41 +02:00 |
|
jaynus
|
5bf763a08e
|
quote, not var.
|
2015-05-01 11:47:49 -07:00 |
|
Tachii
|
bed298d5b3
|
Update stringtable.xml
|
2015-05-01 21:38:05 +03:00 |
|
jaynus
|
2ed05ed469
|
Merge remote-tracking branch 'origin/master' into laserCodeSelection
|
2015-05-01 11:35:11 -07:00 |
|
jaynus
|
dcf4f3b53e
|
Resolved. Conflicts:
addons/missileguidance/functions/fnc_onFired.sqf
|
2015-05-01 11:35:03 -07:00 |
|
jaynus
|
dfbfb4ace2
|
Laser code selection, hotkeys and locking. Turrets & designator, and gunner. Closes #751
|
2015-05-01 11:31:37 -07:00 |
|
Glowbal
|
e1d0ac4b9e
|
Added author
|
2015-05-01 20:16:34 +02:00 |
|
PabstMirror
|
d8a6dd1bbd
|
Stuff
|
2015-05-01 12:58:56 -05:00 |
|
Tachii
|
66eda924ac
|
Update stringtable.xml
|
2015-05-01 20:48:37 +03:00 |
|
Glowbal
|
722c459c1e
|
added APL pbo
|
2015-05-01 19:37:17 +02:00 |
|
Grzegorz
|
7e87c3a250
|
Update stringtable.xml
|
2015-05-01 19:32:59 +02:00 |
|
Grzegorz
|
e36fbe9da7
|
Update stringtable.xml
|
2015-05-01 19:32:43 +02:00 |
|
Grzegorz Sikora
|
4668869959
|
PL translation
|
2015-05-01 19:30:30 +02:00 |
|
Tachii
|
b1a23fd3c7
|
Update stringtable.xml
|
2015-05-01 20:29:57 +03:00 |
|
Tachii
|
43dea56ae6
|
Update stringtable.xml
|
2015-05-01 20:29:00 +03:00 |
|
Tachii
|
66818e0a74
|
Update stringtable.xml
|
2015-05-01 20:26:05 +03:00 |
|
Tachii
|
889275091e
|
Update stringtable.xml
|
2015-05-01 20:24:13 +03:00 |
|
Tachii
|
1771b61578
|
added 2 missing ru strings
|
2015-05-01 20:23:05 +03:00 |
|
Tachii
|
43655d0cec
|
Update stringtable.xml
|
2015-05-01 20:18:51 +03:00 |
|
Tachii
|
caf301ac99
|
Update stringtable.xml
Added 1 RU string
|
2015-05-01 20:15:35 +03:00 |
|
PabstMirror
|
8d1ac26e24
|
Save and replay valid awake animations
|
2015-05-01 12:12:13 -05:00 |
|
Glowbal
|
80162627ec
|
Fixed spelling of enableUnconsciousnessAI
|
2015-05-01 18:49:59 +02:00 |
|
Felix Wiegand
|
23bb96e514
|
Merge pull request #948 from ruPaladin/patch-7
Russian translation (interact_menu)
|
2015-05-01 18:39:34 +02:00 |
|
ruPaladin
|
2aa788bba2
|
Update stringtable.xml
|
2015-05-01 19:26:23 +03:00 |
|
ruPaladin
|
a883517a5e
|
Update stringtable.xml
|
2015-05-01 19:18:06 +03:00 |
|
KoffeinFlummi
|
30e90a377e
|
Fix duplicate entries
|
2015-05-01 17:51:31 +02:00 |
|
KoffeinFlummi
|
48e59f0d71
|
Merge branch 'master' of https://github.com/acemod/ACE3
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
|
2015-05-01 17:46:58 +02:00 |
|
KoffeinFlummi
|
1e786d4a92
|
Merge https://github.com/FreeZbe/ACE3 into french-merge
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
|
2015-05-01 17:45:00 +02:00 |
|
KoffeinFlummi
|
e46eba673f
|
Merge branch 'master' into german-translation
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
|
2015-05-01 17:36:40 +02:00 |
|
KoffeinFlummi
|
954e4ef549
|
Merge branch 'master' of https://github.com/acemod/ACE3
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
|
2015-05-01 17:32:19 +02:00 |
|
KoffeinFlummi
|
e96f23c197
|
Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge
Conflicts:
addons/atragmx/stringtable.xml
addons/interact_menu/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
addons/realisticnames/stringtable.xml
addons/respawn/stringtable.xml
|
2015-05-01 17:30:59 +02:00 |
|
Felix Wiegand
|
526b0a2d59
|
Merge pull request #931 from gienkov/master
PL translation
|
2015-05-01 17:15:22 +02:00 |
|
KoffeinFlummi
|
5f60321a69
|
Merge https://github.com/Legolasindar/ACE3 into spanish-merge
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
|
2015-05-01 17:12:00 +02:00 |
|
KoffeinFlummi
|
761e23001f
|
Merge https://github.com/Dimaslg/ACE3 into spanish-merge
Conflicts:
addons/medical/stringtable.xml
addons/missileguidance/stringtable.xml
addons/optionsmenu/stringtable.xml
|
2015-05-01 16:51:20 +02:00 |
|
Nicolás Badano
|
65dcbce25e
|
Merge pull request #945 from acemod/revert-937-fcsMuzzleVelocityCorrection
Revert "Takes negative initSpeed values into account"
|
2015-05-01 11:07:57 -03:00 |
|
jaynus
|
e4567fb59f
|
Merge remote-tracking branch 'origin/master' into guidanceClassFixes
Conflicts:
addons/javelin/functions/fnc_onOpticDraw.sqf
|
2015-05-01 06:59:28 -07:00 |
|
jaynus
|
9997b6d464
|
action is select 1
|
2015-05-01 06:57:49 -07:00 |
|
Nicolás Badano
|
cde80b2901
|
Revert "Takes negative initSpeed values into account"
|
2015-05-01 10:38:41 -03:00 |
|
commy2
|
b255d1040b
|
scope 1 for ACE_Comanche_Test, #943
|
2015-05-01 15:30:11 +02:00 |
|
FreeZbe
|
68d62b0005
|
Update stringtable.xml
|
2015-05-01 14:20:21 +02:00 |
|
FreeZbe
|
518614ec0b
|
Update stringtable.xml
|
2015-05-01 14:20:03 +02:00 |
|
FreeZbe
|
79ac41bd95
|
Update stringtable.xml
|
2015-05-01 14:19:43 +02:00 |
|
bux578
|
bfb68fe368
|
fix spelling errors
|
2015-05-01 14:19:30 +02:00 |
|
FreeZbe
|
80ae016021
|
Update stringtable.xml
|
2015-05-01 14:19:15 +02:00 |
|
FreeZbe
|
acf74dd2ae
|
Update stringtable.xml
|
2015-05-01 14:13:32 +02:00 |
|
FreeZbe
|
7a397459ae
|
Update stringtable.xml
|
2015-05-01 14:13:08 +02:00 |
|
FreeZbe
|
371aa381ec
|
Update stringtable.xml
|
2015-05-01 14:12:45 +02:00 |
|
FreeZbe
|
820c841b35
|
Update stringtable.xml
|
2015-05-01 14:12:10 +02:00 |
|
FreeZbe
|
53be70f661
|
French : update stringtable
|
2015-05-01 14:07:08 +02:00 |
|
ulteq
|
a6f4c68ef4
|
Removed obsolete comment
|
2015-05-01 13:50:01 +02:00 |
|
ulteq
|
6d0e2cc464
|
Merge pull request #936 from acemod/explosivesSleepReplacement
Replaced sleep with waitAndExecute
|
2015-05-01 12:55:14 +02:00 |
|
Glowbal
|
f0efba09e5
|
Merge pull request #814 from acemod/basic-med-options
Basic medical module options
|
2015-05-01 12:27:22 +02:00 |
|
ulteq
|
a9cde188ea
|
Merge pull request #937 from acemod/fcsMuzzleVelocityCorrection
Takes negative initSpeed values into account
|
2015-05-01 12:24:22 +02:00 |
|
bux578
|
2acc10ba70
|
meh
|
2015-05-01 12:19:42 +02:00 |
|
Glowbal
|
e9a86da8e0
|
Should be in same order as the module
|
2015-05-01 12:18:21 +02:00 |
|
bux578
|
aa2e5077e4
|
missing german translation
|
2015-05-01 12:17:28 +02:00 |
|
ulteq
|
4c0bed609e
|
Fixed a typo
|
2015-05-01 11:53:53 +02:00 |
|
Glowbal
|
5beca63ae2
|
Added missing private
|
2015-05-01 11:51:23 +02:00 |
|
ulteq
|
940f8e8349
|
Cleanup++:
*Removed spawn
*Added, moved and renamed some privates
|
2015-05-01 11:38:09 +02:00 |
|
commy2
|
a97c934688
|
fix ubc, fix #938
|
2015-05-01 11:01:07 +02:00 |
|
ulteq
|
d3b36c2b56
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-05-01 10:26:48 +02:00 |
|
ulteq
|
723ffc21d1
|
Removed unneeded TODO
|
2015-05-01 10:26:37 +02:00 |
|
ulteq
|
2219339e24
|
Fixed a typo
|
2015-05-01 10:25:59 +02:00 |
|
ulteq
|
965e45a53c
|
Takes negative initSpeed values into account
|
2015-05-01 10:25:33 +02:00 |
|
commy2
|
b859956604
|
rename category ace <blank> to ace common
|
2015-05-01 10:19:47 +02:00 |
|
PabstMirror
|
0f736ae684
|
GetDeathAnim
|
2015-05-01 03:13:26 -05:00 |
|
ulteq
|
e8264110bb
|
Replaced sleep with waitAndExecute
|
2015-05-01 10:12:41 +02:00 |
|
commy2
|
c52278c11f
|
Merge branch 'feature/laserpointer-3rdparty' of https://github.com/11thmeu/ACE3 into 11thmeu-feature/laserpointer-3rdparty
|
2015-05-01 09:52:03 +02:00 |
|
esteldunedain
|
a0923aa5c3
|
Tweak the position for rally point actions. Fix #837
|
2015-05-01 01:57:37 -03:00 |
|
esteldunedain
|
324b9510e3
|
Allow positions for actions to be computed dynamically. Also leverage that for the position of the "Weapon" action, instead of hard coding an exception for that.
|
2015-05-01 01:56:39 -03:00 |
|
esteldunedain
|
fc02bb4e06
|
Stylistic changes
|
2015-05-01 00:32:16 -03:00 |
|
esteldunedain
|
aa4a5539d4
|
Merge branch 'master' into interactMoreOptions
Conflicts:
addons/interact_menu/functions/fnc_renderIcon.sqf
|
2015-05-01 00:04:22 -03:00 |
|
KoffeinFlummi
|
984a1fe337
|
Rename breakLine to break_line
|
2015-05-01 02:14:23 +02:00 |
|
KoffeinFlummi
|
e06e1a2f89
|
Make preventDeath work
|
2015-05-01 01:38:36 +02:00 |
|
KoffeinFlummi
|
cb82b20464
|
Let setUncon handle AI unconsciousness
|
2015-05-01 01:38:16 +02:00 |
|
KoffeinFlummi
|
48770f77d2
|
Rename caching variables in basic HD
|
2015-05-01 01:37:58 +02:00 |
|
KoffeinFlummi
|
67bd2b4e2f
|
Reduce animation forcing delay
|
2015-05-01 01:36:09 +02:00 |
|
KoffeinFlummi
|
98e44e86d8
|
Offload ejecting to unloadPerson
|
2015-05-01 01:35:50 +02:00 |
|