Commit Graph

170 Commits

Author SHA1 Message Date
Kevin Dungs cd9d3673e9 Most things working. Apart from achivements somehow. Also achievements pop up has to be reintroduced. Probalby write an AchievementsManager or something. 2014-11-08 15:55:02 +01:00
Kevin Dungs 709cea5180 Correct JSON. 2014-11-08 15:55:02 +01:00
Kevin Dungs 5eafe3edbe Add achievements generated with the achievements-tool. 2014-11-08 15:55:01 +01:00
Kevin Dungs 8516492297 Integrate achievements into GameObject system.
Now have to adjust the UI accordingly.
2014-11-08 15:55:01 +01:00
Kevin Dungs bfd38af8b8 Working on this A LOT. However, at this point this version is unfinished and DOESNT WORK! 2014-11-08 15:55:01 +01:00
Kevin Dungs 156b1337e4 Add favicon 2014-11-08 15:55:01 +01:00
Kevin Dungs 8f4c974d42 Make mobile work better on smaller screens. 2014-11-08 15:55:01 +01:00
Kevin Dungs 902ae22c4f Improve blinking and bring it to mobile. 2014-11-08 15:55:01 +01:00
Kevin Dungs 88ddebc980 Get new outreach engine working. 2014-11-08 15:55:00 +01:00
Kevin Dungs c452bc52cf Add .blink class for super annoying blink effect. 2014-11-08 15:54:38 +01:00
Kevin Dungs 18de4cd070 Improved upgrade system. Needs content! 2014-11-08 15:54:38 +01:00
Keenan Lidral-Porter 8b007637a3 Prevent user from selecting DOM element when clicking detector 2014-08-12 22:34:14 +02:00
Tadej Novak f92bf03e17 Merge pull request #57 from cgeorg/patch-1
Set the number of events to delete correctly
2014-08-12 22:22:21 +02:00
Tadej Novak cb572f2411 Update image links 2014-08-12 22:01:27 +02:00
Tadej Novak bbd5a9050c Merge pull request #54 from RaoOfPhysics/master
Changes to research description
2014-08-12 21:48:35 +02:00
cgeorg ff9515c277 Only splice if there's something to remove 2014-08-12 07:15:13 -04:00
Achintya Rao 26b47bb44a Add text and images for W boson and top quark, clean up other text. 2014-08-11 23:42:02 +02:00
cgeorg 46cda56701 Set the number of events to delete correctly
The code was only freeing up to 20 or so events, depending on how many particles the last non-visible event had.  Correctly setting the index to delete-up-to to be the highest non-visible event.
2014-08-11 17:10:01 -04:00
Achintya Rao 53ec991374 Add "magnet" to detector components and clean up some other text. 2014-08-11 19:18:56 +02:00
Tadej Novak 2ed2be50fd Bump version 2014-08-10 12:57:41 +02:00
Tadej Novak 5949b87dfa Merge pull request #46 from hesselink/patch-1
[Language] Fix small typos in detector description.
2014-08-10 12:49:43 +02:00
Tadej Novak c87bb78bfd Merge pull request #37 from kayellpeee/spelling-fix
Fixes spelling error
2014-08-10 12:48:54 +02:00
Tadej Novak 9969394a87 Merge pull request #40 from milki/patch-1
Typo in detector.html
2014-08-10 12:48:11 +02:00
Erik Hesselink f0aa5290b1 Fix small typos in detector description. 2014-08-08 14:47:48 +02:00
milki 7283b83b6f Typo in detector.html 2014-08-07 20:01:58 -07:00
Keenan Lidral-Porter dd44c4725b Fixes spelling error on public relations - top quark - lvl 1 + 2 2014-08-07 14:11:41 -07:00
Tadej Novak fac46769ab Add missing ng-cloak 2014-08-07 20:37:37 +02:00
Igor Babuschkin 0e3bd25af4 Add ng-cloak to mobile version as well 2014-08-07 20:34:39 +02:00
Igor Babuschkin 9f9505a596 Use ng-cloak to hide templates at startup
Fixes #22
2014-08-07 20:34:39 +02:00
Igor Babuschkin 84302d2375 Reduce amount of events 2014-08-07 19:30:18 +02:00
Tadej Novak f1caef5a47 Improve rendering speed check 2014-08-07 19:30:11 +02:00
Kevin Dungs 9110f6c5dc Merge pull request #30 from popox/BBbar-wiki-link
link to wikipedia for the B–Bbar oscillation
2014-08-07 15:45:01 +02:00
Paul B 5ef96cf3a5 fix: link to wikipedia for the B–Bbar oscillation 2014-08-07 15:24:05 +02:00
Tadej Novak 66864f0efc Temporarily remove event analytics 2014-08-07 13:50:55 +02:00
Igor Babuschkin 7ce7b84383 Take duration into account when fading out event 2014-08-07 13:35:19 +02:00
Tadej Novak 54753b9e90 Remove accidentially commited file 2014-08-07 13:34:40 +02:00
simleo 2940f52bc3 fix typo in html/CPV.html 2014-08-07 13:19:03 +02:00
Kevin Dungs a0a0578c2d Quick fix some annoying errors. 2014-08-07 13:19:03 +02:00
Tadej Novak c1373c6132 Fix mobile analytics 2014-08-07 10:46:10 +02:00
Kevin Dungs 79cd2ad461 I'm an idiot. .attach not .apply... 2014-08-07 10:44:45 +02:00
Tadej Novak 7c19dd93b4 Bump version, hardcoded for now 2014-08-07 10:13:33 +02:00
Kevin Dungs a41f422700 Small fixes and brushing up the UI. 2014-08-07 09:56:47 +02:00
Kevin Dungs 6d6b2d401b Add touch icons. 2014-08-06 20:31:44 +02:00
Kevin Dungs 5785b72585 Mention fastclick in the libraries section. 2014-08-06 19:42:39 +02:00
Kevin Dungs a740361c42 Add fastclick. 2014-08-06 19:42:39 +02:00
Kevin Dungs c07fbd43e9 Get warning on index.html to work. 2014-08-06 19:42:39 +02:00
Kevin Dungs 65cf1d0fc8 Implement first mobile version. 2014-08-06 19:42:39 +02:00
Kevin Dungs dfde77bf5c Add a very simple mobile version of the game. At this stage this is for
testing purposes only. For a next release I will work on putting all the
controllers in templates and have only one page for everything.
2014-08-06 19:42:39 +02:00
Kevin Dungs ac4894488f Add explicit "About" link.; 2014-08-06 19:36:14 +02:00
Tadej Novak 4305672ac7 Possible analytics fix 2014-08-06 19:30:20 +02:00