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

23961 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
efa5c473d2 add fatten-faces mode to convex-hull tool for use on meshes which were derived from height-fields 2015-04-09 14:29:17 -07:00
Seth Alves
66ea6f4eb4 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-09 09:59:00 -07:00
Clément Brisset
59a5fac2f1 Merge pull request #4619 from ctrlaltdavid/memory-fixes 
Memory fixes
 2015-04-09 18:51:02 +02:00
samcake
91d6046051 Merge pull request #4622 from jherico/starfield_hack_fix 
Ensure blending is enabled during starfield rendering
 2015-04-09 09:45:14 -07:00
Brad Davis
21dd87c11c Merge pull request #4620 from Atlante45/remove_url_extra_whitespace 
Trim entity properties set from JS that are strings
 2015-04-09 09:29:46 -07:00
Brad Davis
5efb960645 Ensure blending is enabled during starfield rendering 2015-04-09 09:18:53 -07:00
David Rowe
b2dd53ac43 Coding standard 2015-04-09 08:37:24 -07:00
Atlante45
298a81cea9 Trim entity properties set from JS that are strings 2015-04-09 14:42:26 +02:00
Clément Brisset
36631dd3a3 Merge pull request #4608 from ctrlaltdavid/fix-animation-not-starting 
CR for Animation fixes
 2015-04-09 11:39:13 +02:00
Philip Rosedale
f51cafa066 Merge pull request #4616 from huffman/marketplace-always-visible 
Marketplace always visible
 2015-04-08 20:51:51 -07:00
David Rowe
76d6c6cac5 Delete char* items properly 2015-04-08 20:03:42 -07:00
David Rowe
e768852645 Fix catching bad_alloc 
Non-allocation wasn't caught on Windows; it just crashed.
 2015-04-08 20:02:22 -07:00
Ryan Huffman
a0e324f9f5 Add error for when importing on a domain without permissions 2015-04-08 13:58:14 -07:00
Ryan Huffman
b6af9fde9e Make marketplace button always visible 2015-04-08 13:57:41 -07:00
Philip Rosedale
5e681ee56b Merge pull request #4615 from huffman/align-checkboxes 
Align checkboxes
 2015-04-08 13:39:25 -07:00
Ryan Huffman
e3dea8ccc8 Remove margin in entityProperties 2015-04-08 13:24:03 -07:00
Ryan Huffman
92b91c9a38 Fix checkboxes not aligning with label 2015-04-08 13:23:48 -07:00
Philip Rosedale
b89a50590e Merge pull request #4614 from huffman/new-entity-position 
Update new entity positioning to be in front of camera
 2015-04-08 12:55:57 -07:00
Ryan Huffman
e2a7072270 Update new entity positioning to be in front of camera 2015-04-08 12:50:02 -07:00
Philip Rosedale
9abe5ee292 Merge pull request #4612 from huffman/entity-properties-size 
Entity properties size
 2015-04-08 12:18:32 -07:00
Philip Rosedale
52f82b0768 Merge pull request #4613 from samcake/orange 
fix the rendering bug on mac release
 2015-04-08 11:27:06 -07:00
samcake
4fb5c8f907 fix the rendering bug on mac release due to the State::DepthTest not properly aligned to 4bytes. Improved the glCheckError for knowing where the error comes from. 2015-04-08 11:04:13 -07:00
Seth Alves
62fe9870e3 more command-line arguments 2015-04-08 10:48:13 -07:00
Ryan Huffman
83918c53b9 Update entityProperties properties to take up less space 2015-04-08 10:18:29 -07:00
Ryan Huffman
dc503ac068 Update entityProperties checkboxes to be inlined 2015-04-08 10:18:04 -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
David Rowe
43a130dabe Fix Stop button not working at the end of a non-looped animation 2015-04-07 14:02:42 -07:00
David Rowe
09b929b729 Restart looped animation running at shutdown when Interface starts 2015-04-07 14:02:24 -07:00
David Rowe
670d455b90 Fix manually entered attachment model URL not being used 2015-04-07 13:47:37 -07:00
David Rowe
ccf3afadfb Fix manually entered joint mask value not being applied 2015-04-07 13:43:58 -07:00
David Rowe
082a9196ff Fix manually entered animation URL not being able to be started 2015-04-07 13:43:04 -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