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
overte-thingvellir/interface/resources
History
Ryan Huffman 355fe01490 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/RunningScriptsWidget.cpp
	interface/ui/preferencesDialog.ui
	interface/ui/runningScriptsWidget.ui
2014-06-11 13:30:47 -07:00
..
config Add import configuration 2014-01-10 23:26:58 +01:00
html Update welcome screen 2014-05-06 16:17:40 -07:00
icons - few Adjustments in Application class for Script editor 2014-04-21 05:25:28 +02:00
images Merge remote-tracking branch 'upstream/master' into RunningScripts 2014-04-29 16:28:36 -07:00
info repair usage of INI file for QSettings 2014-02-19 14:09:18 -08:00
mention-sounds fixed mention sounds dir for deployment 2014-05-12 20:55:24 +02:00
meshes Switched from loading FBX and FST simultaneously to loading FST first, then 2014-02-11 14:20:52 -08:00
shaders Cascaded shadow maps for models. 2014-05-29 15:30:40 -07:00
sounds fixed mention sounds dir for deployment 2014-05-12 20:55:24 +02:00
styles Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 2014-06-11 13:30:47 -07:00
visage Add Ryan's updated smoothing factors. 2014-03-21 10:38:29 -07:00