Commit Graph

18 Commits

Author SHA1 Message Date
Alexander Bock
8fc0eb560a Create additional subdirectory in Jenkinsfile 2017-08-15 10:14:15 -04:00
Alexander Bock
709d7fa63c Use branch name in Jenkinsfile 2017-08-15 10:06:17 -04:00
Alexander Bock
04a90acd23 Update Jenkinsfile to point to shorter workspace directory in Windows 2017-08-15 10:02:43 -04:00
Alexander Bock
c275b2f833 Feature/cmake cleanup (#381)
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31)
* Cleaning up CMake files
  * Restructure application specification
  * Add parameter for library mode to all modules
  * Add functions to handle global variable state
* Misc/remove warnings (#383)
* Increase build timeout and do a clean rebuild every commit
2017-08-14 09:38:32 -04:00
Kalle Bladin
4ecb98f06f Feature/globe shading (#363)
* Perform Oren Nayar diffuse shading on globes.

* Remove unused propertyowner

* Enable accurate normals for globes

* Use property for accurate normals.

* Correctly calculate height when scale is changed.

* Auto update line endings to LF in main.cpp and openspaceengine.cpp

* Clean up and comment

* Convert shader indentation to spaces (Wooooops..).

* Line endings

* Line endings and small fixes

* Line endings

* Clean up
2017-07-14 16:33:03 +02:00
Jonathan Bosson
78c301ec8d Merge branch 'master' into feature/multitouch 2017-07-13 11:07:39 -06:00
Alexander Bock
b09f89f918 Build OpenSpace on Linux Jenkins multithreaded
Remove unused NASM declaration
2017-07-13 12:26:19 -04:00
Alexander Bock
87d25549c1 Fix line ending for Jenkinsfile
Update Ghoul repository
2017-07-13 12:24:23 -04:00
Jonathan Bosson
a9a67e67f4 build fix due to lua URL change 2017-07-11 12:23:53 -06:00
Alexander Bock
0f34b05512 Increasing warning level 2017-07-08 12:40:52 -04:00
Alexander Bock
644e7fbe98 Update Ghoul repository
Make Jenkins less verbose on Windows and Mac
2017-07-03 11:43:21 -04:00
Alexander Bock
26f8e78b93 Update to using Visual Studio 2017 2017-07-01 15:46:44 -04:00
Alexander Bock
6401f691b9 Remove GCC warnings
Only use 2 threads for multithreaded compilation on Jenkins in Windows
2017-07-01 14:00:29 -04:00
Matthew Territo
1338a2d44f Update NASM path for Mac. 2017-06-21 16:40:27 -06:00
Emil Axelsson
f6da2b6472 Jenkinsfile: Start build time after individual nodes start building 2017-05-29 18:46:24 +02:00
Emil Axelsson
788d5f4b04 Add build timeout (#317) 2017-05-24 15:52:14 +02:00
Emil Axelsson
b32c416615 Improvements from code review 2017-03-03 17:39:23 +01:00
Emil Axelsson
442969f2b1 Jenkins compilation fix 2017-03-02 18:50:11 +01:00