esteldunedain
|
1d208b4efc
|
Modify Function for medical actions
|
2015-04-17 19:36:03 -03:00 |
|
esteldunedain
|
9de834e156
|
Prototype of simplified diagnosis for basic medical. The left gui is completely scraped. Instead, the medical interaction points are color coded to reflect theier damage (bleeding rate).
|
2015-04-17 00:04:27 -03:00 |
|
esteldunedain
|
bdd3422150
|
Allow to dynamically modify actions at runtime. An optional code entry called modifierFunction can be added. That code is called before evaluating the action, allowing to dynamically change the actions name, icon, etc
|
2015-04-16 23:53:54 -03:00 |
|
PabstMirror
|
e12831bee4
|
#678 - Missing Text Height in settingMenu
|
2015-04-16 15:17:56 -05:00 |
|
ulteq
|
4ef80ab3a3
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-16 20:14:33 +02:00 |
|
PabstMirror
|
fa6cb3e75c
|
#672 - Don't show speaking icon for unconc players
|
2015-04-16 12:58:54 -05:00 |
|
ulteq
|
a7507fefef
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-16 19:55:48 +02:00 |
|
ulteq
|
1794606304
|
Got rid of the __DSP macro
|
2015-04-16 19:52:20 +02:00 |
|
jaynus
|
4a1dd6a957
|
Merge pull request #661 from rlex/master
Add link for issue report details
|
2015-04-16 10:37:39 -07:00 |
|
PabstMirror
|
638433614c
|
Some missing private defines.
|
2015-04-16 12:36:16 -05:00 |
|
Nicolás Badano
|
95cab9d0e7
|
Merge pull request #671 from Legolasindar/master
added spanish translation
|
2015-04-16 14:18:41 -03:00 |
|
PabstMirror
|
3dfcbe42b8
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-04-16 12:10:44 -05:00 |
|
PabstMirror
|
e06fd7350e
|
DEFAULT_PARAM KEY_PARAM private check
|
2015-04-16 12:10:40 -05:00 |
|
jaynus
|
3d7ae5e3a1
|
Merge branch 'master' of github.com:acemod/ACE3
|
2015-04-16 10:10:31 -07:00 |
|
jaynus
|
6a942ac820
|
Fixed: ACE_Fake**** Was showing in arsenal. Fixes #670
|
2015-04-16 10:10:24 -07:00 |
|
Ivan Navarro Cabello
|
61d1e6854e
|
added spanish translation
added spanish translation to ballistics and respawn
|
2015-04-16 19:03:15 +02:00 |
|
ulteq
|
c79afeb2fe
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-16 19:03:06 +02:00 |
|
ulteq
|
668888de81
|
Fixed constant name not following the coding-guideline
|
2015-04-16 19:00:37 +02:00 |
|
jaynus
|
9db256ad8d
|
ignore preceeding numbers
|
2015-04-16 09:54:52 -07:00 |
|
ulteq
|
aeffc55859
|
Added missing privates
|
2015-04-16 18:52:48 +02:00 |
|
Legolasindar
|
3426237b6c
|
Merge pull request #4 from acemod/master
update my master fork
|
2015-04-16 18:52:06 +02:00 |
|
jaynus
|
3c4a3c67db
|
Merge branch 'master' of github.com:acemod/ACE3
|
2015-04-16 09:48:27 -07:00 |
|
jaynus
|
9d87f08aa6
|
Regex's kill kids.
|
2015-04-16 09:48:21 -07:00 |
|
KoffeinFlummi
|
bf0aa6f344
|
Merge branch 'spanish-merge'
|
2015-04-16 18:32:37 +02:00 |
|
KoffeinFlummi
|
11f9478035
|
Merge https://github.com/Legolasindar/ACE3 into spanish-merge
Conflicts:
addons/advanced_ballistics/stringtable.xml
addons/atragmx/stringtable.xml
addons/ballistics/stringtable.xml
addons/javelin/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/scopes/stringtable.xml
addons/weather/stringtable.xml
|
2015-04-16 18:31:31 +02:00 |
|
ulteq
|
d82d9984d8
|
Added missing parentheses
|
2015-04-16 18:29:23 +02:00 |
|
jaynus
|
cdb460d36d
|
Merge branch 'master' of github.com:acemod/ACE3
|
2015-04-16 09:22:16 -07:00 |
|
jaynus
|
4c749a30cf
|
ignore leading numbers search_privates
|
2015-04-16 09:22:11 -07:00 |
|
ulteq
|
4e4dee18df
|
Added missing privates / Removed unused privates
|
2015-04-16 18:21:19 +02:00 |
|
ulteq
|
fa39e8f001
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-16 18:14:42 +02:00 |
|
ulteq
|
e35d3dab49
|
Overworked the ATragMX target slot logic:
*Added missing privates
*Solutions are now automatically calculated on target/gun selection
|
2015-04-16 18:14:32 +02:00 |
|
jaynus
|
43016e6766
|
Merge branch 'master' of github.com:acemod/ACE3
|
2015-04-16 09:00:29 -07:00 |
|
jaynus
|
b50c615e2c
|
Updated for module-specific command line argument.
|
2015-04-16 09:00:22 -07:00 |
|
Nicolás Badano
|
b1328a9c00
|
Merge pull request #669 from Tachii/patch-6
Update AUTHORS.txt
|
2015-04-16 12:59:24 -03:00 |
|
ulteq
|
5117595ecc
|
Minor performance improvement
|
2015-04-16 17:52:21 +02:00 |
|
jaynus
|
517242be99
|
Merge branch 'master' of github.com:acemod/ACE3
|
2015-04-16 08:46:16 -07:00 |
|
jaynus
|
fe7596d28d
|
handles CBA PARAMS_ and EXPLODE_
|
2015-04-16 08:46:11 -07:00 |
|
ulteq
|
defe46b769
|
Added new PFH abort condition (velocity < 100 m/s)
|
2015-04-16 17:30:50 +02:00 |
|
Tachii
|
e6f29cfdb1
|
Update AUTHORS.txt
|
2015-04-16 18:23:00 +03:00 |
|
bux578
|
2e0ab35af9
|
Merge pull request #668 from Tachii/patch-5
Update stringtable.xml
|
2015-04-16 17:21:03 +02:00 |
|
Tachii
|
f5078020fb
|
Update AUTHORS.txt
https://github.com/acemod/ACE3/blob/master/addons/movement/config.cpp
I want to be famous!
|
2015-04-16 18:20:40 +03:00 |
|
Tachii
|
2466d83cac
|
Update stringtable.xml
|
2015-04-16 18:19:11 +03:00 |
|
jaynus
|
54b7022bc1
|
Merge branch 'master' of github.com:acemod/ACE3
|
2015-04-16 08:18:41 -07:00 |
|
jaynus
|
184d7c8506
|
Tool addition. Search for missing private declarations by file.
|
2015-04-16 08:18:30 -07:00 |
|
bux578
|
62a422e36a
|
Merge pull request #667 from Tachii/patch-4
Update stringtable.xml
|
2015-04-16 17:17:35 +02:00 |
|
Tachii
|
def2f9c28e
|
Update stringtable.xml
|
2015-04-16 18:13:53 +03:00 |
|
bux578
|
8f325860e0
|
Merge pull request #666 from Tachii/patch-3
Update stringtable.xml
|
2015-04-16 17:10:53 +02:00 |
|
Tachii
|
dca11e523b
|
Update stringtable.xml
|
2015-04-16 18:08:58 +03:00 |
|
Nicolás Badano
|
8cb167d1be
|
Merge pull request #663 from ruPaladin/patch-1
addons/realisticnames translation to Russian
|
2015-04-16 10:06:12 -03:00 |
|
bux578
|
66f5ad5142
|
Merge pull request #664 from Coren4/master
Translation
|
2015-04-16 15:04:26 +02:00 |
|