 Alexander Brakowski
|
842fe1ef9c
fixed merge conflicts
|
11 years ago |
 Fabio Arnold
|
c8e4b2526a
merge...
|
11 years ago |
|
Fabio Arnold
|
5b24db46ac
force portrait orientation for home screen. also experimented with dark/transparent gl view
|
11 years ago |
|
Fabio Arnold
|
49768cd6a2
theme background color in gl view
|
11 years ago |
|
Alexander Brakowski
|
304e151d3f
some experiments
|
11 years ago |
|
Fabio Arnold
|
5633f699f3
panic animation of android
|
11 years ago |
|
Fabio Arnold
|
ac612758f7
added bee with procedural animation
|
11 years ago |
|
Julien
|
1db8de620a
Merge branch 'master' of https://julien.clauter@git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostagev2.git
|
11 years ago |
|
Julien
|
f8ce2bcdd0
full implemented filter view with time picker
|
11 years ago |
|
Fabio Arnold
|
667c94abde
added android asset 1.6 MBgit add assets/meshes/android.amh
|
11 years ago |
|
Fabio Arnold
|
a2cea05758
added android animation to home screen
|
11 years ago |
|
Fabio Arnold
|
73ce2bd999
animation is working :D
|
11 years ago |
|
Fabio Arnold
|
c17a33cca1
now using short instead of int for indices. converting while loading -> could be more efficient
|
11 years ago |
|
Fabio Arnold
|
01544107b6
gl: now using vertex buffer objects
|
11 years ago |
|
Fabio Arnold
|
526990964b
initial mesh rendering
|
11 years ago |
|
Julien
|
1dda2097ed
Merge branch 'master' of https://julien.clauter@git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostagev2.git
|
11 years ago |
|
Julien
|
607775acc6
added filter object which can be passed through different activities.
|
11 years ago |
|
Alexander Brakowski
|
b3a37139f4
Added profile manager ui
|
11 years ago |
|
Alexander Brakowski
|
dc7ac812dc
Changed the home fragment ui
|
11 years ago |
|
Fabio Arnold
|
848b6737c8
replaced monitoring button with switch
|
11 years ago |
|
Fabio Arnold
|
1d72a8f874
Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostagev2
|
11 years ago |
|
Fabio Arnold
|
c85e0b6c98
added opengl view with spinning triangle to Home
|
11 years ago |
|
Alexander Brakowski
|
60076e7090
removed target folder from tracking
|
11 years ago |
|
Fabio Arnold
|
0404fe1bcf
fixed eclipse build (compatibility jar had duplicate symbols)
|
11 years ago |
|
Fabio Arnold
|
0eaa6ccd4b
spelling error: Thread Map -> Threat Map
|
11 years ago |
|
alexander.brakowski
|
92394879b5
fixed merge conflict
|
11 years ago |
|
alexander.brakowski
|
1d4b7d20eb
Added home fragment view
|
11 years ago |
|
Daniel Lazar
|
5dee346350
changed settings icon
|
11 years ago |
|
Daniel Lazar
|
cad12d37a0
changed icon for preferences
|
11 years ago |
|
alexander.brakowski
|
cf4caa5dbc
Some changes on the navigation drawer
|
11 years ago |
