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

20907 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
16261a5fc1 more updates for new place/location APIs 2015-01-13 14:49:24 -08:00
Andrew Meadows
04b4a95ccb fix for bad cleanup (3 places) 2015-01-13 14:21:41 -08:00
Stephen Birarda
1af87e57da handle new places API format in AddressManager 2015-01-13 14:21:07 -08:00
Sam Gateau
d9efafac7e updating the model fragment shaders to use DeferredBUfferWrite 2015-01-13 14:11:38 -08:00
Andrew Meadows
cee7a4db10 merge upstream/master into andrew/inertia 2015-01-13 14:03:27 -08:00
Andrew Meadows
dcca5d532a fix for glitchy physics updates 
The main problem was: ObjectMotionState::_sentPosition and friends
were not being updated when the EntityServer update arrives.
 2015-01-13 14:00:37 -08:00
ZappoMan
0e19e1f8a5 cleanup some dead code 2015-01-13 13:48:28 -08:00
ZappoMan
60aec8ac00 add support for multiple backup rules 2015-01-13 13:41:32 -08:00
Atlante45
4429e144f4 Fix merge accidental code delete 2015-01-13 11:10:13 -08:00
Atlante45
d8170516ff Remove VoxelServer.cpp kept during merge 2015-01-13 11:05:51 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
 2015-01-13 11:03:14 -08:00
Andrew Meadows
89dceefd2f Merge pull request #4095 from Atlante45/body_not_rotating 
Cache size dialog
 2015-01-13 10:53:18 -08:00
Sam Gateau
522e7698a5 first step factorizing the packDeferredFragment 2015-01-13 10:23:00 -08:00
Ryan Huffman
00f7bf7efe Remove 'Edit Properties...' in favor of properties window 2015-01-13 10:12:15 -08:00
Ryan Huffman
96f75df831 Add missing model properties to entity property window 2015-01-13 10:09:05 -08:00
Sam Gateau
6d217e1479 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-13 10:07:27 -08:00
Stephen Birarda
1b1fd2bc16 Merge pull request #4098 from birarda/master 
don't warn about c++11 for MSVC12
 2015-01-13 09:54:49 -08:00
Stephen Birarda
30f898109d don't warn about c++11 for MSVC12 2015-01-13 09:40:55 -08:00
Ryan Huffman
0c58572d32 Reduce size of camera tool cubes 2015-01-13 08:45:11 -08:00
Ryan Huffman
e873df9680 Remove mode buttons from camera tool and increase size 2015-01-13 08:39:59 -08:00
Ryan Huffman
aad49e4404 Update camera tool to only show when edit entities is enabled 2015-01-13 08:26:32 -08:00
Ryan Huffman
80351a768e Enable camera tool 2015-01-13 08:26:11 -08:00
Sam Gateau
fc698a8525 first step factorizing the packDeferredFragment 2015-01-12 18:51:26 -08:00
Atlante45
cf7089e145 Move constant back to Menu 2015-01-12 18:49:05 -08:00
Brad Hefta-Gaub
47aba6c23b Merge pull request #4096 from Atlante45/move_hydra_grab 
Move scripts to correct directory
 2015-01-12 17:50:50 -08:00
Atlante45
2b48d31cbb Move scripts to correct directory 2015-01-12 17:48:54 -08:00
Atlante45
9ce405a744 Text3DOverlay forward definition 2015-01-12 17:46:38 -08:00
Atlante45
79b9a898de Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating 2015-01-12 17:34:13 -08:00
Atlante45
7d39b45f16 Hopefully fixes the windows compile error 2015-01-12 17:34:07 -08:00
Brad Hefta-Gaub
535f6e267b Merge pull request #4069 from ctrlaltdavid/static-glew 
Use static GLEW in render-utils for Windows
 2015-01-12 17:30:47 -08:00
ZappoMan
ea3a5b7fcd use last backup files timestamp as last backup time. 2015-01-12 17:29:10 -08:00
Atlante45
b6ba82653f Remove glm dependency 2015-01-12 17:00:39 -08:00
Atlante45
74d819fe25 Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating 2015-01-12 16:42:35 -08:00
Atlante45
80af2adf12 Remove constexpr because windows can't handle them 2015-01-12 16:42:27 -08:00
Clément Brisset
60aafba0ce Merge pull request #4077 from huffman/fix-render-hud-windows-linux 
Fix gl projection matrix stack overflow when rendering to HUD
 2015-01-12 16:22:09 -08:00
Clément Brisset
206e1e48f6 Merge pull request #4086 from huffman/std-to-qstring 
Std to qstring
 2015-01-12 16:19:28 -08:00
Clément Brisset
10331c52a8 Merge pull request #4094 from birarda/master 
repairs to AudioScriptingInterface playSound
 2015-01-12 16:18:41 -08:00
Thijs Wenker
8c7099a0bb changed "Load Scripts" label to be better understandable 2015-01-13 01:09:28 +01:00
Stephen Birarda
661221a189 repairs to AudioScriptingInterface playSound 2015-01-12 16:04:00 -08:00
Atlante45
ea3626d87f Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating 2015-01-12 16:03:32 -08:00
Atlante45
934d8d58ef Move some constants out of Menu class files 2015-01-12 16:03:15 -08:00
Sam Gateau
2e1533cd61 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-12 15:59:43 -08:00
Atlante45
e30b119464 Some simple code cleanup 2015-01-12 15:55:25 -08:00
Sam Gateau
1566157250 Use the DeferredBuffer.slh in point and spot lights 2015-01-12 15:52:31 -08:00
Thijs Wenker
336a96bd48 Merge branch 'master' of https://github.com/worklist/hifi into 20255 2015-01-13 00:44:39 +01:00
Atlante45
8415098fc2 Set different caches size depending on cache type 2015-01-12 15:36:36 -08:00
Sam Gateau
67da1148ac global ambient light back 2015-01-12 15:22:47 -08:00
Atlante45
59c9e0bb50 Wire CachesSizeDialog in Menu 2015-01-12 15:19:36 -08:00
Stephen Birarda
208af5cbca Revert "don't play muzak from lobby to avoid error" 
This reverts commit 69f5c769b8.
 2015-01-12 15:14:49 -08:00
Sam Gateau
c45f618852 Factorising the shader code to unpack data from the deferred buffer 2015-01-12 15:00:35 -08:00