[0.2] version bump and all that jazz. uploading a new release!

bigzipdist.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export ZIPNAME=nubdist/iceball-0.1.2.zip
+export ZIPNAME=nubdist/iceball-0.2.zip
 
 #zip -r $ZIPNAME *.dll *.exe *.txt *.bat docs/ \
 #	pkg/base/*.lua \
@@ -26,6 +26,7 @@ zip -r $ZIPNAME *.dll *.exe *.txt opencmd.bat docs/ \
 	pkg/iceball/pmfedit/ pkg/iceball/mapedit/ \
 	pkg/iceball/sprinting/ pkg/iceball/deucenamegen/ \
 	pkg/iceball/launch/ pkg/iceball/lib/ pkg/iceball/gfx/ \
+	pkg/iceball/ircbot/ \
 	pkg/iceball/altgame/ \
 	svsave/info.txt \
 	svsave/pub/server.json svsave/pub/mods.json svsave/base/vol/dummy svsave/vol/dummy \

docs/changelog.txt

@@ -1,3 +1,8 @@
+Interestingly enough this has never ever been used.
+
+Oh well, if someone wants to fill this in, that'd be awesome.
+Otherwise, try "git log".
+
 0.1.0/0.0 - Released YYYY-MM-DD.
 - Initial release.
 

docs/troubleshooting.txt

@@ -8,7 +8,7 @@ You *MUST* retain the correct directory structure.
 
 *** Have you tried running it in the command line? ***
 Open opencmd.bat, and run it from there.
-See if you get any errors.
+See what errors you get.
 You don't need to worry about stdout.txt/stderr.txt with the official builds,
 however if you built it yourself, you may need to check those files.
 
@@ -43,14 +43,16 @@ In my case I tend to prepend the commandline with "gdb --args ".
 Someone else can elaborate here if necessary.
 
 *** How do I change my name? ***
-Did you read the built-in tutorial? It mentioned a file. What was it called?
+clsave/pub/user.json.
+
+*** How do I change my resolution? ***
+clsave/config.json.
 
 *** When I click on iceball:// URLs it doesn't open iceball! ***
 Windows users: I'm not giving you any hints other than open your bloody eyes.
 
 Other users: You'll need to work this one out yourself, sorry.
 
 *** Anything else? ***
-Join us on IRC: #iceball @ irc.quacknet.org (NOT quaKEnet!).
-This really should be on a wiki somewhere.
+Prod us on Reddit: http://reddit.com/r/buildandshoot/
 

heart/heartbeat.py

@@ -45,7 +45,7 @@ def calc_ib_version(w,x,y,a,z):
 
 HB_LIFETIME = 120
 HB_VERSION = 2
-IB_VERSION_CMP = (0,1,2,0,0)
+IB_VERSION_CMP = (0,2,0,0,0)
 IB_VERSION = calc_ib_version(*IB_VERSION_CMP)
 
 # ignore "Z" version

include/common.h

@@ -15,15 +15,15 @@
     along with Iceball.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// Features from the MK fork.
+// Features from the MK fork. Do not bump this unless you are syncing with it.
 #define MK_REVISION 11
 
 // This is what you modify: BUMP Z EVERY TIME YOU CHANGE THE C SIDE
 #define VERSION_W 0
-#define VERSION_X 1
-#define VERSION_Y 2
+#define VERSION_X 2
+#define VERSION_Y 0
 #define VERSION_A 0
-#define VERSION_Z 14
+#define VERSION_Z 0
 // Remember to bump "Z" basically every time you change the engine!
 // Remember to bump the version in Lua too!
 // Remember to document API changes in a new version!

mapedit.bat

@@ -1,2 +1,2 @@
 @echo off
-iceball-gl -s 0 pkg/iceball/mapedit
+iceball -s 0 pkg/iceball/mapedit

pkg/base/common.lua

@@ -103,7 +103,7 @@ MODE_NADE_RANGE = 8.0
 MODE_NADE_DAMAGE = 210.0
 
 -- WARNING: EXPERIMENTAL - set to false if your server slows down an awful lot or locks up!
-MODE_NADE_VPL_ENABLE = true -- disabled for now to slow down the inevitable framerate divebomb we STILL haven't fixed
+MODE_NADE_VPL_ENABLE = false -- disabled for now to slow down the inevitable framerate divebomb we STILL haven't fixed
 MODE_NADE_VPL_MAX_COUNT = 300 -- O(n*m) stuff, n == number of players, m == THIS
 MODE_NADE_VPL_MAX_TRIES = 1000
 MODE_NADE_VPL_MAX_RANGE = 30.0

pkg/base/main_client.lua

@@ -15,8 +15,8 @@
     along with Ice Lua Components.  If not, see <http://www.gnu.org/licenses/>.
 ]]
 
-if common.version.num < 4259840 then
-	error("You need Iceball version 0.1.2 or later to connect to this server.")
+if common.version.num < 8388608 then
+	error("You need Iceball version 0.2 or later to connect to this server.")
 end
 
 if common.mk_compat_disable then
@@ -146,7 +146,7 @@ dofile("pkg/base/lib_gui.lua")
 if common.version.num < 4259840+4 then
 	img_loading = img_loading or skin_load("tga", "loading_default-64c.tga", DIR_PKG_GFX)
 else
-	img_loading = img_loading or skin_load("png", "loading_default-256c.png", DIR_PKG_GFX)
+	img_loading = img_loading or skin_load("png", "loading_default.png", DIR_PKG_GFX)
 end
 
 img_map = img_map or common.img_load("*MAPIMG")

pkg/base/main_server.lua

@@ -15,8 +15,8 @@
     along with Ice Lua Components.  If not, see <http://www.gnu.org/licenses/>.
 ]]
 
-if common.version.num < 4259840 then
-	error("You need Iceball version 0.1.2 or later to run this code.")
+if common.version.num < 8388608 then
+	error("You need Iceball version 0.2 or later to run this code.")
 end
 
 dofile("pkg/base/lib_fastload.lua")

pkg/base/version.lua

@@ -20,14 +20,15 @@
 -- Thanks. --GM
 
 VERSION_ENGINE = {
-	cmp={0,1,2,0,14},
-	num=4259840+14,
-	str="0.1.2-14",
+	cmp={0,2,0,0,0},
+	num=8388608+0,
+	str="0.2",
 }
 
 -- 0.1: 4194304
 -- 0.1.1: 4227072
 -- 0.1.2: 4259840
+-- 0.2: 8388608
 
 VERSION_BUGS = {
 {intro=nil, fix=1, msg="PMF models have the wrong Z value when close to the screen edges, and can be seen through walls"},

pmfedit.bat

@@ -1,2 +1,2 @@
 @echo off
-iceball-gl -s 0 pkg/iceball/pmfedit
+iceball -s 0 pkg/iceball/pmfedit