github.com/space-wizards/space-station-14-old commits

Move ICSharpCode.SharpZipLib to NuGet

7aa041286fdcca9664790fd03491eef1b4d7542d authored over 7 years ago

Fix inconsistent capitalization in resource directories.

48633faf52a8a3fbcdf7dbbe1553d6f588297c39 authored over 7 years ago

Merge pull request #89 from PJB3005/console-title

Signal handlers, clear terminal title on shutdown.

c5901fc68e47fb91f0e1238394fd01ed555e52bc authored over 7 years ago

Merge pull request #98 from ComicIronic/editors

Editorconfig, fixing mistakes from Xamarin and VS

09b8c2407ced459935c7cc3b8f95188a82100545 authored over 7 years ago

Fix compile

b52e6b41389395e121775b747de0e75ecf3e1aa6 authored over 7 years ago

Merge remote-tracking branch 'upstream/master' into travis-compile-fail

6af6397d069dc4cc93a4ba12831f0bacc63936d4 authored over 7 years ago

Fix ClientConsoleHost, clean up ConsoleManager.

7e9b81e71f78a308750e8fd11f98d4ce0e71d06a authored over 7 years ago

Merge pull request #101 from PJB3005/cross-platform-resource-pack

Python-based, cross platform buildResourcePack.py

2627a4e9e88981b14eacff94b2f23cf2f30b448a authored over 7 years ago

Merge remote-tracking branch 'upstream/master' into console-title

edc02ea6f594f046c12a8400a591d68ddad948fe authored over 7 years ago

Improvements & fixing windows compatability.

efb9dce02d05a6ef4894d6c6d22c475cc8d36e61 authored over 7 years ago

Requirements.txt

4cbe38d3d9884b7e2c5f4e4aa9dad78c0706f63e authored over 7 years ago

Merge pull request #102 from psykzz/fix-diag-movement

Fix diagonal movement being slower than normal

106c58b6cc3800dfe6239f287c71fc4898a9e531 authored over 7 years ago

Merge pull request #103 from ComicIronic/compile-fix

Fixed compile break due to recent merge.

5ac92a698b60e1b8cf9cb507024ea1c8a91b4eda authored over 7 years ago

Fixed compile break due to recent merge.

DebugConsole had to be reverted completely due to non-atomic formatting
changes.

e2d3f983994defa59f22bcc738cb3c790da0b29b authored over 7 years ago

Fixes

6fa4c83784b6adc3aa5bc894d5ba9bc6874466a0 authored over 7 years ago

Fix diagonal movement being slower than normal

5fdc2ceb8ebd25b546120cec78347961a59e7158 authored over 7 years ago

Editorconfig, fixing mistakes from Xamarin and VS

c27cc6fe17be97608e2da0435dcafcbb1085c806 authored over 7 years ago

Merge pull request #95 from ComicIronic/graphics-fix

Fix a bunch of broken GUI code in relation to the console and chat.

a536afbe7c18eb649d76eadd633000b10f2c47ee authored over 7 years ago

Merge branch 'master' into graphics-fix

e7a43739a3e984a538bae3ba5e397bb8f25f03ee authored over 7 years ago

Merge pull request #88 from clusterfack/exceptioncrash

Removes Interaction System Exception

60bd7f9eabacaa18cd41f142cc583122aa05d037 authored over 7 years ago

Translate the resource pack builder to Python and make it cross platform.

04cfc10096418de3158ef67cd7a82d78492de4e6 authored over 7 years ago

Drops TODO in to replace notimplementedexception

f4f78ff0debaf58c780d6cdce6cc229e9862b79f authored over 7 years ago

Merge pull request #94 from ComicIronic/relative-paths

Makes the server use relative pathing from the executing directory

f05a838e5c802889f8e7d9747e83dd88fd32eb12 authored almost 8 years ago

Merge pull request #93 from ComicIronic/VS-fix

Fixes build if Microsoft.VisualStudio doesn't exist.

