social_stream-presence 0.10.2 → 0.10.3

data/app/assets/javascripts/presence_game_ter.js.erb

@@ -9,17 +9,25 @@ PRESENCE.GAME.TER = (function(P,$,undefined){
 		
   //Games variables
 	var game;             //Game and player are objects defined in the gamecore.
+	var name = "Tic Tac Toe"
   var player = null;
   var currentPlayer = null;
 	var playing=true;
 	
+	
 	//We must define our ACTION object.
 	//The information exchanged between players is performed through the exchange of action type objects.
 	//We can define our own types of actions, with different fields
-  function action(player,square) {
+  //function action(player,square) {
+    //this.player = player;
+    //this.square = square;
+		//this.type = "general";
+  //}
+	
+	function action(player,square) {
     this.player = player;
-		this.type = "general";
     this.square = square;
+    this.type = "general";
   }
 	
   //Html Divs
@@ -99,8 +107,8 @@ PRESENCE.GAME.TER = (function(P,$,undefined){
 	//We can include our own validation conditions here!
 	//The core will invoke this method automatically in the validation process
   var validateParams = function(myPlayer,myGame,myDivID){
-    if(myGame.players.lenght < 2){
-      return new CORE.createValidationResult(false,"This game needs two players at least");
+    if(myGame.players.length != 2){
+      return new CORE.createValidationResult(false,"This game needs two players");
     }
     return new CORE.createValidationResult(true,"Ok");  
   }
@@ -119,7 +127,7 @@ PRESENCE.GAME.TER = (function(P,$,undefined){
   /////////////////////////////////     * When some player send us a action, the core will invoke the << onActionReceived >> method.
 
   var sendAction = function(action){
-    CORE.sendAction(game.id,game.players,action)
+    CORE.sendAction(game,action)
     return;
   }
 
@@ -322,15 +330,13 @@ PRESENCE.GAME.TER = (function(P,$,undefined){
       var figure = "aspa";
     }
 
-    var path = "/assets/games/ter/modern_circle.png"
     $(img).attr("src","/assets/games/ter/" + game.options['theme'].toLowerCase() + "_" + figure + ".png");
     $("#" + containerDivId).append(img);
     $(img).addClass('tresEnRayaImgTheme' + game.options['theme'])
 		
-		//Calculate displacement
 		var figureSizePercent = 0.8;
-		var xdisplacement = -squareDimension*figureSizePercent/2*0.9;
-		var ydisplacement = 10;
+		var xdisplacement = -squareDimension*figureSizePercent/2*0.7;
+    var ydisplacement = 13;
 		
     $(img).width(squareDimension*figureSizePercent)
     $(img).height(squareDimension*figureSizePercent)
@@ -406,6 +412,10 @@ PRESENCE.GAME.TER = (function(P,$,undefined){
   }
 
   //Getters
+  var getName = function(){
+    return name
+  }
+	
   var getGame = function(){
     return game;
   }
@@ -425,6 +435,7 @@ PRESENCE.GAME.TER = (function(P,$,undefined){
 
   return {
     init: init,
+		getName: getName,
 		validateParams: validateParams,
 		minimumRequirements: minimumRequirements,
 		onActionReceived: onActionReceived

data/app/assets/javascripts/presence_uiManager.js.erb

@@ -1,5 +1,3 @@
-//= require jquery.watermark
-//
 ////////////////////
 //Reconnect button interface functions
 ////////////////////

data/app/assets/javascripts/presence_utilities.js

@@ -1,7 +1,7 @@
 ////////////////////
 //Debug functions
 ////////////////////
-var sspresence_debugging=true;
+var sspresence_debugging=false;
 
 function log(msg) {
 	  if(sspresence_debugging){

data/app/assets/javascripts/presence_videochat.js.erb

@@ -21,6 +21,8 @@ function clickVideoChatButton(slug){
 }
 
 function closeVideoChatWindow(slug){
+	  //Show games button
+    $(getChatBoxButtonForSlug(slug,"games")).show()
     closeVideoSession(slug);
     return;
 }
@@ -29,6 +31,9 @@ function closeVideoChatWindow(slug){
 var reconnectAttemptsVideo = 1;
 
 function openVideoChatWindow(slug){
+	
+	//Hide games button
+	$(getChatBoxButtonForSlug(slug,"games")).hide()
     
   if (slug in contactsInfo) {
     var connectionStatus = contactsInfo[slug].videoChatStatus;

data/app/assets/javascripts/social_stream-presence.js

@@ -3,5 +3,6 @@
 //= require strophe.muc
 //= require jquery.tools.tooltip
 //= require liquidmetal
+//= require jquery.watermark
 //= require TB.min
 //= require_tree .

data/app/assets/stylesheets/chat.css.scss

@@ -81,10 +81,8 @@ div.ui-videobox{
 	height: 0px;
 	border-bottom: 1px solid $separation-color;
 	max-width: 230px;
-}
-
-div.ui-videobox-icon{
-  
+	text-align: center;
+	margin: auto;
 }
 
 div.ui-videobox-icon-change{
@@ -131,7 +129,7 @@ p.video-request{
 }
 
 p.game-info{
-  padding-top: 25%;
+  padding-top: 20%;
   text-align: center;
 }
 
@@ -143,6 +141,57 @@ p.game-request{
   color: $main-color;
 }
 
+.game-choices{
+  display: inline;
+  width: 100%;
+	height: 100%;
+	text-align: center;
+}
+
+div.game-choice {
+  float: left;
+  position: relative;
+	width: 90px;
+  height: 90px;
+	margin-left: 20px;
+	margin-right: 20px;
+	margin-top: 20px;
+}
+
+div.game-choice-buttonLeft {
+  float: left;
+  position: relative;
+	margin-left: 40px;
+	margin-top: 50px;
+}
+
+div.game-choice-buttonRight {
+  float: left;
+  position: relative;
+	margin-right: 40px;
+	margin-top: 50px;
+}
+
+img.game-choice-img{
+	width: 90px;
+	height: 90px;
+}
+
+img.game-choice-button{
+	margin-top: 5px;
+  width: 30px;
+  height: 30px;
+}
+
+p.game-name{
+	margin-top: 5px;
+  text-align: center;
+}
+
+a.game-choice-link{
+	
+}
+
 /* notifications style sheet */
 
 div.ui-chatbox-notify{
@@ -192,8 +241,12 @@ p.ui-chatbox-notify-text{
 }
 
 .chat-videothick{
-	/* display: none; */
 	padding: 1px;
+	/*background-image: url("webcam.png");
+  background-repeat: no-repeat;
+  display: block;
+  height: 16px;
+  width: 16px; */
 }
 
 .chat-videoPublisherthick{

data/config/locales/en.yml

@@ -52,7 +52,7 @@ en:
       joinError: "You can't join in the room \n {{errorMsg}}"
       offline: "You are offline"
     game:
-      call: "{{name}} wants to play"
+      call: "{{name}} wants to play a {{game}} game"
       accept: Accept
       deny: Deny
       offline: "Unable to connect. You are offline"

data/config/locales/es.yml

@@ -52,7 +52,7 @@ es:
        joinError: "No se pudo acceder a la sala.  \n {{errorMsg}}"
        offline: "Estás desconectado"
     game:
-      call: "{{name}} quiere iniciar una partida"
+      call: "{{name}} quiere iniciar una partida de {{game}}"
       accept: Aceptar
       deny: Rechazar
       offline: "Imposible conectar. Estás desconectado"

data/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Presence
-    VERSION = "0.10.2"
+    VERSION = "0.10.3"
   end
 end

metadata

@@ -1,80 +1,99 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: social_stream-presence
-version: !ruby/object:Gem::Version
-  version: 0.10.2
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 10
+  - 3
+  version: 0.10.3
 platform: ruby
-authors:
+authors: 
 - Aldo Gordillo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-03-13 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: social_stream-base
-  requirement: &84856790 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 17
+        - 2
         version: 0.17.2
   type: :runtime
-  prerelease: false
-  version_requirements: *84856790
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: xmpp4r
-  requirement: &84856380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *84856380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: net-ssh
-  requirement: &84855570 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *84855570
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: net-sftp
-  requirement: &84855030 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *84855030
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: ruby-debug19
-  requirement: &84854560 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *84854560
-description: Social Stream Presence provides everything you need for including presence,
-  instant messaging and video chat services in your social network website, including
-  a complete chat fully integrated with Social Stream.
-email:
+  version_requirements: *id005
+description: Social Stream Presence provides everything you need for including presence, instant messaging and video chat services in your social network website, including a complete chat fully integrated with Social Stream.
+email: 
 - agordillos@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - Rakefile
@@ -94,17 +113,43 @@ files:
 - app/assets/images/emoticons/present.png
 - app/assets/images/emoticons/rain.png
 - app/assets/images/emoticons/sun.png
+- app/assets/images/games/sfighter/abobo/abobo.png
+- app/assets/images/games/sfighter/abobo/abobo_block_81x130x1.png
+- app/assets/images/games/sfighter/abobo/abobo_die_156x119x1.png
+- app/assets/images/games/sfighter/abobo/abobo_hit_108x120x3.png
+- app/assets/images/games/sfighter/abobo/abobo_idle_100x121x3.png
+- app/assets/images/games/sfighter/abobo/abobo_kick_137x130x2.png
+- app/assets/images/games/sfighter/abobo/abobo_punch_131x170x4.png
+- app/assets/images/games/sfighter/abobo/abobo_walk_backward_94x126x6.png
+- app/assets/images/games/sfighter/abobo/abobo_walk_forward_94x126x6.png
+- app/assets/images/games/sfighter/cvs/cvs_block_69x99x2.png
+- app/assets/images/games/sfighter/cvs/cvs_die_150x110x1.png
+- app/assets/images/games/sfighter/cvs/cvs_hit_59x103x1.png
+- app/assets/images/games/sfighter/cvs/cvs_idle_59x106x6.png
+- app/assets/images/games/sfighter/cvs/cvs_kick_156x106x9.png
+- app/assets/images/games/sfighter/cvs/cvs_punch_120x104x6.png
+- app/assets/images/games/sfighter/cvs/cvs_walk_backward_58x106x5.png
+- app/assets/images/games/sfighter/cvs/cvs_walk_forward_58x106x5.png
+- app/assets/images/games/sfighter/stage/background1.png
+- app/assets/images/games/sfighter/stage/background2.png
+- app/assets/images/games/sfighter/stage/background3.png
+- app/assets/images/games/sfighter/stage/foreground.png
+- app/assets/images/games/sfighter/stage/ground.png
+- app/assets/images/games/sfighter/thumbnail.png
 - app/assets/images/games/ter/classic_aspa.png
 - app/assets/images/games/ter/classic_board.png
 - app/assets/images/games/ter/classic_circle.png
+- app/assets/images/games/ter/classic_thumbnail.png
 - app/assets/images/games/ter/modern_aspa.png
 - app/assets/images/games/ter/modern_board.png
 - app/assets/images/games/ter/modern_circle.png
+- app/assets/images/games/ter/modern_thumbnail.png
 - app/assets/images/status/available.png
 - app/assets/images/status/away.png
 - app/assets/images/status/chat.png
 - app/assets/images/status/dnd.png
 - app/assets/images/status/offline.png
+- app/assets/images/webcam.png
 - app/assets/javascripts/jquery.flexselect.sstreampresence.js
 - app/assets/javascripts/jquery.ui.chatbox.sstreampresence.js
 - app/assets/javascripts/presence.js.erb
@@ -112,7 +157,9 @@ files:
 - app/assets/javascripts/presence_audio.js.erb
 - app/assets/javascripts/presence_game.js.erb
 - app/assets/javascripts/presence_game_comunication.js.erb
+- app/assets/javascripts/presence_game_factory.js.erb
 - app/assets/javascripts/presence_game_interface.js.erb
+- app/assets/javascripts/presence_game_sfighter.js.erb
 - app/assets/javascripts/presence_game_ter.js.erb
 - app/assets/javascripts/presence_notifications.js
 - app/assets/javascripts/presence_parser.js
@@ -240,30 +287,37 @@ files:
 - vendor/assets/javascripts/strophe.muc.js
 - vendor/assets/stylesheets/flexselect.css
 - vendor/assets/stylesheets/jquery.ui.chatbox.css
+has_rdoc: true
 homepage: https://github.com/ging/social_stream/wiki/Getting-Started-With-Social-Stream-Presence
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: social_stream-presence
-rubygems_version: 1.8.12
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Presence capabilities for Social Stream, the core for building social network
-  websites.
+summary: Presence capabilities for Social Stream, the core for building social network websites.
 test_files: []
-has_rdoc: 
+