Commit Graph

3438 Commits

Author SHA1 Message Date
Lynix 10a1e16566 Build: Add package action
Former-commit-id: 515307c1cb9d10f2a6060f7ae107b969637e8882 [formerly bcb26c49c374e502732e3bff35f8367047accdc5] [formerly 72385d39c30f735fb43d70da3c44840468360efa [formerly 6563ce60169674309fdf8e36e16686b1b0be128e]]
Former-commit-id: fbc9522ed2c0e75f58a3517344d780be3eb99ac4 [formerly ce264fe175de40c051229183d458273ad6cbead1]
Former-commit-id: e312993f3cab7e1587bc09feb0e25ec289237224
2016-09-25 01:56:05 +02:00
Lynix 948273fe99 Graphics: Update global include
Former-commit-id: 69414fbafbbdacfebb1afab54946f4a522ced71f [formerly 52c50d2e6e6424c697339e01acc4268b38721520] [formerly 6ed3e9faade44eceb3926c1463130c7b4844b0f9 [formerly c97e57ebcd52a9764330ce7758fd785bde6bde19]]
Former-commit-id: b5790057312f0d0841d98fd1e0d23b8db8a6816d [formerly 9f3b2b008bc228cd4d9944f64c4eb57a9a985579]
Former-commit-id: 5372d34593928b266d4761baa79f6e5a3af43410
2016-09-25 01:50:21 +02:00
Lynix f434b753ff Core/Algorithm: Add serialize/unserialize overload for std::string
Former-commit-id: c4aa07b3ab8fcac85ac290ae5168bd841ce16dfd [formerly ee0f4fa822ec65aa72d43c9ab370402976713206] [formerly 9ec403e92a60b8ca97d7bc3e579ca5983089ba76 [formerly d7e17cc3ff72d43e23f11a70d785efcff3f4cba2]]
Former-commit-id: 190337087a987ca5ef1ac9789f04e3b9f2fc47af [formerly fc6bed4363a90b165db7fde093a6df37eeb9f45a]
Former-commit-id: 28d6dfe4b4217e91a7283e0fbe45d20ac982f79c
2016-09-25 01:48:57 +02:00
Lynix 19a6eee044 Network/TcpClient: Fix error when receiving an empty packet
Former-commit-id: 653a77b0b059968600777e89c02144d8a3e55cf3 [formerly 338bed3ccd44ad4a683e90cd1b99598660c47048] [formerly 8136c65b123704f0243edd20558ea19d636d2127 [formerly 4c158ec5ee63b97c1d9a828f4088a2f1908f3a32]]
Former-commit-id: b8491dc53c5792acadb2f9f6479e9aaec472ae05 [formerly 79127a86db6256fc749591c59663fbe7cbaddc37]
Former-commit-id: 2621271910cefb53cfd612cd8246af2e10ef4bd8
2016-09-25 01:43:02 +02:00
Lynix c1e1d35028 Core/String: Fix Simplify/Simplified method, not adjusting string size
Former-commit-id: 3996623190ee6195af1f8acf4f8cf07463046e0f [formerly e02718b2c559cd57f24c9315cfb0cf8542db1e92] [formerly f9047f74247e48ff63a96760d12be702ded86f13 [formerly 617cddeb7635631ac64c708ccfa45fa9895a99b8]]
Former-commit-id: 4bf301a65420c8b7968736bc28a2f74163ca3c36 [formerly 50fe7ab0e3f53c6f2337ef5fd4c4a285e69fadef]
Former-commit-id: b93130e3651c3e85551fa265fe334f5534134d34
2016-09-24 21:18:32 +02:00
Lynix 8a50b3ec0e Network/SocketPollerImpl: Fix compilation on POSIX
Yup, again.

Former-commit-id: c3209f14988c5fb21315a47952a71345db0bb016 [formerly 5b404d3bd4bdc3e42f9edd2735f4ee1a90b3ea58] [formerly 79e52d19202a56696c573a38f670176615249341 [formerly 0502a91d67d15b1cfc7c53c1b4cdfb46b86b843c]]
Former-commit-id: 88af57ddf2aac4d27ca9efb3bca979d5ce7b3a7a [formerly e5166f73aeee8823bfcc5e1ae2694750d94f8275]
Former-commit-id: 9597ca83c35be3e631ff1a5784880b69dfbeeab7
2016-09-22 18:45:12 +02:00
Lynix d7ae0c75ce Network/SocketPollerImpl: Fix compilation on POSIX
Thanks Travis CI!

