Changeset 1492


Ignore:
Timestamp:
Jun 18, 2012, 1:09:10 AM (8 years ago)
Author:
touky
Message:

Added Lolnament (Working Title) V0.1a in Orbital, for quick tests purposes.

Location:
trunk/orbital
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/orbital/orbital.cpp

    r1446 r1492  
    149149    }
    150150
     151        m_Lolnament = NULL;//new Lolnament();
     152        Ticker::Ref(m_Lolnament);
     153
    151154    m_ready = false;
    152155}
     
    301304    Ticker::Unref(m_large_stars);
    302305    Ticker::Unref(m_camera);
     306    Ticker::Unref(m_Lolnament);
    303307}
    304308
  • trunk/orbital/orbital.h

    r1444 r1492  
    1717#include "snake.h"
    1818#include "player.h"
     19#include "Lolnament.h"
    1920
    2021class Orbital : public WorldEntity
     
    4142    Array<Tank *> m_tanks;
    4243    Array<Snake *> m_snakes;
     44        Lolnament* m_Lolnament;
    4345
    4446    /* Editor stuff */
  • trunk/orbital/orbital.vcxproj

    r1451 r1492  
    3131    <ClInclude Include="generated\gun-parser.h" />
    3232    <ClInclude Include="gun.h" />
     33    <ClInclude Include="Lolnament.h" />
    3334    <ClInclude Include="mesh-compiler.h" />
    3435    <ClInclude Include="gun-compiler.h" />
  • trunk/orbital/orbital.vcxproj.filters

    r1451 r1492  
    1616      <Filter>generated</Filter>
    1717    </ClInclude>
     18    <ClInclude Include="Lolnament.h" />
    1819  </ItemGroup>
    1920  <ItemGroup>
  • trunk/orbital/shiny.lolfx

    r1441 r1492  
    11
    22-- GLSL.Vert --
    3 #version 100
     3#version 120
    44
    55attribute vec3 in_Vertex;
     
    4848
    4949-- GLSL.Frag --
    50 #version 100
     50#version 120
    5151
    52 precision highp float;
     52//precision highp float;
    5353varying vec4 pass_Color;
    5454
Note: See TracChangeset for help on using the changeset viewer.