Commits · db96644517fed490bfa3dcad313e64b4fe21d452 · astronomy / skylivex

24 Feb, 2013 12 commits
- Make mainwin a derived class from a generic webwin class · db966445
  Franco (nextime) Lanza authored Feb 24, 2013
  
  db966445
- Splig jsbridge.cpp from mainwin.cpp · c7aac7f8
  Franco (nextime) Lanza authored Feb 24, 2013
  
  c7aac7f8
- Fix few typos · 4323ba56
  Franco (nextime) Lanza authored Feb 24, 2013
  
  4323ba56
- Split jsbridge headers from mainwin · 3a0d0f48
  Franco (nextime) Lanza authored Feb 24, 2013
  
  3a0d0f48
- Merge branch 'master' of https://github.com/nextime/skylivex · 3e0c50be
  Franco (nextime) Lanza authored Feb 24, 2013
```
Conflicts:
```
  3e0c50be
- Added settings header to plugins · 8b3bd342
  Franco (nextime) Lanza authored Feb 24, 2013
  
  8b3bd342
- Added a settings class derived from QSettings · ff945dee
  Franco (nextime) Lanza authored Feb 24, 2013
  
  ff945dee
- splitted main and chat windows · fb0019c1
  Ivan Bellia authored Feb 24, 2013
  
  fb0019c1
- Added a plugin skeleton · 2e155e9b
  Franco (nextime) Lanza authored Feb 24, 2013
  
  2e155e9b
- fixed template paths for nextime template and remove duplicate js file · 3093376b
  Franco (nextime) Lanza authored Feb 24, 2013
  
  3093376b
- renamed franco gui template to nextime · 3aa1a1f9
  Franco (nextime) Lanza authored Feb 24, 2013
  
  3aa1a1f9
- Moved ivan gui template under gui/ivan · 265f278f
  Franco (nextime) Lanza authored Feb 24, 2013
  
  265f278f
23 Feb, 2013 10 commits
- Re-added maingui.html from Ivan's branch · 4a1a56d5
  Franco (nextime) Lanza authored Feb 23, 2013
  
  4a1a56d5
- Restore old default resolution for mainwin · 5c7e7a85
  Franco (nextime) Lanza authored Feb 23, 2013
  
  5c7e7a85
- Add the base Franco's gui · 72635d14
  Franco (nextime) Lanza authored Feb 23, 2013
  
  72635d14
- Testing merge with ivan · bad30449
  Franco (nextime) Lanza authored Feb 23, 2013
  
  bad30449
- Merge branch 'SkyliveX-Ivan' · d7cb61d5
  Franco (nextime) Lanza authored Feb 23, 2013
```
Conflicts:
	gui/maingui.html
	skylivex.pro.user
```
  d7cb61d5
- Add my pro.user file · 43216d5b
  Franco (nextime) Lanza authored Feb 23, 2013
  
  43216d5b
- Fixed a JSBridge potential memory leak · efdce20a
  Franco (nextime) Lanza authored Feb 23, 2013
  
  efdce20a
- fixed main size · 07196361
  Ivan Bellia authored Feb 23, 2013
  
  07196361
- added html graphic for main window · 25eb4181
  Ivan Bellia authored Feb 23, 2013
  
  25eb4181
- aa · 4cb37259
  Ivan Bellia authored Feb 23, 2013
  
  4cb37259
21 Feb, 2013 8 commits
- Fixed login Html formatting · dc03a1fa
  Ivan Bellia authored Feb 21, 2013
  
  dc03a1fa
- test · 43c3308c
  Ivan Bellia authored Feb 21, 2013
```
test2
```
  43c3308c
- Fix a little typo · 4e93a67a
  Franco (nextime) Lanza authored Feb 21, 2013
  
  4e93a67a
- fix MacOS load plugin path · 7dda91dc
  Franco (nextime) Lanza authored Feb 21, 2013
  
  7dda91dc
- Move skproto timer in the same thread · c70f3162
  Franco (nextime) Lanza authored Feb 21, 2013
  
  c70f3162
- fix compilation issues · 0172fe95
  Franco (nextime) Lanza authored Feb 21, 2013
  
  0172fe95
- maingui layout done · 68798f4f
  Franco (nextime) Lanza authored Feb 21, 2013
  
  68798f4f
- First sheleton of the mainwin · 77ae0c2b
  Franco (nextime) Lanza authored Feb 21, 2013
  
  77ae0c2b
20 Feb, 2013 6 commits
- Make it compile with gcc 4.7... · bdfa3a0d
  root authored Feb 20, 2013
  
  bdfa3a0d
- Urldecode and other things · 0321d9b6
  Franco (nextime) Lanza authored Feb 20, 2013
  
  0321d9b6
- Some future proof tests for drag a borderless window · 2808b71c
  Franco (nextime) Lanza authored Feb 20, 2013
  
  2808b71c
- Make the login window have borders and background · d2d651e9
  Franco (nextime) Lanza authored Feb 20, 2013
  
  d2d651e9
- Export to JS some window settings · 31e360d1
  Franco (nextime) Lanza authored Feb 20, 2013
  
  31e360d1
- Login page and login sequence complete! · 02eafc95
  Franco (nextime) Lanza authored Feb 20, 2013
```
There is also a command SERMES to be added!
```
  02eafc95
19 Feb, 2013 4 commits
- socket write implemented · 6bff57e7
  Franco (nextime) Lanza authored Feb 19, 2013
  
  6bff57e7
- Without a continue idle timer the cpu usage is lower... · f7c2a279
  Franco (nextime) Lanza authored Feb 19, 2013
  
  f7c2a279
- Skylive Message parser is coming... · b6ff20d0
  Franco (nextime) Lanza authored Feb 19, 2013
  
  b6ff20d0
- Initial stesure of the protocol parser · 8be07439
  Franco (nextime) Lanza authored Feb 19, 2013
  
  8be07439