Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Shoozza committed Feb 4, 2021
2 parents 7cbf0c6 + 271fe3a commit bf5aeb2
Show file tree
Hide file tree
Showing 52 changed files with 27,703 additions and 28,000 deletions.
24 changes: 24 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# visual basic 6 expects crfl
*.bas text eol=crlf
*.cls text eol=crlf
*.dsr text eol=crlf
*.frm text eol=crlf
*.vbp text eol=crlf
*.vbw text eol=crlf

*.RES binary
*.aps binary
*.bin binary
*.dll binary
*.exe binary
*.exe.compat binary
*.frx binary
*.gif binary
*.ico binary
*.ism binary
*.ncb binary
*.ocx binary
*.ocx.bin binary
*.ocx.compat binary
*.res binary
*.tlb binary
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.exe
*.vbw
22 changes: 22 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
MIT License

Copyright (c) 2006-2007 Anna Zajaczkowski
Copyright (c) 2009-present The PolyWorks Contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
12 changes: 8 additions & 4 deletions READ THIS/SVN Checklist.txt → READ THIS/checklists.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
Checklists
==========

Commit
------

* Save vb6 project
* Build and move any needed files to the installer directory
* Compile installer and test it
* Save vb6 project (Menu->File->Save Project)
* Build project (Menu->File->Make Soldat PolyWorks.exe)
* Move any needed files to the installer directory (/Soldat PolyWorks.exe into /pwinstall)
* Compile installer and test it (open /pwinstall/pw.nsi with makensisw.exe)
* Test everything new/changed/fixed
* Commit files and changelog
* Done!
Expand Down Expand Up @@ -32,4 +36,4 @@ Release
* Upload new installer and zip file to original locations
* Save modification to PolyWorks topic
* Post update reply with version number and changes
* Done!
* Done!
4 changes: 0 additions & 4 deletions READ THIS/mini todo.txt

This file was deleted.

7 changes: 7 additions & 0 deletions READ THIS/todo.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Todo
====

* fix smooth movement while zoomed
* texture movement direction issue (while rotated)
* collider radius in properties window
* render polygon edges as an option
25 changes: 22 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,30 @@
# Soldat PolyWorks
Soldat map editor
Soldat PolyWorks
================

Needs VB6 to be compiled.
Map editor for the game [Soldat](https://soldat.pl)

![Screenshot of the Polyworks GUI](/img/screenshot.jpg?raw=true "Soldat Polyworks")

Requirements
------------
* Visual Basic 6 SP6
* NSIS (optional - for generating the Installer)
* Resource Hacker (optional - for replacing the old icon)

Notes
-----
When VB6 is installed, it may have issues finding referenced controls, such as "MBMouse.ocx".
You have to add them manually out of the /pwinstall folder.

If you want to contribute while using Visual Studio 2015 update 1+, you may need this addon:
https://visualstudiogallery.msdn.microsoft.com/00cc8ff8-beb3-4f08-8aa6-59eefba3bb40
(You will still need VB6 for compilation)

License
-------
MIT

### Note:
Soldat PolyWorks v1.4.0.17 with source code was originally released by Anna Zajaczkowski as:
["Feel free to do whatever you want with it."](https://web.archive.org/web/20191012125637/https://forums.soldat.pl/index.php?topic=174.msg214342)
It was subsequently relicensed under the MIT License by [the PolyWorks contributors](https://web.archive.org/web/20191012125244/https://github.com/Soldat/polyworks/issues/8).
50 changes: 50 additions & 0 deletions bump.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
:: Bump batch script
::
:: Updates the version numbers for this project
:: Requires sed to work

@ECHO OFF
PUSHD .

sed >NUL 2>&1
IF %ERRORLEVEL% == 9009 (
ECHO ERROR: Cannot find sed
GOTO END
)

IF "%1" == "" GOTO USAGE
SET BUMP_VERSION=%1

ECHO _START_%BUMP_VERSION%_END_ | sed -nb "/^_START_[0-9]\+\(\.[0-9]\+\)*_END_/!{q100}"
IF ERRORLEVEL 1 GOTO USAGE

SET BUMP_VERSION=%1

SET BUMP_COMMAND_MAJOR='ECHO _START_%BUMP_VERSION%_END_ ^^^| sed -b "s/^_START_\([0-9]\+\)\(\.[0-9]\+\)*_END_/\1/"'
SET BUMP_COMMAND_MINOR='ECHO _START_%BUMP_VERSION%_END_ ^^^| sed -b "s/^_START_[0-9]\+\.\([0-9]\+\)\(\.[0-9]\+\)*_END_/\1/"'
SET BUMP_COMMAND_REVISION='ECHO _START_%BUMP_VERSION%_END_ ^^^| sed -b "s/^_START_[0-9]\+\.[0-9]\+\.[0-9]\+\.\([0-9]\+\)\(\.[0-9]\+\)*_END_/\1/"'

FOR /F "tokens=*" %%i IN (%BUMP_COMMAND_MAJOR%) DO SET BUMP_VERSION_MAJOR=%%i
FOR /F "tokens=*" %%i IN (%BUMP_COMMAND_MINOR%) DO SET BUMP_VERSION_MINOR=%%i
FOR /F "tokens=*" %%i IN (%BUMP_COMMAND_REVISION%) DO SET BUMP_VERSION_REVISION=%%i

CD /D "%~dp0"

:: Add more matches here
sed -bi "s/^!define PRODUCT_VERSION \".*\"/!define PRODUCT_VERSION \"%BUMP_VERSION%\"/g" pwinstall/pw.nsi
sed -bi "s/^Soldat Polyworks [0-9]\+\(\.[0-9]\+\)*/Soldat Polyworks %BUMP_VERSION%/g" pwinstall/readme.txt

sed -bi "s/\(MajorVer=\)[0-9]\+/\1%BUMP_VERSION_MAJOR%/g" prjSoldatMapEditor.vbp
sed -bi "s/\(MinorVer=\)[0-9]\+/\1%BUMP_VERSION_MINOR%/g" prjSoldatMapEditor.vbp
sed -bi "s/\(RevisionVer=\)[0-9]\+/\1%BUMP_VERSION_REVISION%/g" prjSoldatMapEditor.vbp

ECHO DONE!

GOTO END

:USAGE
ECHO %0: Updates the version numbers in the project
ECHO Usage: %0 1.2.3.4

:END
POPD
Loading

0 comments on commit bf5aeb2

Please sign in to comment.