Commit b5a9bad3bc7b90902f1b2f8ea7c9e1f2e96447bb

Authored by DarkGod
1 parent 37d41678

bump to 1.1.0

@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 -- darkgod@te4.org 18 -- darkgod@te4.org
19 19
20 -- Engine Version 20 -- Engine Version
21 -engine.version = {1,0,6,"te4",17} 21 +engine.version = {1,1,0,"te4",17}
22 engine.require_c_core = engine.version[5] 22 engine.require_c_core = engine.version[5]
23 engine.version_id = ("%s-%d_%d.%d.%d"):format(engine.version[4], engine.require_c_core, engine.version[1], engine.version[2], engine.version[3]) 23 engine.version_id = ("%s-%d_%d.%d.%d"):format(engine.version[4], engine.require_c_core, engine.version[1], engine.version[2], engine.version[3])
24 24
@@ -46,6 +46,10 @@ function engine.version_compare(v, ev) @@ -46,6 +46,10 @@ function engine.version_compare(v, ev)
46 end 46 end
47 47
48 function engine.version_nearly_same(v, ev) 48 function engine.version_nearly_same(v, ev)
49 - if v[1] == ev[1] and v[2] == ev[2] and v[3] >= ev[3] then return true end 49 + if v[1] == ev[1] then
  50 + if v[2] == ev[2] and v[3] >= ev[3] then return true
  51 + elseif v[2] >= ev[2] then return true
  52 + end
  53 + end
50 return false 54 return false
51 end 55 end
@@ -22,8 +22,8 @@ long_name = "Example Module for T-Engine4" @@ -22,8 +22,8 @@ long_name = "Example Module for T-Engine4"
22 short_name = "example" 22 short_name = "example"
23 author = { "DarkGod", "darkgod@te4.org" } 23 author = { "DarkGod", "darkgod@te4.org" }
24 homepage = "http://te4.org/modules:example" 24 homepage = "http://te4.org/modules:example"
25 -version = {1,0,6}  
26 -engine = {1,0,6,"te4"} 25 +version = {1,1,0}
  26 +engine = {1,1,0,"te4"}
27 description = [[ 27 description = [[
28 This is *NOT* a game, just an example/template to make your own using the T-Engine4. 28 This is *NOT* a game, just an example/template to make your own using the T-Engine4.
29 ]] 29 ]]
@@ -144,6 +144,7 @@ newTalent{ @@ -144,6 +144,7 @@ newTalent{
144 m.clone_on_hit = nil 144 m.clone_on_hit = nil
145 if m:knowTalent(m.T_BONE_SHIELD) then m:unlearnTalent(m.T_BONE_SHIELD, m:getTalentLevelRaw(m.T_BONE_SHIELD)) end 145 if m:knowTalent(m.T_BONE_SHIELD) then m:unlearnTalent(m.T_BONE_SHIELD, m:getTalentLevelRaw(m.T_BONE_SHIELD)) end
146 if m:knowTalent(m.T_MULTIPLY) then m:unlearnTalent(m.T_MULTIPLY, m:getTalentLevelRaw(m.T_MULTIPLY)) end 146 if m:knowTalent(m.T_MULTIPLY) then m:unlearnTalent(m.T_MULTIPLY, m:getTalentLevelRaw(m.T_MULTIPLY)) end
  147 + if m:knowTalent(m.T_SUMMON) then m:unlearnTalent(m.T_SUMMON, m:getTalentLevelRaw(m.T_SUMMON)) end
147 m.no_points_on_levelup = true 148 m.no_points_on_levelup = true
148 m.faction = self.faction 149 m.faction = self.faction
149 150
@@ -22,8 +22,8 @@ long_name = "Tales of Maj'Eyal: Age of Ascendancy" @@ -22,8 +22,8 @@ long_name = "Tales of Maj'Eyal: Age of Ascendancy"
22 short_name = "tome" 22 short_name = "tome"
23 author = { "DarkGod", "darkgod@te4.org" } 23 author = { "DarkGod", "darkgod@te4.org" }
24 homepage = "http://te4.org/" 24 homepage = "http://te4.org/"
25 -version = {1,0,6}  
26 -engine = {1,0,6,"te4"} 25 +version = {1,1,0}
  26 +engine = {1,1,0,"te4"}
27 description = [[ 27 description = [[
28 Welcome to Maj'Eyal. 28 Welcome to Maj'Eyal.
29 29