Commit Graph

66 Commits

Author SHA1 Message Date
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
commy2
5a1aae6028 manual merge 2015-11-30 17:44:15 +01:00
commy2
ca9b909e75 fix CBA_fnc capitalization 2015-11-30 16:45:20 +01:00
Niner1309
1a43341506 Fixed Laser Update Position Bug 2015-09-26 19:15:09 +02:00
Michael Braun
5047d4de1c Switched to ACE_LOG<LEVEL>_# variation 2015-08-26 17:39:44 +02:00
Michael Braun
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +02:00
PabstMirror
f9b3cbc02a Merge pull request #1956 from SzwedzikPL/laser_default_keybinds
default laser code down keybind fix
2015-08-14 19:36:02 -05:00
Glowbal
275b0c4300 Merge branch 'release'
Conflicts:
	README.md
	addons/finger/stringtable.xml
2015-08-04 22:29:05 +02:00
PabstMirror
b3741f4036 Capitalization for macro CBA_fnc_addPerFrameHandler 2015-08-04 02:34:38 -05:00
PabstMirror
822115214f Laser - Handle Bad Data Returns 2015-07-31 03:06:27 -05:00
SzwedzikPL
eb6abd69b8 default laser code down keybind fix 2015-07-30 22:37:08 +02:00
jonpas
66ceaa1d31 Fixed IS_STRING error due to regex replacing it with LSTRING 2015-05-30 20:09:53 +02:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
jonpas
87db721d4f Stringtable fixes up to medical 2015-05-27 21:19:14 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
Kavinsky
8e9b35c757 Fixed Capitalized folders on include paths 2015-05-20 23:28:10 +02:00
Josuan Albin
836cd9d833 Documentation pass 3
- Fixed typos in laser/readme
- Documentation guidelines updated
- ACE3 mentions updated in
- - ai
- Updated doc
- - fcs
- - hearing
-  -hitreaction
- - interaction
- - interact_menu
- - inventory
- - javelin
- - laser
- - laserpointer
- - laser_selfdesignate
- - logistics_uavbattery
- - logistics_wirecutter
- - magazinerepack
- - main
- - map
- - maptools
- - markers
2015-05-17 21:01:17 +02:00
jaynus
991ecdfe01 Removed: Debug sidechat in laser seeker code. 2015-05-11 13:37:50 -07:00
KoffeinFlummi
2bb3a0f139 Cleanup #1095
- Fix tabs
- Remove tabler comments
- Restore one removed Russian string
2015-05-10 16:19:46 +02:00
Alessandro Foresi
2dd06babec Added: Italian translations completed.
Fixed: BOM markers where missing
2015-05-10 11:44:46 +02:00
ProfessorCZ
a0e443cfc6 Czech translation - Update 2015-05-03 11:48:56 +02:00
KoffeinFlummi
7633f406ae Merge branch 'patch-2' of https://github.com/Dimaslg/ACE3 into spanish-merge
Conflicts:
	addons/laser/stringtable.xml
2015-05-03 02:40:44 +02: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
Harakhti
6c2717be7f More more translations
Stope.
2015-05-02 18:06:01 +02:00
ToasterBR
021b00c722 Translation to Portuguese
Done all remaining portuguese translations, including some minor
corrections
2015-05-02 03:38:53 -03:00
licht-im-Norden87
f93ac12807 Added german strings to laser 2015-05-02 03:28:54 +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
Tachii
60c02f4051 added 2 missing ru strings 2015-05-02 00:21:00 +03:00
FreeZbe
7e12c97317 French : update / fix stringtable 2015-05-01 23:09:09 +02:00
Grzegorz
3b321c7bf2 PL translation
laser
2015-05-01 22:46:51 +02:00
jaynus
dfbfb4ace2 Laser code selection, hotkeys and locking. Turrets & designator, and gunner. Closes #751 2015-05-01 11:31:37 -07:00
jaynus
8361ec3812 ace_lasers 2015-04-18 10:57:11 -07:00
jaynus
26e2917f79 Merge remote-tracking branch 'origin/master' into laserCodes
Conflicts:
	addons/javelin/CfgWeapons.hpp
2015-04-18 10:36:07 -07:00
jaynus
3a94753645 tab 2015-04-17 07:28:59 -07:00
jaynus
fb6553a7a7 Only show distance if laser is on. 2015-04-14 16:57:01 -07:00
jaynus
934f2ce097 Display current laser code. Standardize GVARs 2015-04-14 16:29:49 -07:00
jaynus
2ec74a6a3e align correctly, create event, remove FCS from laserDesignator. 2015-04-14 16:20:03 -07:00
jaynus
971566fc3e Laser code dialog entry. ACTUALLY HIDE THE DAMN LASER 2015-04-14 16:05:01 -07:00
Nou
dc5028275a Seeker FOV implemented, fast FOV check. 2015-04-12 19:16:58 -07:00
jaynus
7c6b84b1f1 Begin laserdesignator UI changes. 2015-04-12 16:52:10 -07:00
jaynus
fd4cb50d3d Remove thermal, prep for coding. 2015-04-12 16:44:39 -07:00
jaynus
db5d54dffd Only allow for laser designator for vanilla compensation. 2015-04-12 16:38:43 -07:00
jaynus
509b5e1a05 Integration of lasers for vanilla laser designation as well. Remove debug. 2015-04-12 14:12:21 -07:00
jaynus
2317a3c988 Visually hide laser targets. 2015-04-12 14:03:15 -07:00
jaynus
5251de8447 break out seeker angle check. more laser code cleanup. 2015-04-12 12:16:26 -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
16cd05edc8 Merge branch 'network_lasers' of github.com:acemod/ACE3 into network_lasers 2015-04-12 11:01:27 -07:00