Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 11:13:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
26067 commits 71 branches 56 tags 1.2 GiB
Commit graph

26067 commits

This branch
This branch
All branches
Author SHA1 Message Date
Leonardo Murillo
7aee293df4 Buttons are connected and execting old functions 2015-06-08 14:56:46 -06:00
Leonardo Murillo
edce36f5a1 Checkpoint - buttons in place 2015-06-08 14:29:10 -06:00
Leonardo Murillo
bd85ce1312 Auto Update checkpoint - dialog is QML and populated with real data 2015-06-08 13:55:28 -06:00
Leonardo Murillo
83b7054138 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-08 11:55:47 -06:00
Brad Davis
94cd0762bd Merge pull request #5059 from ctrlaltdavid/20560 
CR for #20560 - Re-style QML Login Window
 2015-06-07 13:19:14 -07:00
David Rowe
d7866d9981 Rename previous Dialog to VrDialog 2015-06-06 10:48:07 -07:00
David Rowe
bbde367386 Rename new Dialog to DialogContainer 2015-06-06 10:42:49 -07:00
Leonardo Murillo
68b419deec Syncing 2015-06-05 17:11:32 -06:00
David Rowe
7fb434613c Fix #include for Unix 2015-06-05 15:57:09 -07:00
Stephen Birarda
a63811a491 Merge pull request #5066 from venkatn93/master 
Title bar shows domain IDs upon teleport
 2015-06-05 18:55:02 -04:00
David Rowe
c7c355c19f Remove circular login dialog variation 2015-06-05 15:37:25 -07:00
Niraj Venkat
141ff70a60 Some changes to constants 2015-06-05 15:36:42 -07:00
Leonardo Murillo
2236ccf0e1 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-05 16:18:03 -06:00
Leonardo Murillo
dea80d1757 Styling update dialog and working towards passing build details from c++ to qml 2015-06-05 16:17:54 -06:00
Andrew Meadows
886ec63072 Merge pull request #5067 from sethalves/actions 
undo unneeded/breaky change in grab.js
 2015-06-05 14:02:35 -07:00
Seth Alves
037a70b03a undo unneeded/breaky change in grab.js 2015-06-05 13:47:07 -07:00
Niraj Venkat
827d8bd854 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-05 13:33:41 -07:00
Niraj Venkat
a3f19e9d4c Fixing title bar update on teleport 2015-06-05 13:33:14 -07:00
Andrew Meadows
30389ad51f Merge pull request #5039 from sethalves/actions 
Actions
 2015-06-05 13:26:44 -07:00
David Rowe
ee8449712c Code review and tidying 2015-06-05 13:23:06 -07:00
David Rowe
7e9122e3d1 Replace login background SVGs with QML rectangles 2015-06-05 13:15:18 -07:00
David Rowe
f168385798 Add spinner in place of "Logging in..." 2015-06-05 12:57:40 -07:00
Seth Alves
b425cc6491 merge from upstream 2015-06-05 11:56:33 -07:00
Seth Alves
b0480af040 Merge pull request #5053 from AndrewMeadows/isothermal 
fix crash during bogus reconnect on login
 2015-06-05 11:38:23 -07:00
Seth Alves
aff582287d use const references for arguments in action-related calls 2015-06-05 11:26:54 -07:00
Philip Rosedale
1f11625db4 Merge pull request #5060 from ericrius1/paint 
moved ball marker closer to hand so painting feels more visceral
 2015-06-05 11:26:22 -07:00
Andrew Meadows
53fa6cf0b2 Merge pull request #5040 from jherico/web-entities-fix 
Fixing web entity glow and 'back' behavior
 2015-06-05 10:46:58 -07:00
Niraj Venkat
a2165e3a8a Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-05 10:42:20 -07:00
Seth Alves
28c034698f Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-05 10:41:20 -07:00
Seth Alves
c5143cdfa0 Merge pull request #5027 from AndrewMeadows/isentropic 
cleanup around sending all "terse update" data whenever some of it changes
 2015-06-05 10:41:06 -07:00
Niraj Venkat
c8236f867b Address manager changes to support domain ID 2015-06-05 10:40:17 -07:00
Seth Alves
4e10c28b41 merge from upstream 2015-06-05 10:31:13 -07:00
Seth Alves
edb3622c85 Merge pull request #5037 from AndrewMeadows/inertia 
collision groups for physical objects
 2015-06-05 10:26:28 -07:00
Eric Levin
9f974c3b5c moves ball marker closer to avatar for mouse as well 2015-06-05 10:19:39 -07:00
Seth Alves
08902d0ec9 Merge pull request #5061 from jherico/skybox-jiggle 
Fix the skybox jiggle in the HMD
 2015-06-05 10:14:07 -07:00
Seth Alves
51f5730e68 formatting 2015-06-05 10:05:11 -07:00
Seth Alves
eb912892dc code review 2015-06-05 09:56:34 -07:00
Brad Davis
16f55c7557 Fix the skybox jiggle in the HMD 2015-06-05 09:52:56 -07:00
David Rowe
562228e924 Change login password recovery link text 2015-06-05 09:47:34 -07:00
Eric Levin
30ba7ffc29 moved ball marker closer to hand so painting feels more visceral 2015-06-05 09:36:12 -07:00
David Rowe
37aefe73f8 Remove unnecessary semicolons 2015-06-05 09:07:07 -07:00
David Rowe
426fbc662a White error text instead of black 2015-06-05 09:03:46 -07:00
David Rowe
6c7fb7e54c Fix setting focus at start-up when not logged in 2015-06-05 09:02:35 -07:00
Seth Alves
2086a25f93 oops 2015-06-05 08:59:19 -07:00
Seth Alves
086b9d404a fix return-type in lambda 2015-06-05 08:59:08 -07:00
Leonardo Murillo
01236e0159 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-05 09:48:44 -06:00
Andrew Meadows
9cb7cb314d update minimum version support 2015-06-05 08:43:48 -07:00
David Rowe
977eae9f86 Make login password and register links work 2015-06-05 08:42:33 -07:00
Andrew Meadows
08b64666fe Merge pull request #5033 from howard-stearns/smooth-initial-crash-volume 
Smooth initial crash volume
 2015-06-05 08:40:09 -07:00
David Rowe
ce78a95dee Make login dialog able to be dragged 2015-06-05 08:22:36 -07:00