Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 14:38:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
13257 commits 75 branches 59 tags 1.2 GiB
Commit graph

7166 commits

Author SHA1 Message Date
Ryan Huffman
4a0a9f8a36 Update console style 2014-05-27 08:57:29 -07:00
Ryan Huffman
9af0269151 Update console style 2014-05-27 08:05:56 -07:00
Ryan Huffman
b9248e0bbf Update JSConsole to QWidget 2014-05-27 08:03:46 -07:00
Ryan Huffman
422c2eac67 Update showConsole -> toggleConsole and change shortcut 2014-05-27 07:29:48 -07:00
Ryan Huffman
1d7272cbbf Add console.ui interface file 2014-05-26 10:18:04 -07:00
Ryan Huffman
099777ef8c Merge branch 'master' of git://github.com/highfidelity/hifi into 19648 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2014-05-26 10:01:44 -07:00
Ryan Huffman
5a5d5b4983 Add JSConsole 2014-05-26 09:59:28 -07:00
Ryan Huffman
3d28cff9df Add console to menu 2014-05-26 09:58:06 -07:00
Ryan Huffman
c362731226 Add support to load script engines not based on a file 2014-05-26 09:57:37 -07:00
Clément Brisset
6bb933996f Merge pull request #2920 from ZappoMan/aacube 
Add RayPick support for models
 2014-05-24 17:03:59 -07:00
ZappoMan
a98ac0782a CR feedback 2014-05-24 16:37:32 -07:00
Kai Ludwig
587f60631f missed a tab 2014-05-24 21:28:03 +02:00
Kai Ludwig
c832df0783 added missing locking against crashing in Overlays::~Overlays() 2014-05-24 21:22:34 +02:00
ZappoMan
9d9600aad5 fix max dimension 2014-05-23 22:08:31 -07:00
Clément Brisset
3e671c1968 Merge pull request #2922 from birarda/master 
fix credit amount in window title
 2014-05-23 17:43:04 -07:00
Stephen Birarda
fe05beb88d remove an unneeded debug 2014-05-23 17:41:58 -07:00
Stephen Birarda
9df0f2c1e5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-23 17:38:28 -07:00
Stephen Birarda
714e29c887 fix credit amount in window title 2014-05-23 17:37:36 -07:00
Andrzej Kapolka
632f87dc88 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-23 17:15:03 -07:00
Andrzej Kapolka
e48f02f2c5 Remove unused variable. 2014-05-23 17:13:27 -07:00
Clément Brisset
965d5778d6 Merge pull request #2917 from stojce/19705 
Code Review for Job #19705
 2014-05-23 17:07:17 -07:00
Andrzej Kapolka
ac2137c3b6 Fixed a couple copy and paste errors. 2014-05-23 16:56:10 -07:00
Andrzej Kapolka
84b78429f2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-23 16:37:25 -07:00
Andrzej Kapolka
67e3454a86 Missed a few files. 2014-05-23 16:37:12 -07:00
Philip Rosedale
7c8ece6a5b Merge pull request #2919 from AndrewMeadows/inertia 
turn on gravity when there is a voxel floor to stand on
 2014-05-23 16:36:57 -07:00
Andrzej Kapolka
0baf757c0d Basic support for shadows on models. 2014-05-23 16:35:51 -07:00
Stephen Birarda
1e9589c19e fix an implicit cast to float 2014-05-23 16:18:21 -07:00
Stephen Birarda
1b00cda068 don't use powf for credit conversions 2014-05-23 16:12:34 -07:00
Andrew Meadows
8d660c76cc merge upstream/master into andrew/inertia 2014-05-23 16:00:55 -07:00
Andrew Meadows
d425b5b322 Enable local gravity when there is a floor nearby. 2014-05-23 15:59:27 -07:00
Brad Hefta-Gaub
50e812a82b Merge pull request #2913 from talentraspel/19680 
locking against crash
 2014-05-23 15:08:20 -07:00
Brad Hefta-Gaub
43bdc8c156 Merge pull request #2912 from Atlante45/point_and_glow 
Point and glow
 2014-05-23 12:31:41 -07:00
Atlante45
28536eaef2 CR 2014-05-23 11:53:34 -07:00
Stojce Slavkovski
b3b8e2d775 Merge branch 'master' of https://github.com/worklist/hifi into 19705 2014-05-23 20:50:10 +02:00
Stojce Slavkovski
be9aac08ee add disabled state to Share button on click 2014-05-23 20:49:48 +02:00
ZappoMan
7036233a47 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-23 11:47:47 -07:00
Atlante45
f0f62ced6b Don't create a glower if no glow 2014-05-23 11:41:42 -07:00
Brad Hefta-Gaub
861a48f6f9 Merge pull request #2911 from ey6es/master 
Use local viewer model for specular.
 2014-05-23 11:35:40 -07:00
Brad Hefta-Gaub
10b0471641 Merge pull request #2906 from Barnold1953/master 
Write thread safety for Overlays QMaps
 2014-05-23 11:34:02 -07:00
Atlante45
7b9f6f8505 Merge branch 'master' of https://github.com/highfidelity/hifi into point_and_glow 2014-05-23 11:32:52 -07:00
Kai Ludwig
7fb9e3a7e6 spaces instead of tabs. 2014-05-23 20:25:20 +02:00
Kai Ludwig
107c142532 _voxelFades needs locking. 2014-05-23 20:21:00 +02:00
ZappoMan
ee523ff373 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-23 11:17:59 -07:00
barnold1953
6817c9682e Added a new lock specific to deleting, and improved safety 2014-05-23 11:17:55 -07:00
Atlante45
df68082705 Added local glow to models 2014-05-23 11:02:07 -07:00
Andrzej Kapolka
bfd00f1b15 Use local viewer model for specular. 2014-05-23 10:57:14 -07:00
ZappoMan
39ed7f7b65 renaming of AABox to AACube, introduction of actual AABox 2014-05-23 10:45:04 -07:00
barnold1953
9553271fa1 Added some missing locks to make Overlays thread safe for reading as well. 2014-05-23 10:44:40 -07:00
Philip Rosedale
22548b9956 Merge pull request #2909 from PhilipRosedale/master 
add visual indicator of thrust direction
 2014-05-23 09:58:55 -07:00
Philip Rosedale
6998dfae3c add visual indicator of thrust direction 2014-05-23 09:57:47 -07:00