Former-commit-id: 2cd53feae4b3932e5bf9e7c66255e6358a8d19d5 [formerly 9ba688db99ae881c295e5a8311abbdcccbd1157f] [formerly e5da0484598567ea44283080497f2a56e5fe5111 [formerly 4a290f7e5ba137e43cf64a93a7a2489adfb5dea5]]
Former-commit-id: 5c8bc90add749a1650d9b21e6672e19c2595d5b7 [formerly 4f9a5539c50af5307fbe6c78d3d71242c358fca6]
Former-commit-id: 0cd70283de3052441db90417ae96b0f90a421f87
2016-09-22 18:37:21 +02:00
Lynix dedd583bf5 Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
Former-commit-id: 4cb675e0bbc35ccf3bd34f47749a01258e263f3a [formerly d4c7b62197b02c2b7353c85ae41788b1b17af315] [formerly 43ec97ab70568fd11b6b422fea17ef7c6cd84fd2 [formerly 7370de6e2e8cd39d350fdba299c43c0aec8c668e]]
Former-commit-id: 67728e7bda47ca6470821e455c802e27e6f9e3bf [formerly 93dc4cc646aff434875fab140f8df0fca8bde4a7]
Former-commit-id: 3d722a3d7b0e3e4cf70a02d4fdc38aea380cbd71
2016-09-22 18:18:03 +02:00
Lynix 6fdf4478bd Network/SocketPoller: Fix compilation
Former-commit-id: ebb7105d949a924f5a454aab4f3704824e8c7e31 [formerly f2b5c057a8ded314be40d1752ad6bc86dcade278] [formerly 6487addceedb75d6f59c9c138b8e3635ea271ba2 [formerly 18f1b6e1d02b0377b382bec327f1df99c1b04f27]]
Former-commit-id: 90fc36d0a362d402fd10a23addb1bbb407e4ffb9 [formerly 82f63c8797caafb24fd3e5c8de76b8814ec24585]
Former-commit-id: 75da2a9a2dc4b2dbbbd5ad8de986ea58ee199c0f
2016-09-22 18:17:59 +02:00
Lynix 0b1ae4f16a Core/Config: Fix typo
Former-commit-id: 8e9d1c6f4ef8231b9ff59d51abf224606795775d [formerly 5ff9f91c844593607b64df00b5ec9344da1aa864] [formerly 83084c13b439390fa313594332ef0d42e793df9a [formerly 317e9e476ef6a7a97e9906245682080a196dd82f]]
Former-commit-id: 5b16e13e15bcc5054743387fd1cb738515a198d9 [formerly ec5e19e21a44489c2eaa0843b0f869341c5deb20]
Former-commit-id: 60028fb6c993ddf6cee0458f9ed6d5d7fcca25bd
2016-09-22 18:17:29 +02:00
Lynix 9452b98f49 Network: Add SocketPoller class
Former-commit-id: 86b9266d904551d19e7ec8e8d6bbe5f137e8d29f [formerly 34575937d84f796cfe36a5ab97ea1f787c1506ba] [formerly 6c8c621523800958ad38eef118fcb3687c34b367 [formerly a1f1330fbe6f990a21bbe6dccfe727edec0e2b44]]
Former-commit-id: 6635c463a753f744b835267181b51ed89620b627 [formerly 14e84c7155cd669ac20a5492e67704059a442925]
Former-commit-id: 7becccdf2d8aac7cdf526d855215d7d144be284c
2016-09-22 18:16:39 +02:00
Lynix 61ea7f3e0e Update readme
Former-commit-id: 8e947ba710497070000ad834748eb6890e8079e0 [formerly 5cf6c0d507dd97b5b0934472c2a57d3442893cb6] [formerly 9fc16ab88c14c0da4306e040be89c4c6ea54816e [formerly acb28d545ce7d6ba366f69de3a3499a99b063807]]
Former-commit-id: 688f139d2c6ff77cd218cb1319033eb18a63f304 [formerly 92cf401113dac5e442ceed89c403e8fac15d3fef]
Former-commit-id: a94d7513ddbf716c8936840bb8d30dc04da532b5
2016-09-22 00:54:04 +02:00
Lynix f3eaadcd8b Sdk/Application: Fix wrong inline constructor
Thanks Travis-CI !


