Commit Graph

116 Commits

Author SHA1 Message Date
Lynix 7e63e8fdb6 Vulkan: Wrap vulkan queues
Former-commit-id: 9fff47e3efbb8ce7b2c70be9a468627b7e8a1340
2016-05-19 18:33:47 +02:00
Lynix d2c372247f Merge branch 'master' into vulkan
Former-commit-id: f91a339c32e2ab8f0ef3fd2cfc5c038ceccdc401
2016-05-17 20:25:51 +02:00
Lynix 4ecc701ad2 Build: Copy all dependency modules to the example directory
Former-commit-id: e6c2cb47433d84c17e7277125180469f2b3f0d37
2016-05-16 20:02:59 +02:00
Lynix 59b9e96f21 Build: Make every lib copy its binaries (and dependency bins) to the example/bin folder
Former-commit-id: 6f966190fd910968615553f4c9250d2f14a5c726
2016-05-15 00:38:19 +02:00
Lynix 6fa8b38976 Merge branch 'master' into vulkan
Former-commit-id: 875dd773cefa6dde4744443851378e33bfab0ab8
2016-05-14 13:58:06 +02:00
Lynix 5d2fa3ce98 Build/Tool: Make Assimp plugin copy its library file to the example directory
Former-commit-id: c24dd8b79f56353a4b5b43b7e8de1ff0c672eb05
2016-05-05 23:36:53 +02:00
Lynix 1e3225d1b4 Build: Add an option to copy the built library to the example directory
Former-commit-id: 78618a92f864e75c1c46f478a1cfc57726188b89
2016-05-05 23:36:34 +02:00
Lynix 943dae72af Build: Rename .bat scripts
Former-commit-id: 8dde8153d3a3065fd98f3e094f8b6fa641e9fd62
2016-05-03 23:04:56 +02:00
Lynix 1d3d6a4d1a Merge remote-tracking branch 'refs/remotes/origin/master' into vulkan
Former-commit-id: d09d354e223654aaa253d680f53609464bae3873
2016-04-30 11:45:19 +02:00
Lynix d558ef6edc Merge pull request #61 from TaoSc/master
Updated features page and assets' optimization

Former-commit-id: e54a4ef6ccb784f6a606fbeb4474edc20b9e9076
2016-04-30 00:46:32 +02:00
Lynix 81e2c3817a Build: Add support for Linux, BSD and Solaris
Former-commit-id: 2f7f1e74fd101d688977ceb5129027cb1fa4a67b
2016-04-29 20:54:42 +02:00
Lynix 0aac3ab33e Build: Improve code and allow to be platform specific about everything
Former-commit-id: 7f13e1a49ad33da26c1841ee550c9de03303cd80
2016-04-29 20:34:03 +02:00
Lynix 1742fa9457 Merge branch 'master' into vulkan
Former-commit-id: fd9f2f119e959847d4d9eabece7b678243b26bde
2016-04-29 20:12:27 +02:00
Lynix 4996b158c2 Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
Former-commit-id: b649a1ff5716046c72a1720777e4675a57689bca
2016-04-29 18:47:33 +02:00
Lynix 34b7260d54 Plugins: Add Assimp plugin (WIP)
Currently load only static meshes


Former-commit-id: 61dee8f53a423d6d170bd3bfe72e71daa63e8c5b
2016-04-29 14:22:14 +02:00
Lynix 95cb384897 Build: Add support for OS-specific defines
Former-commit-id: 7181f755cfc2640e862e496db96909fdbe485072
2016-04-29 09:03:05 +02:00
Lynix 432022c5b7 Build/Vulkan: Add Win32 define
Former-commit-id: d1bd3db4f8e89c3a8ea3544fb6dab744781b76bb
2016-04-29 09:02:24 +02:00
Tao Schreiner ab4777b9e8 Cleaner looking features page
Former-commit-id: 558b682d896f6ed9def6f5b55851f6968ebf3c6f
2016-04-27 03:00:35 +02:00
Lynix 22a31c72ed Vulkan: Add loading of Instance/Device
Former-commit-id: 0184f78824900bd46cff94dbfe829b126b8c984d
2016-04-24 02:28:26 +02:00
Lynix 4a948dfaa9 Merge branch 'master' into vulkan
Former-commit-id: 8e5cf8f5c93203818a1939df269593f8556019f0
2016-04-23 22:57:14 +02:00
Lynix ddf75e852a Vulkan: Add empty module
Former-commit-id: 89e01819b36aeda5bfadac35d8a4190256461eca
2016-04-21 13:38:58 +02:00
Lynix 3051b6bdde Sdk/Build: Fix linking error in non-united mode
Former-commit-id: ace2ebdd84755b5031c372242ff9cec896251e3b
2016-04-21 13:30:10 +02:00
Lynix 6808d60cc1 Sdk: Remake LuaAPI internal
Former-commit-id: 297c30dbeca443d934edfd8d889cd7a6c725d0e1
2016-03-31 22:51:10 +02:00
Lynix 946d2cea7a SDK: Add global headers (improved global headers script)
Former-commit-id: f04a3526b185c6c5b8025168cd56829898082bc6
2016-03-03 14:10:52 +01:00
Lynix c46af20b5e Build/SdkServer: Excludes Graphics Lua API file
Former-commit-id: ae25551cf432eff08a505ad34b3332bf7ef79b88
2016-01-24 15:32:17 +01:00
Lynix d7ab29e5ef Fix and improve last PR
Former-commit-id: 16afead68e42411402dfb5a7bd957a4940b6f83a
2016-01-24 15:20:14 +01:00
GigAnon 7dec6e10a6 Merge remote-tracking branch 'refs/remotes/DigitalPulseSoftware/master'
Former-commit-id: e13918db0bc7a95763cffd3bb9360faa7662c1dc
2016-01-20 14:15:51 +01:00
Lynix d0ff07d262 Build/SdkServer: Fix Console.cpp being included in the project
Former-commit-id: 62d706654c398a60946282e112d7e139107ac745
2016-01-20 14:08:03 +01:00
GigAnon 450b80716e Trying to fix premake
Upgrading to premake5 fix Visual Studio 15, but breaks Code::Blocks.


