Skip to content

Unity trunk #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open

Unity trunk #118

Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
4e25059
Merge pull request #1 from Unity-Technologies/master
bamboo Oct 25, 2011
7d92c92
Merge pull request #3 from Unity-Technologies/master
Tak Dec 8, 2011
b1fff80
Merge pull request #4 from Unity-Technologies/unity3.5
joncham Jan 10, 2012
d4e7e83
Merge pull request #5 from Unity-Technologies/master
Tak Jan 24, 2012
4d4895c
Merge pull request #6 from Unity-Technologies/master
Tak Jan 24, 2012
f9ab9b2
Merge pull request #7 from Unity-Technologies/master
bamboo Jan 26, 2012
7cbb925
Merge pull request #9 from Unity-Technologies/master
Tak Jan 31, 2012
dc52254
Merge pull request #10 from Unity-Technologies/master
Tak Jul 24, 2012
770d48a
Add reference to System.Core in Boo.Lang.csproj since we are using LINQ.
joncham Aug 31, 2012
583c85d
Add reference to System.Core in booc.csproj.
joncham Sep 6, 2012
58e6e96
merge latest improvements and fixes to boo
bamboo Jan 2, 2013
bd94f5e
Merge pull request #14 from Unity-Technologies/unity-staging
bamboo Feb 5, 2013
9ebe371
Merge pull request #15 from Unity-Technologies/unity-4.1
joncham Feb 5, 2013
e021cf8
Merge pull request #19 from Unity-Technologies/unity-staging
Tak Apr 2, 2013
ba668f4
Merge pull request #21 from Unity-Technologies/unity-staging
Tak Jun 6, 2013
2fd646f
Merge pull request #22 from Unity-Technologies/scripting/boo-call-ast…
shana Jun 19, 2013
84250f2
Merge pull request #24 from bamboo/unity-staging
Tak Jun 25, 2013
2ea66a4
Revert "introduce var macro to promote explicit variable declaration …
Tak Jun 25, 2013
1fdf431
Merge pull request #26 from Unity-Technologies/unity-staging
Tak Jul 10, 2013
8b09704
Make sure access to obsolete members are reported
adrianoc Sep 18, 2014
f45b79a
Merge pull request #27 from Unity-Technologies/unity-staging
Tak Sep 19, 2014
604df22
Fixed issue with being unable to get the type of System.Runtime.Compi…
lukaszunity Oct 17, 2014
355149a
Merge pull request #28 from Unity-Technologies/unity-staging
adrianoc-unity3d Oct 17, 2014
7d948a8
Respect obsolete status of declaring type if members / nested types a…
adrianoc-unity3d Jul 7, 2015
f08bf63
improved handling of members / nested types of obsolete types
adrianoc-unity3d Jul 8, 2015
df23b5d
Merge pull request #30 from Unity-Technologies/fix-obsolete-attribute
adrianoc-unity3d Jul 10, 2015
af8ab22
Merge pull request #31 from Unity-Technologies/unity-staging
adrianoc-unity3d Jul 10, 2015
cc9e1bb
Make cctor not fail if the domain contains even a single type that fa…
lucasmeijer Jul 23, 2015
fc212e6
fix whitespace
lucasmeijer Jul 23, 2015
3469dd9
Merge pull request #32 from Unity-Technologies/unity-staging
Tak Jul 23, 2015
28f853e
stop relying on Assembly.GetName() which is [SecurityCritical]
lucasmeijer Jul 27, 2015
fb6deca
Merge pull request #34 from Unity-Technologies/unity-staging
adrianoc-unity3d Jul 27, 2015
cfb58ae
added support to resolve overloaded methods
adrianoc-unity3d May 25, 2016
d03a0fc
simplified code that checks for parameter type matches
adrianoc-unity3d May 31, 2016
3395630
Merge pull request #36 from Unity-Technologies/unity-resolve-method-w…
adrianoc-unity3d Jun 7, 2016
e7fb9f8
Merge pull request #37 from Unity-Technologies/unity-staging
adrianoc-unity3d Jun 9, 2016
c2789f8
Improve detection of errors when calling generic methods from a stati…
timj-unity Aug 15, 2016
4c50fa8
Merge pull request #38 from Unity-Technologies/generic-method-without…
lukaszunity Aug 22, 2016
795b650
Merge pull request #39 from Unity-Technologies/unity-staging
lukaszunity Aug 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge pull request #14 from Unity-Technologies/unity-staging 
pull unity-staging already in 4.1into unity-4.1
  • Loading branch information
@bamboo
bamboo committed Feb 5, 2013
commit bd94f5ecd40856217cefb7333fa50bda3f333236

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.