andros/shall-I-kill-her
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Develop #4

Merged
wariosolis merged 35 commits from develop into master 2017-01-04 00:04:34 +01:00
Conversation 1 Commits 35 Files Changed 110
+4753 -58
35 Commits
Author SHA1 Message Date
wariosolis 4fc2dc4ce7 End game 2016-12-12 19:36:02 -06:00
Andros Fenollosa 8d7a3d0f69 Add stage 3 2016-12-13 00:29:29 +01:00
Andros Fenollosa 296d8850bd First stage cruz 2016-12-12 22:04:59 +01:00
Andros Fenollosa 1b4cba7f5b Add start screen 2016-12-12 21:03:31 +01:00
Andros Fenollosa 19a9dbd51f Translate text to English 2016-12-12 19:31:33 +01:00
Andros Fenollosa 47d62cea78 Disable bells 2016-12-12 19:21:54 +01:00
wariosolis d056a71769 Fixes arrows - Left arrow -> go to end level 2016-12-12 12:16:36 -06:00
Edwin Najera 3693f69ed1 add game intro 2016-12-11 14:16:07 -06:00
Andros Fenollosa df95c0c0c7 Fix game 2016-12-11 20:45:35 +01:00
Andros Fenollosa 633f2b5a00 Fix bells 2016-12-11 20:41:49 +01:00
Andros Fenollosa 30630b33ef Update bells 2016-12-11 20:39:41 +01:00
wariosolis f31e5f13ec Fixes stages 2016-12-11 12:39:02 -06:00
wariosolis a51a4034ef Merge branch 'develop' of https://github.com/notestudio/shall-I-kill-her into develop 
* 'develop' of https://github.com/notestudio/shall-I-kill-her:
  Finish messages
  Add messages
  Add new song
 2016-12-11 12:04:01 -06:00
Andros Fenollosa c17ac46781 Merge branch 'develop' of github.com:notestudio/shall-I-kill-her into develop 2016-12-11 18:58:07 +01:00
Andros Fenollosa f6b21a5ac3 Finish messages 2016-12-11 18:57:28 +01:00
wariosolis 417cb5cc75 Fixes stages flow 
Fixes button right
 2016-12-11 11:55:00 -06:00
Wario Solis 04cb76d1a1 Fixes images 
Change stress image
 2016-12-11 10:39:31 -06:00
Wario Solis 3b92144107 Merge branch 'feature/levels' into develop 
Add new levels #2
* feature/levels:
  Levels
  Levels
 2016-12-11 09:41:32 -06:00
Wario Solis eb71230744 Levels 2016-12-11 09:39:24 -06:00
Wario Solis 1fe28914a6 Levels 2016-12-11 09:02:44 -06:00
Andros Fenollosa 904018d30d Merge branch 'develop' of github.com:notestudio/shall-I-kill-her into develop 2016-12-11 15:55:15 +01:00
Andros Fenollosa 6107811f19 Add messages 2016-12-11 15:54:56 +01:00
Wario Solis d4411e61c4 Merge branch 'feature/stress-controller' into develop 
* feature/stress-controller:
  Stress controller Fixes stage 2 Adding new backgrounds
  Background music
 2016-12-11 08:46:11 -06:00
Wario Solis 7faaa52567 Background music 2016-12-11 08:44:27 -06:00
Wario Solis a370bde94e Stress controller 
Fixes stage 2
Adding new backgrounds
 2016-12-11 08:40:12 -06:00
Andros Fenollosa da07188c08 Add new song 2016-12-11 15:27:36 +01:00
Andros Fenollosa 9c0ff69bde Finish bells 2016-12-11 15:21:36 +01:00
Andros Fenollosa 088390f9c3 Add check bad order 2016-12-11 15:00:42 +01:00
Wario Solis 2878c915ea Background music 2016-12-11 07:46:53 -06:00
Andros Fenollosa bc2510f306 Add collision bells 2016-12-11 12:49:18 +01:00
Andros Fenollosa a3b358c627 Add bell level 2016-12-11 12:01:21 +01:00
Andros Fenollosa 3309b4cd2f Fix position bells 2016-12-11 10:00:12 +01:00
Andros Fenollosa c7e13147de Merge 2016-12-11 09:33:56 +01:00
Andros Fenollosa 6b7c56e6f4 Update bells 2016-12-11 09:32:32 +01:00
Wario Solis 53243cef36 Dynamic world size by stage 2016-12-10 18:09:24 -06:00