Permalink
Browse files

Pushing the last batch of changes from internal repo. Lots of new gam…

…e objects and other improvements.
  • Loading branch information...
1 parent 94c937f commit f212bee81ff63082e66b97bb3061991e05097d34 @emoller emoller committed Aug 27, 2011
Showing with 13,647 additions and 4,767 deletions.
  1. +13 −0 index.html
  2. BIN resources/atlas/friends/female.png
  3. BIN resources/atlas/friends/male.png
  4. BIN resources/atlas/game/apple_basket_pieces.png
  5. BIN resources/atlas/game/pickup_effects.png
  6. BIN resources/atlas/game/tutips.png
  7. BIN resources/atlas/gui/acorn_display.png
  8. BIN resources/atlas/gui/dialogue_idols.png
  9. BIN resources/atlas/gui/padlock.png
  10. BIN resources/atlas/gui/tutorial_page.png
  11. BIN resources/atlas/no_c_red/attackeffect.png
  12. BIN resources/atlas/tilesets/cleanup.png
  13. BIN resources/atlas/tilesets/indoors.png
  14. BIN resources/atlas/tilesets/outer.png
  15. BIN resources/audio/music.m4a
  16. BIN resources/audio/music.mp3
  17. BIN resources/audio/music.ogg
  18. BIN resources/audio/music.wav
  19. +5,048 −4,022 resources/emberwind.json
  20. BIN resources/localized/dutch/Copyright.png
  21. BIN resources/localized/dutch/CriticalHits.png
  22. BIN resources/localized/dutch/ObjectiveArrows.png
  23. BIN resources/localized/dutch/UpgradeBanners.png
  24. BIN resources/localized/dutch/controls_mac_pc.png
  25. +181 −0 resources/localized/dutch/dialogue.json
  26. +159 −0 resources/localized/dutch/stringtable.json
  27. BIN resources/localized/english/CriticalHits.png
  28. BIN resources/localized/english/UpgradeBanners.png
  29. BIN resources/localized/english/controls_mac_pc.png
  30. +181 −0 resources/localized/english/dialogue.json
  31. +160 −0 resources/localized/english/stringtable.json
  32. BIN resources/localized/french/Copyright.png
  33. BIN resources/localized/french/CriticalHits.png
  34. BIN resources/localized/french/ObjectiveArrows.png
  35. BIN resources/localized/french/UpgradeBanners.png
  36. BIN resources/localized/french/controls_mac_pc.png
  37. +181 −0 resources/localized/french/dialogue.json
  38. +159 −0 resources/localized/french/stringtable.json
  39. BIN resources/localized/german/Copyright.png
  40. BIN resources/localized/german/CriticalHits.png
  41. BIN resources/localized/german/ObjectiveArrows.png
  42. BIN resources/localized/german/UpgradeBanners.png
  43. BIN resources/localized/german/controls_mac_pc.png
  44. +181 −0 resources/localized/german/dialogue.json
  45. +159 −0 resources/localized/german/stringtable.json
  46. BIN resources/localized/italian/Copyright.png
  47. BIN resources/localized/italian/CriticalHits.png
  48. BIN resources/localized/italian/ObjectiveArrows.png
  49. BIN resources/localized/italian/UpgradeBanners.png
  50. BIN resources/localized/italian/controls_mac_pc.png
  51. +181 −0 resources/localized/italian/dialogue.json
  52. +159 −0 resources/localized/italian/stringtable.json
  53. BIN resources/localized/japanese/Copyright.png
  54. BIN resources/localized/japanese/CriticalHits.png
  55. BIN resources/localized/japanese/ObjectiveArrows.png
  56. BIN resources/localized/japanese/UpgradeBanners.png
  57. BIN resources/localized/japanese/controls_mac_pc.png
  58. +181 −0 resources/localized/japanese/dialogue.json
  59. +159 −0 resources/localized/japanese/stringtable.json
  60. BIN resources/localized/polish/Copyright.png
  61. BIN resources/localized/polish/CriticalHits.png
  62. BIN resources/localized/polish/ObjectiveArrows.png
  63. BIN resources/localized/polish/UpgradeBanners.png
  64. BIN resources/localized/polish/controls_mac_pc.png
  65. +181 −0 resources/localized/polish/dialogue.json
  66. +159 −0 resources/localized/polish/stringtable.json
  67. BIN resources/localized/portuguese/Copyright.png
  68. BIN resources/localized/portuguese/CriticalHits.png
  69. BIN resources/localized/portuguese/ObjectiveArrows.png
  70. BIN resources/localized/portuguese/UpgradeBanners.png
  71. BIN resources/localized/portuguese/controls_mac_pc.png
  72. +181 −0 resources/localized/portuguese/dialogue.json
  73. +159 −0 resources/localized/portuguese/stringtable.json
  74. BIN resources/localized/russian/Copyright.png
  75. BIN resources/localized/russian/CriticalHits.png
  76. BIN resources/localized/russian/ObjectiveArrows.png
  77. BIN resources/localized/russian/UpgradeBanners.png
  78. BIN resources/localized/russian/controls_mac_pc.png
  79. +181 −0 resources/localized/russian/dialogue.json
  80. +159 −0 resources/localized/russian/stringtable.json
  81. BIN resources/localized/spanish/Copyright.png
  82. BIN resources/localized/spanish/CriticalHits.png
  83. BIN resources/localized/spanish/ObjectiveArrows.png
  84. BIN resources/localized/spanish/UpgradeBanners.png
  85. BIN resources/localized/spanish/controls_mac_pc.png
  86. +181 −0 resources/localized/spanish/dialogue.json
  87. +159 −0 resources/localized/spanish/stringtable.json
  88. BIN resources/localized/swedish/Copyright.png
  89. BIN resources/localized/swedish/CriticalHits.png
  90. BIN resources/localized/swedish/ObjectiveArrows.png
  91. BIN resources/localized/swedish/UpgradeBanners.png
  92. BIN resources/localized/swedish/controls_mac_pc.png
  93. +181 −0 resources/localized/swedish/dialogue.json
  94. +159 −0 resources/localized/swedish/stringtable.json
  95. +8 −16 src/Animation.js
  96. +126 −32 src/App.js
  97. +1,146 −93 src/AppStates.js
  98. +27 −17 src/Audio.js
  99. +241 −0 src/Breakables.js
  100. +25 −17 src/CaveEntrance.js
  101. +111 −0 src/ChaikinCurve.js
  102. +62 −0 src/DialogueSystem.js
  103. +23 −3 src/FSM.js
  104. +8 −4 src/GUIButtons.js
  105. +206 −81 src/GUIHeadsUp.js
  106. +260 −76 src/Game.js
  107. +6 −5 src/GameObjects.js
  108. +46 −31 src/Gremlin.js
  109. +159 −0 src/GremlinBasket.js
  110. +139 −8 src/GremlinStates.js
  111. +86 −69 src/HittableObject.js
  112. +13 −10 src/House.js
  113. +33 −7 src/Input.js
  114. +111 −0 src/Lamppost.js
  115. +1 −11 src/Movement.js
  116. +436 −17 src/PCStates.js
  117. +2 −2 src/Pickup.js
  118. +45 −5 src/PlayerCharacter.js
  119. +22 −7 src/ResourceClasses.js
  120. +151 −78 src/ResourceDepot.js
  121. +68 −13 src/Stage.js
  122. +26 −0 src/StageClasses.js
  123. +732 −0 src/TutorialTip.js
  124. +305 −0 src/Villager.js
  125. +62 −7 src/Wick.js
  126. +3 −1 src/render/Render.js
  127. +23 −2 src/render/RenderCanvas.js
  128. +132 −132 src/render/RenderWebGL.js
  129. +1 −1 src/render/webgl-utils.js
