piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity
2,687 Commits 2 Branches 0 Tags
43059f353935c50290e84e9b2d9e91b60f54aa4b
Commit Graph
2687 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bertrand Songis 43059f3539 Merge pull request #561 from tensafefrogs/next 
Fix missing curly braces and adjust some formatting.
 2014-01-19 13:09:19 -08:00
Bertrand Songis 987b5eeecb Merge pull request #564 from opentx/romolo/fix_and_improve_contributors_dialog_506 
Fixes #506
 2014-01-19 13:07:35 -08:00
Geoff Stearns 261cdd4cca Fix missing curly braces and adjust some formatting. 2014-01-19 15:44:29 -05:00
Dvogonen 9ec25ed189 Merge branch 'origin/next' 
Conflicts:
	companion/src/contributorsdialog.cpp
 2014-01-19 20:33:11 +01:00
Dvogonen 0326a3d27f Creating logo folder and a proposed new logo. Only storage for the time beeing. Not used in build. 2014-01-19 15:18:33 +01:00
Bertrand Songis 57d3fe53bc Update DONATIONS.txt 2014-01-19 15:08:36 +01:00
Romolo Manfredini f0e7accae8 Properly reset windows geometry and state 2014-01-19 10:01:48 +01:00
Romolo Manfredini 0c0662711e Revert to old renderer 2014-01-19 08:10:28 +01:00
Bertrand Songis 5160fd8503 Issue #555 fixed (core in customizetxdialog) 2014-01-18 07:49:05 +01:00
Bertrand Songis 296b12ffdb Merge pull request #553 from opentx/dvogonen/graphical_improvemens 
Dvogonen/graphical improvemens
 2014-01-17 11:24:25 -08:00
Kjell Kernen 9ce093dfd0 Fixes #532 2014-01-17 18:57:49 +01:00
Bertrand Songis b30fdf841d Update DONATIONS.txt 2014-01-17 18:24:54 +01:00
mhotar 988103d785 TX action icons v2 2014-01-17 16:53:37 +01:00
Bertrand Songis 8662736e22 Merge branch 'next' of https://github.com/opentx/opentx into next 2014-01-17 16:31:40 +01:00
Bertrand Songis d134c063e5 ModelEdit channels 'next' support 2014-01-17 16:43:36 +01:00
Bertrand Songis 11e83de0d3 Support of inputs / mixes from 'next' continued. More duplicated code 
removed.
 2014-01-17 15:46:19 +01:00
Kjell Kernen 3326d6ac6b New icons from Martin Hotar 2014-01-17 14:40:18 +01:00
Bertrand Songis 88602a88c7 Update DONATIONS.txt 2014-01-17 07:05:33 +01:00
Bertrand Songis f2bc9e2fe1 Update DONATIONS.txt 2014-01-17 07:04:17 +01:00
Kjell Kernen c19c592035 THe rest of the monochrome icons originals. 2014-01-17 00:23:44 +01:00
Bertrand Songis ddd8d137fc Replace SVN strings by a VERS string (2.0) 2014-01-16 22:31:03 +01:00
Dvogonen eca1273b59 Final icon commit. I have a couple of original icons on another computer hat I will add tomorrow. Besides that I thing this thing is ready for prime time (except if there is some kind of an uproar against mhotars new nice icons). 2014-01-16 21:47:54 +01:00
Dvogonen e0e16a4256 Icons optimized for sharpness 2014-01-16 21:03:21 +01:00
Bertrand Songis bf54445c94 Merge remote-tracking branch 'origin/kilrah/Taranis_120MHz' into next 2014-01-16 13:05:21 +01:00
Kjell Kernen d2e510792d First round of 32x32 optimized icons 2014-01-16 12:44:27 +01:00
Bertrand Songis 1574df9e12 Update DONATIONS.txt 2014-01-16 12:32:51 +01:00
Bertrand Songis c27c4f2c78 Update DONATIONS.txt 2014-01-16 07:07:37 +01:00
Andre Bernet 006eee1411 Merge branch 'dvogonen/automatically_convert_settings_511' of https://github.com/opentx/opentx into next 
Conflicts:
	companion/src/main.cpp
 2014-01-15 23:02:21 +01:00
Dvogonen 4f087a216f Fixes #511 - Again :-) 2014-01-15 22:24:31 +01:00
Dvogonen 18a5883f66 Merge branch 'origin/next' 2014-01-15 22:06:10 +01:00
Andre Bernet cfec9ed00e Merge pull request #535 from opentx/dvogonen/Rename_companion9x_qrc_to_companion_qrc_512 
Fixes #512
 2014-01-15 12:59:15 -08:00
Dvogonen 9fd20a87fe Fixes #511 2014-01-15 21:54:43 +01:00
Dvogonen 20ddf27fff Merge branch 'origin/next' 2014-01-15 21:30:05 +01:00
Dvogonen 2f67344b81 Fixes #512 2014-01-15 21:13:57 +01:00
Dvogonen 78b28444e6 Example of optimized icons for actual resolution. 2014-01-15 20:46:53 +01:00
Kjell Kernen fb705d66df New, flat icons for everything. Optimized for 32x32. Work needed to optimize for 16x16 used in menus. 2014-01-15 17:32:49 +01:00
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
Dvogonen f11c961be4 Enlarged and moved icons 2014-01-15 08:28:11 +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