Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 10:32:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
27308 commits 75 branches 59 tags 1.2 GiB
Commit graph

27308 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
233d92c315 Some code cleanup 2015-06-24 15:44:47 -07:00
Atlante45
31a98c5b40 Replace pos/rot by a transform in Base3DOverlay 
Also keep getBounds a pure virtual methods
 2015-06-24 15:44:47 -07:00
Atlante45
c22f1aa7e1 Overlay2D return correct getBounds 2015-06-24 15:44:46 -07:00
Atlante45
e8da8e374c Simplify Overlays payloadGetBounds 2015-06-24 15:44:46 -07:00
Atlante45
6bb21b7a48 Use dynamic_pointer_cast instead of static_cast 2015-06-24 15:44:45 -07:00
Brad Hefta-Gaub
1cb7d0c1a5 Merge pull request #5194 from jherico/qml_warnings 
Removing qml warnings
 2015-06-24 15:42:36 -07:00
Clément Brisset
6db4184748 Merge pull request #5171 from huffman/fix-edit-rotate 
Fix edit.js rotation display
 2015-06-24 15:35:15 -07:00
Ryan Huffman
1ccd72d01e Revert "Disable edit.js rotation text overlay temporarily" 
This reverts commit b9ecff02f9.
 2015-06-24 15:32:32 -07:00
Sam Gondelman
19ec080e2b Merge with master 2015-06-24 15:04:03 -07:00
bwent
0516caaa32 Added CHECK_PROPERTY_CHANGE macro 2015-06-24 14:58:33 -07:00
Philip Rosedale
0bef506be2 Merge pull request #5190 from jherico/mirror_zoom 
Mirror zoom
 2015-06-24 14:43:14 -07:00
Ryan Huffman
4df1bea4ec Merge pull request #5167 from SamGondelman/hmdControls 
hmdControls.js for movement when wearing an HMD
 2015-06-24 14:40:31 -07:00
Philip Rosedale
584ecf73af Merge pull request #5196 from howard-stearns/toolbar-auto-persist-as-percentage-of-screen 
Toolbar auto persist as percentage of screen
 2015-06-24 14:29:27 -07:00
Ryan Huffman
54ee869d9b Fix y position of toolbar 2015-06-24 14:04:53 -07:00
Ryan Huffman
666eaa81fe Cleanup implementation of toolbar titlebar 2015-06-24 14:02:06 -07:00
Philip Rosedale
b7c64ef246 Merge pull request #5193 from SamGondelman/master 
hydra dead zone to prevent drifting
 2015-06-24 13:52:48 -07:00
DaveDubUK
0e71583048 code review changes for walk.js 1.25 2015-06-24 19:41:54 +07:00
DaveDubUK
73e59fe07f code review changes for walk.js 1.25 2015-06-24 19:25:25 +07:00
DaveDubUK
c2287e9953 code review changes for walk.js 1.25 2015-06-24 19:24:57 +07:00
Howard Stearns
3b8a46b87d Allow scripted audio injectors to have options set. 2015-06-23 21:01:34 -07:00
Howard Stearns
2e4c782626 Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound 2015-06-23 20:51:30 -07:00
Seth Alves
28582ed14d Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-23 19:50:35 -07:00
Zander Otavka
8c77fd369b Add subsections to the edit.js properties list. 2015-06-23 17:40:38 -07:00
Andrew Meadows
1ceed98ca2 Merge pull request #5166 from jherico/64bit 
Enable Windows 64 bit builds
 2015-06-23 17:03:42 -07:00
Zander Otavka
05b668484c Change address bar back/forward button color. 2015-06-23 16:41:15 -07:00
bwent
99cd9bada1 Added Billboard entity property and enabled billboarding for text entities 2015-06-23 16:22:34 -07:00
Brad Davis
fb2fb06371 Fixing misplaced UI on scale resolution, PC edition 2015-06-23 15:42:32 -07:00
Ryan Huffman
694a051724 Add titlebars to toolBars.js 2015-06-23 15:32:24 -07:00
Seth Alves
a46e8ed14c quiet compiler 2015-06-23 15:27:35 -07:00
Seth Alves
0af137af36 save encoded action data rather than generating it on demand 2015-06-23 15:27:25 -07:00
Seth Alves
146f51faac quiet compiler 2015-06-23 15:26:43 -07:00
Ryan Huffman
8a1f446f05 Fix textoverlay3d text position 2015-06-23 14:43:41 -07:00
Seth Alves
b7a952baec Merge pull request #5197 from ericrius1/quadFix 
deleted empty files I accidentally committed.
 2015-06-23 14:31:53 -07:00
ericrius1
b1190bee6e deleted empty files I accidently committed. 2015-06-23 14:13:13 -07:00
Niraj Venkat
0c2e208044 Added basic layout to tooltip QML 2015-06-23 13:54:19 -07:00
Howard Stearns
5114f82dca Fix https://app.asana.com/0/32622044445063/38213714069516 2015-06-23 12:07:01 -07:00
Howard Stearns
62ab4a45d2 Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound 2015-06-23 11:59:05 -07:00
Sam Gondelman
778e19ac11 fixed camera mode issue 2015-06-23 11:45:08 -07:00
David Rowe
93509f4c6e Code review 2015-06-23 11:25:02 -07:00
Brad Davis
da031b039c Removing qml wanrings 2015-06-23 10:58:52 -07:00
Sam Gondelman
c1fdbeb3b4 hydra dead zone to prevent drifting 2015-06-23 10:52:44 -07:00
Seth Alves
6e34678a59 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-23 10:48:21 -07:00
Seth Alves
4bf4e9f5da Merge pull request #5164 from ericrius1/lineBounds 
Line bounds
 2015-06-23 10:47:38 -07:00
Ryan Huffman
3e576fea92 Remove vertical scaling from Text3DOverlay 2015-06-23 10:27:01 -07:00
Niraj Venkat
d1526c25b2 Starting new tooltip design in QML 2015-06-23 10:08:48 -07:00
Philip Rosedale
1930043329 Merge pull request #5191 from ericrius1/gunFix 
fixed bullet size to be smaller for gun.js script
 2015-06-23 09:53:23 -07:00
ericrius1
cf579ab275 fixed bullet size to be smaller 2015-06-23 09:52:29 -07:00
Zander Otavka
1f2e38b20b Merge remote-tracking branch 'origin/master' 2015-06-23 09:32:50 -07:00
Sam Gondelman
824c219fa0 started fixing camera mode issue 2015-06-23 09:26:38 -07:00
Zander Otavka
f7cd756796 Improve entity properties list in edit script. 
Add headers to break up logical sections, and reorder/relabel a few
properties.
 2015-06-23 09:17:23 -07:00