4245 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Quitta	eecb35c42f	Merge with default	2013-06-06 23:55:04 +02:00
Quitta	2f072fb60b	Merge with rc-botanic-webdev	2013-06-06 23:54:41 +02:00
Quitta	932c23646e	initial branch creation	2013-06-06 23:53:34 +02:00
Botanic	7a8d47922f	updated files that were not merged	2013-06-06 03:38:24 -07:00
Botanic	c9811a9804	fixed thanks kervala	2013-06-06 01:28:12 -07:00
Botanic	94b3b07c85	added in-game template file	2013-06-05 23:39:33 -07:00
Botanic	9014f722c4	added base class file for sql as well as updated users to use class	2013-06-05 23:19:40 -07:00
Botanic	eda629c1ab	changed to use class	2013-06-05 23:10:00 -07:00
Botanic	b6fe4f98b3	added old to hgignore	2013-06-05 23:08:57 -07:00
Botanic	e42f2f8ba0	initial work on ams_lib	2013-06-05 23:04:46 -07:00
dfighter1985	beffa4d49e	Making GCC happy.	2013-05-15 01:54:35 +02:00
dfighter1985	0b08f18d61	Editbox should now create it's text when added.	2013-05-11 02:40:55 +02:00
dfighter1985	df281b1019	Inconsistent line ending style, according to VS. How it managed to do this is a mystery tho.	2013-05-10 22:35:04 +02:00
dfighter1985	6c3d300753	Added some defaults.	2013-05-10 22:29:47 +02:00
dfighter1985	4717f03b3a	The editor probably shouldn't crash when adding textbutton widget.	2013-05-10 02:10:18 +02:00
dfighter1985	80720c0137	Make sure to apply the changes, when changing properties.	2013-05-10 00:55:23 +02:00
dfighter1985	7ecea68385	Forgot to set the parent.	2013-05-10 00:28:29 +02:00
dfighter1985	871fed3e12	When adding a new widget, the correct widget is now instantiated. Also added some checks.	2013-05-09 23:57:48 +02:00
dfighter1985	954bb6a533	Some more work for widget adding support. Basically the system works, just need to make sure the proper widget is instantiated, and the defaults are loaded ( so it shows up ).	2013-05-09 05:53:14 +02:00
dfighter1985	80c6617ccc	Added some more checks, signal and slots related to widget adding.	2013-05-05 05:49:35 +02:00
dfighter1985	1e84771ba0	Added GUI for widget adding.	2013-05-05 04:58:15 +02:00
dfighter1985	038aa26e84	Merged default.	2013-05-04 22:28:31 +02:00
dfighter1985	f36affd576	Merged default	2013-05-03 02:07:38 +02:00
dfighter1985	3403be9a77	Merging default.	2013-03-12 07:17:04 +01:00
dfighter1985	8959b635c2	Merged upstream changes.	2013-03-12 06:11:50 +01:00
dfighter1985	8f195bdbe2	FIXED: Deleting the CViewText of CCtrlTextButton should no longer lead to crashes.	2013-03-10 00:56:27 +01:00
dfighter1985	80adabbab2	MODIFIED: Ups, missed this.	2013-03-09 22:31:51 +01:00
dfighter1985	9f65dc5d2b	FIXED: Widgets will no longer get stuck in the widget hierarchy tree, when deleting their parent.	2013-03-09 22:02:31 +01:00
dfighter1985	91d0ed861b	FIXED: It's not nice to leak memory.	2013-03-09 20:58:53 +01:00
dfighter1985	0637f74779	MODIFIED: Preliminary support for a little cleanup when removing a widget from it's parent group ( for example when moving the widget ).	2013-03-08 06:28:52 +01:00
dfighter1985	5bd77c58b5	MODIFIED: Widgets derived from CInterfaceGroup should now be deleted too properly.	2013-03-08 06:07:21 +01:00
dfighter1985	bf53503fc1	MODIFIED: Draw the highlight of the currently selected widget in editor mode.	2013-03-07 06:01:33 +01:00
dfighter1985	d84b4dcf14	MODIFIED: collapse the widget hierarchy tree and remove the widget from it when it's deleted. Also clear the widget properties panel.	2013-03-03 03:49:56 +01:00
dfighter1985	b054ea1462	MODIFIED: Somehow I left this here, and it prevented viewtexts from being selected.	2013-03-03 00:54:22 +01:00
dfighter1985	7935256164	MODIFIED: Text buttons will now delete their text too when being deleted.	2013-03-02 23:27:17 +01:00
dfighter1985	64bc3e40a5	MODIFIED: GUI Editor can now delete widgets.	2013-03-02 06:57:40 +01:00
dfighter1985	117563a7f1	MODIFIED: When selecting a widget in the central widget, the hierarchy tree should now be updated as well.	2013-03-02 03:24:22 +01:00
dfighter1985	02dbaec3dd	MODIFIED: Update property browser when selecting in the central widget.	2013-02-23 06:55:19 +01:00
dfighter1985	dcad62844b	MODIFIED: Views can now be selected too from the central widget.	2013-02-23 00:13:44 +01:00
dfighter1985	93de10c56d	Merged default	2013-02-22 04:15:10 +01:00
dfighter1985	bbb47d9b2e	Merged default	2013-02-18 13:22:03 +01:00
Botanic	e5619e273b	Backed out changeset: 97505c669e04	2013-02-08 03:09:17 -08:00
Botanic	3d2b747e6d	Backed out changeset: e36d69e04aa1	2013-02-08 03:08:59 -08:00
Botanic	341e468d5b	Backed out changeset: 57d8f3733daf	2013-02-08 03:08:42 -08:00
Botanic	bc638755e6	Backed out changeset: c569b6062f5d	2013-02-08 03:08:24 -08:00
Botanic	84701dfca3	fixed load form and character_cl	2013-02-07 15:04:28 -08:00
Botanic	326b07885f	fixed vertex_program_parse	2013-02-07 13:00:51 -08:00
Botanic	2521f746d1	Fixed warning: multi-character character constant [-Wmultichar]	2013-02-07 12:19:00 -08:00
Botanic	ab608d2cfe	Fixed warning "unix_event_emitter.cpp:569:8: warning: 'KeySym XKeycodeToKeysym(Display*, KeyCode, int)' is deprecated (declared at /usr/include/X11/Xlib.h:1695)"	2013-02-07 03:27:12 -08:00
mattraykowski	9aca86757e	merge from default	2013-01-30 10:15:14 -06:00