Former-commit-id: 40bde8de004459e30e45b45005d8a7680ae321ca [formerly 94921ad26e3e4d8d8980a2002618b1b8bc134d23] [formerly abfe68167af6aee324ec64a1d55114c63f364ceb [formerly 79ab743755f65fd23200091380187675b2af7281]]
Former-commit-id: 487d2ae56048c786e08f9b6b69d34483cabd6517 [formerly 28cef4f85f78fa47fb28430b75c0c7550b79c8a5]
Former-commit-id: 3ce94333b5d83df940384dddac64e41cf3b5a5d2
2016-09-22 00:26:34 +02:00
Lynix 9b72dc7f16 Dummy (checking Travis)
Former-commit-id: 0a4750c4c18149a2fddccfc697ab4b077a4e40ed [formerly 1580efe5b88277bf0dd89116c8ba1adbe5fe7aef] [formerly 8f3722003187e02f6eb72f60b137450dd0202d5f [formerly bc6639eb71a842a731a5333aeae0c7a03cc56834]]
Former-commit-id: d1ac46f69ae170fe2a10f74888610ed9bbb8c1ab [formerly aa852c6891a41d4a3cb844ebcc6ee48d32fcd9b1]
Former-commit-id: 87a4634a7c238b7b2243ebc7b5cbe401b5b782fc
2016-09-22 00:14:34 +02:00
Lynix d8e4479301 Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
Former-commit-id: 5aedc37bf0ef2df3fff657784171cb6495d7b2ca [formerly 7cdba66033b7fce3b0d739fb53bcb1eb15d234e4] [formerly d1623880ed1e27630a59328717f68c66f3f5783e [formerly 8d1c11755bb60ac964f9f1cbf60ec3c543ec32fb]]
Former-commit-id: 401144b6d943a8378bd0c1b010d28823b8224c4b [formerly 99cfdb9a57be4d0de69616ea5faaa9c02a6dca63]
Former-commit-id: b143897a5f4ff0439d36cd0ae8678673597129d0
2016-09-22 00:03:28 +02:00
Lynix 52cc7bcd2e Enable Travis-CI service (By @Gawaboumga)
Former-commit-id: c1d99b6d4143e8836ee0d78ff63069876c9ad79d [formerly ad183fdb6a31e9e7f7dfcde5000cf028a63df0b7] [formerly abd770532214b16cb0a30c11fb33eb36b6bb8198 [formerly 3bb0d4d7574707a52feb54ce585709f2fe53f8f7]]
Former-commit-id: ff3f54eb9ea724597bd7b90ed48a8abc407f6a98 [formerly c922a4b3af5daae9555e4dfb645891e648588e7d]
Former-commit-id: 59d8e6ffc8ebcf5cb9b92e50b5d2507e7930d962
2016-09-22 00:03:25 +02:00
Lynix 0a656ca398 Renderer/UberShaderPreprocessor: Fix compilation error with some drivers
Former-commit-id: 10cc42b1ab1249d59b7b911e700f3bf146abc4f5 [formerly cd1c27e41936c49793e6566e8ae0f9ec44cf6b82] [formerly 04b38622de068b9f93ee759570140c0dc45309a7 [formerly 999ce6bcfad58271c8c035305814993a60830a03]]
Former-commit-id: b16a232eaac6611e6848ccf0c6ca92b91684528c [formerly be808b5c7dc569547012a91e7f6cd148ed1624cb]
Former-commit-id: e4d594358f11b228969d347f0a230192cb2f46e6
2016-09-20 18:01:05 +02:00
Lynix 34c1208202 Network/Windows: Fix compilation with MinGW
Thanks to Maeiky


