Commit graph

1158 commits

Author SHA1 Message Date
John
2e744ba51f SOS page in detail panel 2015-08-17 15:55:43 +03:00
John
81f6895954 Bigger text in suit page 2015-08-17 14:24:05 +03:00
John
a54cbc8778 Cog hover panel in battle gui 2015-08-17 12:42:39 +03:00
John
3f12bc6500 Gag/SOS detail panel popup on battle gui 2015-08-17 11:11:38 +03:00
John
794d1298ee Add level range to suit page 2015-08-17 01:53:29 +03:00
John
3cc83f1441 Add hover thing to suit page + fix library flickering for Intel HD graphics 2015-08-17 01:29:51 +03:00
Alexander
cc19bbaebb Kill useless code. 2015-08-16 16:31:11 -04:00
Alexander
90fe033e08 Merge remote-tracking branch 'origin/master' into feature/deployment 2015-08-16 16:28:50 -04:00
Alexander Behrhof
029bd08e1f Merge branch 'features/dan' into 'master'
Features/dan



See merge request !3
2015-08-16 16:19:07 -04:00
Master Jumblespeed
9ba059adc4 rpc: fix small bug with calling toons 2015-08-16 16:10:47 -04:00
Master Jumblespeed
1f21d7053f tokens: add some token checks 2015-08-16 15:12:23 -04:00
Alexander
398ede7a85 Jumble, WHY U DELETE MY COMMITS <3 2015-08-16 14:01:39 -04:00
Master Jumblespeed
61b8cc4fd3 Merge branch 'feature/deployment' of Repo.Ez-webz.com:Stride/src into feature/deployment 2015-08-16 02:45:23 -04:00
Master Jumblespeed
c3f9e861d0 rpc: change rpc_getUserAccountId to call data from site 2015-08-16 02:44:23 -04:00
Alexander
833d9b2880 Remove debug message. 2015-08-16 02:32:13 -04:00
Alexander
c98510471d Fixed the missiong Icon from the game. (Can be reverted) 2015-08-16 02:29:12 -04:00
Alexander
2f96488aec Changed the way we call the mongodb so the database match up. 2015-08-16 02:28:44 -04:00
Alexander
5018215e74 The game now allows you in, and pulled Jumble's ssl, ban, and chat changes. 2015-08-15 19:36:05 -04:00
Loudrob
7139be634f cashbot boss treasure 2015-08-14 19:24:08 -04:00
Master Jumblespeed
6a05d84b04 merge and add 2015-08-14 18:58:37 -04:00
Master Jumblespeed
4904b8040c chat: finalize speedchat from site 2015-08-14 18:50:30 -04:00
Alexander
e4568ef9fd Add rest of Nirai code changes, And get the game working without compression. 2015-08-14 16:44:11 -04:00
John
b4afca2fce Teleport fail cooldown + whisper frame text fix 2015-08-14 19:47:48 +03:00
John
2689789ab1 Clickable browser whispers + cleanup 2015-08-14 19:30:11 +03:00
John
09c412ea74 Remove glove color option from MAT 2015-08-14 17:50:02 +03:00
John
0154fb4453 Remove black, gray, white toons from the make a toon and random toon generation (Sorry, Sid Sonata!) 2015-08-14 17:43:59 +03:00
John
d686796023 Merge SnowUtil and SkyUtil into SZUtil, fix mayChange spam in log because of the map, fix the various issues with the underwater fog. 2015-08-14 17:23:45 +03:00
John
699c54b40d DisplaySettingsDialog fix 2015-08-14 16:47:05 +03:00
Alexander
ad81064fb7 Add back files from old deployment branch. 2015-08-14 02:23:24 -04:00
John
655d77a401 Add chat settings RPC command: untested 2015-08-14 00:38:00 +03:00
John
b8ef66621f CHAT_SETTINGS Account dc field 2015-08-14 00:31:23 +03:00
John
be54eb19df 2X merit multiplier for factories 2015-08-13 23:39:09 +03:00
Loudrob
ecc33e1c3d some more mongo stuff (sorry that i pushed it here :() 2015-08-13 16:00:50 -04:00
John
ae3a7e7dc5 Nerf fish rarity properly 2015-08-13 22:42:29 +03:00
John
a3822b5099 Proper resistance toon DNAs + scarecrow fix in CFO battle 2015-08-13 15:41:18 +03:00
John
fc0a24904c Tutorial chat bubble click fix + arrows fix 2015-08-13 14:47:51 +03:00
John
1d1e96d055 Fix cast member crash 2015-08-13 14:03:08 +03:00
John
0976a80bef Carry 3 TNTs and 7 trapdoors 2015-08-13 13:58:38 +03:00
John
dc83a72cc4 Widescreen whisper frame 2015-08-13 13:54:13 +03:00
John
3880d7e032 NPCToons cleanup 2015-08-13 13:23:57 +03:00
John
6bdc129b67 Organic gag display in the battle GUI and better ~trackBonus command 2015-08-13 03:55:51 +03:00
John
3d5a138a68 SOS friends are now sorted by rarity 2015-08-13 03:19:58 +03:00
John
b155962dca Fix a bug with the teleport button 2015-08-12 22:46:34 +03:00
John
2098275dfa Cog HQ teleport crash fix 2015-08-12 22:03:58 +03:00
John
9299357345 Color picker fixes 2015-08-12 21:49:51 +03:00
John
0489a156a3 Color drag 2015-08-12 21:37:20 +03:00
John
b3efea4a6d Teleport button fixed 2015-08-12 20:17:34 +03:00
John
7a8552c10e More fixes 2015-08-12 19:14:40 +03:00
John
19608959c5 Tutorial fix 2015-08-12 19:10:45 +03:00
John
f137f3f047 Toons now stop when greeted with a warning message while trying to go into a door instead of running in 1 place 2015-08-12 18:44:35 +03:00
John
1dcba024d5 NPC fix!! 2015-08-12 18:37:17 +03:00
John
c7011bc757 Don't send trophies on result 2015-08-12 14:55:03 +03:00
John
41307f6a0f Revert "Another friend fix"
This reverts commit 156752b4a7.
2015-08-12 14:51:07 +03:00
John
156752b4a7 Another friend fix 2015-08-12 14:45:48 +03:00
John
da0366d02a TV proper loop 2015-08-12 14:39:31 +03:00
John
bacd4b365c Boarding Group messages are now clickable 2015-08-12 14:21:39 +03:00
John
9d43264adc Friends list bug fix 2015-08-12 14:17:43 +03:00
John
e2d7b9b674 POPSICLES 2015-08-10 16:33:28 +03:00
John
1d8fe20587 Refactor suit health bar 2015-08-09 15:23:35 +03:00
John
7019d1ba9a Rewritten (no pun intended) cog panel 2015-08-09 14:32:13 +03:00
John
a2d5b004c9 Holocaust fire cost 2015-08-09 13:41:30 +03:00
Alexander
1d4caa84e9 Revert to old way for now. 2015-08-08 22:53:39 -04:00
Alexander
9b1dfba315 Let's try this. 2015-08-08 22:38:16 -04:00
Alexander
4ac30dbe52 Forgot a import. 2015-08-08 22:29:39 -04:00
Alexander
4a12f647ee Fix game crashing now? 2015-08-08 22:24:05 -04:00
Alexander
aa99dab28d Avoid using the account-bridge on prod. 2015-08-08 22:14:29 -04:00
Alexander
f6e34fd8a5 Fix Missing 'mongodb' 2015-08-08 21:14:57 -04:00
Alexander
504c178acc Update Resources, LibPandaDna (broken) and fix the missing resources on the client. 2015-08-08 10:12:50 -04:00
John
80b5e4c548 New magic word: ~secondVP - skips to second battle 2015-08-08 13:32:48 +03:00
John
ce8d856ebe Proper Fish Bingo implementation using News Manager 2015-08-08 12:08:45 +03:00
John
0718b91ed4 Add the new shops and NPCs for the street 2015-08-07 23:54:53 +03:00
John
56c9f71296 Yet another fix.. 2015-08-07 23:32:10 +03:00
John
d696338f5d Color shop crash fix 2015-08-07 23:27:54 +03:00
Alexander
d93a8e5e60 Merge remote-tracking branch 'origin/master' into feature/deployment 2015-08-07 16:13:37 -04:00
John
4a0ac70835 Preferred district 2015-08-07 17:36:58 +03:00
John
e31d7fae8e NPC Tuple magic word 2015-08-07 13:02:07 +03:00
John
68b8b047a5 Grammar fixes, settings.json beautify, crash fixes, GC fixes (still breaks though with #f), and gag selection fix 2015-08-06 14:55:00 +03:00
John
3093813f06 Holocaust minimum laff for elevators 2015-08-06 12:29:26 +03:00
Alexander
ad206df3e9 Add some more things needed for deployment. 2015-08-05 15:41:39 -04:00
John
c00680154d Falling asleep fix 2015-08-05 13:54:18 +03:00
John
7ad94d8034 Holocaust Talkative Tyler 2015-08-05 13:44:56 +03:00
John
57cb06e3fa Migrate color after manual change 2015-08-05 13:30:52 +03:00
John
567c556ebc No TV looping 2015-08-05 11:38:49 +03:00
John
ead19d7c63 Another fix 2015-08-05 11:05:01 +03:00
Alexander
00e3650737 Replace self.shard with the correct districtId. 2015-08-05 04:02:12 -04:00
Alexander
5c776d6cc8 Fix a mistake I made. 2015-08-05 03:55:11 -04:00
Alexander
2e6cc13c56 Add the resources as a submodule for deployment. 2015-08-05 03:46:11 -04:00
John
c609a44980 Shuffle button fix 2015-08-04 23:17:48 +03:00
John
b036e788e8 Cut down on colors 2015-08-04 22:11:43 +03:00
John
859eba5e10 Fix Glove NPC.. I promise 2015-08-04 22:08:38 +03:00
John
ed9c41bbf4 Glove NPC 2015-08-04 22:00:20 +03:00
John
8acb336dae Actual color picker 2015-08-04 21:57:39 +03:00
John
86223ef6df Take that colorful coons! 2015-08-04 19:59:47 +03:00
John
edb6fa9d40 Broken af 2015-08-04 19:33:25 +03:00
John
3ff51a9b14 Holocausted Laughing Man 2015-08-04 16:26:11 +03:00
John
1f4783607d Color gender equality 2015-08-04 14:46:02 +03:00
John
a4c9d2957c Gag popup on hover 2015-08-04 03:18:12 +03:00
John
1b6c2c0176 Buster's pitched cog fall apart sound 2015-08-03 17:31:13 +03:00
John
e0e2c27681 Added a few NPCs to the new street - the NameMe ones are missing 2015-08-03 15:49:36 +03:00
John
a5b7293a35 Fix emote access 2015-08-03 03:53:39 +03:00