ThePhD
c61a434561
weeee gating things
2018-11-21 15:32:46 -05:00
ThePhD
7e5f2837a8
Merge branch 'develop' into sol3
...
# Conflicts:
# include/single/sol/sol.hpp
# include/single/sol/sol_forward.hpp
2018-11-21 15:06:23 -05:00
ThePhD
a6186c4666
update single / tag
2018-11-21 15:05:08 -05:00
ThePhD
4906e43918
beep boop fixes
2018-11-21 15:03:45 -05:00
ThePhD
d15709d85a
Merge branch 'develop' into sol3
...
# Conflicts:
# include/single/sol/sol.hpp
# include/single/sol/sol_forward.hpp
# include/sol/coroutine.hpp
# include/sol/stack_core.hpp
# sol/usertype_metatable.hpp
2018-11-21 08:19:26 -05:00
ThePhD
55e92056c1
Fiiiiixes.
2018-11-21 07:34:32 -05:00
ThePhD
1a3f989eba
Merge branch 'develop' into sol3
...
# Conflicts:
# include/single/sol/sol.hpp
# include/single/sol/sol_forward.hpp
# include/sol/stack_push.hpp
2018-11-20 22:18:20 -05:00
ThePhD
157db07a56
C and C++ strings are ass
2018-11-20 22:09:43 -05:00
ThePhD
094ace3c7b
freeze changes
2018-11-20 11:59:36 -05:00
ThePhD
9b47849110
update tests (which compile, but now all fail)
2018-11-18 13:06:01 -05:00
ThePhD
e74ce68163
freeze and test
2018-11-11 13:40:28 -08:00
ThePhD
93db30d200
update single for 2.20.5
2018-11-10 11:02:36 -08:00
ThePhD
593dfc08ef
Fix up metatable
2018-11-10 10:55:39 -08:00
ThePhD
162746dac9
Merge branch 'develop' into sol3
...
# Conflicts:
# docs/source/tutorial/variables.rst
# include/single/sol/sol.hpp
# include/single/sol/sol_forward.hpp
# include/sol/proxy.hpp
# sol/usertype_metatable.hpp
2018-11-10 07:12:13 -08:00
ThePhD
2cfbc8c0ea
Fix up the remaining sol2 issues, prepare for more sol3 stuff
2018-11-10 06:41:06 -08:00
ThePhD
a7048aea45
fix up variables tutorial
2018-11-09 14:36:27 -08:00
ThePhD
091ca39438
update call
2018-11-09 10:53:46 -08:00
ThePhD
1f90b049f2
cut off containers if they are not specialization
2018-11-09 09:41:44 -08:00
ThePhD
f75d335988
Merge remote-tracking branch 'origin/develop' into sol3
...
# Conflicts:
# include/single/sol/sol.hpp
# include/single/sol/sol_forward.hpp
2018-11-09 08:26:27 -08:00
Patryk Czachurski
47bbe98e20
Regenerate the single header file
2018-10-28 14:11:27 -07:00
Patryk Czachurski
bd10d0e6c4
Add the clang check to load_result.hpp as well
2018-10-28 14:11:27 -07:00
Patryk Czachurski
2d47fc09c3
Inside sol::proxy::call, check if we're building with clang
...
If building with clang on Windows, it tries to imitate MSVC by specifying reasonable _MSC_VER defines.
This makes sol2 compile MSVC version of sol::proxy::call (without the "template" preffix) that is nevertheless not accepted by clang.
This commit fixes the problem by also checking if "__clang__" is defined.
2018-10-28 14:11:27 -07:00
syl
2a91f2416a
Fix typo error in usertype.rst
2018-10-25 02:05:35 -07:00
ThePhD
a1951a79f2
Merge branch 'develop' into sol3
2018-10-25 01:53:46 -04:00
ThePhD
3f49a4e2de
Update README
2018-10-25 01:52:37 -04:00
The Phantom Derpstorm
2a68514241
Merge pull request #718 from jquesnelle/topointer-stack-fix
...
Pop stack element used as argument of lua_topointer
2018-10-17 13:26:51 -07:00
Jeffrey Quesnelle
2ebbe5de86
Pop the correct element that was pushed
2018-10-17 14:40:18 -04:00
Jeffrey Quesnelle
511765c734
Pop stack element used as argument of lua_topointer
2018-10-17 14:29:30 -04:00
ThePhD
cae67925a4
Merge branch 'develop' into sol3
2018-10-15 22:03:27 -04:00
ThePhD
929e3f27a0
update readme
2018-10-15 22:02:16 -04:00
ThePhD
037fa994f3
add new presentation about sol2/sol3
2018-10-15 21:53:56 -04:00
ThePhD
fa07e54e08
some small fixes for usertypes, still need a few more drastic improvements...
2018-10-15 21:53:16 -04:00
ThePhD
50f92be1c7
std decay, huh?
...
change base walk comparison to be less derp
2018-09-28 05:24:46 -07:00
ThePhD
015ef6a37a
usertype destructor needs to be of the right type for non-const values
2018-09-28 04:43:06 -07:00
ThePhD
72b9d91c14
ultra fast lua_Cfunction serialization, wew
2018-09-28 04:25:17 -07:00
ThePhD
75ff9b3658
change include guard
2018-09-28 03:53:40 -07:00
ThePhD
a70a166132
more minor fixes
2018-09-28 03:53:17 -07:00
ThePhD
f42a678d20
minor fixes
2018-09-28 00:55:47 -07:00
ThePhD
e56cbc1dc5
update sol3 tag
2018-09-27 23:55:09 -07:00
ThePhD
1335c67967
fix all the terrible includes
2018-09-27 23:50:05 -07:00
ThePhD
03979d2200
Merge branch 'develop' into sol3
...
# Conflicts:
# include/single/sol/sol.hpp
# include/sol/container_traits.hpp
2018-09-27 22:29:29 -07:00
ThePhD
0a9dc24f1f
first big sol3 push... tests not updated yet
2018-09-27 22:27:38 -07:00
The Phantom Derpstorm
4f974a7424
Merge pull request #701 from isvogor-foi/develop
...
fmt rename to fmt_ to avoid naming conflict with the spdlog library
2018-09-03 09:40:02 -04:00
isvogor
f438284a47
fmt rename to fmt_ to avoid naming conflict with the spdlog library
2018-09-03 15:36:37 +02:00
ThePhD
94c4b7c89e
Merge branch 'develop' into sol3
2018-08-10 20:54:15 -04:00
ThePhD
db927c5159
update CMake to have namespaced stuff
2018-08-10 20:53:31 -04:00
ThePhD
e7886facda
update single
2018-08-10 20:51:13 -04:00
ThePhD
c09e8309df
update cmakelists, think about normalizing base_type from T everywhere... consistency and stuff, y'know?
2018-08-10 20:43:39 -04:00
ThePhD
0e321272e6
update docs a bit, think aobut changes to container_traits and friends...
2018-08-10 11:17:31 -04:00
ThePhD
cf1376cd06
Merge branch 'develop' into sol3
...
# Conflicts:
# single/sol/sol.hpp
# single/sol/sol_forward.hpp
2018-08-04 12:05:27 -04:00
