Merge pull request #1 from atduskgreg/master

real readme
obviousjim · Jan 24, 2012 · 8fa99bc · 8fa99bc
2 parents 11323c2 + fdfb8ae
commit 8fa99bc
Show file tree

Hide file tree

Showing 78 changed files with 10 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/.../Assets/Editor/Project1ExampleTemplate.js → .../Assets/Editor/Project1ExampleTemplate.js b/.../Assets/Editor/Project1ExampleTemplate.js → .../Assets/Editor/Project1ExampleTemplate.js
diff --git a/...ectFIles/Assets/Plugins/GeometryHelper.js → ...ectFiles/Assets/Plugins/GeometryHelper.js b/...ectFIles/Assets/Plugins/GeometryHelper.js → ...ectFiles/Assets/Plugins/GeometryHelper.js
diff --git a/ProjectFIles/Assets/Project1Example.unity → ProjectFiles/Assets/Project1Example.unity b/ProjectFIles/Assets/Project1Example.unity → ProjectFiles/Assets/Project1Example.unity
diff --git a/ProjectFIles/Library/AnnotationManager → ProjectFiles/Library/AnnotationManager b/ProjectFIles/Library/AnnotationManager → ProjectFiles/Library/AnnotationManager
diff --git a/ProjectFIles/Library/AssetImportState → ProjectFiles/Library/AssetImportState b/ProjectFIles/Library/AssetImportState → ProjectFiles/Library/AssetImportState
diff --git a/ProjectFIles/Library/AssetServerCacheV3 → ProjectFiles/Library/AssetServerCacheV3 b/ProjectFIles/Library/AssetServerCacheV3 → ProjectFiles/Library/AssetServerCacheV3
diff --git a/ProjectFIles/Library/AssetVersioning.db → ProjectFiles/Library/AssetVersioning.db b/ProjectFIles/Library/AssetVersioning.db → ProjectFiles/Library/AssetVersioning.db
diff --git a/ProjectFIles/Library/AudioManager.asset → ProjectFiles/Library/AudioManager.asset b/ProjectFIles/Library/AudioManager.asset → ProjectFiles/Library/AudioManager.asset
diff --git a/ProjectFIles/Library/BuildPlayer.prefs → ProjectFiles/Library/BuildPlayer.prefs b/ProjectFIles/Library/BuildPlayer.prefs → ProjectFiles/Library/BuildPlayer.prefs
diff --git a/ProjectFIles/Library/BuildSettings.asset → ProjectFiles/Library/BuildSettings.asset b/ProjectFIles/Library/BuildSettings.asset → ProjectFiles/Library/BuildSettings.asset
diff --git a/ProjectFIles/Library/DynamicsManager.asset → ProjectFiles/Library/DynamicsManager.asset b/ProjectFIles/Library/DynamicsManager.asset → ProjectFiles/Library/DynamicsManager.asset
diff --git a/...ctFIles/Library/EditorBuildSettings.asset → ...ctFiles/Library/EditorBuildSettings.asset b/...ctFIles/Library/EditorBuildSettings.asset → ...ctFiles/Library/EditorBuildSettings.asset
diff --git a/ProjectFIles/Library/EditorSettings.asset → ProjectFiles/Library/EditorSettings.asset b/ProjectFIles/Library/EditorSettings.asset → ProjectFiles/Library/EditorSettings.asset
diff --git a/...les/Library/EditorUserBuildSettings.asset → ...les/Library/EditorUserBuildSettings.asset b/...les/Library/EditorUserBuildSettings.asset → ...les/Library/EditorUserBuildSettings.asset
diff --git a/ProjectFIles/Library/FailedAssetImports.txt → ProjectFiles/Library/FailedAssetImports.txt b/ProjectFIles/Library/FailedAssetImports.txt → ProjectFiles/Library/FailedAssetImports.txt
diff --git a/ProjectFIles/Library/InputManager.asset → ProjectFiles/Library/InputManager.asset b/ProjectFIles/Library/InputManager.asset → ProjectFiles/Library/InputManager.asset
diff --git a/...Iles/Library/InspectorExpandedItems.asset → ...iles/Library/InspectorExpandedItems.asset b/...Iles/Library/InspectorExpandedItems.asset → ...iles/Library/InspectorExpandedItems.asset
diff --git a/ProjectFIles/Library/MonoManager.asset → ProjectFiles/Library/MonoManager.asset b/ProjectFIles/Library/MonoManager.asset → ProjectFiles/Library/MonoManager.asset
diff --git a/ProjectFIles/Library/NetworkManager.asset → ProjectFiles/Library/NetworkManager.asset b/ProjectFIles/Library/NetworkManager.asset → ProjectFiles/Library/NetworkManager.asset
diff --git a/ProjectFIles/Library/ProjectSettings.asset → ProjectFiles/Library/ProjectSettings.asset b/ProjectFIles/Library/ProjectSettings.asset → ProjectFiles/Library/ProjectSettings.asset
diff --git a/ProjectFIles/Library/QualitySettings.asset → ProjectFiles/Library/QualitySettings.asset b/ProjectFIles/Library/QualitySettings.asset → ProjectFiles/Library/QualitySettings.asset
diff --git a/...ssemblies/Assembly-UnityScript-Editor.dll → ...ssemblies/Assembly-UnityScript-Editor.dll b/...ssemblies/Assembly-UnityScript-Editor.dll → ...ssemblies/Assembly-UnityScript-Editor.dll
diff --git a/...blies/Assembly-UnityScript-Editor.dll.mdb → ...blies/Assembly-UnityScript-Editor.dll.mdb b/...blies/Assembly-UnityScript-Editor.dll.mdb → ...blies/Assembly-UnityScript-Editor.dll.mdb
diff --git a/...mblies/Assembly-UnityScript-firstpass.dll → ...mblies/Assembly-UnityScript-firstpass.dll b/...mblies/Assembly-UnityScript-firstpass.dll → ...mblies/Assembly-UnityScript-firstpass.dll
diff --git a/...es/Assembly-UnityScript-firstpass.dll.mdb → ...es/Assembly-UnityScript-firstpass.dll.mdb b/...es/Assembly-UnityScript-firstpass.dll.mdb → ...es/Assembly-UnityScript-firstpass.dll.mdb
diff --git a/...ScriptAssemblies/CompilationCompleted.txt → ...ScriptAssemblies/CompilationCompleted.txt b/...ScriptAssemblies/CompilationCompleted.txt → ...ScriptAssemblies/CompilationCompleted.txt
diff --git a/ProjectFIles/Library/ScriptMapper → ProjectFiles/Library/ScriptMapper b/ProjectFIles/Library/ScriptMapper → ProjectFiles/Library/ScriptMapper
diff --git a/ProjectFIles/Library/TagManager.asset → ProjectFiles/Library/TagManager.asset b/ProjectFIles/Library/TagManager.asset → ProjectFiles/Library/TagManager.asset
diff --git a/ProjectFIles/Library/TimeManager.asset → ProjectFiles/Library/TimeManager.asset b/ProjectFIles/Library/TimeManager.asset → ProjectFiles/Library/TimeManager.asset
diff --git a/ProjectFIles/Library/assetDatabase3 → ProjectFiles/Library/assetDatabase3 b/ProjectFIles/Library/assetDatabase3 → ProjectFiles/Library/assetDatabase3
diff --git a/...cache/00/00000000000000001000000000000000 → ...cache/00/00000000000000001000000000000000 b/...cache/00/00000000000000001000000000000000 → ...cache/00/00000000000000001000000000000000
diff --git a/...cache/00/00000000000000002000000000000000 → ...cache/00/00000000000000002000000000000000 b/...cache/00/00000000000000002000000000000000 → ...cache/00/00000000000000002000000000000000
diff --git a/...cache/00/00000000000000003000000000000000 → ...cache/00/00000000000000003000000000000000 b/...cache/00/00000000000000003000000000000000 → ...cache/00/00000000000000003000000000000000
diff --git a/...cache/00/00000000000000004000000000000000 → ...cache/00/00000000000000004000000000000000 b/...cache/00/00000000000000004000000000000000 → ...cache/00/00000000000000004000000000000000
diff --git a/...cache/00/00000000000000005000000000000000 → ...cache/00/00000000000000005000000000000000 b/...cache/00/00000000000000005000000000000000 → ...cache/00/00000000000000005000000000000000
diff --git a/...cache/00/00000000000000006000000000000000 → ...cache/00/00000000000000006000000000000000 b/...cache/00/00000000000000006000000000000000 → ...cache/00/00000000000000006000000000000000
diff --git a/...cache/00/00000000000000007000000000000000 → ...cache/00/00000000000000007000000000000000 b/...cache/00/00000000000000007000000000000000 → ...cache/00/00000000000000007000000000000000
diff --git a/...cache/00/00000000000000008000000000000000 → ...cache/00/00000000000000008000000000000000 b/...cache/00/00000000000000008000000000000000 → ...cache/00/00000000000000008000000000000000
diff --git a/...cache/00/00000000000000009000000000000000 → ...cache/00/00000000000000009000000000000000 b/...cache/00/00000000000000009000000000000000 → ...cache/00/00000000000000009000000000000000
diff --git a/...cache/00/0000000000000000a000000000000000 → ...cache/00/0000000000000000a000000000000000 b/...cache/00/0000000000000000a000000000000000 → ...cache/00/0000000000000000a000000000000000
diff --git a/...cache/00/0000000000000000b000000000000000 → ...cache/00/0000000000000000b000000000000000 b/...cache/00/0000000000000000b000000000000000 → ...cache/00/0000000000000000b000000000000000
diff --git a/...cache/00/0000000000000000c000000000000000 → ...cache/00/0000000000000000c000000000000000 b/...cache/00/0000000000000000c000000000000000 → ...cache/00/0000000000000000c000000000000000
diff --git a/...cache/29/29ab53d882a3a4726a4d9adaec43361a → ...cache/29/29ab53d882a3a4726a4d9adaec43361a b/...cache/29/29ab53d882a3a4726a4d9adaec43361a → ...cache/29/29ab53d882a3a4726a4d9adaec43361a
diff --git a/...cache/3a/3a2aaaa1c44d349018c9b1819495c741 → ...cache/3a/3a2aaaa1c44d349018c9b1819495c741 b/...cache/3a/3a2aaaa1c44d349018c9b1819495c741 → ...cache/3a/3a2aaaa1c44d349018c9b1819495c741
diff --git a/...cache/6a/6ad86ad2fb1d841a5b2779c3d9176577 → ...cache/6a/6ad86ad2fb1d841a5b2779c3d9176577 b/...cache/6a/6ad86ad2fb1d841a5b2779c3d9176577 → ...cache/6a/6ad86ad2fb1d841a5b2779c3d9176577
diff --git a/...cache/77/7714d76630b584449a289f3a112d253c → ...cache/77/7714d76630b584449a289f3a112d253c b/...cache/77/7714d76630b584449a289f3a112d253c → ...cache/77/7714d76630b584449a289f3a112d253c
diff --git a/...cache/95/957dc15530e6e4a838d8521202873ee6 → ...cache/95/957dc15530e6e4a838d8521202873ee6 b/...cache/95/957dc15530e6e4a838d8521202873ee6 → ...cache/95/957dc15530e6e4a838d8521202873ee6
diff --git a/ProjectFIles/Library/expandedItems → ProjectFiles/Library/expandedItems b/ProjectFIles/Library/expandedItems → ProjectFiles/Library/expandedItems
diff --git a/ProjectFIles/Library/guidmapper → ProjectFiles/Library/guidmapper b/ProjectFIles/Library/guidmapper → ProjectFiles/Library/guidmapper
diff --git a/...adata/00/00000000000000001000000000000000 → ...adata/00/00000000000000001000000000000000 b/...adata/00/00000000000000001000000000000000 → ...adata/00/00000000000000001000000000000000
diff --git a/...adata/00/00000000000000002000000000000000 → ...adata/00/00000000000000002000000000000000 b/...adata/00/00000000000000002000000000000000 → ...adata/00/00000000000000002000000000000000
diff --git a/...adata/00/00000000000000003000000000000000 → ...adata/00/00000000000000003000000000000000 b/...adata/00/00000000000000003000000000000000 → ...adata/00/00000000000000003000000000000000
diff --git a/...adata/00/00000000000000004000000000000000 → ...adata/00/00000000000000004000000000000000 b/...adata/00/00000000000000004000000000000000 → ...adata/00/00000000000000004000000000000000
diff --git a/...adata/00/00000000000000005000000000000000 → ...adata/00/00000000000000005000000000000000 b/...adata/00/00000000000000005000000000000000 → ...adata/00/00000000000000005000000000000000
diff --git a/...adata/00/00000000000000006000000000000000 → ...adata/00/00000000000000006000000000000000 b/...adata/00/00000000000000006000000000000000 → ...adata/00/00000000000000006000000000000000
diff --git a/...adata/00/00000000000000007000000000000000 → ...adata/00/00000000000000007000000000000000 b/...adata/00/00000000000000007000000000000000 → ...adata/00/00000000000000007000000000000000
diff --git a/...adata/00/00000000000000008000000000000000 → ...adata/00/00000000000000008000000000000000 b/...adata/00/00000000000000008000000000000000 → ...adata/00/00000000000000008000000000000000
diff --git a/...adata/00/00000000000000009000000000000000 → ...adata/00/00000000000000009000000000000000 b/...adata/00/00000000000000009000000000000000 → ...adata/00/00000000000000009000000000000000
diff --git a/...adata/00/0000000000000000a000000000000000 → ...adata/00/0000000000000000a000000000000000 b/...adata/00/0000000000000000a000000000000000 → ...adata/00/0000000000000000a000000000000000
diff --git a/...adata/00/0000000000000000b000000000000000 → ...adata/00/0000000000000000b000000000000000 b/...adata/00/0000000000000000b000000000000000 → ...adata/00/0000000000000000b000000000000000
diff --git a/...adata/00/0000000000000000c000000000000000 → ...adata/00/0000000000000000c000000000000000 b/...adata/00/0000000000000000c000000000000000 → ...adata/00/0000000000000000c000000000000000
diff --git a/...adata/29/29ab53d882a3a4726a4d9adaec43361a → ...adata/29/29ab53d882a3a4726a4d9adaec43361a b/...adata/29/29ab53d882a3a4726a4d9adaec43361a → ...adata/29/29ab53d882a3a4726a4d9adaec43361a
diff --git a/...adata/3a/3a2aaaa1c44d349018c9b1819495c741 → ...adata/3a/3a2aaaa1c44d349018c9b1819495c741 b/...adata/3a/3a2aaaa1c44d349018c9b1819495c741 → ...adata/3a/3a2aaaa1c44d349018c9b1819495c741
diff --git a/...adata/6a/6ad86ad2fb1d841a5b2779c3d9176577 → ...adata/6a/6ad86ad2fb1d841a5b2779c3d9176577 b/...adata/6a/6ad86ad2fb1d841a5b2779c3d9176577 → ...adata/6a/6ad86ad2fb1d841a5b2779c3d9176577
diff --git a/...adata/77/7714d76630b584449a289f3a112d253c → ...adata/77/7714d76630b584449a289f3a112d253c b/...adata/77/7714d76630b584449a289f3a112d253c → ...adata/77/7714d76630b584449a289f3a112d253c
diff --git a/...adata/95/957dc15530e6e4a838d8521202873ee6 → ...adata/95/957dc15530e6e4a838d8521202873ee6 b/...adata/95/957dc15530e6e4a838d8521202873ee6 → ...adata/95/957dc15530e6e4a838d8521202873ee6
diff --git a/...adata/f6/f60949fc16235490aa7d51bae440b83f → ...adata/f6/f60949fc16235490aa7d51bae440b83f b/...adata/f6/f60949fc16235490aa7d51bae440b83f → ...adata/f6/f60949fc16235490aa7d51bae440b83f
diff --git a/...0/00000000000000000000000000000000_/10202 → ...0/00000000000000000000000000000000_/10202 b/...0/00000000000000000000000000000000_/10202 → ...0/00000000000000000000000000000000_/10202
diff --git a/...0/00000000000000000000000000000000_/10206 → ...0/00000000000000000000000000000000_/10206 b/...0/00000000000000000000000000000000_/10206 → ...0/00000000000000000000000000000000_/10206
diff --git a/...0/00000000000000000000000000000000_/10207 → ...0/00000000000000000000000000000000_/10207 b/...0/00000000000000000000000000000000_/10207 → ...0/00000000000000000000000000000000_/10207
diff --git a/...0/00000000000000000000000000000000_/10208 → ...0/00000000000000000000000000000000_/10208 b/...0/00000000000000000000000000000000_/10208 → ...0/00000000000000000000000000000000_/10208
diff --git a/...0/00000000000000000000000000000000_/10209 → ...0/00000000000000000000000000000000_/10209 b/...0/00000000000000000000000000000000_/10209 → ...0/00000000000000000000000000000000_/10209
diff --git a/...0/00000000000000000000000000000000_/10300 → ...0/00000000000000000000000000000000_/10300 b/...0/00000000000000000000000000000000_/10300 → ...0/00000000000000000000000000000000_/10300
diff --git a/...0/00000000000000000000000000000000_/10301 → ...0/00000000000000000000000000000000_/10301 b/...0/00000000000000000000000000000000_/10301 → ...0/00000000000000000000000000000000_/10301
diff --git a/...0/00000000000000000000000000000000_/10302 → ...0/00000000000000000000000000000000_/10302 b/...0/00000000000000000000000000000000_/10302 → ...0/00000000000000000000000000000000_/10302
diff --git a/README b/README
diff --git a/README.asciidoc b/README.asciidoc
@@ -0,0 +1,9 @@
+== Pixels to Polygons: Programming 3D Worlds
+
+http://jamesgeorge.org/3dworlds/[Syllabus]
+
+=== Some Helpful Resources
+
+* http://www.studica.com/unity[Unity student pricing]
+
+* http://unity3d.com/support/documentation/Manual/Lightmapping.html[Lightmapping tutorial] (includes instructions for how to use area lights w/baking)