piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity
2,640 Commits 2 Branches 0 Tags
e7dc6644c7171efdd92f8876881386f02450b03b
Commit Graph
2640 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bertrand Songis e7dc6644c7 Merge remote-tracking branch 'origin/dvogonen/rename_companion_485' into next 
Conflicts:
	companion/src/CMakeLists.txt
	companion/src/main.cpp
	companion/src/modeledit.cpp
	companion/src/xsimulatordialog.cpp
 2014-01-15 16:09:17 +01:00
Andre Bernet 02f75dedd9 Merge branch 'bsongis/Companion_ModelEdit_split' into next 2014-01-15 14:55:15 +01:00
Andre Bernet 9b6c0e4fd1 Multiplex was collated to source 2014-01-15 14:41:54 +01:00
Bertrand Songis 691b52572f Fixes in ExpoDialog. Some more code refactoring 2014-01-15 14:05:33 +01:00
Bertrand Songis 888895b60b Corrections on Curves in MixerDialog and ExpoDialog (introduction of 
CurveGroup to share code)
 2014-01-15 11:50:00 +01:00
Bertrand Songis 0f0db5e1d3 Companion core in simu now understood: the stickMode was completely out, 
and the Tx trims were shifted!
 2014-01-14 22:44:10 +01:00
Bertrand Songis d945052c82 Removes the core in companion simu, compiled on VC++. A compiler bug? I 
don't get it...
 2014-01-14 20:06:01 +01:00
Bertrand Songis bea06a1772 Update DONATIONS.txt 2014-01-14 07:13:15 +01:00
Bertrand Songis cedddfe8d2 EEPROM 'next' support. A lot of corrections. 2014-01-13 19:09:05 +01:00
Dvogonen 9cc9e115a4 Icons regenerated to correct font related problem. 2014-01-13 14:02:39 +01:00
Bertrand Songis 0b387a2467 [Companion] Assert on EEPROM import errors removed 2014-01-13 11:54:08 +01:00
Bertrand Songis 7755ae6063 Update DONATIONS.txt 2014-01-13 07:12:18 +01:00
Bertrand Songis bbf5e9608d Update CREDITS.txt 2014-01-12 22:02:52 +01:00
Bertrand Songis 01cb2411c8 Update DONATIONS.txt 2014-01-12 21:08:15 +01:00
Bertrand Songis 1bdca8ae9c Update DONATIONS.txt 2014-01-12 16:47:31 +01:00
Bertrand Songis 278f5013ab Update DONATIONS.txt 2014-01-12 09:25:24 +01:00
Bertrand Songis 8ad6f3d5e6 Update DONATIONS.txt 2014-01-11 19:55:10 +01:00
Bertrand Songis 7426aa7738 Update DONATIONS.txt 2014-01-10 17:04:58 +01:00
Bertrand Songis cb4286d99d make clean now removes all .o files 2014-01-10 15:58:58 +01:00
Bertrand Songis 96e1dcbcd8 Issue #193 fixed (curves names shifted) 2014-01-10 15:57:25 +01:00
Bertrand Songis 7880d144f6 Issue #193 fixed (shift when importing Taranis EEPROM v215) 2014-01-10 11:43:10 +01:00
Bertrand Songis 7f6bdd87cb Update DONATIONS.txt 2014-01-09 20:43:56 +01:00
Bertrand Songis cb6d13bf6a Merge branch 'bsongis/Companion_ModelEdit_split' of github.com:bsongis/opentx into bsongis/Companion_ModelEdit_split 2014-01-09 19:44:00 +01:00
Bertrand Songis e8d54d35f1 Sources shift when exporting EEPROM (Virtual and Lua inputs) 2014-01-09 19:47:18 +01:00
Bertrand Songis 9a2b668956 GvarsOfsNum (er9x) removed 2014-01-09 18:53:35 +01:00
Bertrand Songis 691d568b1a FixOffset (from er9x) removed 2014-01-09 18:03:22 +01:00
Bertrand Songis 84661b20d4 Update DONATIONS.txt 2014-01-09 17:12:54 +01:00
Bertrand Songis b5435ce940 Update DONATIONS.txt 2014-01-09 07:15:06 +01:00
Bertrand Songis df4c7afdbb Update DONATIONS.txt 2014-01-08 17:32:37 +01:00
Andre Bernet 3ade8707a7 Nicer module UI 2014-01-07 21:30:57 +01:00
Bertrand Songis 57f9489d81 EEPROM import bugfixing 2014-01-07 19:33:29 +01:00
Bertrand Songis 27f8be304a The non active curves are not drawn in bold (pen width 2) 2014-01-07 18:03:50 +01:00
Bertrand Songis 3b59d07724 Support of current EEPROM inside Companion. Some more code around 
EEPROMS export removed (needed to be fixed, so I preferred to remove in
the same commit).
 2014-01-07 17:57:42 +01:00
