Commit Graph

72 Commits

Author SHA1 Message Date
ThePhD
1e514f145f
Merge branch 'develop' into sol3
# Conflicts:
#	include/single/sol/sol.hpp
#	include/single/sol/sol_forward.hpp
2018-11-27 22:20:59 -05:00
ThePhD
6ff83c6657
Merge branch 'develop' into sol3
# Conflicts:
#	include/single/sol/sol.hpp
#	include/single/sol/sol_forward.hpp
2018-11-27 10:25:07 -05:00
ThePhD
8f73b92109
Merge commit 'c61a434561b863bab870873992c4ab23f963ca6c' into sol3
# Conflicts:
#	include/sol/types.hpp
2018-11-21 15:45:17 -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
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
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
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
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
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
ThePhD
a1951a79f2
Merge branch 'develop' into sol3 2018-10-25 01:53:46 -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
0a9dc24f1f
first big sol3 push... tests not updated yet 2018-09-27 22:27:38 -07:00