63 Commits

Author	SHA1	Message	Date
KimLS	d14608356d	Added all lua objects i need for now, a ton of API too	2013-06-02 00:15:26 -07:00
KimLS	e47de5deed	Merge with master	2013-05-24 01:23:58 -07:00
KimLS	a3e24b6854	Merge from master	2013-05-23 12:50:34 -07:00
Arthur Ice	5255c236c3	added std:: to a lot of locations which where ... missed and added NOMINMAX to cmakelist	2013-05-22 23:55:49 -07:00
Arthur Ice	b4e65a8840	tabbify and cleaned up std issues and min/max problems.	2013-05-22 21:27:37 -07:00
Michael Cook	0fdfe025cb	Remove 'using namespaces std' fixes #61	2013-05-22 16:17:19 -04:00
KimLS	b26df187e6	Merge from master terrible	2013-05-15 16:01:13 -07:00
KimLS	dc045591e4	Lua work - loading works, I think checking for sub works. Calling subs is in the beginning stages and binding is starting	2013-05-10 20:13:35 -07:00
j883376	4bdd8b2502	Change space indentation to tabs	2013-05-09 11:37:51 -04:00
j883376	ffcff4aea1	Remove trailing whitespace	2013-05-09 11:13:16 -04:00
Arthur Ice	7560b6b0a7	NULL to nullptr	2013-05-04 18:06:58 -07:00
badcaptain	a41874b6a7	Moved merc save data from extended player profile to new merc table, save merc buffs, added cure and rez spells to healer merc.	2013-02-18 00:50:19 -05:00
KimLS	da7347f76f	svn -> git Migration	2013-02-16 16:14:39 -08:00