Commit Graph

90 Commits

Author SHA1 Message Date
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
Lynix 71e595fe49 Build: Rework build system + introduced SDK build file
Former-commit-id: 90727a78031a83753404d2fe09a6347315a00a39
2015-06-14 15:48:16 +02:00
Lynix a6092be930 Move all build files to build directory
Former-commit-id: 499125a81d877144aabe7d89bb69043b92872b24
2015-06-14 01:47:02 +02:00
Lynix aee0812505 Build/Graphics: Fix conflict
Former-commit-id: 48015e97d5e7a6b06406c7867f6119fa6be7c38a
2015-06-13 23:28:01 +02:00
Lynix b2a248d6f5 Merge remote-tracking branch 'origin/BuildSystem-Update' into NDK
Conflicts:
	build/scripts/common.lua
	build/scripts/module/audio.lua
	build/scripts/module/core.lua
	build/scripts/module/graphics.lua
	build/scripts/module/lua.lua
	build/scripts/module/noise.lua
	build/scripts/module/physics.lua
	build/scripts/module/renderer.lua
	build/scripts/module/utility.lua

Former-commit-id: 8374b17a214e0efbdc7d35e81ed809f8dc9d3b79
2015-06-13 23:26:34 +02:00
Lynix 1fc17c8b53 Separate NAZARA_API into multiple defines (one per module)
To fix inter-module dependency


Former-commit-id: 64704f020e0af22e529d38527323ba977187d4d0
2015-06-13 22:31:29 +02:00
Lynix 251e21f006 More VS fixes
Former-commit-id: 356effb816b9527ff9e89ee3b99074c468455b08
2015-06-13 19:42:07 +02:00
Lynix 656290d089 Core/Bitset: Add comparison operators
Former-commit-id: 7ca04f36fa001f322182c5e9457127f05432d373
2015-05-19 14:31:04 +02:00
Lynix 54f954208e Script/Features: Update TaskScheduler
Former-commit-id: bb2659b892103880402cf7443847fa1cb66a19c2
2015-05-19 14:14:22 +02:00
Lynix 90e4a1ca52 Core/HardwareInfo: Added GetTotalMemory
Former-commit-id: 71289723115161dd253ccb65c1c91af65344c678
2015-05-19 14:13:48 +02:00
Lynix 95cb02c41c (Features) Fixed typo
Former-commit-id: fa5a551d876f513ec941af0069d8997c8aee7940
2015-03-18 20:32:14 +01:00
Lynix 6648fbe577 (Features) Fixed typo
Former-commit-id: 6f2d3c3327f18e29507eedc9a1275bfe3ca4fdb3
2015-03-18 17:26:21 +01:00
Lynix 5c52698131 (Feature page) Improved design.. I guess
Former-commit-id: 42db15aed57eeb9650d7c4566fa778831815c1ab
2015-03-18 17:19:55 +01:00
Lynix 12c238ddae Added feature page generation
Former-commit-id: 9d1b3db59f4d13ceb69212c289925c198eb14bc6
2015-03-18 17:11:24 +01:00
Lynix debe39501e Added experimental new build system
Former-commit-id: ab7fb35db6be4b975d0558680c840d72e38562f9
2015-01-20 23:37:49 +01:00
Lynix a89adfe551 Fixed Freetype not being linked to Utility
Former-commit-id: 4bbfced926430defe35d6ef800954cdb0f2f6c2a
2015-01-17 19:41:38 +01:00
Lynix ba8aed916f Renamed unicode option to parseunicode
Former-commit-id: 600c6fd480d9e96c90319b367545dd5199a10664
2014-12-17 13:54:44 +01:00
Lynix ca54b6cdca Updated module headers (generation)
Former-commit-id: a9a2e4eaeda16caa67989ae81c55ac090b1454de
2014-07-11 10:23:19 +02:00
Lynix c4b10dddda Big config/debug update
Added config checkers
Macro no longer use suffixes
Moved MemoryManager to upper directory
Renamed *_MEMORYMANAGER to *_MANAGE_MEMORY
Renamed AUDIO_STREAMEDBUFFERCOUNT to AUDIO_STREAMED_BUFFER_COUNT
Renamed CORE_REAL_PRECISION to CORE_DECIMAL_DIGITS
Renamed DEBUG_MEMORYMANAGER_DISABLE_REDEFINITION to
DEBUG_NEWREDEFINITION_DISABLE_REDEFINITION
Renamed GRAPHICS_MAX_LIGHTPERPASS to GRAPHICS_MAX_LIGHT_PER_PASS
Renamed UTILITY_FORCE_DECLARATION_STRIDE_MULTIPLE_OF_32 to
UTILITY_VERTEX_DECLARATION_FORCE_STRIDE_MULTIPLE_OF_32


Former-commit-id: 81ef836ac9f092ac471f60e544bb7c7c6370593c
2014-07-08 10:56:37 +02:00
Lynix 2776ce9f4a Fixed Audio module compilation
Former-commit-id: 6ce67eacb51d71a1bd5f3e3e05a14a615c4b12ea
2014-01-19 00:57:39 +01:00
Lynix 5876e1c17a Removed OpenAL static linkage from Audio module
Since OpenAL is loaded dynamically


Former-commit-id: 6d45daa73a78e4a050316c1f23040a528148049f
2014-01-15 14:38:54 +01:00
Lynix 3026d8b9ac Optimized resource encoder
Is now three times faster


Former-commit-id: 39397911e4b87d1831d15a32d7125a707c353bf7
2013-11-26 15:59:49 +01:00
Lynix 0e99205046 Fixed rendering
Resource encoder now store unsigned char instead of signed char


Former-commit-id: 648dd1d55facd40bc37075291782a54cbbc4811f
2013-11-26 15:25:43 +01:00
Lynix 14f513f656 Resource encoder now print module name
Former-commit-id: 14e782da2b803f3c4847e19c9f46872f641c0c7a
2013-09-20 21:46:30 +02:00
Lynix 197bddb6ba Transformed "Encoded shaders" into "Encoded Resources"
Former-commit-id: ead4cc9bb162d2f9e5c08756575e84f3a9056679
2013-09-20 16:20:51 +02:00
Lynix 7f2888a346 Remade shader encoder
Former-commit-id: f96b33ed36650931c78b58fae6d7fc7f68efab20
2013-08-26 10:46:58 +02:00
Lynix f1dc7b98e5 Separated Shaders from Manager
Former-commit-id: 7faddbd38bd729b2778f09be3f98105ef5219740
2013-08-25 19:55:03 +02:00