Josuan Albin
|
7c9dcf6bdb
|
Merge branch 'pr/3480'
Conflicts:
addons/advanced_ballistics/stringtable.xml
addons/cargo/stringtable.xml
addons/flashlights/stringtable.xml
addons/hearing/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/main/stringtable.xml
addons/map/stringtable.xml
|
2016-06-18 16:26:46 +02:00 |
|
jonpas
|
03e923aa68
|
Cleanup Function Headers titles
|
2016-06-18 11:50:41 +02:00 |
|
Glowbal
|
8c9b31b1c7
|
Merge pull request #3815 from acemod/cbaEventSystem
Deprecate ACE events framework
|
2016-06-09 14:20:26 +02:00 |
|
SilentSpike
|
90ebf9638b
|
Update common event names to meet new standard
|
2016-06-04 11:12:56 +01:00 |
|
PabstMirror
|
77baeda976
|
Merge branch 'master' into huehuehue
|
2016-06-03 00:01:13 -05:00 |
|
PabstMirror
|
d7f9c52c2f
|
Merge branch 'master' into cbaEventSystem
|
2016-06-02 19:29:30 -05:00 |
|
jonpas
|
95573ee711
|
Stringtable URL (#3855)
* Move url into stringtable to display it properly, Add some missing author and url entries
* Fix main
* Remove duplicate author
|
2016-06-01 23:45:51 +02:00 |
|
commy2
|
9d61dd6159
|
Merge pull request #3850 from acemod/fixCfgPatchesAuthor
Fix CfgPatches author/ is not a value
|
2016-06-01 14:24:17 +02:00 |
|
jonpas
|
1354826d56
|
Put semi-colon to the correct place
|
2016-06-01 14:11:32 +02:00 |
|
jonpas
|
1331265e65
|
Move url into a macro
|
2016-06-01 13:49:10 +02:00 |
|
jonpas
|
6730d016c2
|
Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility
|
2016-06-01 13:27:02 +02:00 |
|
jonpas
|
26fbc36cab
|
Merge branch 'master' into cbaEventSystem
|
2016-05-31 22:36:08 +02:00 |
|
PabstMirror
|
598c3dc181
|
Fix 1.60 UBC (slingloads)
|
2016-05-30 17:11:06 -05:00 |
|
commy2
|
fd26e2e44e
|
Merge pull request #3516 from acemod/cbamissiontime
replace timePFH with CBA_missionTime
|
2016-05-30 21:23:57 +02:00 |
|
jonpas
|
7a307393a4
|
Merge branch 'master' into useQuotedPathMacros
|
2016-05-30 21:14:17 +02:00 |
|
jonpas
|
4f515ec4e1
|
QGVAR captives, interaction
|
2016-05-25 20:23:53 +02:00 |
|
SilentSpike
|
207d6612da
|
Remove duplicate ACE_newEvents entries
|
2016-05-24 15:06:17 +01:00 |
|
SilentSpike
|
c4b75160a4
|
Run event renaming script
|
2016-05-24 14:13:11 +01:00 |
|
SilentSpike
|
108ff4f644
|
Replace ACE event system calls with CBA counterparts
Regex used:
\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent
E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event
E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
|
2016-05-22 16:47:39 +01:00 |
|
commy2
|
da70854568
|
manual merge
|
2016-05-18 11:48:27 +02:00 |
|
Glowbal
|
36e48554c2
|
Merge pull request #3787 from acemod/motorcycleInteraction
Add interaction support to Motorcycle class
|
2016-05-14 09:33:41 +02:00 |
|
jonpas
|
a950b2c2fe
|
Add canPush config entry to enable pushing on boats with mass higher than 2600
|
2016-05-13 16:33:15 +02:00 |
|
jonpas
|
c591c7af64
|
Add interaction support to Motorcycle class
|
2016-05-12 21:30:32 +02:00 |
|
Ozan Eğitmen
|
b8abec0c61
|
Fix Capitalization of ACE Settings classes. (#3627)
|
2016-05-07 22:14:56 +02:00 |
|
Glowbal
|
83a8c488d9
|
Merge pull request #3751 from acemod/wipeoutWhitespace
Cleaned up excessive whitespace
|
2016-05-04 11:46:56 +02:00 |
|
BaerMitUmlaut
|
7fcbe93b71
|
Cleaned up excessive whitespace
|
2016-05-03 02:32:44 +02:00 |
|
ProfessorCZ
|
7d0fcde9fa
|
CZ Translate - Update
04/30/2016
|
2016-04-30 00:57:24 +02:00 |
|
jonpas
|
85b4366368
|
Use new QPATHTOF and QPATHTOEF macros
|
2016-04-08 20:34:50 +02:00 |
|
Alessandro Foresi
|
e97c7c0f65
|
Translation: IT completed (with BOM)
|
2016-03-27 21:22:15 +02:00 |
|
Alessandro Foresi
|
e5a7578f92
|
Translation: IT completed (no BOM)
|
2016-03-27 21:20:15 +02:00 |
|
PabstMirror
|
b5e95f3945
|
Add some names/descriptions to settings configs
|
2016-03-08 01:17:40 -06:00 |
|
commy2
|
a85c5b14cf
|
Merge pull request #3547 from acemod/fixsavegamecrashmaybe
Store Interact Menus on CBA Namespaces
|
2016-03-06 19:28:26 +01:00 |
|
jonpas
|
c378cd9f12
|
Disable action menu on mouse hint with inGameUISetEventHandler rather than showHud, as showHud disables UI script commands
|
2016-03-06 16:47:46 +01:00 |
|
commy2
|
8892aeed9d
|
missed one
|
2016-03-06 07:55:34 +01:00 |
|
jonpas
|
4918dbacb0
|
Replace and depreacate EFUNC(common,addScrollWheelEventHandler) with MouseZChanged Display EH
|
2016-03-02 17:33:46 +01:00 |
|
commy2
|
467075ad67
|
replace timePFH with CBA_missionTime
|
2016-03-02 11:01:39 +01:00 |
|
commy2
|
fa3913752b
|
replace XEH_ENABLED macro with actual class, fix #3482, fix #3483
|
2016-03-01 17:05:00 +01:00 |
|
Jonathan Pereira
|
309f48ee0b
|
Added remaining PT-BR translarions
|
2016-03-01 08:56:43 -03:00 |
|
NorXAengell
|
772c4cc100
|
Another batch of translations and corrections (Fr)
|
2016-03-01 02:27:19 +01:00 |
|
BlackWindowS
|
c61e7b5104
|
Tweaked & added translations
Translation of almost every STR to French
|
2016-02-28 14:48:04 +01:00 |
|
jonpas
|
10abe5cd57
|
Merge branch 'master' into German-translations
|
2016-02-27 01:36:07 +01:00 |
|
System98
|
48d312cb8e
|
Add german translations
- add missing german translations
- small fixes to existing texts
- remove unused strings in "medical" addon
|
2016-02-25 18:10:26 +01:00 |
|
esteldunedain
|
71707bc81a
|
Some spanish translations for 3.5.0
|
2016-02-25 10:54:19 -03:00 |
|
Nicolás Badano
|
d02a590886
|
Merge pull request #3406 from acemod/diePurista
Replace Purista with Roboto - everywhere
|
2016-02-25 09:56:16 -03:00 |
|
jonpas
|
7f022eda00
|
Replace Purista with Roboto - everywhere, close #3401
|
2016-02-24 15:06:27 +01:00 |
|
commy2
|
8233661d55
|
remove unused non API functions
|
2016-02-24 09:39:39 +01:00 |
|
commy2
|
0f7bfc0f66
|
Merge pull request #3389 from acemod/precompileongamestart
precompile on game start
|
2016-02-22 16:00:19 +01:00 |
|
commy2
|
46a239f9f6
|
precompile on game start
|
2016-02-22 15:20:36 +01:00 |
|
licht-im-Norden87
|
91bdceead6
|
interaction
|
2016-02-20 23:27:32 +01:00 |
|
ChairborneIT
|
0021bc08df
|
Added translation for most Italian stringtable entries
|
2016-02-20 21:39:05 +01:00 |
|