Former-commit-id: 06501a2d834a10fad4db902b2a5015e6ac7a1fd8 [formerly f2ae3e67ba3fec2d8c740a4472b6fd32aa601a41] [formerly a13631a0e24cb5518e132d450c8d099f985d3fb2 [formerly 0b3ed439870f29acf33c6a6cfbbe8747fc3394ff]]
Former-commit-id: 04e5439cd9d14ac7de4a5b126b0359aee42b0bd1 [formerly 6cab591aa8cf90d4ab3ddf6a883023caf1694b4d]
Former-commit-id: fe7895dc9cd1c1f54a2c0b7df1d578220e06b180
2016-09-19 13:16:16 +02:00
Lynix e5218301b5 Graphics/TileMap: Add support for isometric tilemaps
Former-commit-id: f89318c22ae2dcdab159f46dcfcbdb778af00ae6 [formerly 9912b85867bbb46cd785af9f3fe3a1dc72180149] [formerly a82344e574762f14805ea6c831a0a314cfe36a20 [formerly c234ec3cebd016381a38cd13f7d411511ae98164]]
Former-commit-id: d170f0897b77bf29f984a8ddf9e5b193d63a5e60 [formerly 54a8819656b3c626c1485dbf5ccc8f015ad005f4]
Former-commit-id: 0b0bf65c250219c29b27067b315a3735d8fbbd70
2016-09-19 13:07:55 +02:00
Lynix 48eb9ee3b5 Utility/Window: Fix destructor inline
Former-commit-id: f55088c7edd5d14c4626a42fe11b7328fa3526b6 [formerly 6c5f0e4666989e8d57da06da103bc180ac1f0d8d] [formerly 2b8719258209c5c45d0b2d4257332b18f5594c3b [formerly fbc1e2f64d490e340d1b0054e7f9c2cacac18086]]
Former-commit-id: b8b5f64fb182f7b5e1f4a3d270590da1f35be0f1 [formerly ee4b8d9204690c2a33bb94047515e1e64e6fcef3]
Former-commit-id: 6413a1c4026dc7904026c259f7ead483342fcad2
2016-09-17 12:08:44 +02:00
Lynix 5ea113a7ce Build: Exclude Canvas from SDKServer
Former-commit-id: a8af440cf6b03bae851f3e5131406fa5cbceda4c [formerly 58b0f03d169d0461cecb33a5e4586cf37bf077c2] [formerly 08112bb2f0587c5896593199f5a3b5bcdbb70ca2 [formerly c57bfe24eee2d20b01fe5d0cde5a11cab6a18feb]]
Former-commit-id: d21b82472fd15db8649f7b9629899b4ca7e774ce [formerly ad273ef7cfb07524113cc0803c545f81e4329356]
Former-commit-id: a1a777eac82c90dea3c82c65436da7add49521fd
2016-09-16 17:26:41 +02:00
Lynix cf523f8dff Build: Exclude Canvas from SDKServer
Former-commit-id: dd4a58fbed3f78e8409d6e4b64ce56ff8931196a [formerly 6e5e1187887403a27e6db10a7573f88bb420b66d] [formerly cd92e9bb999655ec61800c9c6dd82841001d55d9 [formerly 16a3cff53b7491731b8d8f4bdf5103b2e384a359]]
Former-commit-id: 502c2ad8828b5a84232b622aedefbce9e7fa112d [formerly 081c0d9b4db201c03bf080b78f42539cab0bff06]
Former-commit-id: 356d9849d351839c6d749b2d697f6a1c4b4cf123
2016-09-16 17:26:41 +02:00
Lynix 061261b911 Sdk/ButtonWidget: Make buttons clickable
Former-commit-id: a2a018254f6f6ebc36f402e6cec12b5ab048d4c3 [formerly d3a5c72ac4b0df83cb1100ea0f58b2c03e029d18] [formerly 404765b9f0bac1b2b41e594783ae730c15c7dfc0 [formerly e0628754a233a7cde8ffa60e02e4614dc3d9961e]]
Former-commit-id: 127c9d5cd50790a3003fd4a6ea4c21b17526c7ae [formerly 545310c49f5a4e118cf089480e7c7321f09719a0]
Former-commit-id: 217ef14e8265f3bb469e859e61c1a18e5f8e5c14
2016-09-16 16:56:10 +02:00
Lynix 7a111101e6 Sdk/ButtonWidget: Make buttons clickable
Former-commit-id: 999f91775de93746f964b5a8d9276208cd8a592b [formerly e135030f2cb801715242168c305950d8991f38f1] [formerly 9e88a4002c5293aa0f96585e23992e6b539961a4 [formerly ad29706e81fe2facde2a1e669ac0e0b558f0ae0a]]
Former-commit-id: 32b8c7ebe3a5bccd02fa929471548b8872bdac16 [formerly 5d1450890b7dc43e967e3e1431f2ceb6c415b655]
Former-commit-id: 21f53b1616bc5c367f7696c86781e5dad8455335
2016-09-16 16:56:10 +02:00
Lynix 8ad2f05abd Sdk/Widgets: Add OnMouseButtonPressed/OnMouseButtonRelease events
Former-commit-id: 6991c60426c0a41d88174fbe404dee49fc13dc2b [formerly 662192d79c314e08128b196cd352188eff903fb0] [formerly d238c31726f70ecf078d8e8cc3dc3032cf1529ca [formerly 5caa1f462aed257779cfe5e8413729062f026bf5]]
Former-commit-id: 296fe5698e0bf5d8b058de032a8549df1c4891eb [formerly 20dfabc83b4eb8c2cc89138a05c29d53e17c952a]
Former-commit-id: 44b7f726bc84056071b9e577357a736e78436767
2016-09-16 16:55:55 +02:00
Lynix 9ea02e8b81 Sdk/Widgets: Add OnMouseButtonPressed/OnMouseButtonRelease events
Former-commit-id: 472d7dc96b23ae29eaa951acd9db1a7771252616 [formerly 48ebfb3f7bb87c895d9ed8208799ab9654d9a8d8] [formerly 7617433fe3c998e6bdde1e01f4b5b9ea7578640d [formerly 280df873dfc507940fdd7ddc0b282c3ba1c0a405]]
Former-commit-id: 82ca7b74b4759b8a929e0110cdce3e1426d376da [formerly d8147aeca86e65d22182277f57b9ab47a5575793]
Former-commit-id: 373c4a0f6655511f55355550d2f8d8af9e81eea0
2016-09-16 16:55:55 +02:00
Lynix 9e1b2c69a9 Core/MemoryHelper: Fix compilation with MinGW
Former-commit-id: d06a447e934ee66f3f5c399fdd58f2bc95260544 [formerly 18a9328df6edb35b500a57184a8c5155e0e8f6ed] [formerly ef18cf674c43bc0e5cd0f54f50897f184b74d327 [formerly 474225aa4a4843398bfdc5e9d6c9f3db88573170]]
Former-commit-id: 3d5905c69b5fd68c585cecf5191bcffe1d3557f9 [formerly 4a1183e5d7a59d8efe05091b282b406c1c4049e3]
Former-commit-id: 8755e653ff0730ec687db80117405f33a4b2e430
2016-09-16 14:19:42 +02:00
Lynix c76d7dfdf2 Merge branch 'gui' of https://github.com/DigitalPulseSoftware/NazaraEngine into gui
Former-commit-id: c916f9e8ea65e837da46c45ba24448ef5c71eaa4 [formerly c65ac563584ac4a964d557f3f3b124cd65fdb737] [formerly da52e24493f3b6835fc33b62ebf57680288d57cb [formerly 1b4cedf373869c998c2505c146889a0e673bf6db]]
Former-commit-id: e225d991ef379f454c368789a6edad0d7cf59ef2 [formerly 28c5fe9f7176e6ea7070a860b1b5191c9ccec574]
Former-commit-id: d902c31743f9a2f33347b1a479d22d2baaaefc93
2016-09-15 13:17:11 +02:00
Lynix 115920ba4c Merge branch 'gui' of https://github.com/DigitalPulseSoftware/NazaraEngine into gui
Former-commit-id: 8663c06042dcddd79b65edd376a5d741a18e8b14 [formerly b30644fc68a2a27550a77b73d7d558b3980a430a] [formerly 8a444fb9d8b0e0eab3ddd50d85c82b918514337d [formerly 4c09129a5ff3b423d89535e1a6a7eda8e2727d6d]]
Former-commit-id: 464e82dbb668e330966a8466797b5d9b4549866c [formerly f134c82285e8241ea3f7cea7251b3281670b43b5]
Former-commit-id: 037696eee6648e5819bdfedac3ef94527b3cf630
2016-09-15 13:17:11 +02:00
Lynix 72206a3ca3 Sdk/Widget: Add Canvas system, mouse movement event for widgets (buttons react to hovering)
Former-commit-id: 685295853d1f0edf28c36b2f698eca881da25ea2 [formerly f65f951ed3d2edfd9c12d390837cd13e5691eaa3] [formerly 5e239f37c28bf5e93a71cba29a94f0de680a79a2 [formerly 38346fa5d68c7bf79ddebc1990959e7c56617640]]
Former-commit-id: 92da4ed40fb63fe0b02c7543ea64cebda0575623 [formerly 2db1fe5fca87a1461ceb8314709d764af079a7be]
Former-commit-id: 77d61a99fd5a2bb21701fbe4a4b4451c3655663a
2016-09-15 13:16:37 +02:00
Lynix 9438f519bb Sdk/Widget: Add Canvas system, mouse movement event for widgets (buttons react to hovering)
Former-commit-id: 1945290ec1bd8fb85f0271e71a3deac8fe29d1d3 [formerly 685f46c52586642355658b6dc97b01c62c8ceb18] [formerly 2d7b1bdc6ec1b08d82f5967bde41e07681b37bba [formerly 24f645b1a9ae22d4d9a3d45d40a09a92929f407a]]
Former-commit-id: 0b8303a6701d2a0507433fb004a181ed1852e250 [formerly 81f107cd8a3b5adf3fb583e24d72fb11600be8d4]
Former-commit-id: 1fe7c371f085ef008da5f4362924ebed8a2e968a
2016-09-15 13:16:37 +02:00
Lynix 8e009a1d66 Core/MemoryHelper: Add portable stack allocation
Former-commit-id: 50b96029c53d1784f028148f1ec15ae2cf98d036 [formerly eb3398905190df3d0dc77c8a3b54bb455059e39b] [formerly bfac4638e043161208ee7cf4735a788b1427f73e [formerly 1ee0a59ab5aa407c995afd287a9aaa4307075754]]
Former-commit-id: 521c4248c638e5141534cd1d223d8f563693b821 [formerly 203f6191b3b24ccb2e04d330372973dadfb81e1d]
Former-commit-id: 140a5c705819055b4d27f43156b079d6142049a5
2016-09-15 00:46:59 +02:00
Lynix 487c9da235 Build: Exclude widgets from server
Former-commit-id: bd50a23eba3b5c305ecc98a1f1df010281e4e7a5 [formerly d3650d65ed6e57e7cfc6291639289c765ba9382a] [formerly 7e41ad12a23a6729e7626216567a5696115424f2 [formerly 6c80a2e25fd9f8336e441e09276983964a2b971d]]
Former-commit-id: 96e347d714a329b8cf46ae566bac33572498a3f0 [formerly 11c3246462c05eaab2b74374142b4d33b567ca16]
Former-commit-id: be2165ad8478c1a8136c95da9b96ce255ea66e70
2016-09-13 20:25:50 +02:00
Lynix 320ce3e1d5 Build: Exclude widgets from server
Former-commit-id: 6413518ac424e52e8e38ebfeac097968bbb153b6 [formerly dab972657333b67cbc27b0c03c928289617db977] [formerly d90816f1d8a4643f089f1a14d3afb189a4f7d5ab [formerly 521bcf5d4fba8ff2866fb52b0cafaa38fd79c036]]
Former-commit-id: 81a120be306c06ce0ae1e1e0506939f2a099e772 [formerly 7b61d9cdf0547c9a813059710e70aad0e4de41ba]
Former-commit-id: 57ebe4da311643188488a370ec5d30f248854a04
2016-09-13 20:25:50 +02:00
Lynix 7346c2926a Sdk/ButtonWidget: Fix compilation
Former-commit-id: a0a2e6a82405e07a8b6a4368117819c9e62a0085 [formerly 421f7bfb54896e1a0422faef047faaab39847fdf] [formerly 13b796a812ff951ebe87c060466926bc76208bbf [formerly 6199fe41191725ddb9a96873079a5dd8f4f33217]]
Former-commit-id: d6fd2d5405c228052e30e6dfa7cc41f17c1d669b [formerly 6a6596e7af6e1ca4ab85f85545b8b42a243baf7d]
Former-commit-id: 988451787c7c374d258f1bd91eb840a16a57fe8c
2016-09-13 19:55:39 +02:00
Lynix 220a7263b1 Sdk/ButtonWidget: Fix compilation
Former-commit-id: b45ba6c55c8942083b3bee3b742c300a1890eb0e [formerly f223376c239bab00acc4c560077c0bf691f8988d] [formerly e39b7c76edf6008b7a67c096714d1824705416c5 [formerly 9139170e026fc9c493f971ac55ac268249e32c77]]
Former-commit-id: cf7e25cde5cc09839e0cd7364a0fff5fe77ed39b [formerly 7fd5a315ec88b6c0512505874970ee45f06c5f86]
Former-commit-id: 3d85e1aad535da46085731400bfc153868972aea
2016-09-13 19:55:39 +02:00
Lynix 174ba16774 Merge branch 'master' into gui
Former-commit-id: dc210af8af6601458a94819b8a8a7e5fe95f5b5c [formerly 76e541353be06bf6fe63e1fe1d900ca527900013] [formerly e96fc9ec302c19011cdd8381fcf060fac147b794 [formerly bcc7f0e74882257759dc405b14e66c987c8ef1bd]]
Former-commit-id: 819f102a0c9665c5997f7156a44942a1aeea6608 [formerly 6708e884546b06e7664648cdbe6f3a9867f9922e]
Former-commit-id: 39d6d4e9b3ac3b7ff77c14a78e49dd58aca0bd10
2016-09-13 19:52:36 +02:00
Lynix a061a62de6 Merge branch 'master' into gui
Former-commit-id: a39dbeecbe470bf070375d55feb4a8a6154ce455 [formerly bbd2cced77138d6cf898887cc643869c5d47abde] [formerly 09e150b969ecfa7976eb8fb6ec085df1b8516d72 [formerly 25cd192c9f9caa4c1d3459b3a6e6bb3caabf6e19]]
Former-commit-id: f07555922035b7891f06c2a9034908e344a95ece [formerly cd7e94cdfb0438d1964f574f39870ed7746d693d]
Former-commit-id: 5f9a16d88ccddfc9ce15561d9a3e231cc076ffdc
2016-09-13 19:52:36 +02:00
Lynix 357128f0b6 Graphics/Sprite: Fix warning in Sprite.inl
Former-commit-id: acfa72fdbd3aa66e4bc0cb917a1a8cc7c0b8395e [formerly d9db1c38b03b447ef582abe4c1032fd6e9a2485a] [formerly 5d90dc0f2aa86933526a6d06e02500112f7b4d30 [formerly f270581870a1efe3d37f270e560210bf3cec84e3]]
Former-commit-id: 69b6226e20f64bd3a2c2eab1ba0dc04c86160575 [formerly 03b7cd7f3c69d324c6d279ad3f1f8eda18a8551b]
Former-commit-id: 9002c0116b59210fa094dc86851bdc5b48b0908c
2016-09-13 19:51:46 +02:00
Lynix c6767a0fbd Graphics/Sprite: Fix warning in Sprite.inl
Former-commit-id: a3410af1934a462a4fe197700379ed64bbd6c76b [formerly 318faba08dbf1a4216a1fa5626be22c3b4973e92] [formerly 3f938befd96d748b6261b20301b8cb4afde287a5 [formerly 2dcf1a7bd016c4c81d9ecf08056ea202ac0c47ef]]
Former-commit-id: 742fa64e7f5954bca97ac7dd7ae11697fe47eea9 [formerly bd0de568838add11360d8dbd27af5c7ae0ddb1bb]
Former-commit-id: 35ca6c90855d4b3956e0cea3f7c265a286b121b5
2016-09-13 19:51:46 +02:00
Lynix b94bc43c45 Graphics/Sprite: Fix warning in Sprite.inl
Former-commit-id: d98effab8708be30ad3005c3bca55d41dfad7374 [formerly 0b5277e1c02f1e72176b75050c3b079773dc236a] [formerly ea744cb5ec679e07b5f1899eb43c774d9f243512 [formerly d00d22f33e729a7da00a8419649aa8df99bf31ef]]
Former-commit-id: fb3627a89717615b3e865f08a076cbeffba45cf6 [formerly d1f9986651979a37c581d94854843600780b7484]
Former-commit-id: 1fc32e9067bb08f741ebf20ace85b43060353aa1
2016-09-13 19:51:46 +02:00
Lynix 136fb65a6d SDK/Widgets: Add buttons (not clickable atm)
Former-commit-id: 8c37250acd7bf5123674f1d83d4d55d7125f080e [formerly 6705a2a453bb8c1e441a5008beb9a4ac60847fa2] [formerly a391c49c98f003cfcb8409d67052ce7998329f9b [formerly a8440703ccade130b116dc51246cd3ec0e16e6ae]]
Former-commit-id: 7f0f4bd7353768e7e0440ef41ce24c8035d7ee83 [formerly 6d3310e1488bbea850e17257da5588f9f0d0ec03]
Former-commit-id: 1ef3f72963ba3df19e789aae2a2e263e104a2e94
2016-09-13 18:22:40 +02:00
Lynix 81e819567b SDK/Widgets: Add buttons (not clickable atm)
Former-commit-id: b90e4ddc0fd7dd18efd480243639d4e7c76c719b [formerly 2ff8f6dc8bb21873734f6d7a3b4bba6fb6edf24d] [formerly 0268cc083e0a8c6285cf05eead7b1a375ae5466d [formerly a4bdefb8421a31c7c62c293f128253de0fa5c6da]]
Former-commit-id: 8788b5116384b23544d620c28105516d8c2eb6a1 [formerly 785d6986573cd5483a37697b3f13651fa9ffa5b2]
Former-commit-id: 2d424bb16eb5f01381b3a6b315bce258092542c1
2016-09-13 18:22:40 +02:00
Lynix 6e520f5ed6 Merge remote-tracking branch 'refs/remotes/origin/master' into gui
Former-commit-id: 0cddd4efb12e38d9cceead424fd81f4939707542 [formerly 18a8f78457314e51a04ea89f08667d43ca79357c] [formerly cdb38b3e376619863941e051c571f0ef67c6cb0b [formerly 270e21a0e26acc827015b606049714c0ce28f508]]
Former-commit-id: 6e5b36578ab62d34272f27806d26a1b770653991 [formerly f261a7fd51dfe61c99b0c2f72b46d03c1b7f786f]
Former-commit-id: c14259a2f894eb3956cb5a34345c3ebca7dc0d50
2016-09-13 13:12:53 +02:00
Lynix b8955b3a58 Merge remote-tracking branch 'refs/remotes/origin/master' into gui
Former-commit-id: 59196209e6eeed397230c6045118644c1a16e8c4 [formerly 202ed159fbcf23c31800981958bbcc5cf19541ef] [formerly 26b15fd1fcc56e0688b9c5b96f7ecf520a94659e [formerly c3aec70c11386ff7de6b3c24fc305d85d8fa99bb]]
Former-commit-id: f408bb60f5f63049a69c092fef8f505489cf25d7 [formerly 1ae19a052b01f9d6a1f68feb713b7b29165b62c1]
Former-commit-id: ba308fa71ecc78736df1ab12444bbf4014c2e1c5
2016-09-13 13:12:53 +02:00
Lynix d8caea738f I'm a moron
Former-commit-id: e0bc0cbf0810d92ec21569e47e25ff344754c45d [formerly 5de16df03c69dd12360d92b3f526f582a7788de3] [formerly a6391f964534e24dbb766fbd0ba7775f108bcf9b [formerly 42441b30de399dbe4d83d7156232a6db3044a7d6]]
Former-commit-id: c320af3cdf8f44494f4edaf45288a8ac9cbfb6ea [formerly 26cf22fa23593ab18e3543210e7d17ad7a4380ed]
Former-commit-id: 3ac65b75454925ccd9a48a1d8f92e97712fc9532
2016-09-12 14:36:34 +02:00
Lynix b64e65bbb3 I'm a moron
Former-commit-id: bba4e4d5d99fa7d4f8542ddf4f371578a6fbfde6 [formerly 38666d69d3f61b68f53452f9e08afd5d4545e247] [formerly 5d5ca1fbc58f8f55e49df32e840347807b307df1 [formerly 1268ae19bb805894bc4ea98bca9f3aaee23a884f]]
Former-commit-id: db42585f88b7aac2d9d946aa19168a051180875f [formerly 437851904db490748a7b7b946e4823177e782a6a]
Former-commit-id: ec09684d4e6f2d0ce7664f73f1c552e5dbde9278
2016-09-12 14:36:34 +02:00
Lynix f0081c8817 I'm a moron
Former-commit-id: c657fb51f06383769d53b11dd29ebe5d3b08d34b [formerly 5482d05d0e31b9ede0b135d4b5b884c75b125bcf] [formerly 7718539d36139bdec2e22cdc6b3ed68a6440de37 [formerly 8b343f4e3dc51bdf480b9d6be8e49132b29bf161]]
Former-commit-id: 3cbad989c037da16dd4be92a64156f4b5dde892b [formerly c2f2a41e12c8022100478900725f083f95a680e2]
Former-commit-id: 86c5f71ab9d0147d10f677bd31ad8272e6121fe6
2016-09-12 14:36:34 +02:00
Lynix fac97086ca Damnit
Former-commit-id: bb159672db85225cce3945f809c6e3dab5cc45ed [formerly 4de941226b9d851bedc5cffc9934b8547f01f7b9] [formerly 86a1dd7b8768a993a0d9edc6848e80974c9014fd [formerly 832d3b5a6ac4428e708943c4bfe06573d3449bad]]
Former-commit-id: 06b9982f5c9de274cd70c4ec4d5a76b436a3e28b [formerly a7f4fb44ee5f2a4769849aaedfb1526fd64a530e]
Former-commit-id: b8969759bb762818162abef970b14726bf9183b3
2016-09-12 14:35:58 +02:00
Lynix 5c681d11ce Damnit
Former-commit-id: aad22f6569e9d096a8af02034f7dd2ecc3bbe4eb [formerly a9fa210a8442a12064c5e768b3e03beb8ab1c10b] [formerly ca732eb0b0b42f7fce822e8ab0aae44e22c1e651 [formerly 11a53e81205d74e5b9cbb9fdbe9c242c5c7736c1]]
Former-commit-id: 291082c51c9d9dc4b361c9ed5196b13c8edfc061 [formerly 8620c5eaff7c69742c98c94f52a028c721240a1e]
Former-commit-id: 3f488710c3ab59acd5381dc7877f3ae968847703
2016-09-12 14:35:58 +02:00