Bertrand Songis 3dfdd1b61d Update DONATIONS.txt 2014-01-07 15:13:26 +01:00
Bertrand Songis 5d3c827488 Merge remote-tracking branch 'origin/next' into bsongis/Companion_ModelEdit_split 2014-01-07 07:12:14 +01:00
Dvogonen 893eb3c061 Fixed problem with language selection in dropbox. 2014-01-06 19:11:30 +01:00
Dvogonen a646e240fb Fixed last companion9x strings. Getting very close. 2014-01-06 18:21:30 +01:00
Dvogonen 57718d0100 Cleaning up graphics and about box 2014-01-06 15:15:14 +01:00
Dvogonen a86ab46bb1 And now the infernal Linux install path should be correct. I hope... 2014-01-06 01:48:45 +01:00
Dvogonen 0494118089 Improved customized splash for burn dialog with OpenTX logo. 2014-01-06 01:31:16 +01:00
Dvogonen c2d220e94b Fixed Linux desktop file, which was badly broken. Added more and better icons to propper locations. 2014-01-06 01:29:53 +01:00
Bertrand Songis d19f50772e Update DONATIONS.txt 2014-01-05 20:57:12 +01:00
Andre Bernet b3f1716f82 Merge pull request #509 from opentx/bsongis/Companion_crash_190 
Fixes #190
 2014-01-05 04:53:00 -08:00
Andre Bernet 5d3c3f4a21 Merge pull request #508 from opentx/bsongis/Donations_update 
Merge new donations
 2014-01-05 04:51:43 -08:00
Dvogonen 9b1f36c155 Mac Icon genereated online from vector image by iconverticons.com. I have no way of checking it. Hope it is acceptable. 
Improved 48x48 png icon. Also generated online at iconverticons.com. They must use a good rendering machine. The result is better than from Gimp.
 2014-01-05 13:37:36 +01:00
Andre Bernet 7a5154305b Fix mac paths - app icon still needs updating 2014-01-05 12:51:30 +01:00
Andre Bernet 63dd5927fb Merge branch 'bsongis/Sky9x_Stick_Gain_Issue_155' of https://github.com/opentx/opentx into next 2014-01-05 12:26:45 +01:00
Andre Bernet 624bab7826 Merge branch 'bsongis/Taranis_audio_freeze' of https://github.com/opentx/opentx into next 2014-01-05 12:26:14 +01:00
Andre Bernet d65b74269b More renaming. Just for the life of me can't get the translations to be recognised. Also, while a clean install will use the new app folders, the nsi scripts are currently configured to retrieve the install folder from registry if present. Might want to think about whether we want to remove this or not. 2014-01-05 12:13:38 +01:00
Dvogonen 0d189b87da Removed old graphics. 
Created scalable version of the Companion logo.
Regenerated icons for Windows and Linux.
 2014-01-05 12:11:18 +01:00