Atlante45
|
2d973e5288
|
Move updateMyAvatar to AvatarManager
|
2015-01-29 16:55:32 -08:00 |
|
Atlante45
|
647a935eaa
|
Remove app->getAvatar
|
2015-01-29 15:16:40 -08:00 |
|
Atlante45
|
4ef87b9919
|
Merge branch 'master' of https://github.com/highfidelity/hifi into android
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/ui/PreferencesDialog.cpp
interface/src/ui/Stats.cpp
libraries/audio-client/src/AudioClient.cpp
libraries/audio-client/src/AudioClient.h
|
2015-01-28 13:13:32 -08:00 |
|
Atlante45
|
c25ae9d506
|
Merge branch 'android' of git://github.com/birarda/hifi into android
Conflicts:
interface/src/Application.cpp
libraries/entities/src/EntityCollisionSystem.cpp
libraries/entities/src/EntityCollisionSystem.h
|
2015-01-27 15:04:17 -08:00 |
|
Stephen Birarda
|
54660dd1a2
|
resolve conflicts on merge with upstream master
|
2015-01-27 14:24:48 -08:00 |
|
Atlante45
|
20358a87d6
|
Moved some headers around
|
2015-01-27 01:43:01 -08:00 |
|
Atlante45
|
dbdb87a1a2
|
Moved Menu dependency out of audio
|
2015-01-27 01:21:59 -08:00 |
|
Atlante45
|
71b565c33c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess
Conflicts:
interface/src/Application.cpp
|
2015-01-27 01:21:33 -08:00 |
|
Atlante45
|
4fce5113dd
|
Use DM to access AvatarHashMap/Manager
|
2015-01-23 11:50:27 -08:00 |
|
Andrew Meadows
|
1b7074e52a
|
purge EntityCollisionSystem
|
2015-01-21 14:16:34 -08:00 |
|
Stephen Birarda
|
d2af9a2911
|
have Application pass audio pos/orientation to AudioClient
|
2015-01-21 12:03:11 -08:00 |
|
Stephen Birarda
|
e28ca27ccd
|
add a position and orientation getter for AudioClient
|
2015-01-21 11:55:12 -08:00 |
|
Andrew Meadows
|
86583f3f3f
|
physics collisions emit script collision events
|
2015-01-21 11:27:32 -08:00 |
|
Atlante45
|
77bab2a8c2
|
Setup Thread and timer for settings
|
2015-01-20 17:11:46 -08:00 |
|
Atlante45
|
2b3f12a7c4
|
More settings hooks
|
2015-01-20 16:52:42 -08:00 |
|
Atlante45
|
d15d8e0ad6
|
ScriptsLocation uses new settings
|
2015-01-19 16:45:10 -08:00 |
|
Atlante45
|
c1e195d17b
|
Remove load/saveSettings from Menu/Application
Tweaked scanMenuBar too
|
2015-01-19 16:24:58 -08:00 |
|
Atlante45
|
43597ea29d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess
Conflicts:
interface/src/Application.cpp
interface/src/Menu.cpp
|
2015-01-19 14:18:22 -08:00 |
|
Atlante45
|
967028e5cf
|
Removed more QSettings references
|
2015-01-18 19:29:27 -08:00 |
|
Atlante45
|
c2b7ff1b54
|
Totally removed Application's setting memember
|
2015-01-18 19:10:30 -08:00 |
|
Atlante45
|
6bda5de5e5
|
Move (re)storeSizeAndGeometry out of Application
Moved to MainWindow
|
2015-01-18 18:24:44 -08:00 |
|
Atlante45
|
5266ae5397
|
firstRun uses new Settings
|
2015-01-18 18:24:28 -08:00 |
|
Atlante45
|
1f31828e08
|
Moved last methog out of Menu
Also did a bit of Header cleanup
|
2015-01-18 07:14:52 -08:00 |
|
Atlante45
|
e7a2b0296b
|
Removed Menu::bumpSettings()
|
2015-01-18 06:57:59 -08:00 |
|
Atlante45
|
8933da7bc7
|
Moved SpeechRecognizer out of Menu
Added it in the DM
|
2015-01-18 06:50:34 -08:00 |
|
Atlante45
|
fdce0baee9
|
Removed vsync slot from menu
|
2015-01-18 05:39:53 -08:00 |
|
Atlante45
|
e8a396b08b
|
Moved Octree max pps out of Menu
Moved it to OctreeQuery
|
2015-01-17 23:31:38 -08:00 |
|
Atlante45
|
8996bf8e0d
|
Use qApp
Reuse qApp global variable following Qt's pattern
|
2015-01-16 15:26:42 -08:00 |
|
Andrew Meadows
|
d5119b3532
|
merge upstream/master into andrew/bispinor
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/physics/src/EntityMotionState.h
libraries/physics/src/ObjectMotionState.cpp
libraries/physics/src/PhysicsEngine.cpp
libraries/physics/src/PhysicsEngine.h
|
2015-01-16 14:36:27 -08:00 |
|
Philip Rosedale
|
1ff90bec5d
|
Merge pull request #4124 from AndrewMeadows/inertia
support for simple kinematic motion
|
2015-01-16 13:33:44 -08:00 |
|
Sam Gateau
|
d1fb071208
|
Adding ambient sphere in the lighting equation and menu to control te presets
|
2015-01-16 09:38:53 -08:00 |
|
Andrew Meadows
|
250fd98fee
|
support for simple kinematic motion
|
2015-01-15 17:51:01 -08:00 |
|
Philip Rosedale
|
048d190350
|
Merge pull request #4108 from ctrlaltdavid/20263
CR for Job #20263 - Create a "Bookmarks" capability
|
2015-01-15 10:30:41 -08:00 |
|
Andrew Meadows
|
ff171a5782
|
Bullet is now required dependency
|
2015-01-15 10:27:43 -08:00 |
|
David Rowe
|
95efe9857b
|
Merge branch 'master' into 20263
|
2015-01-15 09:52:19 -08:00 |
|
Ryan Huffman
|
00487fb175
|
Fix issue with avatar data being sent too often
|
2015-01-15 09:45:51 -08:00 |
|
David Rowe
|
fa6faa771a
|
Add bookmarks with Bookmark Location menu item
The menu of bookmarks is kept sorted.
|
2015-01-13 22:39:16 -08:00 |
|
Atlante45
|
36db547c0f
|
Setup DependencyManager before any member of Application
|
2015-01-13 20:35:45 -08:00 |
|
ZappoMan
|
873403a333
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
Conflicts:
interface/src/Audio.cpp
interface/src/Audio.h
interface/src/Menu.cpp
interface/src/Menu.h
|
2015-01-06 12:27:16 -08:00 |
|
ZappoMan
|
0e943ae240
|
remove render view frustum mode
|
2015-01-05 17:23:10 -08:00 |
|
Stephen Birarda
|
51bba4884f
|
resolve conflicts on merge with upstream master
|
2015-01-05 14:40:48 -08:00 |
|
Stephen Birarda
|
dfb02aea0c
|
resolve conflicts on merge, add cstring inc
|
2015-01-05 09:25:30 -08:00 |
|
ZappoMan
|
9630279459
|
Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy
Conflicts:
examples/editVoxels.js
examples/fallingSand.js
examples/growTrees.js
interface/src/Application.cpp
interface/src/Application.h
libraries/avatars/CMakeLists.txt
libraries/entities/src/EntityItem.h
|
2014-12-31 10:50:53 -08:00 |
|
ZappoMan
|
95bb125e48
|
more voxelEctomy
|
2014-12-30 20:13:57 -08:00 |
|
ZappoMan
|
4ea9bbc309
|
first major pass at voxelEctomy
|
2014-12-30 18:08:58 -08:00 |
|
ZappoMan
|
e1d8022409
|
working on removing voxels
|
2014-12-30 14:11:31 -08:00 |
|
Stephen Birarda
|
c7a5f3c86c
|
resolve conflicts and merge with upstream master
|
2014-12-29 10:59:42 -07:00 |
|
Andrew Meadows
|
9b7e50858a
|
merge upstream/master into andrew/inertia
Conflicts:
libraries/avatars/CMakeLists.txt
libraries/entities/CMakeLists.txt
|
2014-12-29 09:15:49 -08:00 |
|
Atlante45
|
da636ca918
|
ModelUploader only has static methods accessible
|
2014-12-23 14:00:23 -08:00 |
|
Atlante45
|
879c3e2fd0
|
Add entity model upload
|
2014-12-23 12:30:00 -08:00 |
|