Commit Graph

84 Commits

Author SHA1 Message Date
john stone
921ac4f8ef Merge branch 'master' of git.c3d2.de:sic++
Conflicts:
	src/sicmain.cc
2014-05-02 00:56:29 +02:00
john stone
0cef450872 new struct of configuration paths 2014-05-02 00:54:08 +02:00
blastmaster
44f77648f5 fixed path names 2014-05-02 00:41:38 +02:00
blastmaster
b181c1906b entmemberfunktioned 2014-05-02 00:27:37 +02:00
blastmaster
1ab8812486 genderisierung 2014-05-02 00:09:13 +02:00
john stone
55a96a00b1 Merge branch 'master' of git.c3d2.de:sic++ 2014-05-02 00:06:59 +02:00
john stone
6164210a1e blah 2014-05-02 00:06:48 +02:00
blastmaster
79ae0e2756 alle persits_path endlich raus 2014-05-02 00:06:35 +02:00
john stone
e1831be30d Merge branch 'master' of git.c3d2.de:sic++ 2014-05-02 00:01:20 +02:00
blastmaster
d5111690c5 delete persit_path foo 2014-05-02 00:01:14 +02:00
john stone
2d4a8dc2bf stuff 2014-05-02 00:01:01 +02:00
blastmaster
9a8fb2f600 Merge branch 'master' of git.c3d2.de:sic++ 2014-05-01 23:40:01 +02:00
blastmaster
f7d44fc073 delete get/set and replace persist_path 2014-05-01 23:39:52 +02:00
john stone
ed0020756a prepare merging double development 2014-05-01 23:39:14 +02:00
john stone
b887fa1328 fixes... mostly autohell 2014-05-01 22:22:04 +02:00
john stone
6834cd55ec this doesn't really make things faster, but I tried 2014-05-01 21:54:15 +02:00
blastmaster
deb84a05d9 typo 2014-05-01 21:52:49 +02:00
john stone
f82a7a11b4 :-) 2014-05-01 21:52:14 +02:00
john stone
452a5efc3a Merge branch 'master' of git.c3d2.de:sic++ 2014-05-01 21:50:46 +02:00
john stone
e5a6c5bebc autohell adapted 2014-05-01 21:50:31 +02:00
blastmaster
31b26b5680 fix include 2014-05-01 21:40:15 +02:00
john stone
1742560b87 Merge branch 'master' of git.c3d2.de:sic++ 2014-05-01 21:36:08 +02:00
john stone
6017de0195 starting autohell of jason: merging continues 2014-05-01 21:36:01 +02:00
blastmaster
4beffd644a aender render 2014-05-01 21:31:25 +02:00
john stone
a80ae200ff new sicccobj 2014-05-01 21:27:06 +02:00
blastmaster
2b4f7167a8 Merge branch 'master' of git.c3d2.de:sic++
Conflicts:
	src/sicccobject.H
2014-05-01 21:19:28 +02:00
john stone
ef1fd94da3 prep to merge blastmasters sicccobj 2014-05-01 21:16:47 +02:00
blastmaster
93357ce279 praettie brind 2014-05-01 21:16:36 +02:00
john stone
921378da1e Merge branch 'master' of git.c3d2.de:sic++
Conflicts:
	src/sicccobject.H
2014-05-01 20:01:56 +02:00
john stone
043569d0cb stuff changed for compliance 2014-05-01 19:56:48 +02:00
blastmaster
20fc098c89 obligatorische kackscheisse 2014-05-01 19:50:04 +02:00
blastmaster
8d91ec55b8 implement first version of container class for stored items 2014-03-29 16:43:17 +01:00
john stone
8c28d1adb8 ähh bup 2014-02-23 18:04:52 +01:00
john stone
e9c7f79bc3 rendering of mainpage starts to work
At least it seems working. No dynamic objects are created
for now...
2014-02-22 18:03:05 +01:00
john stone
1b5b8b7413 the stringstream is coming 2014-02-21 13:40:21 +01:00
john stone
dd2469778b on way to rendering dynamics 2014-02-21 12:02:31 +01:00
john stone
715ccc0f22 putting dynamics to life 2014-02-15 12:26:28 +01:00
john stone
aa6c74c15e Mehr Anwendungsstrukturfoo:
Sicobject: Repräsentation der Hochgeladenen Files
Sicmaster:global Interconnect und Laufzeitdatenverwaltung
2014-02-15 12:00:16 +01:00
john stone
6557a866ef refactoring s/MediocreSimple//, Vererbung muss weg! 2014-01-26 13:07:21 +01:00
john stone
44df053023 moved to mediocresimplestaticfilehandler 2014-01-26 12:53:04 +01:00
john stone
b4337f73b2 gespielt mit std::unique_ptr und so... 2014-01-25 23:32:02 +01:00
john stone
7b64cb5b76 dancing arround class stuff. virtual interface cleaned 2014-01-25 17:47:37 +01:00
blastmaster
48f43be792 adjust Makefile.am 2014-01-23 02:23:58 +01:00
blastmaster
5cba410e54 adjust using of routerin 2014-01-23 02:22:57 +01:00
blastmaster
7f5e571dfb make static things static 2014-01-23 02:22:06 +01:00
blastmaster
55fb0d0b0f implement consistent use of virtual class 2014-01-23 02:19:33 +01:00
blastmaster
b035f4b923 fix undefined vtable references 2014-01-23 02:16:46 +01:00
blastmaster
727685f27e simple class definition of Siccobject 2014-01-23 02:15:42 +01:00
blastmaster
1d85e91051 fixed c_str() typo 2014-01-22 23:53:06 +01:00
john stone
64f2193b2a ahhh SCHEIẞE... kann keinen memberfunction als mg callback nehm :( 2014-01-18 15:10:23 +01:00