65740ac8ae
Example/FirstScene: Setup Spaceship and World lua variables
...
Former-commit-id: 7d37419cc0636bc1271660cf4518a0c08332f364 [formerly cd5984e732b464c9d31ed34ec072b9039b07163d] [formerly 43de557c346987fa965b60a88eb5a08c7a73e5e5 [formerly 671d1bde65cf2ee3dcb69711d59bd3c8ebde6a1a]]
Former-commit-id: d52eed5ca2f7b4a12139b560278051349d4c5947 [formerly 322c6e78f8a487fb5dcef586d74d792d27065d6a]
Former-commit-id: 3c7b7d706d45ea2731708b502364bb1dad7b3a56
2016-08-28 18:26:35 +02:00
11baa02ec3
SdkServer: Fix compilation
...
Former-commit-id: ea7163d5af56b3e08b865d0fb6ac5aacc5ec9ab4 [formerly 3fcbe74d2738776bc3f92f59a572931f82aacf5a] [formerly 1f83d4bc4e639999892376bd7328536878b36ff4 [formerly d1617dde160d6b1415758f57759581b537f241ff]]
Former-commit-id: b44ee9651c91d2362e61cb661479849d03a09e82 [formerly 34a3c0fb2093a9de6130b5d0d784e6dd76ae22c8]
Former-commit-id: 6a87eec688dd737da6ec80ef882c9ce1fd168933
2016-08-28 18:16:35 +02:00
22914f38e8
SdkServer: Fix compilation
...
Former-commit-id: ec1f6310e42086c20589190f5bce7760a3df38ce [formerly 72c0b397681e524e782cf3ab177a16b93d34dba3] [formerly 91f72f2b87fa8b03d9a86b0dcaef1705402b0004 [formerly cdc0851e924c2246c4ed62240b105571c8d9630a]]
Former-commit-id: a31774c45bfad37c84bb9a15a974930d9687f310 [formerly dfcf84977f23cad5687abd42a6ca120353b0961f]
Former-commit-id: 578ec85861ca025f70efa04187a24b6fb27cdfd4
2016-08-28 18:16:35 +02:00
07fe2f560e
Sdk/Application: Add Console and FPSCounter overlays
...
This allows any Nazara-powered application to enable a ready-to-use
console or a working FPS counter
Former-commit-id: 2b1c7ae5a7c72ea1c102734841f4e25742c2b42b [formerly f1fece5295a0a43147396752b3c61d84e0d7fc74] [formerly 40eff1e79a68fb5e0b7e1d4d6528fec318fed74c [formerly b17ee1558babcd4ed89525e447fb9c4e58b67033]]
Former-commit-id: 1e1297789e402d25e7b5324dceebbbe8021a2217 [formerly 1c62735c3ff7f53efbef3e45c2284739fc22ec32]
Former-commit-id: 3d331aae0e7db884e36d07b095a9d25a1dbe7926
2016-08-28 18:10:09 +02:00
6872616ca4
Sdk/Application: Add Console and FPSCounter overlays
...
This allows any Nazara-powered application to enable a ready-to-use
console or a working FPS counter
Former-commit-id: 274b276313b530ff8c99f3e0fb43c8b78689d787 [formerly 36e3a7e9d0d050af4b217311bde4496597e37c37] [formerly 69146c2fc6887f86b9c39d0265a95a4ba003f41e [formerly 72a66d7a31ceb87197b800813c90d43f73fc26b4]]
Former-commit-id: 3fda987313648101b8a423e5e3aa8b0cd67a1c72 [formerly 5f9d42cdc5ed5443846531bad26059f66670df63]
Former-commit-id: 2ef1496fb4a379e14f9c11c788da306eff465719
2016-08-28 18:10:09 +02:00
62cfdd6ade
Utility/EventHandler: Add OnEvent signal
...
Former-commit-id: 2e598906e684b4328d99a9226ce03c90ad2573ad [formerly 653efe0750defdec35c094fa8ec72cb3b35a1ca0] [formerly d4fe9970a38bc851114697a315a561199dd4f146 [formerly 909526b7566949bf50375a90ef44264425b06f0e]]
Former-commit-id: d8ef7a871bd700761eb87404131d11e5bb0bd324 [formerly 9e23fe05aeb8b4e042d0583960afa5ca8b2ce6ec]
Former-commit-id: 5e8dacdd4f0323551f5ae2ae83f7841f5c7ac479
2016-08-28 18:02:07 +02:00
449bcfc462
Utility/EventHandler: Add OnEvent signal
...
Former-commit-id: c4f6d185d78db4d9fa0e0ca76cf7b42768cd2ed3 [formerly 62df0f1948485951d72c42a51b511ecc5b283278] [formerly 444726d074e7e939db81547bf2f3dbcdc9eb25f6 [formerly 38d61f87a4280a20ac94286481dd418d5d931989]]
Former-commit-id: 5a075b3e46f01486271fe5157b7176e768d8f939 [formerly bde57734c06d9d0b8220b65348cf8a67f971e228]
Former-commit-id: 5e0857da1061965a4f8d9cf1c181ed25bf511320
2016-08-28 18:02:07 +02:00
1a7ac46893
Example/FirstScene: Fix event handling
...
Former-commit-id: a3d33e15303aee7de339f1bc6ba84866fcaea524 [formerly 391d9095d6b64cf1409f12ab62f1b95a721e8489] [formerly a609374620028cae9cc3f3ba66efda909bb33479 [formerly 2f3dbf79330334123da1e6ff0edd74ec9c8f53b4]]
Former-commit-id: 69d9719acc6ba619e60b8580f4ba49bb543cbe9f [formerly bb65e744b18ef7e185c2960c5f07223a057a5496]
Former-commit-id: 08a99a0241402466ac4463807b1127060095f827
2016-08-28 01:22:47 +02:00
6c031d7bed
Example/FirstScene: Fix event handling
...
Former-commit-id: 3df87a66a47ed6c920ada5e82382c08fc43f74ac [formerly ac9e4cec56ddf7d6ab52683b8bb46bf93693ebd2] [formerly 9929ba33dde25afe7d6610bf7194c6e4fcf65b08 [formerly 50ebcce013b250739688ead06e428e56a59d2fbd]]
Former-commit-id: b30b4d96c2d4203705224511e99536cabd21bbb9 [formerly 48a867c50010f962f8a7609fab094290d274414c]
Former-commit-id: aea00b4a975d02a16fe3c10e2a67a0bf8bbf2ac4
2016-08-28 01:22:47 +02:00
cda509da6f
Utility/Window: Improve visibility of deprecated methods
...
Former-commit-id: f0f794407f33b485962dacf1f1ac39ea5beac7de [formerly b40cb93e11aa6bc2242c745607ee748567192f7c] [formerly 41f4a381d9742dd586673e0685be31541edf5864 [formerly 4190ba3ddbd098f79909b244b0dea90cbb924771]]
Former-commit-id: 887f75b329b705181f5c1a5d00297b2377e0b626 [formerly c199d56deb1d59d95b19c5684c0f3529f6d62e58]
Former-commit-id: 960ff4eab6b9886095c1ae079753161d4b5c6be1
2016-08-28 01:20:31 +02:00
52afd9fb3f
Utility/Window: Improve visibility of deprecated methods
...
Former-commit-id: 27a46b53eb4d239d9f48157aeb339562a3247d7c [formerly c53e2e7c4b38b94befb1ef968867b6e0436b3e89] [formerly 20a1935be4339f8766d419805843514c382f53b1 [formerly f152706c89a0be8e81c7e8ebfe2bc1c15073dc52]]
Former-commit-id: 34f818c35fdc341952e5f4d0abcc52ea156ba4a6 [formerly 460e972df1e0f71da2d05ce4262b250532d13d0d]
Former-commit-id: af5af59a338b0b9c2cb48a8e0b1fdc697c9952d5
2016-08-28 01:20:31 +02:00
134063a87d
Network/SocketImpl: Fix compilation for recent MinGW versions
...
Former-commit-id: b32cdfc7c9341b56a2534f49304ed6a40889ef65 [formerly be0dcc051b3714196a74c2639d61f3377b1732cf] [formerly 4a3c9b84f8d4b5c55f3fe086df6609b9198ff2a0 [formerly d07e788c4b54277aa726e82810c36c64dae14084]]
Former-commit-id: f71fe5191f9470facf8669ebd89ff86f8b9be9dc [formerly 96f25b63a8bb4ffa5523dd972bf2a24b8df80269]
Former-commit-id: f1beb415423a8babbe61e95c3fe35ad9456c6622
2016-08-28 01:09:40 +02:00
527c8ea0cf
Network/SocketImpl: Fix compilation for recent MinGW versions
...
Former-commit-id: 2ae224dcad69a0810766070d2b2da5b27e7baee4 [formerly 650e490cc39a9d9c418d2b1d51e99abffc1405b0] [formerly 01200d66fef998690c174eb8b9dfe5e99c2f9dc0 [formerly ab94280b73977d0fafcde35eb84cf70f48f34382]]
Former-commit-id: 7dda3b7eb0c7343300c89be7a094068a54f49e6f [formerly 19c82582082ff5657ccb4a3259c94c57984cb9a7]
Former-commit-id: 8e2bea477e1d83645530b00357315ae8160376c5
2016-08-28 01:09:40 +02:00
732a6d9322
Utility/Window: Window now automatically close on quit event
...
Former-commit-id: 3e3e84e1e89a2c643e19e183a1286d95550d2965 [formerly 813114f7beb2af1836f8dfd66fe089be66efb6d9] [formerly 881ff104de309ade91fed5b5ffdb66025775bc57 [formerly 3fd695c4ac86999600262c99160d8dd20740409c]]
Former-commit-id: bce06f73894643e2f612c60c73fa340c54a4ad98 [formerly fe4a806707c5339aff9eada8e20e1921d1190141]
Former-commit-id: 7a2012bd3d3930beb958bb729934d41cd6b81e69
2016-08-28 01:09:15 +02:00
414bc1f5b4
Utility/Window: Window now automatically close on quit event
...
Former-commit-id: da6eb0214de58af84c0cbedffc0916a1a5b335e8 [formerly ca81aa0c8f8da61e841a1ccb85295f99efe7e317] [formerly 30f112245ee8eee0ed5f4db88cc4a7c13b9d9a9c [formerly f404a5b5bef35d9c80232371a40bd04c5acc8cfc]]
Former-commit-id: c1443eed4321f48aa42e93d2679f0eddaacbbb5d [formerly 386ba36f29ace0e098fd95e4f05fec6498b4183a]
Former-commit-id: 1fb357a16a42eee7d0658d09716ef7cdcca584ab
2016-08-28 01:09:15 +02:00
618449c13a
Utility/Window: Add new event system, based on signals
...
Old pooling-based system remains for now but is now deprecated
Former-commit-id: 803c6f51e8287613610ede8433bef8112bc70352 [formerly 9f60f0fabea7fa0d0d62feba217e28c421522e36] [formerly f05d3dededee17402669ec9e4060c95d77c74bb4 [formerly 5b96073b92c3a10a5c485abcc7c33ecedb819fca]]
Former-commit-id: 4280c668fb5ec67c0b765a80516b9b4fe466135d [formerly c8ce15aa230bf2f1040b00153ec81aa1f39ef48d]
Former-commit-id: 71893d639b5e1628776d8a4577b0309437865c16
2016-08-28 01:08:38 +02:00
9fa65db6b9
Utility/Window: Add new event system, based on signals
...
Old pooling-based system remains for now but is now deprecated
Former-commit-id: d72e76bab0887baa03286aed78f7ded0a2e31928 [formerly ec70c388b12fb2b91017e54f4a6d67bac1c62335] [formerly 1a6692f78aedb5328b223c04c566d32467db6c92 [formerly 64b8d386ff07df682760ec632d753545ecff7856]]
Former-commit-id: aba6a64e2a31336ae1835bc9954d22488fda2000 [formerly a42eceabc84044a258926385db3944ada398f4fa]
Former-commit-id: 07a208c5693749b325e8574b52e7affa298bb147
2016-08-28 01:08:38 +02:00
6b155f7e14
Test/StateMachine: Fix compilation
...
Former-commit-id: b941ed79168687628c27d3ebb2caf1863e968307 [formerly 6b0801514a3427900ea38124301fb3d833ac6bfa] [formerly f2cd5d78631c02468c54f602b19ca4c728a91243 [formerly 6262416d9bb0b6d7812fcbadb8f45d79d3391ec3]]
Former-commit-id: 702008d7fd198ac4bd65b719cf7f7d639834cde0 [formerly 15ee4f1c843a1ce92a1a7d25f27d3c941fea115d]
Former-commit-id: b12e457b17f44d2cda68b5c9a6138c4b02b7f1fe
2016-08-25 16:28:25 +02:00
5528b26a25
Test/StateMachine: Fix compilation
...
Former-commit-id: 8295c8c806237bd8e19b1552a49261a4ffe88f25 [formerly 787c63351091093758db9e757f5fb25503fe1148] [formerly 2d6ee7f2e25afe0cbefb253cfd3ff14a98fd0d1c [formerly 478af98f46f86377def455f096426cfc8b54fb63]]
Former-commit-id: 96b7dc76d50ed661f9a8a0d785d5fc0d00b3a009 [formerly 4f4129ba5e902fece9d58530c40c8d134a05cc27]
Former-commit-id: bf52731510dbb1269be506e9ebea6f0733045b4a
2016-08-25 16:28:25 +02:00
6621b6dd60
Doc: Parse SDK files
...
Former-commit-id: 57d6730ea85baa89caff212323c2aa62d2d720d6 [formerly f36024b268f43ed21b43bbb623de44157332d3cc] [formerly 193ae75a9b524ce038467e914f6b48292623639f [formerly 717d411e4631f7fe54050bbc5f7f0ede2295bfbe]]
Former-commit-id: 0e8e8cb198ddfaf338e7170f81b693e00bd8c4cd [formerly 3b7d40477da76ec363107ad730386cd272ae44e0]
Former-commit-id: 345dba1dbf3a5c158f9536fee36b2a48da12eeb9
2016-08-25 13:07:19 +02:00
c5c1c454f8
Doc: Parse SDK files
...
Former-commit-id: 94d9118cec01ee4d12a54a67d55a0371bc9ba468 [formerly 8c2a965cd764520350610b9850e8197d839cdc3d] [formerly ce2a5f4595aa3ed4a29a3515af6bba3636475b83 [formerly 859959e9a29925ce0890646a1642f94d86c85e23]]
Former-commit-id: 40a94eec9460cc432128b67f3812e62a3a2c2690 [formerly 52ee3533c6dfd71eeaaa1ecf1d0399e0db5435e0]
Former-commit-id: 9b12d3abb8b596f975ac4bed4717abaeb628c5e9
2016-08-25 13:07:19 +02:00
de274b632d
Sdk/Console: Remove debug error
...
Former-commit-id: d1ea434fd474fc66e7c7b751d656c88f7d782ddc [formerly 1c7a1aff7717bdd946cbd3b48d0ed6b7d2f326e3] [formerly c6877dcd98758602be9d2378cec991bb0e2e91c5 [formerly d114ffd6832788fecd0f167c11e8796b7cb2bf3a]]
Former-commit-id: 1c163946a75f63bcf71acb39dda8674c82508a94 [formerly d8dd26e5087771e7d83ab97d6075594236c501f1]
Former-commit-id: 30aa3c22d308ce012631f5c58d03f4843702a4f3
2016-08-23 18:25:10 +02:00
6a9b220f9c
Sdk/Console: Remove debug error
...
Former-commit-id: e61d02701914ef72992f4215101932034c9e1955 [formerly 574b436182acaea0150fae9354eda683806448e0] [formerly 58cb547714a8ab0c091b54d44f83213b20d66368 [formerly 87cdc49740f693b1b66c1944080da56b055c6824]]
Former-commit-id: bf8fd50e5d191795955b4b837120858abaeedacb [formerly 6c9e6c8c650bf2c2495d7f35d51f5c1252fd4113]
Former-commit-id: d6291244b05c46535c79b42a41dc22031824876f
2016-08-23 18:25:10 +02:00
2a0fb4ffdc
Sdk/Binding: Fix Entity::Enable default argument
...
Former-commit-id: 82181122fca24b99e78ba927c71ce9237b1b3674 [formerly ef758ac2d0aac925dbcd6e72effc21b9effa83c0] [formerly 2555ac6b28f36b220aea76f2aeb0012536665058 [formerly b28da55971c4db17ddbf7fd6bacd8c03d02ffcbd]]
Former-commit-id: 8a84469ff40d37e114fbdee8c3fa16a3748ca010 [formerly 3f3cfc52071d469150feeaf2f7cdff8c33a8f46f]
Former-commit-id: 8f522f2357b7564229ebdea1e8d4a2b3cc223366
2016-08-23 18:22:09 +02:00
62b53933c1
Sdk/Binding: Fix Entity::Enable default argument
...
Former-commit-id: ca596b8effcdd6028aa665b55d4f6df79978ae2c [formerly 74e04834586b29d9b1e5b6a5d35c189a0e52744e] [formerly ef7ba96ec9a4d2bd399f5a17286f2e0984f3e328 [formerly e54635c17ef79cf72e9d9ba61ee47bfb4e3d1641]]
Former-commit-id: 305e7ab658b9ff15aa036354b35d761a2481c02f [formerly a5d1243b7c37850bfcbd32deed477b172ab42342]
Former-commit-id: 8bd8da5e957777f2e3828f4b871636b7d57b3f10
2016-08-23 18:22:09 +02:00
943ff4f337
Merge pull request #70 from S6066/patch-1
...
Sdk/Entity: Add default parameter to Enable()
Former-commit-id: bf08a8cf3164babbb6895e2a8ad1ba912d58dc6a [formerly b1ebc18d25b555f4d7a4ee66e97bc8abbd118542] [formerly baaddbcb14203f7c0f54d7b250be5c72225df805 [formerly 8f79b0026d2d8ee49e2c46f22d4875e70e2d2d30]]
Former-commit-id: 16f99801049de2777e9038142127b2641766f920 [formerly 197c3c1cec4d69ecba80ecb51e07482fcb251d30]
Former-commit-id: a46966e2843427ea1365386ff29894f5d072040e
2016-08-23 16:54:00 +02:00
94c5c095f5
Merge pull request #70 from S6066/patch-1
...
Sdk/Entity: Add default parameter to Enable()
Former-commit-id: 1a0f5084df8e773cb8c19e84ec4d689d4f60e6e1 [formerly 7abfee7e656df505b39a61072c4c8afd5081dc99] [formerly 57286b977a9ea03c68aa0f0c2ce7749cc379c858 [formerly 1d56bf83000e9e6d58382b4888637ec8b3030bbe]]
Former-commit-id: d69028a1905987dc953f53cfa7f70fd056c1a647 [formerly 7f1dcbd126d4f60441d190c1781a1f5416e48cc6]
Former-commit-id: 52ca52448b1f814c3c49d69e58201da7524d72e6
2016-08-23 16:54:00 +02:00
ab9bd52b1c
Update Entity.hpp
...
Former-commit-id: 1d99c5e8ecc59365b5e7b8a38ca6b7d728afe61e [formerly 8ad7a1c88ab8bfc98b3d31cc475ba5f1da2b640a] [formerly b8e21adaa60f4709451afbf5b38546e3129a1d5e [formerly 29cf1e9d53f54156ec4d691c4155d510139a8f0b]]
Former-commit-id: 0c981c02a27181bbb8771bf4c3524a0a3a935f60 [formerly aaf146a3ca97aaa7b0c9601b7e277b0a2b66936b]
Former-commit-id: 4f2fda343a111f80d6f9827d3a377fe07d2f59b5
2016-08-23 16:49:47 +02:00
0db53f8aaf
Update Entity.hpp
...
Former-commit-id: 1b7e8af53d5df90da6ecad26408e0296f4383290 [formerly b4d6cbc46d87a84927f0a832f3ded26453c53ada] [formerly 79671fe49616035368284c6690d0585d9c22d144 [formerly 45e76a15885bab06c77b58cc5910ff32e5b47f16]]
Former-commit-id: 66753e226681587402b8c9b13b4bd76a3aa16a1f [formerly 4c779422137a298036a73f0f1a94fc7a12505bc0]
Former-commit-id: be21ca9b5c2c4cb40998c939f348eb1e00488b9d
2016-08-23 16:49:47 +02:00
0f1c629d46
Merge pull request #69 from Gawaboumga/Documentation-SDK
...
Documentation sdk
Former-commit-id: 9e3747db82d92e546b7130e448d873a44abd3e9f [formerly 95bdbe47474230d38dc0db5081153c493a72c52f] [formerly 82a3c12f7a93ad7ef06382772d77138752e3aee8 [formerly 1b17f83fe753c74b553d08ce90dbeea6258524ae]]
Former-commit-id: d601e3115eac024da86ecdcf58ad7d0330c39a18 [formerly 65d8537930d8ae18ff90de4399d809031472c269]
Former-commit-id: 7ee513182b637a4c67f9cc97d78754987a4c9949
2016-08-23 12:54:10 +02:00
6622197063
Merge pull request #69 from Gawaboumga/Documentation-SDK
...
Documentation sdk
Former-commit-id: 507fc57113c0607bf22f624010b5812e0e8b1b08 [formerly e850f356da113e3bdde26b9bda4e94d92b8a56a6] [formerly e3d12d85c2e853cceb8cede3c16283b9ed42e50d [formerly 94e66485982d6a4f631b12dd966c2e361cf018c0]]
Former-commit-id: 81766d9f12358ac98b9e45c664c0b5032b6c40b5 [formerly 35c4ac2eb49fc4b395eb1d779de9770d121df68f]
Former-commit-id: 98b59d743c77e93039108cdd18cf71709d4f694b
2016-08-23 12:54:10 +02:00
bdedd05032
Add new Renderer architecture (far from complete)
...
Former-commit-id: 52226793d7a087dfe0523315d3303934daffee49 [formerly 9de1c04df6b371f861a2eee8bba38902ee5041cd] [formerly ecd3099df5498722f6390447f40bd3907b8e40c4 [formerly 3076df585565fc9759ab3e718270f2e5ef620840]]
Former-commit-id: 92d52f967d0b088d1271afef26069e08cacd6b0f [formerly 5fe27e2ead104278951c772c2121a7b677f88d4d]
Former-commit-id: fb6c2456d8edd3ec022d5d953f79fecdd4f2b8f4
2016-08-23 12:52:34 +02:00
24d7861380
Fix documentation
...
Former-commit-id: bdaff1e4efaaad685df60baa0d11af3e7951dc4d [formerly 409b51215b894006fbcae285c8dfd67c97c9ae11] [formerly 58a176f2944bc3d347ccba58360cbdee3bb1b8d3 [formerly e6bd6b34212946c04eeec6896954c3969d1baf5f]]
Former-commit-id: 944b2ddd24acdcb0b6a5db07cfc75c13f407737a [formerly 7ed2f044fe8e50bf99a1c432e6079f7a445af573]
Former-commit-id: a1bfe55ac944ea530578a0cc813dd253cc708b69
2016-08-21 13:49:24 +02:00
27d1fb048f
Fix documentation
...
Former-commit-id: d43e254a2b72c53f09058ececd3bb449a9db9b37 [formerly 6351dd5b08b135d781a4ef646801ecf264cd3158] [formerly d43cdee4a57da3c91eb04f07e8b6cd8ab6311bb1 [formerly d22dfb0c17d68a4b4d4f21cd4c302b01d2340c92]]
Former-commit-id: 09aca89659ff3eaf9a62d81458e055af07db19f7 [formerly d76a23b823cd559549b3e71a67b5fe18f9130869]
Former-commit-id: a4180f4dabc413916bef4c102d414a03aa9c3d97
2016-08-21 13:49:24 +02:00
9eba331f34
Documentation for module 'NDK'
...
Former-commit-id: 63e1cac538c577a1f1aafa71fa7eef69a6d4daab [formerly b2d8769fd02a0e7d9c476d4ad7be1988a1fd6789] [formerly 636b5cb79bcb8da44d9aa45ba1023565bcf29f0d [formerly a2361ec2b8679d4d4ba096e543b5d4b91825dd62]]
Former-commit-id: d402d35477f9db0135c553d55c401939426bf62d [formerly 607336ea0f42731e4604f3a8c2df06f3aecfc401]
Former-commit-id: 69e23cd6c06723486de5e4641ce810012dac66da
2016-08-21 13:48:52 +02:00
95689f46fb
Documentation for module 'NDK'
...
Former-commit-id: a6c2075cfbfd0eccf2b77def71c0d42684bed590 [formerly 36ece2bc6a148bde6cacf45084821d20edcd115e] [formerly 4a6988792ec026e65be6850c46dfe8ddda92a885 [formerly fd3f4f975de5c427f3adc98b220446fd255be396]]
Former-commit-id: c87fdc9483202842267c60eff3d619f0df2963bf [formerly ee35202f1b2df7ca20da5b6d8b13147f2b92c933]
Former-commit-id: dad5de1b00bb4413f7aa191ca06b7d43b659f32a
2016-08-21 13:48:52 +02:00
42abd200be
Bump catch version to 1.5.6
...
Former-commit-id: 4d37a90a9b840d333a159a1dcacd53ea95db3ba2 [formerly bf36087ffb753a7af75e0e773b3f767a9b6bc930] [formerly f083c0f2e7bc51feb99d67236590e02d4c4fdc9c [formerly 1de37fcc69b9aadc24a59b1f02b6149cfe7892cb]]
Former-commit-id: 2aaa24ba86fba570146e7021555f3013e6748101 [formerly 2e555cd1b66c3f5e97c99589d759e767358c3387]
Former-commit-id: 62ce50a1506908ca2ac38e8c33801aee59b9065f
2016-08-21 13:48:01 +02:00
1e219ef819
Bump catch version to 1.5.6
...
Former-commit-id: 6887b4ad01091a7f1c6414d06530648c030f6bd5 [formerly f19339a30b9338cc4ce4a743b2d141d7cd96620e] [formerly 7ee374a24add744a5902afcc1be7046b27405758 [formerly 64b979cf954d620fa2d872d255917d59669432a5]]
Former-commit-id: a983a31af8079cf28c1a9cf50eeb88a72982a947 [formerly 9d5fbde640f1413d277233cb7e3ef01b91d0989b]
Former-commit-id: 4a0cc60a0a84d72bc4f6d5ae7472f06dfdf1f193
2016-08-21 13:48:01 +02:00
5023e0f105
Fix memory leak
...
Former-commit-id: f76e17e36834c1b9af93f973ae87f7000b71df35 [formerly ceae57bf8bdbc37a273fe38c2a2a24133c87545e] [formerly 15212571531d85f97fe94173a6fafd08d565f66a [formerly 882de2c616328d69b82032c0c8ddc1aa2337d5be]]
Former-commit-id: a2cc366f2802e3cdcbe5d3f09d9861375f693ec9 [formerly 58c365b7bd04a65069e777d43b584176d5ab167d]
Former-commit-id: 611c679fbfd831ad8e1e4c3d97e23d87eacd5fb8
2016-08-21 13:47:43 +02:00
1e5071767f
Fix memory leak
...
Former-commit-id: 3d67e7af059379e90dc668a4c3a0cb8874d78e2b [formerly 984bb7e66db42e532388baa17ad52d76bd5d0eb0] [formerly 39d68118d7a374f0e340d1418b0ac0658812dac5 [formerly 9fbc9f8e87056cb54fdf156ce803bacbd35e61a7]]
Former-commit-id: bcd15b913e75bbfb848a275f1e9b876086984588 [formerly c2c2a81447c7988c5c4bb47889843fbcfae79de3]
Former-commit-id: 5c1519b2f7bc347f9935f8329c60b311f9020f7e
2016-08-21 13:47:43 +02:00
40763370b9
Example/HardwareInfo: Fix generated file
...
Former-commit-id: 52bf3fe6fae3381602479acc4c3eff893ce1bd2f [formerly 6ee9d195ce38bf504de0c9b56be4efe0878c2fa4] [formerly c5b7e5223a061866b3dbaa5ba90a4f22b8af66dd [formerly a8ebb981b3161b7610b1f62dbeaace151cc92d54]]
Former-commit-id: 8a13ef79c41673716f8ddce6b9085f69e38ee429 [formerly a6b9c3201bc80717308147b42b082b5a4d0260cf]
Former-commit-id: 8f4ca3784b3ce027eea7a6b69e2418aef02824ee
2016-08-20 17:12:20 +02:00
1018daa1e5
Example/HardwareInfo: Fix generated file
...
Former-commit-id: 630e7c09a608ae3442d7f75ca7957938db505cb5 [formerly 886fb7052439151c752641117daa78a8d2f8d2ef] [formerly 2ad36b2270b027ecb31330a021229d60aad6e94e [formerly c641ef9008276b7891b2509cc78281c52f22a1e3]]
Former-commit-id: 7f3ec7800d291c3ac45ed2ed69b51b96564ada4f [formerly 3df9d6ce614593a2b3dfaa28dc88ef50a432def5]
Former-commit-id: e4fff6791544525cbeb0e9b2de43c8845475fad6
2016-08-20 17:12:20 +02:00
576c7c3f5d
Fixed linking of tools on GCC 64bits
...
Former-commit-id: e47425b9ff79fc0cb3342594422bb5e20cbc4250 [formerly 373a7d7f61de3a74cd4302389b94e78ccd47ed8d] [formerly cc40ac8e81efa2207d533729cf117b786922b92f [formerly 9fe0392a9506a796791b3a21c54236ad638bd6fc]]
Former-commit-id: 18791f6f0c493e6cd28be214431f7e18a39e8741 [formerly 49f8a79996b9fc6698d091472c5347dd0c8d0081]
Former-commit-id: 45316bf33503cd2fd1d0bbdbffe21dff6d22f565
2016-08-19 01:49:36 +02:00
f93eb6f5d1
Fixed linking of tools on GCC 64bits
...
Former-commit-id: 3e11e8f2d7ac0c6856a618b30778432b2abb845c [formerly 84b2e7fdea81101189a15488adf8a299f2c94146] [formerly 25857bd3c5ee2df838145658a59396659269069f [formerly 4398fdf08d380ab6d2973323b14347e4ef88bdba]]
Former-commit-id: 89f4498e34648bf5637b0a3a6556256c328ca0fd [formerly 92e91db53ccf7e0f1bdac31540772140f18adb4b]
Former-commit-id: fe2780f5d39f288d778b59b315afbf1f3b629cd3
2016-08-19 01:49:36 +02:00
d7a10031d7
Merge remote-tracking branch 'refs/remotes/origin/master' into vulkan
...
Former-commit-id: 2e493255187c5475d9b95b9e6587882147ba73d6 [formerly a927d09a1b19979816b780e45aef97586b35803d] [formerly 210b99c352db0c551479502d20b23c4aa82243ec [formerly 7bc73ba32423ca914d7223357a718f374050830d]]
Former-commit-id: 162363b9c34c4ef911b40fd804f7b57f06e7b4cc [formerly 796fb4d4f5b557206930658c5b5c1931f5c1e701]
Former-commit-id: 75cb3cf72f63c56632d7754bddea9c999b8fe454
2016-08-17 13:12:14 +02:00
5d308d7812
Build: Fix an oopsie
...
Former-commit-id: f0f30058efb92e7a24d66f480bb65a945880ad68 [formerly e591e16a60ba1768e5a057ca42fe5b86ea68c64f] [formerly 8cda2a08263f38358814c22387afe94436976fd4 [formerly fb3768694da2c6d4311a73c5583293b2b26bf8f3]]
Former-commit-id: 20cb578d12161750f9bd790f75c94de6b3ee5853 [formerly 78f6f9c6108bad01926e88b94bc27331190493be]
Former-commit-id: af429ed967d8753ba3c0a041c393d1eaf6da3dd7
2016-08-17 13:11:52 +02:00
db21a3204a
Build: Fix an oopsie
...
Former-commit-id: f04f167cb8d4b6596a0eb7f4fcfd14dbd2718f34 [formerly 57cc1fe61467e48037e9c2209669ec1694d2c2f9] [formerly 26ef47fa7468348453d13d94cb2f2d060e8ecd66 [formerly d5105954a02632b79fc84f1380a9199bd9b1a2e3]]
Former-commit-id: 02d8f0217a15a1d47157b752300a5446b12162e1 [formerly 4f595e0b7a16ec460f1f72013a6976d1aadd74f9]
Former-commit-id: f9e5c292baa89929463ca23699d5fa73aa814a34
2016-08-17 13:11:52 +02:00
658526ff58
Build/Assimp: Fix assimp rejection
...
Former-commit-id: 4bd673c117b8450e4e7238dd09c0381e8a4f2c61 [formerly 8cc3af25b5c7baba115c80fe555ab8931def6ef1] [formerly 2d0bcd153b4441bc8b32137965f95e580b6570ab [formerly 567211701b7aca9f35b9b47713138d932673b71d]]
Former-commit-id: db44829c31fcd67fb52643ea63f64bd127080c20 [formerly ded3811843b6d6d90058c238349bcd05c0bfe91b]
Former-commit-id: 56684cc6b81490f9f7e8c445ded6abc4608e0ba1
2016-08-17 13:05:41 +02:00
e46267d8ae
Build/Assimp: Fix assimp rejection
...
Former-commit-id: 46fc5f3b3fd749e86afe6298cb5337ae90f02784 [formerly c271946a1cbb2924f8d79a9d7c3691c7b23c69e8] [formerly 356ec1662b9e3186da7ac6720b7affec617357e4 [formerly 159894148bb93cadef56126939147c24ff340152]]
Former-commit-id: d2e03b0875bb5a7a57817d68fe8b559fd5ba1ad5 [formerly 6ff57bf039f291f64a35cd2c0987b989adea851f]
Former-commit-id: 6673c2d846855701a289a74e01bb2b2fc61bfb25
2016-08-17 13:05:41 +02:00
24a9993c10
Merge branch 'master' into vulkan
...
Former-commit-id: b13aa203a598667deb32eb7bc565377639a780dc [formerly 323ddcd0304d695bb1771c8cb940659f056b32d8] [formerly 2cfd96caad43772ede5a88f8cbae1a70b136a8c9 [formerly f37355fbdc3845fc3304f0a878e50e89772608a5]]
Former-commit-id: 10126f258988cf17ea8b4524a81bff0cb2160cc4 [formerly f4381ead0f258e9ab99e198b61324a011515bbf3]
Former-commit-id: 0fa94c32d68cef4bfa64e78f8a5f97f8fa270333
2016-08-17 13:01:22 +02:00
Lynix
S6066
Gawaboumga
Jérôme Leclercq