ca01673742ccc30465a35bc9fa476b068164bf94 authored almost 8 years ago

Remove debug messages

82f609005f263973ef3378550544d128603b488a authored almost 8 years ago

Merge pull request #92 from ComicIronic/remove-lua

Remove Lua bindings.

f00793265f00ae0c5d5e5c7f0a6463d4fe1bd549 authored almost 8 years ago

Merge pull request #97 from ComicIronic/commands

Console command changes.

1dace9f5c0c4afb6253ea8931a7d57c67f5895d5 authored almost 8 years ago

Merge remote-tracking branch 'upstream/master' into console-title

b70bf6f13b97bd95454c94ea9eca2e9c5df63b95 authored almost 8 years ago

Alright we're done, ClientConsoleHost code left out.

a05055ca5b09bc7bf0951cf56c91d6e5f5323b8c authored almost 8 years ago

More shit.

Yes, shit is an accurate representation here.

132ada4587e0a2a6a43248d8b629d40a772b759b authored almost 8 years ago

More work

b76a961f3b8f1abbc66780295efa44a0289a73ca authored almost 8 years ago

Commands WiP 2

f52fbefa60439746e50e344de9e75b2d6d849ddf authored almost 8 years ago

Command parsing rework part 1.

Added multiple interfaces and abstracts to rework client / chat / server
console commands.

Chat...

bc44efe04b980054c1041c81b9c640fd36d9ff2e authored almost 8 years ago

Fix a bunch of broken GUI code in relation to the console and chat.

a91f7c365f8059f62050d4b87e7451f3b683ae3a authored almost 8 years ago

Fix paths on linux

c3a9001958feb91d55dacfd2087abb75185bae79 authored almost 8 years ago

Makes the server more pwd indepedent.

a35b3ffa8be76c1ca7af06332c3bbb86c1eb359a authored almost 8 years ago

Fixes build if Microsoft.VisualStudio doesn't exist.

646887e7c77dcd9134a825a83c8644daf9545961 authored almost 8 years ago

Remove Lua

9f371ee46a5e546b025cec96e8d463ff5bc53d66 authored almost 8 years ago

Merge pull request #86 from PJB3005/eols

Standardize EOLs

0dc9dd8b1fe466baa382cbb9e0a036e84a7e8ab8 authored almost 8 years ago

Merge pull request #84 from psykzz/sliding-collisions

Slide when colliding with Colliders

e207a099e45dbb639313b2f5f34a927f4f090d6a authored almost 8 years ago

Merge pull request #91 from PJB3005/commandline

Basic command line argument handling for the server.

25d084324d12113312f24c311655e31ac26c569f authored almost 8 years ago

Sorry Comic

fc26fe4fe53c40528b04742e13d5119512a52f29 authored almost 8 years ago

Set newPosition by .Value

b68118ec764dc441c19b06e8a68f11642e87a051 authored almost 8 years ago

Consistency

af158b4b91c0fb7b8a3827e48c520e4df072b0a0 authored almost 8 years ago

Add command line argument parser for the server.

ca3de2289d991ad0684a7ecbf612ab57638742b8 authored almost 8 years ago

Merge pull request #87 from PJB3005/colored-logging

Adds colored logging.

c5ac18d37416dfe477eb1be163e43a3be18b2d96 authored almost 8 years ago

Gitignore packages dir

c22bc9729393f8133b115bbb0d2b6ec0d7f65417 authored almost 8 years ago

Signal handlers for clean shutdown of server, clear terminal title on shutdown.

da7909dcb21deeb519af72d7c8838f4483645efa authored almost 8 years ago

Removes Interaction System Exception

This code would crash servers testing out interaction code whenever they click on an empty tile ...

f4392715c351e11652edd9aba701697b53bd1c94 authored almost 8 years ago

Adds colored logging.

8ff0a2f8b50b357af035fac81a7c566ed28a999c authored almost 8 years ago

Standardize EOLs

6337b130a1b8c165d18feea068301e4b41ccd3df authored almost 8 years ago

