esteldunedain
495c822061
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-14 19:10:31 -03:00
esteldunedain
6f4bb48489
Merge branch 'master' into linearMenuExperiment
...
Conflicts:
addons/attach/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/overheating/stringtable.xml
extensions/CMakeLists.txt
2015-04-14 19:09:57 -03:00
jaynus
739807303b
Fix script error for canceling designation and dying while designating.
2015-04-14 11:42:26 -07:00
KoffeinFlummi
63fe4118d4
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
Harakhti
1b60a335a5
Translation: J to M
...
I feel burned out. This was very specifically long and tedious.
2015-04-13 23:03:09 +02:00
KoffeinFlummi
f6c7d444e1
Merge https://github.com/Anthariel/ACE3 into french-merge
2015-04-13 13:31:48 +02:00
KoffeinFlummi
118b5509ea
Merge https://github.com/gienkov/ACE3 into polish-merge
2015-04-13 13:00:59 +02:00
jaynus
0c3caffe89
Merge pull request #501 from acemod/network_lasers
...
Break all the lasers. Continuing expansion work is in #535
2015-04-12 16:47:24 -07:00
Anthariel
638868b3da
Update stringtable.xml
...
Added: French translation (100%).
2015-04-13 00:41:50 +02:00
jaynus
9287d6fe44
Remove dead code.
2015-04-12 11:46:28 -07:00
jaynus
7f0e54b9c3
More defaults.
2015-04-12 11:43:37 -07:00
jaynus
197b13e6d9
Use current codes for FCS updates.
2015-04-12 11:41:50 -07:00
jaynus
9273a32d23
code cleanup, default laser parameters, getVariable self designation specifics.
2015-04-12 11:38:07 -07:00
jaynus
6be8cc8d84
Removed: Laser visuals
...
Updated: comments and function defs
Changed: pass function name, not full code.
2015-04-12 11:29:33 -07:00
jaynus
887e1d1d99
Remove optional laser visual.
2015-04-12 11:14:12 -07:00
jaynus
01797fd3b9
Integarate laser code into SALH guidance + self_designate. Note todo items.
2015-04-12 11:01:22 -07:00
KoffeinFlummi
614afa8537
Merge https://github.com/Kllrt/ACE3 into czech-merge
...
Conflicts:
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/goggles/stringtable.xml
addons/grenades/stringtable.xml
addons/hearing/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/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/nametags/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
2015-04-12 14:27:59 +02:00
FreeZbe
45ff6c7ce9
French: (Nearly) Complete French translations
...
Some entries (3 or 4) are still missing.
I dont understand what you mean / what the input is related to.
2015-04-12 14:15:45 +02:00
esteldunedain
0565eb6c74
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into linearMenuExperiment
...
Conflicts:
addons/laser_selfdesignate/stringtable.xml
2015-04-12 01:26:55 -03:00
KoffeinFlummi
c6efd4e546
Merge https://github.com/EpMAK/ACE3 into russian-merge
2015-04-12 05:39:46 +02:00
esteldunedain
d06e1b4a2a
Break line extension
2015-04-11 22:22:19 -03:00
EpMAK
21abff3713
Revert "Revert "Russian Translation""
...
This reverts commit ea04f4ab3e
2015-04-11 21:33:34 +03:00
EpMAK
ea04f4ab3e
Revert "Russian Translation"
...
This reverts commit 17a552bb80
2015-04-11 21:33:07 +03:00
Kllrt
38adfbcb70
Added missing CZ strings and made little revision
2015-04-11 16:33:00 +02:00
jaynus
83b453a294
Merge pull request #379 from acemod/allTheMissiles
...
Merging for current builds needing at least better guidance and fixed locking modes. Also allowing for mod-makers to see and utilize the new locking framework.
2015-04-10 12:48:10 -07:00
esteldunedain
d6e70cfe6b
Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3
...
Conflicts:
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/frag/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/medical/stringtable.xml
2015-04-10 16:20:18 -03:00
EpMAK
17a552bb80
Russian Translation
...
Russian translation of stringtables: new lines + old lines fixed a bit,
realistic names for armory are not yet filled.
2015-04-10 19:55:57 +03:00
EpMAK
68d08b8c7b
Revert "Translation"
...
This reverts commit fab5605ad5
2015-04-10 19:46:18 +03:00
EpMAK
fab5605ad5
Translation
...
Russian translation of the texts
2015-04-10 17:51:48 +03:00
Grzegorz
439dfa7b3c
laser_selfdesignate PL translation
...
fixes
2015-04-10 16:31:47 +02:00
VyMajoris
37858ec430
Added - Portuguese translation to laser_selfdesignate
2015-04-10 05:04:15 -03:00
Jo David
33a14076fc
Merge branch 'master' of https://github.com/acemod/ACE3 into translations
...
Conflicts:
addons/captives/stringtable.xml
addons/medical/stringtable.xml
2015-04-10 09:01:24 +02:00
jaynus
9e7d4c25bb
Removes old value of stabalizing which broke gunner. Fixes #412
2015-04-09 23:28:41 -07:00
Grzegorz
e13199af2a
laser_selfdesignate PL translation
2015-04-10 03:15:28 +02:00
Legolasindar
2456660867
Update stringtable.xml
2015-04-10 01:36:42 +02:00
jaynus
01535c7f5c
Merge remote-tracking branch 'origin/master' into allTheMissiles
...
Conflicts:
addons/wep_javelin/config.cpp
2015-04-09 12:41:09 -07:00
commy2
5ea35a01bb
sorting out required addons for modularity
2015-04-09 13:23:29 +02:00
jaynus
177be598d7
Fixes: Laser designator now uses strongest ray result.
2015-04-08 08:48:08 -07:00
jaynus
64724737cd
Code passing cleanup.
2015-04-08 08:35:24 -07:00
jaynus
fa9cf0280c
script error
2015-04-07 12:44:15 -07:00
jaynus
d3d5554c49
Laser designation information localized to vehicle.
2015-04-07 12:35:34 -07:00
jaynus
2ea7ecdbf7
Working save.
2015-04-07 12:11:28 -07:00
jaynus
6deff125ce
Self designation lockdown and cleanup
2015-04-07 09:05:19 -07:00
bux578
92da20ce62
translations
...
#367
2015-04-07 10:02:33 +02:00
jaynus
acf683e621
Call every 10th of a second.
2015-04-06 12:58:53 -07:00
jaynus
906612f954
Fixed: Gunner FOV, explosive rounds and FPS drop.
2015-04-06 12:54:06 -07:00
jaynus
d6cf07a3b6
Changed: FCS update was not being delayed for laser. Delay of 0.5s added.
2015-04-06 11:44:17 -07:00
jaynus
c3dbcf1351
increase frequency of laser update.
2015-04-06 07:40:20 -07:00
esteldunedain
4cf2410622
Fix duplicated laser designator actions
2015-04-06 09:06:56 -03:00
Nou
6541600d44
Switch everything to use modelToWorldVisual instead of modelToWorld.
2015-04-03 15:26:27 -07:00
jaynus
735384cdb4
stabalize a little more and do some debug drawing.
2015-04-03 14:28:12 -07:00
jaynus
ced44f8a9d
Fixed: Reduce bouncing.
...
TODO: wtf is going on with the lateral axis?
TODO: maybe dummy laser that doesnt show up as a target.
2015-04-03 10:34:36 -07:00
jaynus
368b51e0ee
Fixed: Get in/out of vehicle automatically turns off lasers
2015-04-03 10:10:57 -07:00
jaynus
ca8537105f
Merge branch 'lasers' of github.com:KoffeinFlummi/ACE3 into lasers
2015-04-03 09:49:56 -07:00
jaynus
84d801a45a
Added: ace_fcs_forceUpdate event for forcing the FCS to update from self-designate
...
Merged: in-vehicle interact for laser designator
Changed: Perf. tweaks on laser update times.
2015-04-03 09:49:41 -07:00
esteldunedain
b0ac672c13
Only init each vehicle type once
2015-04-03 13:24:50 -03:00
esteldunedain
b7e3a94462
Add designator to the comanche's gunner
2015-04-03 12:44:09 -03:00
esteldunedain
c82cef1b28
- self designate capabilities read from config
...
- add designator on/off actions to the interact_menu
2015-04-03 12:43:41 -03:00
jaynus
596854a264
Moved getTurretDirection to common.
...
Tweak creation of action (fucking actions?!) :( :( :(
2015-04-02 10:05:50 -07:00
jaynus
ec64a1b0ca
Changed: Laser functionality tweaking
...
Changed: DAGR deflection refinement
Clean up of tabs
2015-04-02 09:35:36 -07:00
commy2
3d4c43c613
replace tabs with spaces
2015-02-14 09:50:26 +01:00
commy2
b1a1c855d9
fix wrong class inheritance in laser selfdesignate
2015-02-14 09:47:03 +01:00
PabstMirror
b38bd016f5
Semicolon and bad p3d data paths
...
P3d's had bad \data\ folder, Models not actually used anywhere, but
pboProject complains
2015-02-02 20:15:45 -06:00
KoffeinFlummi
c407553d49
Add remaining READMEs, add helper script
2015-01-26 14:34:48 +01:00
jaynus
16a296e92b
laser_selfdesginate commit for commanche
2015-01-19 20:13:12 -08:00