View
@@ -15,6 +15,7 @@
<script type="text/javascript" src="src/Common.js"></script>
<script type="text/javascript" src="src/Perlin.js"></script>
+ <script type="text/javascript" src="src/ChaikinCurve.js"></script>
<script type="text/javascript" src="src/render/Render.js"></script>
<script type="text/javascript" src="src/render/RenderCanvas.js"></script>
@@ -29,6 +30,7 @@
<script type="text/javascript" src="src/Movement.js"></script>
<script type="text/javascript" src="src/Trigger.js"></script>
<script type="text/javascript" src="src/ParticleSystem.js"></script>
+ <script type="text/javascript" src="src/DialogueSystem.js"></script>
<script type="text/javascript" src="src/GameObjects.js"></script>
<script type="text/javascript" src="src/HittableObject.js"></script>
@@ -37,6 +39,8 @@
<script type="text/javascript" src="src/CaveEntrance.js"></script>
<script type="text/javascript" src="src/House.js"></script>
<script type="text/javascript" src="src/Pickup.js"></script>
+ <script type="text/javascript" src="src/Breakables.js"></script>
+ <script type="text/javascript" src="src/GremlinBasket.js"></script>
<script type="text/javascript" src="src/ResourceClasses.js"></script>
<script type="text/javascript" src="src/ResourceDepot.js"></script>
@@ -53,6 +57,9 @@
<script type="text/javascript" src="src/GremlinStates.js"></script>
<script type="text/javascript" src="src/PCStates.js"></script>
<script type="text/javascript" src="src/Wick.js"></script>
+ <script type="text/javascript" src="src/TutorialTip.js"></script>
+ <script type="text/javascript" src="src/Villager.js"></script>
+ <script type="text/javascript" src="src/Lamppost.js"></script>
<script type="text/javascript">
var app = null;
@@ -69,6 +76,10 @@
}
}
});
+
+ document.onselectstart = function () {
+ return false;
+ };
};
function application() {
@@ -108,6 +119,8 @@
width: 100%;
height: 100%;
color: #fff;
+ font-family: Allan, Arial;
+ font-size: 40px;
}
</style>
</head>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Oops, something went wrong.

0 comments on commit f212bee

Please sign in to comment.