Slide when colliding with walls

37b4d62490627479f96f35bcaa8b84405b4e8bc5 authored almost 8 years ago

Merge pull request #79 from CrAzYPiLoT-SS13/warning_resolve

Reduces warning count

003bc7f0de8085e84536289c2d310e0fdf46b317 authored almost 8 years ago

Merge pull request #77 from psykzz/cleanup

Cleanup whitespace and ChatChannel summaries

eaa86db69828a2224456c735d379832f0ca0d290 authored almost 8 years ago

Reduces warning count to 1

a5159948f9b970e295434331833417b6b4c6a5fd authored almost 8 years ago

Merge remote-tracking branch 'refs/remotes/origin/master' into cleanup

67f4aeca26c4e0b11b740a5e50978c62373ec9e7 authored almost 8 years ago

Cleanup whitespace

0cce393a58f9117ea448f1087b9b3ea33148ab11 authored almost 8 years ago

Cleanup Update func

Moved to a switch to improve readability

f76358354cb60d0d9965144a413bbe92998f51cd authored almost 8 years ago

Cleanup ChatChannel details

001e9c39065bc7ae3d8473f61a29628d7dab9553 authored almost 8 years ago

Merge pull request #72 from psykzz/bug/log-file-inuse

Catch log file in use Exception

c3f2c293bfe68698bb241ecb6ce8fe8abee5f934 authored over 8 years ago

Catch log file in use.

d52a68dad29d9b5a98e941c75742bf53d45daaf0 authored over 8 years ago

Merge pull request #71 from Silvertorch5/devops

Fixes F6 Toggling Lighting and F2 AABB Debug

ec8fccdcdc0f59f52bdb7a9b8e3f2218ee258503 authored over 8 years ago

Toggle AABB Debug with F2

36e0854733b84278fbffcb27040d1e1345f3a439 authored over 8 years ago

F6 will now toggle lighting.

b1a10845ed09c8ba7eae9bff3d34a5bdb35104d7 authored over 8 years ago

Remove ClientUserInterface

Wasnt being used at all.

9422fdcbe9890056f1440e07b04f63d3277a7b40 authored over 8 years ago

Add AABB Debug, Fix Debug Toggle

2eb7391c89283a509c4dfc188e7830fa41f55df8 authored over 8 years ago

Merge pull request #70 from Silvertorch5/master

Fixes #63 Lighting bug, Green Rectangles

d486fb964a904b6830752163c6c77834d7bc744a authored over 8 years ago

Merge pull request #1 from Silvertorch5/devops

Merge into master

7c25e2586dbd6ef181b18f66bfe3326b00d51928 authored over 8 years ago

Fix Green Colliders

0b8b08ebb0eec32747e2483ffa34ec5f39c58207 authored over 8 years ago

Fixes Light Rendering

Hotfix for now, very small performance hit

d7e116aae018bdcb57970d10474a5bc990794d53 authored over 8 years ago

CSFML Libs auto copy to /bin

fda4ace7ecb41390f7e9f80e47d3a9677d41ce8c authored over 8 years ago

Merge remote-tracking branch 'refs/remotes/space-wizards/master' into devops

166eb8fbfcd871dfc17b9ebe7f370051c22a0f89 authored over 8 years ago

Merge pull request #59 from Silvertorch5/devops

Fixes GUI Hotbar

7fd3443d27873be1590d874d32c75223fb5f6281 authored over 8 years ago

Merge remote-tracking branch 'refs/remotes/origin/master' into devops

b35c1a9c7f859361a13d86ac111b88526353e31c authored over 8 years ago

GUI Fix Hotbar

1283dd230f1b2bce9ea37c0d6d2c5dba4f478ca5 authored over 8 years ago

Remove unused libs

57f27347f9524d415f87ee6ac697c993066fb68b authored over 8 years ago

move sfml libs back to Graphics

1b949e3c8c3c253f731cafb06203326f5b0dfc09 authored over 8 years ago

