RSV_Studio/surprise_dungeon
Archived
4
0
Fork 0
Code Releases Activity

Merge branch 'master' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git

Browse source 
Conflicts:
	objects/oPlayer/Step_0.gml
	objects/oPlayer/oPlayer.yy
	sprites/Purple/Purple.yy
	sprites/sSword/sSword.yy
This commit is contained in:
sOlaris38 2020-12-05 12:56:55 +01:00
commit 4bfd9c8491
9 changed files with 513 additions and 154 deletions

11
objects/oPlayer/Step_0.gml.base Normal file
View file

@ -0,0 +1,11 @@
keyLeft = keyboard_check(vk_left) or keyboard_check(ord("Q"));
keyRight = keyboard_check(vk_right) or keyboard_check(ord("D"));;
keyUp = keyboard_check(vk_up) or keyboard_check(ord("Z"));;
keyDown = keyboard_check(vk_down) or keyboard_check(ord("S"));;
keyAttack = keyboard_check_pressed(vk_shift);
deplaceHorizontal = keyRight - keyLeft;
deplaceVertical = keyDown - keyUp;
x += deplaceHorizontal;
y += deplaceVertical;

37
objects/oPlayer/Step_0.gml.orig Normal file
View file

@ -0,0 +1,37 @@
<<<<<<< HEAD
keyLeft = keyboard_check(vk_left) or keyboard_check(ord("Q"));
keyRight = keyboard_check(vk_right) or keyboard_check(ord("D"));
keyUp = keyboard_check(vk_up) or keyboard_check(ord("Z"));
keyDown = keyboard_check(vk_down) or keyboard_check(ord("S"));
keyAttack = keyboard_check_pressed(vk_shift);
// Déplacement du joueur
deplaceHorizontal = keyRight - keyLeft;
deplaceVertical = keyDown - keyUp;
x += deplaceHorizontal;
y += deplaceVertical;
seDeplace = (deplaceHorizontal != 0 or deplaceVertical != 0);
// Animation des sprites
if (seDeplace) {
}
=======
keyLeft = keyboard_check(vk_left) or keyboard_check(ord("Q"));
keyRight = keyboard_check(vk_right) or keyboard_check(ord("D"));;
keyUp = keyboard_check(vk_up) or keyboard_check(ord("Z"));;
keyDown = keyboard_check(vk_down) or keyboard_check(ord("S"));;
keyAttack = keyboard_check_pressed(vk_shift);
deplaceHorizontal = keyRight - keyLeft;
deplaceVertical = keyDown - keyUp;
x += deplaceHorizontal;
y += deplaceVerticald;
>>>>>>> master

23
objects/oPlayer/Step_0.gml.ours Normal file
View file

@ -0,0 +1,23 @@
keyLeft = keyboard_check(vk_left) or keyboard_check(ord("Q"));
keyRight = keyboard_check(vk_right) or keyboard_check(ord("D"));
keyUp = keyboard_check(vk_up) or keyboard_check(ord("Z"));
keyDown = keyboard_check(vk_down) or keyboard_check(ord("S"));
keyAttack = keyboard_check_pressed(vk_shift);
// Déplacement du joueur
deplaceHorizontal = keyRight - keyLeft;
deplaceVertical = keyDown - keyUp;
x += deplaceHorizontal;
y += deplaceVertical;
seDeplace = (deplaceHorizontal != 0 or deplaceVertical != 0);
// Animation des sprites
if (seDeplace) {
}

11
objects/oPlayer/Step_0.gml.theirs Normal file
View file

@ -0,0 +1,11 @@
keyLeft = keyboard_check(vk_left) or keyboard_check(ord("Q"));
keyRight = keyboard_check(vk_right) or keyboard_check(ord("D"));;
keyUp = keyboard_check(vk_up) or keyboard_check(ord("Z"));;
keyDown = keyboard_check(vk_down) or keyboard_check(ord("S"));;
keyAttack = keyboard_check_pressed(vk_shift);
deplaceHorizontal = keyRight - keyLeft;
deplaceVertical = keyDown - keyUp;
x += deplaceHorizontal;
y += deplaceVerticald;

41
objects/oPlayer/oPlayer.yy.orig Normal file
View file

@ -0,0 +1,41 @@
{
"spriteId": {
"name": "sPlayer",
"path": "sprites/sPlayer/sPlayer.yy",
},
"solid": false,
"visible": true,
"spriteMaskId": null,
"persistent": false,
"parentObjectId": null,
"physicsObject": false,
"physicsSensor": false,
"physicsShape": 1,
"physicsGroup": 1,
"physicsDensity": 0.5,
"physicsRestitution": 0.1,
"physicsLinearDamping": 0.1,
"physicsAngularDamping": 0.1,
"physicsFriction": 0.2,
"physicsStartAwake": true,
"physicsKinematic": false,
"physicsShapePoints": [],
"eventList": [
{"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
{"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
],
"properties": [
{"varType":1,"value":"0","rangeEnabled":false,"rangeMin":0.0,"rangeMax":10.0,"listItems":[],"multiselect":false,"filters":[],"resourceVersion":"1.0","name":"deplaceHorizontal","tags":[],"resourceType":"GMObjectProperty",},
{"varType":1,"value":"0","rangeEnabled":false,"rangeMin":0.0,"rangeMax":10.0,"listItems":[],"multiselect":false,"filters":[],"resourceVersion":"1.0","name":"deplaceVertical","tags":[],"resourceType":"GMObjectProperty",},
{"varType":0,"value":"0","rangeEnabled":false,"rangeMin":0.0,"rangeMax":10.0,"listItems":[],"multiselect":false,"filters":[],"resourceVersion":"1.0","name":"spriteDir","tags":[],"resourceType":"GMObjectProperty",},
],
"overriddenProperties": [],
"parent": {
"name": "Objects",
"path": "folders/Objects.yy",
},
"resourceVersion": "1.0",
"name": "oPlayer",
"tags": [],
"resourceType": "GMObject",
}