Commit graph

1135 commits

Author SHA1 Message Date
Alexander
9123efa688 Yell at jumble for telling me to push this. 2015-08-23 21:44:15 -04:00
Master Jumblespeed
1e3fc86d8c toons: change some invokers to targets 2015-08-23 21:21:31 -04:00
Loudrob
824fdc2867 This actually isn't needed lel. 2015-08-23 19:59:17 -04:00
Master Jumblespeed
58275c061e nirai: aes --> xor for byte obfuscation, add toon takeover command, change prefix to stride-beta 2015-08-23 18:04:26 -04:00
Loudrob
94cb45f44b Rest of track choice shit. 2015-08-23 11:21:54 -04:00
Loudrob
9e02732ef9 Revert lil oldman track choice. 2015-08-23 11:13:42 -04:00
Loudrob
ccf64c323b No more taunt. 2015-08-23 11:00:22 -04:00
Master Voltage
634d8bcb19 new cog model code 2015-08-23 00:34:37 -04:00
Loudrob
64a87dff1b A few fixes. 2015-08-22 18:33:08 -04:00
Loudrob
a31c46f29a Fix content pack support. 2015-08-22 08:50:02 -04:00
Alexander
fef0e0678e Fix time zones for now. 2015-08-22 02:25:00 -04:00
Loudrob
7b37667112 go away minnie 2015-08-21 17:06:29 -04:00
Alexander
1309f1a4ad Fix ~~target, and add a command to disable your GM icon. 2015-08-21 15:28:46 -04:00
Alexander
684b9800d7 Rename Painter Joey to Painter Eddy. 2015-08-21 11:50:33 -04:00
Alexander
688979c93e Control C now works when you use it and the server will crash and reboot if it does crash. TODO: fix report manager to not use threading. 2015-08-21 00:40:42 -04:00
Alexander
5c0ff2544b Update resources and pull code from master. 2015-08-20 21:04:27 -04:00
John
d2afb22e07 Fixed that for ya 2015-08-20 11:09:22 +02:00
Alexander
60f3706aae Fix a rpc method. 2015-08-20 00:49:58 -04:00
Loudrob
d536ca4ec4 They have access to ~allSummons anyway so... 2015-08-19 18:37:24 -04:00
Alexander
6a2a335828 Make maxToon, and dna target and not invoker. 2015-08-19 17:54:05 -04:00
Alexander Behrhof
f7eee2c753 Merge branch 'features/dan' into 'feature/deployment'
Features/dan



See merge request !6
2015-08-19 17:10:00 -04:00
Alexander
f28cf39e61 Change to local ip on prod. 2015-08-19 16:57:07 -04:00
Alexander
432c1dc626 Add 2nd floor houses. 2015-08-19 13:45:34 -04:00
Alexander
656185975b Remove a debug message. 2015-08-18 16:05:45 -04:00
Alexander
2aa8488175 Fix a crash and update resources. 2015-08-18 14:39:38 -04:00
John
a867837385 SOS page fix 2015-08-17 16:54:59 +03:00
John
7053ae8676 Add teleport toggle and prevent teleportation when ignored 2015-08-17 16:21:07 +03:00
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