dubslow
|
6eeec77cce
|
Merge branch 'master' into profiles
Conflicts:
misc/settings.cpp
misc/settings.h
widget/widget.cpp
|
2014-10-10 17:43:15 -05:00 |
|
dubslow
|
a99e7d2b94
|
tweaks
|
2014-10-09 04:26:32 -05:00 |
|
dubslow
|
983879e799
|
IT WORKS, IT FINALLY WORKS
|
2014-10-09 03:59:35 -05:00 |
|
dubslow
|
0050589cde
|
(Re)implement profiles UI, using some of the old code.
Avatars aren't handled on switching, and also something about friends disappearing...
|
2014-10-09 03:07:26 -05:00 |
|
krepa098
|
3e234bd076
|
progress
|
2014-10-08 14:25:32 +02:00 |
|
apprb
|
35aeca5dd0
|
cosmetic fixes
|
2014-10-06 03:02:12 +09:00 |
|
apprb
|
866f986d04
|
small fixes
|
2014-10-06 01:30:31 +09:00 |
|
apprb
|
8fa9457305
|
base refactoring
|
2014-10-06 01:17:01 +09:00 |
|
dubslow
|
8212a3dad0
|
Added all current settings except cam test, which segfaults on init...
|
2014-09-30 04:44:27 -05:00 |
|
dubslow
|
d971d7e647
|
scaling still isn't quite right...
|
2014-09-15 08:48:17 -05:00 |
|
dubslow
|
5dc4128215
|
cosmetics
|
2014-09-15 08:31:42 -05:00 |
|
bill
|
aa801f9615
|
new settings infrastructure done, though there's a double free or something in ~Widget()
|
2014-09-15 05:45:59 -05:00 |
|