Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/toonshader/src/tolua/all-5.0.lua @ 5623

Last change on this file since 5623 was 2911, checked in by landauf, 16 years ago

Merged r1-2096 of questsystem5 back to trunk

I hope there weren't more "hidden merge changes" in r2909 than the one in OverlayGroup (removeElement) (and related to this the adjustments in NotificationQueue).

The corresponding media commit seems not yet to be done, but it doesn't break the build.

  • Property svn:eol-style set to native
  • Property svn:mergeinfo set to (toggle deleted branches)
    /code/branches/buildsystem/src/tolua/all-5.0.lua2278-2400
    /code/branches/ceguilua/src/tolua/lua/all.lua1802-1808
    /code/branches/core3/src/tolua/lua/all.lua1572-1739
    /code/branches/gcc43/src/tolua/lua/all.lua1580
    /code/branches/gui/src/tolua/all-5.0.lua2795-2894
    /code/branches/gui/src/tolua/lua/all.lua1635-1723
    /code/branches/input/src/tolua/lua/all.lua1629-1636
    /code/branches/miniprojects/src/tolua/all-5.0.lua2754-2824
    /code/branches/questsystem5/src/tolua/all-5.0.lua2776-2905
    /code/branches/weaponsystem/src/tolua/all-5.0.lua2742-2890
File size: 854 bytes
Line 
1dofile(path.."lua/compat.lua")
2dofile(path.."lua/basic.lua")
3dofile(path.."lua/feature.lua")
4dofile(path.."lua/verbatim.lua")
5dofile(path.."lua/code.lua")
6dofile(path.."lua/typedef.lua")
7dofile(path.."lua/container.lua")
8dofile(path.."lua/package.lua")
9dofile(path.."lua/module.lua")
10dofile(path.."lua/namespace.lua")
11dofile(path.."lua/define.lua")
12dofile(path.."lua/enumerate.lua")
13dofile(path.."lua/declaration.lua")
14dofile(path.."lua/variable.lua")
15dofile(path.."lua/array.lua")
16dofile(path.."lua/function.lua")
17dofile(path.."lua/operator.lua")
18dofile(path.."lua/class.lua")
19dofile(path.."lua/clean.lua")
20--dofile(path.."lua/custom.lua")
21dofile(path.."lua/doit.lua")
22
23local err,msg = xpcall(doit, debug.traceback)
24if not err then
25--print("**** msg is "..tostring(msg))
26 local _,_,label,msg = strfind(msg,"(.-:.-:%s*)(.*)")
27 tolua_error(msg,label)
28end
Note: See TracBrowser for help on using the repository browser.