Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-15 04:39:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
24571 commits 25 branches 0 tags 1.1 GiB
Commit graph

24571 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
d68d13489d Working on appearance of menus 2015-04-23 21:55:31 -07:00
Brad Davis
f17387fab4 Working on menus 2015-04-23 21:23:21 -07:00
Seth Alves
cf0499e671 various physics-related experiments 2015-04-23 21:07:04 -07:00
David Rowe
1678d77af6 Log DDE FPS after a reset 2015-04-23 17:18:32 -07:00
Brad Davis
bb1c73adc7 Working on menus 2015-04-23 14:24:01 -07:00
Brad Davis
9a8207610d Bad merge 2015-04-23 14:23:15 -07:00
Brad Davis
8cb298a55b Working on menus 2015-04-23 14:23:15 -07:00
Brad Davis
d2ff89aaec Cleaning up qml 2015-04-23 14:23:13 -07:00
Brad Davis
3ba0df5201 Fixing headers 2015-04-23 14:23:13 -07:00
Brad Davis
8269b9925b Adding first pass at message box 2015-04-23 14:23:12 -07:00
Brad Davis
a9d65f168b Working on marketplace dialog 2015-04-23 14:23:11 -07:00
Andrew Meadows
0daaf20f01 Merge pull request #4675 from sethalves/detect-ballistic 
Detect ballistic motion + fix up simulation-owner code + fix up EntityItem constructor
 2015-04-23 14:19:51 -07:00
David Rowe
d10621f329 Revert DDE start-up permission change 2015-04-23 14:16:59 -07:00
Brad Davis
ae804357d8 Attempting to fix backspace issue in new UI 2015-04-23 14:10:54 -07:00
Clément Brisset
6669f21a4d Merge pull request #4681 from ZappoMan/DomainZoneExample 
Domain zone example & bug fix for default zone shape
 2015-04-23 23:07:34 +02:00
ZappoMan
aac5675579 add full domain example 2015-04-23 13:45:00 -07:00
ZappoMan
5dddca37ca fix default shape of zones 2015-04-23 13:44:39 -07:00
Seth Alves
bc65616bb3 Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic 2015-04-23 13:09:22 -07:00
Brad Hefta-Gaub
ad7293d4ad Merge pull request #4679 from jherico/offscreen 
Fix a couple of bugs with the new offscreen UI
 2015-04-23 12:45:51 -07:00
Brad Hefta-Gaub
33557e5b05 Merge pull request #4680 from huffman/edit-zone-limits 
Add limits to zone fields in entity properties window
 2015-04-23 12:42:32 -07:00
Brad Hefta-Gaub
a4e4e86669 Merge pull request #4676 from Atlante45/zones 
Zones dynamic shapes
 2015-04-23 12:42:07 -07:00
Atlante45
0b1d4fb1d6 Merge branch 'master' of https://github.com/highfidelity/hifi into zones 2015-04-23 21:16:11 +02:00
Ryan Huffman
1657c50920 Add limits to zone fields in entity properties window 2015-04-23 12:00:13 -07:00
Brad Hefta-Gaub
945433be28 Merge pull request #4678 from sethalves/fix-pile-at-origin 
don't pile things up at the origin during a load
 2015-04-23 11:40:46 -07:00
Brad Hefta-Gaub
f036992da6 Merge pull request #4677 from huffman/edit-zones 
Zone editing
 2015-04-23 11:39:41 -07:00
Brad Davis
d0af5580c8 Fix mouse wheel and clickthrough bugs in offscreen UI 2015-04-23 10:28:03 -07:00
Brad Davis
ac7b373231 Throttle rendering needs to ensure it's active context 2015-04-23 10:27:28 -07:00
Ryan Huffman
361bf7e441 Remove unnecessary print 2015-04-23 10:15:18 -07:00
Atlante45
b776ea8110 Make ::contains() back into a const 2015-04-23 19:15:06 +02:00
Atlante45
b340cd06bf Fix volume formula for capsules 2015-04-23 19:14:07 +02:00
Seth Alves
c21e06e7a7 don't pile things up at the origin during a load 2015-04-23 10:08:59 -07:00
Seth Alves
2ca592de8b fix logic with infectious simulation ownership 2015-04-23 10:02:29 -07:00
Ryan Huffman
78207f0d51 Make zones pickable in edit.js while control is down 2015-04-23 10:00:05 -07:00
Atlante45
83490051d9 Move shape related contains() to ShapeInfo 2015-04-23 18:55:20 +02:00
Ryan Huffman
30b9e16c1a Remove unused findRayIntersection from zoneOverlayManager 2015-04-23 09:52:21 -07:00
Ryan Huffman
d45e935b93 Add show zone overlay option to menu 2015-04-23 09:52:01 -07:00
Ryan Huffman
4a99c21e7b Add zoneOverlayManager.js 2015-04-23 09:36:53 -07:00
Ryan Huffman
e0d4a0b1e1 Add functionality to turn zone picking off 2015-04-23 09:36:41 -07:00
Ryan Huffman
b31f95a002 Fix cube rendering not working with transparency 2015-04-23 09:34:23 -07:00
Ryan Huffman
6612f9cb61 Fix key light properties in proeprties window 2015-04-23 09:33:58 -07:00
Ryan Huffman
ab261f4443 Update zone overlay to only be visible when edit is on 2015-04-23 09:33:33 -07:00
Ryan Huffman
af46ece9af Remove overlays.js include 2015-04-23 09:33:10 -07:00
Ryan Huffman
af93634fcb Merge branch 'master' of github.com:highfidelity/hifi into edit-zones 2015-04-23 09:32:37 -07:00
Ryan Huffman
5654e3abed Add zone overlay manager 2015-04-23 09:32:15 -07:00
Seth Alves
10e5378396 fix mangled if 2015-04-23 09:13:18 -07:00
Atlante45
51d99da29f Magic number 2015-04-23 17:50:26 +02:00
Atlante45
f494f86ee5 Handle registration point in transforms 2015-04-23 17:48:29 +02:00
Atlante45
bda72025af Check mesh extend before going through triangles 2015-04-23 16:40:40 +02:00
Brad Hefta-Gaub
82d3302d1b Merge pull request #4644 from jherico/offscreen 
Working on new-UI implementations of address bar and login
 2015-04-23 07:17:45 -07:00
Atlante45
99fd590a90 Update compound shape geometry when async get 2015-04-23 16:05:06 +02:00