3d79db4c52
Sdk/Widgets: Add TextAreaWidget (experimental)
2016-10-28 17:46:23 +02:00
7df732b927
Sdk/Canvas: Add basic keyboard handler
2016-10-28 17:46:02 +02:00
a4eccc9fac
SDK: Add widget global header
2016-10-27 21:38:46 +02:00
df24519230
Merge remote-tracking branch 'refs/remotes/origin/master' into gui
2016-10-27 18:36:47 +02:00
15a1302522
SDK/Lua: Simplify graphics binding code
2016-10-27 18:30:11 +02:00
6b1d1a1d64
Sdk/Lua: Bind TextureLibrary and TextureManager
2016-10-27 11:29:02 +02:00
1d7e1b46ff
Sdk/Lua: Bind more Matrix4 methods
2016-10-27 11:23:24 +02:00
5ffc5a8784
Lua/LuaClass: Don't remove instance from the Lua stack
...
The instance Lua entry now remains as the first index, shifting all the
parameters indexes by 1
2016-10-27 11:22:35 +02:00
d6f6b4421e
Sdk/Lua: Fix GraphicsComponent:Attach not taking other overloads into account
2016-10-25 13:52:26 +02:00
b27cfd30af
Sdk/VelocityComponent: Cleanup
2016-10-25 12:22:57 +02:00
2a08e19e77
Sdk/Lua: Bind Material class
2016-10-25 12:22:46 +02:00
034f5cc8d7
Sdk/Lua: Bind SpriteLibrary
2016-10-21 17:32:40 +02:00
373b8a7069
SDKServer: Fix compilation
2016-10-21 02:29:09 +02:00
b1abe2aac8
SDK: Fix compilation²
2016-10-21 02:22:12 +02:00
b062b496cf
Fix compilation
2016-10-21 02:12:35 +02:00
8f84700628
Sdk/LuaAPI: Make GetBinding() initialize the binding in case it wasn't initialized
2016-10-21 02:12:23 +02:00
6b6608eccc
Sdk/LuaBinding: Remove "class" suffix from classes instances
2016-10-21 02:03:31 +02:00
6d597aa2bc
Sdk/Application: Cleanup
2016-10-21 02:01:08 +02:00
350c7dad59
Sdk/Lua: Bind Sprite class
2016-10-21 02:00:51 +02:00
4cd6bdd14a
Sdk/Lua: Bind Texture class
2016-10-21 02:00:35 +02:00
6885e99ee7
SDK/Lua: Bind Matrix4
2016-10-20 17:24:22 +02:00
d530ca22e0
Final pass of Clang warning fixes
2016-10-17 16:14:35 +02:00
4c6f049e0d
Fix another lot of warnings from Clang
...
Closes #90
Closes #91
Closes #92
Closes #93
2016-10-17 16:01:05 +02:00
5a07bbd001
Fix a lot of warnings from Clang/GCC
2016-10-17 14:46:53 +02:00
634b67be56
Fix merge fail
2016-10-13 08:33:15 +02:00
1fdda6b07c
Merge remote-tracking branch 'refs/remotes/origin/master' into physics-refactor
2016-10-13 08:32:36 +02:00
01cd9b220f
Sdk/PhysicsSystem: Fix GetWorld() not initializing the internal world
2016-10-13 08:30:33 +02:00
be44a89a85
Sdk: Rename [Collision|Physics]Component to [Collision|Physics]Component3D
2016-10-13 08:23:25 +02:00
b52c7c57bf
Physics3D: Rename PhysWorld to PhysWorld3D
2016-10-13 08:13:56 +02:00
3765cba046
Physics3D: Rename PhysObject to RigidBody3D
2016-10-13 08:06:14 +02:00
3c4d084b27
Physics3D: Rename Physics module class to Physics3D
2016-10-13 07:40:12 +02:00
b7a383d68c
Physics3D: Rename all *Geom to Collider3D
2016-10-13 07:29:34 +02:00
24f1859ec2
Physics: Change includes to Physics3D
2016-10-13 06:03:22 +02:00
debf87e739
Sdk/PhysicsSystem: Create PhysWorld only if required by entities
2016-10-13 05:29:48 +02:00
c4b99fb0df
Sdk/ButtonWidget: Remove debug code on mouse move
...
Former-commit-id: f36553828d8f212b1a837a121876945b7dceb7fb [formerly eb5492d8d1c5d752028b3e7f34be4ecbc4444b03] [formerly c5eb946d4d8e2505a07e74a474dd12d5cc5a71c7 [formerly 29aa56ee96517fa23dfea73a428de67a97f58fe3]]
Former-commit-id: ea67903befcf6d70ecb0735cbc20f5c1cb744486 [formerly ec59646b433a1eb3bccf4516dbdda52f2e23a127]
Former-commit-id: e2589b30389918af8c1f579c22d711542fcff43a
2016-10-11 15:41:33 +02:00
7cab7cacaa
Sdk/BaseWidget: Add Center() method
...
Former-commit-id: 337837199f8909bd39dd10129b379331e9344dd7 [formerly e29dfa72869a7e4831cdf1880db92a7f96cb7755] [formerly fef5a65af9b6bc7b12813a79db818aa6f8034c5f [formerly 5e38bf5eda4f96df7bb2f13d406830a48f293bb9]]
Former-commit-id: b06665741f29f91b9e26fe270e6addd699c5111b [formerly aaf5e62dbdda284ec70dae55b7c37c5e86b75ebc]
Former-commit-id: a9c1a3dc6df30f1688ad9143ba56912d02285c19
2016-10-11 15:41:19 +02:00
2fdc7a8878
Sdk/BaseWidget: Add shortcut to create children widgets
...
Former-commit-id: 5d5ca1d1097086c33133440c08806aec9e478b09 [formerly ca22426131332606a26dc3f33fcda615c7c03d81] [formerly 38913198afa19aa2f5f2ee0f90f99d3780cb3333 [formerly b592a482e9f71b01a3b068276c3bbdcf8dcdda49]]
Former-commit-id: f464592f3d951614bc333bab9e0662fc1f8ad18e [formerly dd7f97b064a63188d227577e5f1f8dcc1526c2a3]
Former-commit-id: 6463d207bbf06bcfb811abb249fe257ee5336c85
2016-10-11 15:40:56 +02:00
05dd93c549
Merge branch 'master' into gui
...
Former-commit-id: b5a6eba7494e7595000e3c7e1f3c77077485519f [formerly 74e8b34c50d86cea8be86dcc5d9b82e112db9277] [formerly 07e6a0bd2e00dcb9517c6ddc1d9ca7d3326707ae [formerly 59878811e379ef9bfd66e6fd0a0f32eaa39dcc6b]]
Former-commit-id: b7a83377bc61d378410ce33748ab63357ee53abb [formerly d789d8762086eb0dd43e0cef08f1edfbd8d346f2]
Former-commit-id: 7aa71e252bf91965f8f488dd9396e6287607edf9
2016-10-10 22:10:36 +02:00
05f7c52378
Fix some warnings pointed by Clang
...
Former-commit-id: 2e2e0a23d3b4115b584743f100ca05fa404a4e9a [formerly 02f505dd5b7c70682e035ddabaa7731fe09d8452] [formerly bccc66f75a5ad50f88043a502c3cae1395889740 [formerly 294134ecf2220589b85d6950054591ce02e596ec]]
Former-commit-id: 9d8d7699eaf4128b3519b3d33b6f5a20bf16f30f [formerly d84e10bdcb4faf5cd48d639bab06544b6fc7bda1]
Former-commit-id: d73659592f82b0416b2ca6f2b406f744e68c4d45
2016-10-05 00:38:52 +02:00
fc3fb062e0
Utility: Add Parameters and NoWindowSystem option
...
Temporary fix until Utility module has been split.
Former-commit-id: 702929f41c8f1dd4015b64e9b331c150ad6fd953 [formerly f113bd948da6a8c5399aab48f53b6cb5ca272081] [formerly 593365938d7e3a835b94727ec6dc744a7a113822 [formerly e43d02e4e221e5c1d85320d71d1a258db44768d1]]
Former-commit-id: 29e2dd7ff9ee608847e3f78a7474e3286343b152 [formerly cf10e1a9dd5ca6df0bdf39730e2b38e9ea0d673a]
Former-commit-id: a479d4eb078b30d6e7b34bd53dba6366fad643de
2016-10-05 00:26:06 +02:00
c653d4c4f2
SDK/Prerequesites: Remove version informations
...
Since the SDK has the same version as Nazara for now
Former-commit-id: 98a11ff3f51208317502bcf4b66a92402f98b780 [formerly 15a3ec197fe5b709829f267eb66a72f1748ba2bd] [formerly 6568140a3c675568f914035350faf840ee215005 [formerly 76ec756093abdd84d386eee843eb2cc70e206222]]
Former-commit-id: 54c6ff374c0e64abbc6e7161ce517ddb568b1972 [formerly 164feb548e2974dcb562f8991f7ded2fa5364fe9]
Former-commit-id: 1c03591596f56e7607ae6abd0daacc2c11d6f2bf
2016-10-04 17:58:17 +02:00
bdc49b1eb3
SDK: Fix compilation with Clang
...
Former-commit-id: bbe7ec821304dd13ac6640a1c1c7b654914cbf2e [formerly 67a6dba7a47490a3f39ac6c9c4a0bf853da63f60] [formerly d116a4c3af3782462a1305bd76a1a410a0075027 [formerly 418e3fc7090ada085deb039eb79b9c74df694666]]
Former-commit-id: 813f866bfcfd81cff799a2bd7b26ec71ada8e9ca [formerly 5cea6c36cbe5b8a73f1e4aecf86042be331ba424]
Former-commit-id: e04eb838630232088ba6f93ad1896228b86f949d
2016-10-04 17:57:47 +02:00
d7b7135e27
Lua/LuaClass: Fix argument count via GetStackTop ( Close #75 )
...
Former-commit-id: 3a0e60a6e7ec7c85ff5f179cc84a468d8c0682f4 [formerly f0712658e69c7ced1fa46f8878f96776d6b36567] [formerly 3035b072473d17863c3c0f6950451ccf582c107e [formerly fe3cbf8a2cf87cf6cc3d3e8577011159bff04387]]
Former-commit-id: df8812d712d28efc2bc83258df53dcb21bbb4b2d [formerly 6d2d8773c96d406690bd5cfc19cef7d1706ff6fc]
Former-commit-id: 461fec0cc2dd99690a3de10436730514712beb73
2016-10-03 19:49:43 +02:00
3875d2abe2
Build: Make some fixes in order to prepare static building
...
Still not linking though
Former-commit-id: 3962a663c9368ea78c4703cc860beef8c440bb4b [formerly b9575a870528ef6712500a94c5223a74d5c6dbec] [formerly bf2ab7b17b25479d6a8fda660e8d9055ffce38de [formerly 3db6f9cbf4cedd9f91ef8f7f1bcc99a4e84027a4]]
Former-commit-id: 0c292fec84d1963f377d16d5e9a15337bef4620f [formerly 93c016fa10c60bf11e4b0b1e17d8c98a66dfa028]
Former-commit-id: 712b1bf14355a82be4cc2c37912f87039b3d9616
2016-09-27 18:10:13 +02:00
29ac52770e
SDK/CameraComponent: Moved virtual functions to source file
...
Former-commit-id: 633046a6f599ce9f8712e11b8195509d9704bfc0 [formerly 080ea253a37d683c72372b406148372f9c1b92d2] [formerly 528dbe2f2c9dcac7b48c11feafb24a12afd43652 [formerly af9843c5eae928fb2f03c0ec1550e7ef95f69108]]
Former-commit-id: f17eed57cd271cfc55ef380bde44917ea26deac7 [formerly 30667bf567620cc339c96388303582b8b8601f68]
Former-commit-id: 66843984b23bee78fdbcefebbf56febddcdb4bb2
2016-09-27 18:09:25 +02:00
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
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
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
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
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