Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
31449 commits 2 branches 0 tags 1.1 GiB
Commit graph

222 commits

Author SHA1 Message Date
Brad Davis
5f1affaff9 Procedural skybox work 2015-09-08 14:31:16 -07:00
ZappoMan
b7d9dc444b more work on clicking focus 2015-08-17 13:06:32 -07:00
Brad Davis
19d31938d3 Merge remote-tracking branch 'upstream/master' into plugins 2015-08-10 21:25:35 -07:00
Bradley Austin Davis
7e60aee1bf Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/Head.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/devices/3DConnexionClient.cpp
	interface/src/ui/overlays/Overlays.cpp
 2015-08-06 11:03:37 -07:00
ericrius1
12770edbe1 Merge branch 'master' into polyLineInProgress 2015-08-03 15:52:26 -07:00
ericrius1
47bc8f50ab cleaning 2015-08-03 08:45:14 -07:00
ZappoMan
c15161b71a fix crash in Particle Entities and pendingChanges.updateItem() 2015-07-28 14:56:38 -07:00
Seth Alves
ee334ff826 JointStates are owned by Rig objects. Model, FaceModel, SkeletonModel call into their Rig pointer to access JointStates. 2015-07-22 18:43:10 -07:00
Stephen Birarda
0177513285 resolve conflicts on merge with upstream/master 2015-07-20 12:29:38 -07:00
Brad Davis
d68618e206 Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
ericrius1
a44e5f949c Merge branch 'master' into polyLineInProgress 2015-07-17 15:01:40 -07:00
Stephen Birarda
e5722098f6 resolve conflicts on merge with upstream/master 2015-07-17 11:06:01 -07:00
ZappoMan
819fa852b8 first pass at GlowEctomy 2015-07-15 12:47:59 -07:00
Atlante45
7bf45308b6 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-14 12:31:37 -07:00
Ryan Huffman
0edc909818 Merge branch 'protocol' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	interface/src/Application.cpp
	libraries/networking/src/Packet.cpp
 2015-07-14 10:21:31 -07:00
Brad Davis
684d466b44 Merge pull request #5308 from venkatn93/avatar 
Avatars rendered correctly based on Scene.shouldRenderAvatars
 2015-07-14 09:06:49 -07:00
Niraj Venkat
ef3c6b25e0 More coding standard changes 2015-07-14 00:45:38 -07:00
ZappoMan
5676246d75 fix the lingering model parts sometimes left behind when switching domains 2015-07-13 15:26:52 -07:00
Stephen Birarda
d990420565 repairs to octree packet receiving in interface 2015-07-13 13:10:57 -07:00
ericrius1
0ce6737b34 merged and normals flipping 2015-07-13 09:43:15 -07:00
Atlante45
a3848f08d2 Conditionnal fixes. 2015-07-10 15:36:17 -07:00
Atlante45
49993695a5 Made geometry refresh safe 2015-07-10 15:20:19 -07:00
Niraj Venkat
706f85e4ce Fixes to comply with coding standard 2015-07-09 17:31:38 -07:00
Niraj Venkat
bd91daf712 Removing debug code 2015-07-09 16:27:23 -07:00
Niraj Venkat
1dce5f80cc Entities are now added/removed from rendering based on Scene.shouldRenderEntities 2015-07-09 16:17:58 -07:00
ericrius1
ad54b4c0b0 changed quad entity to PolyLine 2015-07-01 17:18:36 -07:00
ericrius1
cf720f9e2e merged master 2015-06-29 09:27:40 -07:00
ZappoMan
f61581d29d possible fix for deadlock 2015-06-26 15:42:04 -07:00
David Rowe
1898c6bd55 Merge branch 'master' into 20547 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-06-26 13:05:51 -07:00
Niraj Venkat
6b14a64c8c Formatting changes and teleport on click 2015-06-25 15:15:44 -07:00
ericrius1
9dc6846eba rendering wad entity 2015-06-22 15:12:35 -07:00
Philip Rosedale
111b0f286d Merge pull request #5160 from ctrlaltdavid/addressbar-tidy 
Tidy address bar code
 2015-06-22 12:08:33 -07:00
Howard Stearns
dc10e15e96 Put the common stuff on AudioInjector rather than AudioClient, so that assignment-client (which depends on script-engine) does not need to depend on audio-client. 2015-06-19 14:20:00 -07:00
David Rowe
1047703718 Tidy address bar code 
Re-enable and reposition mouse drag areas
Remove unused graphics assets
Remove unused includes
 2015-06-18 11:18:56 -07:00
Howard Stearns
fdf5860c4f Refactor playSound. 2015-06-18 10:39:58 -07:00
David Rowe
6623d0c552 Add "Reload" button associated with entity editor's script URL field 
The Reload button re-downloads the script for both the editor and for
everyone in the vicinity.
 2015-06-17 16:11:32 -07:00
Niraj Venkat
428b80a50d Removing old debug print code 2015-06-12 17:49:07 -07:00
Niraj Venkat
b9b8cfd60d Starting the new address bar layout 2015-06-12 14:08:06 -07:00
Niraj Venkat
9a193acfa0 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-11 16:28:16 -07:00
Niraj Venkat
366be3c0c0 Check if entity looked at has valid hyperlink href attached 2015-06-11 16:27:50 -07:00
Seth Alves
b1a209b9db pull some common code out of subclasses and into ObjectAction 2015-06-09 16:17:48 -07:00
Brad Hefta-Gaub
202e39799a Merge pull request #5062 from ZappoMan/team-teaching 
Team teaching - merge from master
 2015-06-05 12:21:10 -07:00
Ryan Huffman
37d9394140 Fix entity payloads not being removed on delete 2015-06-05 10:26:09 -07:00
ZappoMan
807cc3db24 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 09:37:39 -07:00
Howard Stearns
407d3b6a6e Pitch is dependent on (largest dimension of) minimum bounding, not max. 
Adjust sound range of full volume.
 2015-06-04 14:23:51 -07:00
Atlante45
8e21d9c14b Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-04 18:11:17 +02:00
ZappoMan
4b389793ad CR feedback 2015-06-04 08:42:10 -07:00
Atlante45
a4340b17e9 Remove deprecated render stats 2015-06-04 14:47:04 +02:00
ZappoMan
c6fb22b915 make sure all entities are rendering in pipeline part 1 2015-06-03 17:16:45 -07:00
Howard Stearns
407746b842 Fix (consistent) typo in non-magic-number constant's name. 2015-06-03 10:38:20 -07:00