Former-commit-id: 75d7a3b01616b5b5e7f9cdf376ebd8386336219c
2016-01-19 17:54:21 +01:00
Lynix cfe7c79991 Sdk: Add server-side module
Former-commit-id: 4df27d1e44d791aad234d095af08ae3c19660fba
2015-12-13 16:36:38 +01:00
Lynix 1bbf038cc6 Network: First commit
Former-commit-id: ec8697acc51569f5043e4f70e4cf42f1c5dc487c
2015-11-09 15:02:25 +01:00
Lynix 69d98fa724 Revert "Build: Make compiling with make easier by adding a native plateform"
This reverts commit ee268879a325e3f62741e57dbe8790fbcc78498f [formerly 3720c0c8924e277e5cab757cc1950adba88bd66b].


Former-commit-id: 2314caedebd2b98ea2fba756c27d4edc76fb0e5c
2015-09-28 21:38:33 +02:00
Lynix b711f47304 Build: Make compiling with make easier by adding a native plateform
Former-commit-id: 2b12eff243fba3ce25a3cd4634ac18b351b18f49
2015-09-28 21:27:17 +02:00
Lynix 05056d41de Build: Fix project generation for Linux
Former-commit-id: 9e0787779d9c8fa84f3f41a6f75e7bf29be403d4
2015-09-28 00:41:59 +02:00
Youri Hubaut 752518ef14 Fix module compilation on linux
Former-commit-id: 205c6578fd50e506ec7d6012e73fea0c14c744d9
2015-09-27 15:37:45 +02:00
Lynix b16abf0d09 Merge branch 'master' into NDK
Conflicts:
	build/scripts/module/renderer.lua
	build/scripts/module/utility.lua
	include/Nazara/Renderer/OpenGL.hpp
	src/Nazara/Core/String.cpp

Former-commit-id: 0a8054be56f01b12c604c88b829cb10b490a9d6f
2015-09-20 23:41:21 +02:00
Youri Hubaut a4032abe63 Fix compilation on linux
Former-commit-id: e7ff20401c32d0f7752d03636b5034a3467bf498
2015-09-19 17:10:34 +02:00
Lynix bef0736295 Build: Disable VS Minimal Rebuild (in order to enable /MP)
Former-commit-id: 3dd5ea9e59060c9991be55271c6619c6c226e61e
2015-09-19 13:38:30 +02:00
Lynix 252adbf191 Build: Fix support for windowed tools
Former-commit-id: 35513cbde7cddecba27256919c0ebd5cc8d56160
2015-09-19 13:37:29 +02:00
Lynix a61f968d05 UnitTests: Add build script and move current tests to "tests/Engine" directory (from "tests/Nazara")
Former-commit-id: 5639305bbdbb69ad6f6f282df6c6de930220b57f
2015-09-19 01:14:19 +02:00
Lynix a09f859144 Build: Fix support for executable tools
Former-commit-id: c6a986ed730d5d5eac043fbf66434821aa6f6839
2015-09-19 01:12:57 +02:00
Lynix dea48a289d Merge branch 'master' into NDK
Conflicts:
	include/Nazara/Core/ConditionVariable.hpp

Former-commit-id: 84320f0a55ae9d8f80ff5211d30d99184c7b4213
2015-08-21 12:49:05 +02:00
Lynix c4c8904aca Merge branch 'NDK' of https://github.com/DigitalPulseSoftware/NazaraEngine into NDK
Former-commit-id: 25bdf44e4ef7458a50ab60cd5f6bd49522528c23
2015-08-20 21:17:47 +02:00
Lynix 2847f262b2 Build: Enabled multi-processor building on VS
Former-commit-id: c62e66a548b36e81a3816bff9457691f203a1f73
2015-08-20 21:17:41 +02:00
Lynix 4d5cea8afe Build: Switching to C++14
Former-commit-id: 05e737521493d41df024932c731079a22b838681
2015-08-20 13:28:31 +02:00
Lynix ec21416231 Build/Common: Fix double execution of actions
Former-commit-id: b7279f39c57f3f2b1974642525dd4dea3d412781
2015-06-21 14:54:29 +02:00
Lynix b3597d5330 Build: Fix library directories
Former-commit-id: 7bf4a9078e03e0de9ec8ab3df2303d4e3eb9e031
2015-06-15 21:14:20 +02:00
Lynix b680bb68c8 Build: Change vs2010 shortcuts to vs2013
Former-commit-id: 58dab51754396ea1118e608867a19fd347d0063c
2015-06-15 20:44:34 +02:00
Lynix 58f8ffac35 Move libraries to specific directories (depending on the compiler)
Former-commit-id: 7b9c7141036ae01ca1d269c0748200ec4d069312
2015-06-15 13:41:50 +02:00
Lynix 32a217ea1b Build: Now handle 32/64bits the right way
Former-commit-id: 5769c92df0994e91e7098df37612893fb51fdf8a
2015-06-14 16:17:02 +02:00