Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 19:53:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23932 commits 71 branches 56 tags 1.2 GiB
Commit graph

23932 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
62fe9870e3 more command-line arguments 2015-04-08 10:48:13 -07:00
Seth Alves
b09cade568 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-08 09:18:22 -07:00
Andrew Meadows
ad33bf0dfb Merge pull request #4609 from sethalves/island 
physics collision model extents, more vhacd changes
 2015-04-08 09:02:36 -07:00
Seth Alves
4600173faa Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-08 08:57:48 -07:00
Philip Rosedale
b949353b0b Merge pull request #4611 from AndrewMeadows/isentropic 
use DynamicCharacterController
 2015-04-08 08:03:01 -07:00
Brad Davis
b55bb998d2 Merge pull request #4607 from samcake/orange 
Add support for Color attribute loading from FBX model
 2015-04-07 17:26:16 -07:00
Brad Davis
9b34003e2d Merge pull request #4599 from Atlante45/fix_quit_vrmode_on_close 
Quit VRMode before aboutToQuit runs
 2015-04-07 17:06:29 -07:00
Andrew Meadows
92b4e2f1e1 Merge pull request #4572 from jherico/console 
Remove the console window created when you start interface on win32 platforms
 2015-04-07 16:49:26 -07:00
Philip Rosedale
af3073e6c3 Merge pull request #4584 from jherico/menu 
Stop the menu from breaking on leaving HMD mode
 2015-04-07 16:41:41 -07:00
Andrew Meadows
2ccc25e380 remove old kinematic CharacterController 2015-04-07 16:29:52 -07:00
Andrew Meadows
40c94fa00e merge upstream/master into andrew/isentropic 2015-04-07 16:23:38 -07:00
Andrew Meadows
d9146b1033 jump to hover works again 2015-04-07 16:23:06 -07:00
Seth Alves
e8ff727c61 when populating shape-info, give the dimensions of the collision model rather than those of the visual model 2015-04-07 15:47:13 -07:00
Seth Alves
3cfafea5ca Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-07 15:09:50 -07:00
Andrew Meadows
b5f0c57dd1 jumping and hovering works with dynamic controller 2015-04-07 15:07:46 -07:00
Brad Davis
c1a1157df9 Merge branch 'master' into menu 2015-04-07 14:41:17 -07:00
Sam Gateau
ad9129b552 Fixing all the shaders for entities to work correctly with the now supported color attribute field 2015-04-07 14:26:45 -07:00
Clément Brisset
61028d12b5 Merge pull request #4600 from jherico/render_crash_on_exit 
Ensure the frame timer doesn't re-engage on exit
 2015-04-07 22:17:47 +02:00
Sam Gateau
f0efade06d Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-07 12:56:21 -07:00
Andrew Meadows
a47170b02c Merge pull request #4601 from samcake/temp1 
Introducing gpu::State and using it in the Model rendering path and more...
 2015-04-07 12:48:42 -07:00
Brad Davis
2f4c3057f3 Merge pull request #4604 from Atlante45/oculus_pick_offset 
Oculus pick offset
 2015-04-07 11:48:21 -07:00
Sam Gateau
9d6839e6a1 Merge branch 'temp1' of https://github.com/samcake/hifi into orange 2015-04-07 11:45:57 -07:00
Sam Gateau
25643479c9 Fixed the memory leak, due to the location pointer in the Model::RenderPipelineLib which was not smart pointed correctly 2015-04-07 11:20:55 -07:00
Seth Alves
bc9e818b95 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-07 11:12:16 -07:00
Philip Rosedale
fff4c040a0 Merge pull request #4606 from ctrlaltdavid/20444 
CR for Job #20444 - Add everyone / friends filter to users list
 2015-04-07 10:55:07 -07:00
Brad Davis
f6fba05e18 Merge pull request #4603 from sethalves/logging-cleanup 
Logging cleanup
 2015-04-07 10:54:51 -07:00
David Rowe
7acc413c66 Change visibility radio buttons to pop-up menu 2015-04-07 10:43:50 -07:00
Sam Gateau
88afb3cedc solution to the color attribute case 2015-04-07 10:04:51 -07:00
Seth Alves
ef5dffecf6 fix filenames in comments 2015-04-07 10:03:14 -07:00
Seth Alves
9014397167 try again without macro 2015-04-07 09:59:04 -07:00
David Rowe
a844b73fcc Move widget parameters into propeties 2015-04-07 09:27:53 -07:00
Seth Alves
e63b39f061 oops missed one 2015-04-07 09:15:40 -07:00
Seth Alves
fc5b442e12 interface is reserved, so use interfaceapp as the logging tag for interface. also experiment with a macro for logging 2015-04-07 09:15:11 -07:00
Atlante45
5e3ed1c8e4 Compute correct mouse position 2015-04-07 17:15:16 +02:00
Atlante45
1cc4384404 Add new frame of reference for cursor 2015-04-07 17:13:30 +02:00
Atlante45
ae6ee54569 Fix ray collision not using inverse rot 2015-04-07 17:11:02 +02:00
Atlante45
73f9276c74 Fix warning 2015-04-07 17:10:31 +02:00
David Rowe
187ca2a403 Widgetize pop-up menu 2015-04-07 00:38:07 -07:00
Sam Gateau
dee651069c adding support for color attribute in FBX, and displaying it correctly 2015-04-06 23:33:13 -07:00
David Rowe
0cbe4d3673 Apply users filter per control value 2015-04-06 22:09:03 -07:00
David Rowe
798d6437b1 Add pop-up menu of "show me" values 2015-04-06 21:54:15 -07:00
David Rowe
6cd512762d Add "Show me" prompt, value, and button to users online window 2015-04-06 20:51:17 -07:00
Seth Alves
fb607e2b26 logging groups for library/shared and interface 2015-04-06 18:45:06 -07:00
David Rowe
5a86f21506 Remove "2D" from identifiers 2015-04-06 18:39:30 -07:00
Seth Alves
cd5245d0d6 logging group for render-utils 2015-04-06 18:16:01 -07:00
Seth Alves
55bab2efd6 put physics into its own logging group 2015-04-06 18:09:45 -07:00
Sam Gateau
7f46736bb4 playing with the shadwos 2015-04-06 17:17:25 -07:00
Seth Alves
3efcc3684e split out octree logging 2015-04-06 17:05:09 -07:00
Seth Alves
91861e9e5a split out octree logging 2015-04-06 17:04:49 -07:00
Seth Alves
8bd77fbcc7 separate out logging for fbx and gpu libraries 2015-04-06 16:52:31 -07:00