Commit graph

999 commits

Author SHA1 Message Date
RogueAI42
e5bd035b4c fix a small bad in ShiftoriumFrontend 2017-06-10 02:50:15 +10:00
Michael VanOverbeek
ebf9b7b253 Merge pull request #126 from AShifter/master
Master
2017-06-05 13:48:50 -04:00
AShifter
a152c2c463 Fixed ShiftLotto (again)
Recently, Codepoints have been changed to ULong64. While SuperDoggo (on
discord) was playing ShiftLotto, he tried to bet 100cp with only 80cp.
The check to make sure you don't overbet failed because ShiftLotto
subtracts codepoints*difficulty - currentCodepoints. If this value is
negitive, it should give you an error. But, due to the transition to
ulong,, this does not work and the check passes, removing (or adding if
you're lucky) codepoints, crashing the game. I fixed this by simply
changing thechecking statment from subtraction to a Less Than check (<).
WOW I TYPED ALOT OF STUFF
2017-06-05 10:01:16 -06:00
AShifter
61c906e596 Merge remote-tracking branch 'refs/remotes/shiftos-game/master' 2017-06-05 09:49:46 -06:00
Michael
3e11eca704 Fix story autosave 2017-06-04 21:07:43 -04:00
Michael
5e40ae4e29 Fix major server reboot. 2017-06-04 15:53:24 -04:00
Michael
69aba3b373 A fuckton of storyline features. 2017-06-04 15:18:53 -04:00
Michael VanOverbeek
4faeb54225 Merge pull request #125 from RogueAI42/master
fixed shiftorium
2017-06-03 11:48:04 -04:00
RogueAI42
7fe5d790dc fixed shiftorium
just in time for chrimbus
2017-06-04 01:29:21 +10:00
Michael
cc55af0c8b story objectives system 2017-06-03 09:16:44 -04:00
Michael
719f2e4170 Rebalance shiftnet subscriptions 2017-06-02 21:06:31 -04:00
Michael
11e80a6a61 fix the audio system 2017-06-02 11:38:38 -04:00
Michael VanOverbeek
bae2c83757 Merge pull request #124 from RogueAI42/master
Pong Refactor
2017-06-02 10:54:23 -04:00
RogueAI42
17f3f6f685 Fixed Pong?
there are some sound crashes but Michael told me to just make the
PR and let him fix the audio backend so that's what I'm doing.
2017-06-03 00:43:20 +10:00
Michael
ce5469464a Fix bug where terminal hangs on bad command 2017-06-02 08:15:51 -04:00
Michael
5246798b0a Make stories not happen until user is logged in. 2017-06-02 08:05:53 -04:00
Michael
0b9ac754ac Another new default skin. 2017-06-01 18:27:22 -04:00
Michael
d001b613fb Fix Graphic Picker UI. 2017-06-01 17:45:59 -04:00
Michael
03cf891c53 Icon Manager and various icon bugfixes. 2017-06-01 17:09:22 -04:00
Michael
324104eb0b volume control slider and other goodies 2017-05-31 19:23:40 -04:00
Michael
b0da30bbde COMPLETELY WORKING notification system! 2017-05-31 09:14:27 -04:00
Michael
c631172761 modular notifications 2017-05-31 09:03:19 -04:00
Michael
3dd402277b Fix sizing issue with notifications, and UP key in terminal 2017-05-31 08:40:29 -04:00
Michael
ecf5297dbb slightly fix balloon notes 2017-05-30 21:50:19 -04:00
Michael
0451b5d157 Slight Shiftnet mods, new default skin. 2017-05-30 16:34:31 -04:00
Michael
0ca2fffe7a storydev.list command 2017-05-30 13:18:14 -04:00
Michael VanOverbeek
c6e3d0e905 Really you long-ass nerd, Michael... 2017-05-30 00:20:19 +00:00
Michael VanOverbeek
b35e50e7ef You scratch my back and I detach your back. 2017-05-30 00:15:35 +00:00
Michael
37ac4c684c It's amazing what talking to Rylan can do to an integer datatype. 2017-05-29 20:08:30 -04:00
Michael
ff47625d25 fix some clientside save softlocks 2017-05-29 16:08:59 -04:00
Michael VanOverbeek
505073b693 Fix server-side crash when kiading revoked api keys 2017-05-29 16:42:01 +00:00
Michael
58c9152351 various things from last night 2017-05-29 11:38:20 -04:00
Rylan/wowmom98
f5a8a0a8c7 actually fix my dumb mistake 2017-05-28 16:30:02 -04:00
Michael
e85832a5a4 fix double login issue and oobe bugs 2017-05-28 16:05:57 -04:00
william341
771c20cfb3 Merge pull request #1 from shiftos-game/master
welp, no longer a dev.
2017-05-28 12:37:00 -07:00
Rylan/wowmom98
c7ba7d733c un obsoleting 2017-05-28 14:44:24 -04:00
Michael
9914c18456 Fuck 2017-05-28 14:40:42 -04:00
Michael
6123e06842 make localization 50 billion times faster 2017-05-28 13:36:28 -04:00
Michael
03ebdf42d9 Funny, disabling localization makes things easier... 2017-05-28 12:40:06 -04:00
Michael
4036e97f3f Don't clear the terminal when in fullscreen 2017-05-28 10:26:11 -04:00
Michael
80899fc5de Cool startup logo 😃 2017-05-28 10:12:59 -04:00
Michael
8e3bdf71e7 strip things down but make things better 2017-05-28 07:21:16 -04:00
Michael
dc0b8c6688 Fix a bug with command-line login. 2017-05-28 06:44:58 -04:00
Michael
e841b168e1 stuff 2017-05-27 16:59:54 -04:00
Michael
fde832b357 simplesrc refurbishment 2017-05-27 12:11:36 -04:00
Michael
97e22b35ad SLIGHT optimizations? 2017-05-26 17:06:38 -04:00
Michael
798f0e5920 Fix a lot of bugs with terminal 2017-05-24 17:18:28 -04:00
Michael
fc12f2244f optimize shiftorium 2017-05-24 16:51:44 -04:00
Michael
8e345174ee Dramatically increase terminal performance. 2017-05-24 16:41:49 -04:00
Michael
9764bfd2aa revamp sos.help a little 2017-05-24 10:03:36 -04:00