KoffeinFlummi
|
a1e709047e
|
Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge
Conflicts:
AUTHORS.txt
addons/aircraft/stringtable.xml
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/disposable/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/grenades/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/kestrel/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/logistics_uavbattery/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/markers/stringtable.xml
addons/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
addons/nametags/stringtable.xml
addons/nightvision/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/parachute/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/respawn/stringtable.xml
addons/safemode/stringtable.xml
addons/switchunits/stringtable.xml
addons/vehiclelock/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
|
2015-04-29 12:52:55 +02:00 |
|
KoffeinFlummi
|
b472292b20
|
Remove tabler comments.
sed is awesome.
|
2015-04-26 21:05:41 +02:00 |
|
VyMajoris
|
523cb49ff1
|
Added - Portuguese translation to lots of things.
Also fixed a typo the english key for STR_ACE_microdagr_configure.
|
2015-04-26 03:09:16 -03:00 |
|
KoffeinFlummi
|
1d93589ebc
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-04-17 15:45:22 +02:00 |
|
KoffeinFlummi
|
20e4858a0d
|
Merge https://github.com/ramius86/ACE3 into italian-merge
|
2015-04-17 15:44:50 +02:00 |
|
commy2
|
26944ea84e
|
make altimeter actually usable with parachutes
|
2015-04-17 13:01:38 +02:00 |
|
commy2
|
73fd9ac62e
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into parafix
|
2015-04-17 12:55:07 +02:00 |
|
commy2
|
558a4fb363
|
Merge pull request #461 from Tenga/altimeter-fix
Altimeter fix, division by zero when no time has passed (game paused, etc.)
|
2015-04-17 12:49:06 +02:00 |
|
commy2
|
20565e8b02
|
hide height / velocity while parachuting, freefallig in expert mode, fix 692
|
2015-04-17 11:02:01 +02:00 |
|
Marco
|
23cb1058fc
|
Update stringtable.xml
IT
|
2015-04-16 10:26:55 +02:00 |
|
Harakhti
|
8bfd915ec4
|
Translation: N to R
This was a lot more fun than the previous two were. 12 folders left...
|
2015-04-13 23:45:44 +02:00 |
|
Tenga
|
e7b5218d52
|
Altimeter fix, division by zero when no time has passed (game paused, etc.)
|
2015-04-11 00:14:06 +02:00 |
|
commy2
|
dc49f2c71e
|
rewrite assigned item fix
|
2015-04-10 18:31:43 +02:00 |
|
jaynus
|
1bb6be5654
|
Cleaning up of all tabs in source code files.
|
2015-04-06 09:22:43 -07:00 |
|
PabstMirror
|
7e383dc10e
|
#198 canInteractWith EGVAR -> EFUNC
|
2015-03-20 17:55:39 -05:00 |
|
Nicolás Badano
|
f90f1cfc21
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2015-03-16 18:39:20 -03:00 |
|
Nicolás Badano
|
cf45de7c11
|
Typo on altimeter. Fix #204
|
2015-03-16 18:36:09 -03:00 |
|
commy2
|
b5f307919e
|
replace canInteract with canInteractWith
|
2015-03-15 13:00:10 +01:00 |
|
PabstMirror
|
aaeb5a3392
|
Parachute - Move unused p3d back to TOMERGE
|
2015-03-12 00:07:28 -05:00 |
|
PabstMirror
|
82ea87d1de
|
Parachute - Config Division/Formating
|
2015-03-12 00:05:28 -05:00 |
|
PabstMirror
|
7173037cb0
|
Fix 2 broken keybinds
|
2015-03-10 12:45:08 -05:00 |
|
PabstMirror
|
81a944457b
|
Merge pull request #170 from KoffeinFlummi/cba-NewKeyBinding
Key Bind Redo (switch to new CBA 150306)
|
2015-03-07 14:09:52 -06:00 |
|
PabstMirror
|
7ed682a849
|
Fix Parachutes
|
2015-03-07 13:48:39 -06:00 |
|
PabstMirror
|
4018742f26
|
Return False on keyUp Code
|
2015-03-05 02:51:24 -06:00 |
|
PabstMirror
|
0919e59719
|
Key Bind Redo (except vector)
|
2015-03-05 01:32:26 -06:00 |
|
Garth L-H de Wet
|
9c20706c83
|
Added a event handler for player vehicle changing. As well as covered the canInteract in key handler.
|
2015-02-03 11:51:16 +02:00 |
|
Garth L-H de Wet
|
b4d1d6b230
|
Removed the PFH when the player vehicle is no longer a parachute.
|
2015-02-03 11:50:33 +02:00 |
|
Garth L-H de Wet
|
c08494cc43
|
Made use of time instead of diag_ticktime, to take care of time acceleration and so forth.
|
2015-02-03 11:50:11 +02:00 |
|
Garth L-H de Wet
|
9e1cd9a194
|
Fixed headers to be more consistent with ACE.
|
2015-02-03 00:05:03 +02:00 |
|
Garth L-H de Wet
|
aca1c0c6cf
|
Converted to use CBA PFH's and MACROs.
|
2015-02-02 23:58:24 +02:00 |
|
Garth L-H de Wet
|
966cb6ffdf
|
Performed initial conversion from AGM to ACE. Added necessary boilerplate files.
|
2015-02-02 22:52:08 +02:00 |
|
Garth L-H de Wet
|
03cef93ac7
|
Initiated AGM_Parachute merge.
|
2015-02-02 22:31:48 +02:00 |
|