Merge remote-tracking branch 'refs/remotes/space-wizards/master' into devops

b3b5411d25e0e7609bebe353f01c0b68ecfed728 authored over 8 years ago

GetAnimatedSprite()

Return NoSprite instead of null

554b007c0b2317986cc0f54a308758b4cfa3b91c authored over 8 years ago

Merge pull request #36 from space-wizards/master

Updated master from upstream/master

290aa4af4cd5b930d7d84ade5fd66aaa06413de7 authored over 8 years ago

Merge branch 'sfml', correctly this time

1c59b4cb7077f2795c1f7753736215442afe9ccd authored almost 9 years ago

Merge branch 'sfml' of https://github.com/space-wizards/space-station-14 into sfml

52f3d8f3f165399fd79573c15f57fff78f5e8ce9 authored almost 9 years ago

Merge pull request #35 from space-wizards/master

Update master from upstream

e0f3cfef6b0176304fdbee08f3b7a2ee6397786f authored almost 9 years ago

Merge branch 'sfml'

cd50f08b1e8fea4c1a1734d655f3e83f56eee9ee authored almost 9 years ago

Revert "Merge pull request #26 from Silvertorch5/viewport"

This reverts commit ffba0852b850d694fff2909b71a531f467134348, reversing
changes made to 99b66c24...

d0dd7870ab3677410c1e51de8cae16626bbf1e4e authored almost 9 years ago

Merge pull request #57 from NickPowers43/nick0

Fixed missing non-directional tile placement sprite and replaced null sprites with the nosprite...

0d1493beeb4604810d2861ab923df17ad421f78a authored almost 9 years ago

Revert "Concatenation with StringBuilder"

This reverts commit 92d55fdb99d97af8dffb6116fbf84c8f81ab1384.

ee50447c3f71ad516bc259b088f01d71fbeeb12f authored almost 9 years ago

Concatenation with StringBuilder

92d55fdb99d97af8dffb6116fbf84c8f81ab1384 authored almost 9 years ago

Fixed null returns

5472b98afa23e56f055d7e9a00e73a1862557c6a authored almost 9 years ago

Fixed missing non-directional sprite

c1aba6592643ec32e1dcb2d7530ebaa09541b59a authored almost 9 years ago

Merge pull request #34 from space-wizards/sfml

Update master from upstream

0f9309e9a00b976e0eb30bde16d26401eb665e75 authored almost 9 years ago

Merge pull request #32 from Silvertorch5/devops

Update master

eb379e07ac7d7cd3627f82f26bec39cfc0e9e5c9 authored almost 9 years ago

Merge pull request #49 from PJB3005/OpenTK-0B

c3606b8337b79fee30588c3c61cd3d8295bd8369 authored almost 9 years ago

Merge pull request #54 from Silvertorch5/devops

Passed Travis CI and visual checks, Merging

ee3fc522b3a0d9c11c35ae2c9eb5ba2bf1047e3b authored almost 9 years ago

Vector2 to Vector2f

e9dbf55f8f80cc6536e0e48eb8c57b900aa7b3d0 authored almost 9 years ago

Disable Debug

for now

d8eef10f022283e8e56afb89fb9bdd3a67e259bd authored almost 9 years ago

Conflict Fix

Fixes the conflict

c149d3aa1617cac7c26a5cc5d2210ad1070d20b6 authored almost 9 years ago

Light Rendering Fix, Update SavedEntities

screenShadows was being drawn every frame instead of when it had changed
causing he weird light ...

d55224b156850929dbf8ca252157d4f01fff7bea authored almost 9 years ago

Conflict fix

7e22c6051f8dc0f6ffa50ea4873ca20b3eb05080 authored almost 9 years ago

Light Rendering Fix, Update SavedEntities

screenShadows was being drawn every frame instead of when it had changed
causing he weird light ...

489d7924d692f9e5d5471a35466e21d533325ba4 authored almost 9 years ago

Ecosyste.ms: OpenCollective

github.com/space-wizards/space-station-14-old